cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sate...@apache.org
Subject git commit: updated refs/heads/master to dfa607f
Date Tue, 05 Aug 2014 10:15:24 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master cc725e53e -> dfa607fb4


CLOUDSTACK-7250 [vCenter 5.5] SourceNAT,StaticNAT and Portfowrding is not working with Vmware
DVS in vCenter 5.5

Change in vCenter 5.5 API from prior versions forced code change in CloudStack. Update property
value of property "VirtualE1000.deviceInfo.summary" is accommodated now.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>


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

Branch: refs/heads/master
Commit: dfa607fb443cbd0c3f2c264c2abfa9f1844a16ce
Parents: cc725e5
Author: Sateesh Chodapuneedi <sateesh@apache.org>
Authored: Tue Aug 5 10:00:00 2014 +0530
Committer: Sateesh Chodapuneedi <sateesh@apache.org>
Committed: Tue Aug 5 10:00:00 2014 +0530

----------------------------------------------------------------------
 .../src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dfa607fb/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
index e8d91f6..e5398af 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
@@ -2412,7 +2412,7 @@ public class VirtualMachineMO extends BaseMO {
             attachedNetworkSummary = ((VirtualEthernetCard)nic).getDeviceInfo().getSummary();
             if (attachedNetworkSummary.startsWith(networkNamePrefix)) {
                 return new Pair<Integer, VirtualDevice>(new Integer(index), nic);
-            } else if (attachedNetworkSummary.endsWith("DistributedVirtualPortBackingInfo.summary"))
{
+            } else if (attachedNetworkSummary.endsWith("DistributedVirtualPortBackingInfo.summary")
|| attachedNetworkSummary.startsWith("DVSwitch")) {
                 dvPortGroupName = getDvPortGroupName((VirtualEthernetCard)nic);
                 if (dvPortGroupName != null && dvPortGroupName.startsWith(networkNamePrefix))
{
                     s_logger.debug("Found a dvPortGroup already associated with public NIC.");


Mime
View raw message