apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed agent code to handle untagged public vlan while parsing the vlan id

Browse Source
This commit is contained in:
Rajesh Battala 2014-02-05 23:44:14 +05:30
parent adf6026d21
commit 7f780f26f9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
View File

@ -391,7 +391,7 @@ namespace HypervResource
string vlan = null; string vlan = null;
string isolationUri = nic.isolationUri; string isolationUri = nic.isolationUri;
string broadcastUri = nic.broadcastUri; string broadcastUri = nic.broadcastUri;
if ( (broadcastUri != null ) || (isolationUri != null && isolationUri.StartsWith("vlan://")) && !isolationUri.Equals("vlan://untagged")) if ( (broadcastUri != null ) || (isolationUri != null && isolationUri.StartsWith("vlan://")))
{ {
if (broadcastUri != null && broadcastUri.StartsWith("storage")) if (broadcastUri != null && broadcastUri.StartsWith("storage"))
{ {
@ -402,7 +402,11 @@ namespace HypervResource
vlan = isolationUri.Substring("vlan://".Length); vlan = isolationUri.Substring("vlan://".Length);
} }
int tmp; int tmp;
if (!int.TryParse(vlan, out tmp)) if (vlan.Equals("untagged", StringComparison.CurrentCultureIgnoreCase) ) {
// recevied vlan is untagged, don't parse for the vlan in the isolation uri
vlan = null;
}
else if (!int.TryParse(vlan, out tmp))
{ {
// TODO: double check exception type // TODO: double check exception type
errMsg = string.Format("Invalid VLAN value {0} for on vm {1} for nic uuid {2}", isolationUri, vmName, nic.uuid); errMsg = string.Format("Invalid VLAN value {0} for on vm {1} for nic uuid {2}", isolationUri, vmName, nic.uuid);