cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke4...@apache.org
Subject [44/50] git commit: CS-9919: Support for Nexus Swiches (Cisco Vswitches)
Date Sun, 27 May 2012 22:30:44 GMT
CS-9919: Support for Nexus Swiches (Cisco Vswitches)

Description:

	Do not set the access mode of an interface if vlanid is zero.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8db1ca29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8db1ca29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8db1ca29

Branch: refs/heads/master
Commit: 8db1ca296bde978b8afee95fbb71c56b65fc8922
Parents: b6687fa
Author: Devdeep Singh <devdeep.singh@citrix.com>
Authored: Sun May 13 12:32:04 2012 +0530
Committer: Vijayendra Bhamidipati <vijayendra.bhamidipati@citrix.com>
Committed: Fri May 25 17:41:17 2012 -0700

----------------------------------------------------------------------
 .../com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java |    7 ++++---
 .../hypervisor/vmware/mo/HypervisorHostHelper.java |    2 --
 2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8db1ca29/utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java
----------------------------------------------------------------------
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 abf902b..bf0752a 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".

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8db1ca29/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
----------------------------------------------------------------------
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 160c4e7..1861b32 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); 


Mime
View raw message