From b4529d302431c84cb2ab202790163f191e42b2a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantino=20V=C3=A1zquez=20Blanco?= <tinova@fdi.ucm.es>
Date: Fri, 10 Jul 2009 14:19:17 +0000
Subject: [PATCH] Added dynamic virtualswitch selection in VMWare drivers

git-svn-id: http://svn.opennebula.org/one/trunk@671 3034c82b-c49b-4eb3-8279-a7acafdc01c0
---
 src/im_mad/vmware/OneImVmware.java       |   4 +-
 src/vmm_mad/vmware/DeployVM.java         | 284 +++++++++++------------
 src/vmm_mad/vmware/OperationsOverVM.java |   4 +-
 src/vmm_mad/vmware/ParseXML.java         |  22 +-
 4 files changed, 151 insertions(+), 163 deletions(-)

diff --git a/src/im_mad/vmware/OneImVmware.java b/src/im_mad/vmware/OneImVmware.java
index e6da8778d9..c4a17fcbd4 100644
--- a/src/im_mad/vmware/OneImVmware.java
+++ b/src/im_mad/vmware/OneImVmware.java
@@ -125,9 +125,9 @@ class OneImVmware extends Thread
                               }
                               
                               argsWithHost[arguments.length]      = "--url";
-//                              argsWithHost[arguments.length + 1 ] = "https://" + hostToMonitor + ":443/sdk";
+                              argsWithHost[arguments.length + 1 ] = "https://" + hostToMonitor + ":443/sdk";
 
-                              argsWithHost[arguments.length + 1 ] = "https://localhost:8008/sdk";
+//                              argsWithHost[arguments.length + 1 ] = "https://localhost:8008/sdk";
                               gP = new GetProperty(argsWithHost, "HostSystem", hostToMonitor);
                                               
                               // Now it's time to build the response gathering the properties needed
diff --git a/src/vmm_mad/vmware/DeployVM.java b/src/vmm_mad/vmware/DeployVM.java
index 4c8f72ff0b..bcc342e095 100644
--- a/src/vmm_mad/vmware/DeployVM.java
+++ b/src/vmm_mad/vmware/DeployVM.java
@@ -217,8 +217,8 @@ public class DeployVM
          vmConfigSpec.setCpuAllocation(raInfo);
          
          // DISKs
-         
-         addDisks();
+         // TODO finish disk support
+         // addDisks();
          
          // Network
          
@@ -253,6 +253,137 @@ public class DeployVM
       }
       
       
