CS-9919: Support for Nexus Swiches (Cisco Vswitches)

Devdeep Singh · Vijayendra Bhamidipati · commit 8db1ca296bde · 2012-05-25T17:41:17.000-07:00
Description:

	Do not set the access mode of an interface if vlanid is zero.
diff --git a/utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java b/utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java
@@ -50,8 +50,7 @@ public enum SwitchPortMode {
 
     public enum OperationType {
         addvlanid,
-        removevlanid,
-        setrate
+        removevlanid
     }
 
     public static String getAddPortProfile(String name, PortProfileType type,
@@ -338,7 +337,9 @@ private static Element configPortProfileDetails(Document doc, String name, PortP
             // Switchport mode.
             portProf.appendChild(getSwitchPortMode(doc, mode));
             // Adding vlan details.
-            portProf.appendChild(getAddVlanDetails(doc, mode, Integer.toString(vlanid)));
+            if (vlanid > 0) {
+                portProf.appendChild(getAddVlanDetails(doc, mode, Integer.toString(vlanid)));
+            }
         }
 
         // Command "vmware port-group".
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
@@ -165,7 +165,6 @@ public static void createPortProfile(VmwareContext context, String ethPortProfil
 		
 		List<Pair<OperationType, String>> params = new ArrayList<Pair<OperationType, String>>();
 		params.add(new Pair<OperationType, String>(OperationType.addvlanid, vid.toString()));
-		params.add(new Pair<OperationType, String>(OperationType.setrate, networkRateMbps.toString()));
 		
 		try {
 			netconfClient.updatePortProfile(ethPortProfileName, SwitchPortMode.access, params); 
@@ -202,7 +201,6 @@ public static void updatePortProfile(VmwareContext context, String ethPortProfil
 		
 		List<Pair<OperationType, String>> params = new ArrayList<Pair<OperationType, String>>();
 		params.add(new Pair<OperationType, String>(OperationType.addvlanid, vid.toString()));
-		params.add(new Pair<OperationType, String>(OperationType.setrate, networkRateMbps.toString()));
 		
 		try {
 			netconfClient.updatePortProfile(ethPortProfileName, SwitchPortMode.access, params); 
