From 85acc2e00e2192b965303edd7ae2a96ca8c9e8c6 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 16:36:53 +0000
Subject: [PATCH] Now VMWare drivers remove predefined NICs from VMWare VMs

git-svn-id: http://svn.opennebula.org/one/trunk@672 3034c82b-c49b-4eb3-8279-a7acafdc01c0
---
 src/vmm_mad/vmware/DeployVM.java | 53 ++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/vmm_mad/vmware/DeployVM.java b/src/vmm_mad/vmware/DeployVM.java
index bcc342e095..b84c97dcfa 100644
--- a/src/vmm_mad/vmware/DeployVM.java
+++ b/src/vmm_mad/vmware/DeployVM.java
@@ -256,46 +256,49 @@ public class DeployVM
      
      void configureNetwork()
      {
-         String[][] nics = pXML.getNet();
-         
+         String[][] nics                  = pXML.getNet();
+         int        nics_toRemove_counter = 0; 
          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();
+         VirtualDevice [] test = vmConfigInfo.getHardware().getDevice();
          
-
-         
-         // Lenth of array is #nicsToBeRemoved-#nicsToBeAdded
-                     
-         //test.length+
-         VirtualDeviceConfigSpec [] nicSpecArray = new VirtualDeviceConfigSpec[
-                                                                               nics.length];
+         VirtualDeviceConfigSpec [] nicSpecArray_toRemove = new VirtualDeviceConfigSpec[test.length];   
          
          // Let's remove existing NICs
-         
-       /*  for(int i=0;i<test.length;i++)
+         for(int i=0;i<test.length;i++)
          {
              VirtualDeviceConfigSpec nicSpec = new VirtualDeviceConfigSpec(); 
              VirtualEthernetCard nic;
              
              nicSpec.setOperation(VirtualDeviceConfigSpecOperation.remove);            
-             nic             = (VirtualEthernetCard)test[i];
+             
+             try
+             {
+                nic             = (VirtualEthernetCard)test[i];
+             }
+             catch(Exception e)
+             {
+                 continue;
+             }
              
              nicSpec.setDevice(nic);
-             
-             nicSpecArray[i] = nicSpec;
+             nicSpecArray_toRemove[nics_toRemove_counter++] = nicSpec;
          }
-         */
          
-        // Let's add specified NICs
-         
-         for(int i=0;i<nics.length;i++)
+        
+
+         VirtualDeviceConfigSpec [] nicSpecArray = new VirtualDeviceConfigSpec[nics_toRemove_counter+   
+                                                                               nics.length];
+
+         // Let's add specified NICs
+         for(int i=nics_toRemove_counter;i<(nics.length+nics_toRemove_counter);i++)
          {
              VirtualDeviceConfigSpec nicSpec = new VirtualDeviceConfigSpec();
-             String networkName = nics[i][1]; 
+             String networkName = nics[i-nics_toRemove_counter][1]; 
              
              nicSpec.setOperation(VirtualDeviceConfigSpecOperation.add);
              VirtualEthernetCard nic =  new VirtualPCNet32();
@@ -303,15 +306,19 @@ public class DeployVM
                 = new VirtualEthernetCardNetworkBackingInfo();
              nicBacking.setDeviceName(networkName);
              nic.setAddressType("manual");
-             nic.setMacAddress(nics[i][0]);
+             nic.setMacAddress(nics[i-nics_toRemove_counter][0]);
              nic.setBacking(nicBacking);
              nic.setKey(4);
              nicSpec.setDevice(nic);
-             nicSpecArray[i] = nicSpec; // +test.length
+             nicSpecArray[i] = nicSpec; 
+         }
+
+         for(int i=0;i<nics_toRemove_counter;i++)
+         {
+            nicSpecArray[i] = nicSpecArray_toRemove[i];
          }
          
          vmConfigSpec.setDeviceChange(nicSpecArray);
-    
      }