Repository: cloudstack Updated Branches: refs/heads/4.3 d81b67939 -> e2fd4ef42
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 <[email protected]> (cherry picked from commit dfa607fb443cbd0c3f2c264c2abfa9f1844a16ce) Signed-off-by: Rohit Yadav <[email protected]> Conflicts: vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1d7adf52 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1d7adf52 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1d7adf52 Branch: refs/heads/4.3 Commit: 1d7adf52161f3a6ec1d6609ac70f3086c79d8a41 Parents: d81b679 Author: Sateesh Chodapuneedi <[email protected]> Authored: Tue Aug 5 10:00:00 2014 +0530 Committer: Rohit Yadav <[email protected]> Committed: Fri Nov 14 17:22:34 2014 +0530 ---------------------------------------------------------------------- .../src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1d7adf52/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 69a7e50..faf79fc 100644 --- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java +++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java @@ -2355,8 +2355,8 @@ 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")) { - dvPortGroupName = getDvPortGroupName((VirtualEthernetCard) nic); + } 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."); return new Pair<Integer, VirtualDevice>(new Integer(index), nic);
