apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-15 18:12:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Description:

	Do not set the access mode of an interface if vlanid is zero.
This commit is contained in:
Devdeep Singh 2012-05-13 12:32:04 +05:30 committed by Vijayendra Bhamidipati
parent b6687faf89
commit 8db1ca296b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java
View File

@ -50,8 +50,7 @@ public class VsmCommand {
public enum OperationType { public enum OperationType {
addvlanid, addvlanid,
removevlanid, removevlanid
setrate
} }
public static String getAddPortProfile(String name, PortProfileType type, public static String getAddPortProfile(String name, PortProfileType type,
@ -338,7 +337,9 @@ public class VsmCommand {
// Switchport mode. // Switchport mode.
portProf.appendChild(getSwitchPortMode(doc, mode)); portProf.appendChild(getSwitchPortMode(doc, mode));
// Adding vlan details. // 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". // Command "vmware port-group".

2
vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
View File

@ -165,7 +165,6 @@ public class HypervisorHostHelper {
List<Pair<OperationType, String>> params = new ArrayList<Pair<OperationType, String>>(); 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.addvlanid, vid.toString()));
params.add(new Pair<OperationType, String>(OperationType.setrate, networkRateMbps.toString()));
try { try {
netconfClient.updatePortProfile(ethPortProfileName, SwitchPortMode.access, params); netconfClient.updatePortProfile(ethPortProfileName, SwitchPortMode.access, params);
@ -202,7 +201,6 @@ public class HypervisorHostHelper {
List<Pair<OperationType, String>> params = new ArrayList<Pair<OperationType, String>>(); 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.addvlanid, vid.toString()));
params.add(new Pair<OperationType, String>(OperationType.setrate, networkRateMbps.toString()));
try { try {
netconfClient.updatePortProfile(ethPortProfileName, SwitchPortMode.access, params); netconfClient.updatePortProfile(ethPortProfileName, SwitchPortMode.access, params);