You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/11/14 13:14:28 UTC
[1/4] git commit: updated refs/heads/4.3 to e2fd4ef
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 <sa...@apache.org>
(cherry picked from commit dfa607fb443cbd0c3f2c264c2abfa9f1844a16ce)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
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 <sa...@apache.org>
Authored: Tue Aug 5 10:00:00 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
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);
[4/4] git commit: updated refs/heads/4.3 to e2fd4ef
Posted by bh...@apache.org.
CLOUDSTACK-6011 . When detach is called on a deleted volume, avoid the NPE and throw an appropriate exception instead
(cherry picked from commit f4a96d4c853bd4f60539b9b9e9218b42640652a9)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e2fd4ef4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e2fd4ef4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e2fd4ef4
Branch: refs/heads/4.3
Commit: e2fd4ef42c92f64353b2830f5f19e5b32eafd3fa
Parents: d9e9471
Author: Likitha Shetty <li...@citrix.com>
Authored: Mon Feb 3 17:59:58 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Nov 14 17:32:41 2014 +0530
----------------------------------------------------------------------
server/src/com/cloud/storage/VolumeApiServiceImpl.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2fd4ef4/server/src/com/cloud/storage/VolumeApiServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
index bc319b9..df5e205 100644
--- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
@@ -1387,6 +1387,11 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
volume = _volsDao.findByInstanceAndDeviceId(cmmd.getVirtualMachineId(), cmmd.getDeviceId()).get(0);
}
+ // Check that the volume ID is valid
+ if (volume == null) {
+ throw new InvalidParameterValueException("Unable to find volume with ID: " + volumeId);
+ }
+
Long vmId = null;
if (cmmd.getVirtualMachineId() == null) {
@@ -1395,11 +1400,6 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
vmId = cmmd.getVirtualMachineId();
}
- // Check that the volume ID is valid
- if (volume == null) {
- throw new InvalidParameterValueException("Unable to find volume with ID: " + volumeId);
- }
-
// Permissions check
_accountMgr.checkAccess(caller, null, true, volume);
[2/4] git commit: updated refs/heads/4.3 to e2fd4ef
Posted by bh...@apache.org.
CLOUDSTACK-6652 CLONE - [Automation] Vmware- System's StartCommand failed with "NumberFormatException" while using VMware DVS
vlan id format was like "vlan://<id>" instead of just "<id>". This causes numberformatexception while converting the vlan id to integer form from string form. this was fixed for standard vswitch in bug Cloudstack-5046. now fixed for other 2 cases of dvswitch as well as pvlan.
Signed-off-by: Sateesh Chodapuneedi <sa...@apache.org>
(cherry picked from commit a605ca09cd3e40a8f25ae3e36ce37f1f24ac489b)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/17676d6b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/17676d6b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/17676d6b
Branch: refs/heads/4.3
Commit: 17676d6bb96a473facddba69be0809884db70d66
Parents: 1d7adf5
Author: Sateesh Chodapuneedi <sa...@apache.org>
Authored: Tue May 13 15:00:29 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Nov 14 17:25:34 2014 +0530
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/17676d6b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
index 645dec9..70581ea 100755
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
@@ -501,10 +501,10 @@ public class HypervisorHostHelper {
if(vlanId != null && !UNTAGGED_VLAN_NAME.equalsIgnoreCase(vlanId)) {
createGCTag = true;
- vid = Integer.parseInt(BroadcastDomainType.getValue(vlanId));
+ vid = Integer.parseInt(vlanId);
}
if (secondaryvlanId != null) {
- spvlanid = Integer.parseInt(BroadcastDomainType.getValue(secondaryvlanId));
+ spvlanid = Integer.parseInt(secondaryvlanId);
}
}
[3/4] git commit: updated refs/heads/4.3 to e2fd4ef
Posted by bh...@apache.org.
CLOUDSTACK-5785: VM display name cell not updated upon detaching volume from VM
(cherry picked from commit ea29adb7b96d31a07f6528c79f57847a43175966)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d9e94717
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d9e94717
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d9e94717
Branch: refs/heads/4.3
Commit: d9e94717b5db251b2a888b485fc695dae2ee2e59
Parents: 17676d6
Author: Chris Suich <cs...@gmail.com>
Authored: Thu Apr 10 22:23:04 2014 -0400
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Nov 14 17:31:27 2014 +0530
----------------------------------------------------------------------
ui/scripts/storage.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d9e94717/ui/scripts/storage.js
----------------------------------------------------------------------
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index a1af129..bd9f7c9 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -968,7 +968,7 @@
getUpdatedItem: function(json) {
return {
virtualmachineid: null,
- vmname: null
+ vmdisplayname: null
};
},
getActionFilter: function() {