Changeset 228

Timestamp:

11/13/08 16:36:52 (8 weeks ago)

Author:

tinova

Message:

Fixed leases deletion.

Location:

one/branches/DEVELOPMENT/VirtualNetworkManager

Files:

• include/Attribute.h (modified) (2 diffs)
• src/common/Attribute.cc (modified) (1 diff)
• src/vm/VirtualMachine.cc (modified) (4 diffs)

one/branches/DEVELOPMENT/VirtualNetworkManager/include/Attribute.h

@@ -81 +81 @@
     
     /**
-     *  Replaces the attribute value from a string.
-     */
-    virtual void replace(const string& sattr) = 0;
-    
-    /**
      *  Returns the attribute type
      */
@@ -219 +214 @@
     /**
      *  Replace the value of the given attribute with the provided map
-     */    
-    void replace(const string& sattr);
+     */
+    void replace(const map<string,string>& attr);
+
 
     /**

one/branches/DEVELOPMENT/VirtualNetworkManager/src/common/Attribute.cc

@@ -90 +90 @@
 /* -------------------------------------------------------------------------- */
 
-void VectorAttribute::replace(const string& sattr)
+void VectorAttribute::replace(const map<string,string>& attr)
 {
-        attribute_value.erase(attribute_value.begin(),attribute_value.end());
-
-        unmarshall(sattr);
+        attribute_value = attr;
 }
 

one/branches/DEVELOPMENT/VirtualNetworkManager/src/vm/VirtualMachine.cc

@@ -305 +305 @@
     VirtualNetwork           * vn;
     VectorAttribute          * nic;
-
-    ostringstream              new_nic;
+    map<string,string>         new_nic;
     
     string                     ip;
@@ -312 +311 @@
     string                     bridge;
     string                     network;
+
+    ostringstream              vnid;
 
     //Set a name if the VM has not got one
@@ -337 +338 @@
      num_nics   = vm_template.get("NIC",nics);
      
-     for(int i=0; i<num_nics; i++,new_nic.str(""))
+     for(int i=0; i<num_nics; i++,vnid.str(""))
      {
+         new_nic.erase(new_nic.begin(),new_nic.end());
+
          nic = dynamic_cast<VectorAttribute * >(nics[i]);
 
@@ -366 +369 @@
          
          vn->unlock();
+
+         vnid << vn->get_oid();
+
+         new_nic.insert(make_pair("NETWORK",network));
+         new_nic.insert(make_pair("MAC"    ,mac));
+         new_nic.insert(make_pair("BRIDGE" ,bridge));
+         new_nic.insert(make_pair("VNID"   ,vnid.str()));
+         new_nic.insert(make_pair("IP"     ,ip));
          
-         new_nic << "NETWORK="  << network << "," <<
-                    "MAC="      << mac     << "," <<
-                    "BRIDGE="   << bridge  << "," <<
-                    "VNID="     << vn->get_oid() << "," <<
-                    "IP="       << ip;   
-         
-         nic->replace(new_nic.str());
+         nic->replace(new_nic);
                  
     }