From 8db1ca296bde978b8afee95fbb71c56b65fc8922 Mon Sep 17 00:00:00 2001
From: Devdeep Singh <devdeep.singh@citrix.com>
Date: Sun, 13 May 2012 12:32:04 +0530
Subject: [PATCH] CS-9919: Support for Nexus Swiches (Cisco Vswitches)

Description:

	Do not set the access mode of an interface if vlanid is zero.
---
 utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java   | 7 ++++---
 .../cloud/hypervisor/vmware/mo/HypervisorHostHelper.java   | 2 --
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java b/utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java
index abf902b5278..bf0752acf84 100644
--- 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 class VsmCommand {
 
     public enum OperationType {
         addvlanid,
-        removevlanid,
-        setrate
+        removevlanid
     }
 
     public static String getAddPortProfile(String name, PortProfileType type,
@@ -338,7 +337,9 @@ public class VsmCommand {
             // 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
index 160c4e7c04a..1861b32a344 100755
--- 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 class HypervisorHostHelper {
 		
 		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 class HypervisorHostHelper {
 		
 		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);