+     
+     void configureNetwork()
+     {
+         String[][] nics = pXML.getNet();
+         
+         if(nics.length==1 && nics[0].equals(""))
+         {
+             return;
+         }
+         
+         // First, let's find out the number of NICs to be removed    
+        // VirtualDevice [] test = vmConfigInfo.getHardware().getDevice();
+         
+
+         
+         // Lenth of array is #nicsToBeRemoved-#nicsToBeAdded
+                     
+         //test.length+
+         VirtualDeviceConfigSpec [] nicSpecArray = new VirtualDeviceConfigSpec[
+                                                                               nics.length];
+         
+         // Let's remove existing NICs
+         
+       /*  for(int i=0;i<test.length;i++)
+         {
+             VirtualDeviceConfigSpec nicSpec = new VirtualDeviceConfigSpec(); 
+             VirtualEthernetCard nic;
+             
+             nicSpec.setOperation(VirtualDeviceConfigSpecOperation.remove);            
+             nic             = (VirtualEthernetCard)test[i];
+             
+             nicSpec.setDevice(nic);
+             
+             nicSpecArray[i] = nicSpec;
+         }
+         */
+         
+        // Let's add specified NICs
+         
+         for(int i=0;i<nics.length;i++)
+         {
+             VirtualDeviceConfigSpec nicSpec = new VirtualDeviceConfigSpec();
+             String networkName = nics[i][1]; 
+             
+             nicSpec.setOperation(VirtualDeviceConfigSpecOperation.add);
+             VirtualEthernetCard nic =  new VirtualPCNet32();
+             VirtualEthernetCardNetworkBackingInfo nicBacking 
+                = new VirtualEthernetCardNetworkBackingInfo();
+             nicBacking.setDeviceName(networkName);
+             nic.setAddressType("manual");
+             nic.setMacAddress(nics[i][0]);
+             nic.setBacking(nicBacking);
+             nic.setKey(4);
+             nicSpec.setDevice(nic);
+             nicSpecArray[i] = nicSpec; // +test.length
+         }
+         
+         vmConfigSpec.setDeviceChange(nicSpecArray);
+    
+     }
+     
+      
+    DeployVM(String[] args, String hostName, String vid, ParseXML _pXML, String _datastore, String _datacenter) throws Exception
+    {  
+
+        String[] argsWithHost = new String[args.length+2];
+        
+        for(int i=0;i<args.length;i++)
+        {
+            argsWithHost[i] = args[i];
+        }
+        
+        argsWithHost[args.length]      = "--url";
+        argsWithHost[args.length + 1 ] = "https://" + hostName + ":443/sdk";
+
+        //argsWithHost[args.length + 1 ] = "https://localhost:8008/sdk";
+
+
+        cb = AppUtil.initialize("DeployVM", null, argsWithHost);
+        cb.connect();
+        
+        datastoreName  = _datastore;
+        datacenterName = _datacenter;
+        
+        vmName     = _pXML.getName() + "-" + vid;
+        vmDiskName = _pXML.getName();
+        pXML       = _pXML;
+
+        // Get reference to host
+        hostMor = cb.getServiceUtil().getDecendentMoRef(null,"HostSystem",
+                                                           hostName);
+                                                        
+        com.vmware.apputils.vim.ServiceConnection sc = cb.getConnection();
+        content = sc.getServiceContent();
+        service = sc.getService();
+    }
+    
+    DeployVM(String[] args, String hostName, String _vmName, String _datastore, String _datacenter) throws Exception
+    {  
+
+        String[] argsWithHost = new String[args.length+2];
+        
+        for(int i=0;i<args.length;i++)
+        {
+            argsWithHost[i] = args[i];
+        }
+        
+        argsWithHost[args.length]      = "--url";
+        argsWithHost[args.length + 1 ] = "https://" + hostName + ":443/sdk";
+        
+        //argsWithHost[args.length + 1 ] = "https://localhost:8008/sdk";
+
+        cb = AppUtil.initialize("DeployVM", null, argsWithHost);
+        cb.connect();
+
+        datastoreName  = _datastore;
+        datacenterName = _datacenter;
+        
+        vmName     = _vmName;
+        vmDiskName = _vmName.substring(0,_vmName.lastIndexOf("-"));
+
+        // Get reference to host
+        hostMor = cb.getServiceUtil().getDecendentMoRef(null,"HostSystem",
+                                                           hostName);
+                                                        
+        com.vmware.apputils.vim.ServiceConnection sc = cb.getConnection();
+        content = sc.getServiceContent();
+        service = sc.getService();
+    }
+    
+/*
      void addDisks()
      {
          String[] disks = pXML.getDisk();
@@ -313,152 +444,5 @@ public class DeployVM
          }
          
          vmConfigSpec.setDeviceChange(vdiskSpecArray);           
-     }
-     
-     void configureNetwork()
-     {
-         String[] nics = pXML.getNet();
-         
-         if(nics.length==1 && nics[0].equals(""))
-         {
-             return;
-         }
-         
-         // First, let's find out the number of NICs to be removed    
-         VirtualDevice [] test = vmConfigInfo.getHardware().getDevice();
-         
-
-         
-         // Lenth of array is #nicsToBeRemoved-#nicsToBeAdded
-                     
-         VirtualDeviceConfigSpec [] nicSpecArray = new VirtualDeviceConfigSpec[test.length+
-                                                                               nics.length];
-         
-         // Let's remove existing NICs
-         
-       /*  for(int i=0;i<test.length;i++)
-         {
-             VirtualDeviceConfigSpec nicSpec = new VirtualDeviceConfigSpec(); 
-             VirtualEthernetCard nic;
-             
-             nicSpec.setOperation(VirtualDeviceConfigSpecOperation.remove);            
-             nic             = (VirtualEthernetCard)test[i];
-             
-             nicSpec.setDevice(nic);
-             
-             nicSpecArray[i] = nicSpec;
-         }
-         */
-         
-        // Let's add specified NICs
-         
-         for(int i=0;i<nics.length;i++)
-         {
-             VirtualDeviceConfigSpec nicSpec = new VirtualDeviceConfigSpec();
-             // TODO make this dynamic
-             String networkName = "one-net"; 
-             
-             nicSpec.setOperation(VirtualDeviceConfigSpecOperation.add);
-             VirtualEthernetCard nic =  new VirtualPCNet32();
-             VirtualEthernetCardNetworkBackingInfo nicBacking 
-                = new VirtualEthernetCardNetworkBackingInfo();
-             nicBacking.setDeviceName(networkName);
-             nic.setAddressType(nics[i]); 
-             nic.setBacking(nicBacking);
-             nic.setKey(4);
-             nicSpec.setDevice(nic);
-             nicSpecArray[i+test.length] = nicSpec;
-         }
-     }
-     
-      
-    
-    /*
-    private String getDataStoreName(int size) throws Exception{
-       String dsName = null;
-       ManagedObjectReference [] datastores 
-          = (ManagedObjectReference [])cb.getServiceUtil().getDynamicProperty(
-                _virtualMachine,"datastore");
-       for(int i=0; i<datastores.length; i++) {
-          DatastoreSummary ds 
-             = (DatastoreSummary)cb.getServiceUtil().getDynamicProperty(datastores[i],
-                                                                       "summary");
-          if(ds.getFreeSpace() > size) {
-             dsName = ds.getName();
-             i = datastores.length + 1;           
-          }
-       }
-       return dsName;
-    }
-    */
-    
-    DeployVM(String[] args, String hostName, String vid, ParseXML _pXML, String _datastore, String _datacenter) throws Exception
-    {  
-
-        String[] argsWithHost = new String[args.length+2];
-        
-        for(int i=0;i<args.length;i++)
-        {
-            argsWithHost[i] = args[i];
-        }
-        
-        argsWithHost[args.length]      = "--url";
-        //argsWithHost[args.length + 1 ] = "https://" + hostName + ":443/sdk";
-
-        argsWithHost[args.length + 1 ] = "https://localhost:8008/sdk";
-
-
-        cb = AppUtil.initialize("DeployVM", null, argsWithHost);
-        cb.connect();
-        
-        datastoreName  = _datastore;
-        datacenterName = _datacenter;
-        
-        vmName     = _pXML.getName() + "-" + vid;
-        vmDiskName = _pXML.getName();
-        pXML       = _pXML;
-
-        // Get reference to host
-        hostMor = cb.getServiceUtil().getDecendentMoRef(null,"HostSystem",
-                                                           hostName);
-                                                        
-        com.vmware.apputils.vim.ServiceConnection sc = cb.getConnection();
-        content = sc.getServiceContent();
-        service = sc.getService();
-    }
-    
-    DeployVM(String[] args, String hostName, String _vmName, String _datastore, String _datacenter) throws Exception
-    {  
-
-        String[] argsWithHost = new String[args.length+2];
-        
-        for(int i=0;i<args.length;i++)
-        {
-            argsWithHost[i] = args[i];
-        }
-        
-        argsWithHost[args.length]      = "--url";
-        //argsWithHost[args.length + 1 ] = "https://" + hostName + ":443/sdk";
-        
-        argsWithHost[args.length + 1 ] = "https://localhost:8008/sdk";
-
-        cb = AppUtil.initialize("DeployVM", null, argsWithHost);
-        cb.connect();
-
-        datastoreName  = _datastore;
-        datacenterName = _datacenter;
-        
-        vmName     = _vmName;
-        vmDiskName = _vmName.substring(0,_vmName.lastIndexOf("-"));
-
-        // Get reference to host
-        hostMor = cb.getServiceUtil().getDecendentMoRef(null,"HostSystem",
-                                                           hostName);
-                                                        
-        com.vmware.apputils.vim.ServiceConnection sc = cb.getConnection();
-        content = sc.getServiceContent();
-        service = sc.getService();
-    }
-    
-
+     }*/
 }
