cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rajeshbatt...@apache.org
Subject git commit: updated refs/heads/4.3 to a9ca480
Date Tue, 24 Dec 2013 11:26:25 GMT
Updated Branches:
  refs/heads/4.3 43806aafe -> a9ca48035


CLOUDSTACK-5595 add vlan to storage nic to vnic for ssvm


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

Branch: refs/heads/4.3
Commit: a9ca48035423df972aed2a7af140d190e636720f
Parents: 43806aa
Author: Rajesh Battala <rajesh.battala@citrix.com>
Authored: Tue Dec 24 16:56:12 2013 +0530
Committer: Rajesh Battala <rajesh.battala@citrix.com>
Committed: Tue Dec 24 17:00:24 2013 +0530

----------------------------------------------------------------------
 .../DotNet/ServerResource/HypervResource/WmiCallsV2.cs  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a9ca4803/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
index f0f7f7b..06730e0 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
@@ -390,9 +390,17 @@ namespace HypervResource
                     string mac = nic.mac;
                     string vlan = null;
                     string isolationUri = nic.isolationUri;
-                    if (isolationUri != null && isolationUri.StartsWith("vlan://")
&& !isolationUri.Equals("vlan://untagged"))
+                    string broadcastUri = nic.broadcastUri;
+                    if ( (broadcastUri != null ) || (isolationUri != null && isolationUri.StartsWith("vlan://"))
&& !isolationUri.Equals("vlan://untagged"))
                     {
-                        vlan = isolationUri.Substring("vlan://".Length);
+                        if (broadcastUri != null && broadcastUri.StartsWith("storage"))
+                        {
+                            vlan = broadcastUri.Substring("storage://".Length);
+                        }
+                        else
+                        {
+                            vlan = isolationUri.Substring("vlan://".Length);
+                        }
                         int tmp;
                         if (!int.TryParse(vlan, out tmp))
                         {


Mime
View raw message