diff --git a/src/vmm_mad/vmware/OperationsOverVM.java b/src/vmm_mad/vmware/OperationsOverVM.java
index d025d27f3e..a9ced9848b 100644
--- a/src/vmm_mad/vmware/OperationsOverVM.java
+++ b/src/vmm_mad/vmware/OperationsOverVM.java
@@ -287,9 +287,9 @@ public class OperationsOverVM
          }
 
          argsWithHost[args.length]      = "--url";
-         //argsWithHost[args.length + 1 ] = "https://" + hostName + ":443/sdk";
+         argsWithHost[args.length + 1 ] = "https://" + hostName + ":443/sdk";
 
-         argsWithHost[args.length + 1 ] = "https://localhost:8008/sdk";
+//         argsWithHost[args.length + 1 ] = "https://localhost:8008/sdk";
 
          cb = AppUtil.initialize("DeployVM", null, argsWithHost);
          cb.connect();
diff --git a/src/vmm_mad/vmware/ParseXML.java b/src/vmm_mad/vmware/ParseXML.java
index 321dba4d27..55ea5cbcd6 100644
--- a/src/vmm_mad/vmware/ParseXML.java
+++ b/src/vmm_mad/vmware/ParseXML.java
@@ -13,12 +13,12 @@ import org.xml.sax.SAXParseException;
 
 public class ParseXML
 {
-    private String   name = "";
-    private String   cpu  = "";
-    private String[] disk = {""};
-    private String   memory = "";
-    private String[] macs = {""};
-    private String   vmID = "";
+    private String      name = "";
+    private String      cpu  = "";
+    private String[]    disk = {""};
+    private String      memory = "";
+    private String[][]  macs;
+    private String      vmID = "";
     
     /**
      * Parses the XML file and fills the values
@@ -97,13 +97,17 @@ public class ParseXML
             
             if(nwNL.getLength()!=0)
             {
-                macs = new String[nwNL.getLength()];
+                macs = new String[nwNL.getLength()][2];
                 
                 for(int i=0; i<nwNL.getLength(); i++)
                 {
                     NodeList mac = ((Element)nwNL.item(i)).getElementsByTagName("MAC");
                     
-                    macs[i] = ((Node)mac.item(0)).getFirstChild().getNodeValue().trim();
+                    macs[i][0] = ((Node)mac.item(0)).getFirstChild().getNodeValue().trim();
+
+                    NodeList bridge = ((Element)nwNL.item(i)).getElementsByTagName("BRIDGE");
+
+                    macs[i][1] = ((Node)bridge.item(0)).getFirstChild().getNodeValue().trim();
                 }
             }            
         }
@@ -145,7 +149,7 @@ public class ParseXML
      * Returns networks MACs
      * @return macs array with the macs of the NICs to be added to this VM
      **/
-    String[] getNet()
+    String[][] getNet()
     {
         return macs;
     }