cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [10/10] git commit: updated refs/heads/master to 4d57ec0
Date Tue, 03 May 2016 02:53:17 GMT
Merge branch '4.8'

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


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

Branch: refs/heads/master
Commit: 4d57ec04acec3d3baacde95cdb0905304bfd2658
Parents: e762e27 126a039
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Tue May 3 08:22:37 2016 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Tue May 3 08:22:37 2016 +0530

----------------------------------------------------------------------
 debian/control                                  |  2 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java |  8 +--
 .../cloud/vm/VirtualMachineManagerImplTest.java | 28 ++++++++++
 .../vmware/resource/VmwareResource.java         |  7 ++-
 .../resource/VmwareStorageProcessor.java        | 28 ++++------
 .../com/cloud/api/query/QueryManagerImpl.java   |  6 +--
 .../com/cloud/storage/VolumeApiServiceImpl.java | 34 ++++++++++++
 server/src/com/cloud/vm/UserVmManager.java      |  2 +
 server/src/com/cloud/vm/UserVmManagerImpl.java  | 12 +++++
 .../cloud/storage/VolumeApiServiceImplTest.java | 25 +++++++++
 server/test/com/cloud/vm/UserVmManagerTest.java | 21 ++++++++
 test/integration/smoke/test_loadbalance.py      |  2 +-
 .../utils/volume/VirtualMachineDiskInfo.java    | 48 +++++++++++++++++
 .../volume/VirtualMachineDiskInfoTest.java      | 55 ++++++++++++++++++++
 .../vmware/mo/VirtualMachineDiskInfo.java       | 42 ---------------
 .../mo/VirtualMachineDiskInfoBuilder.java       |  2 +
 .../hypervisor/vmware/mo/VirtualMachineMO.java  |  2 +-
 17 files changed, 250 insertions(+), 74 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d57ec04/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d57ec04/engine/orchestration/test/com/cloud/vm/VirtualMachineManagerImplTest.java
----------------------------------------------------------------------
diff --cc engine/orchestration/test/com/cloud/vm/VirtualMachineManagerImplTest.java
index a101dfb,d849eab..9bc22c4
--- a/engine/orchestration/test/com/cloud/vm/VirtualMachineManagerImplTest.java
+++ b/engine/orchestration/test/com/cloud/vm/VirtualMachineManagerImplTest.java
@@@ -508,10 -515,22 +516,30 @@@ public class VirtualMachineManagerImplT
      }
  
      @Test
 +    public void testExeceuteInSequence() {
 +        assertTrue(_vmMgr.getExecuteInSequence(HypervisorType.XenServer) == false);
 +        assertTrue(_vmMgr.getExecuteInSequence(HypervisorType.KVM) == false);
 +        assertTrue(_vmMgr.getExecuteInSequence(HypervisorType.VMware) == HypervisorGuru.VmwareFullClone.value());
 +        assertTrue(_vmMgr.getExecuteInSequence(HypervisorType.Ovm3) == VirtualMachineManager.ExecuteInSequence.value());
 +    }
++
++    @Test
+     public void testCheckIfCanUpgrade() throws Exception {
+         when(_vmInstance.getState()).thenReturn(State.Stopped);
+         when(_serviceOfferingMock.isDynamic()).thenReturn(true);
+         when(_vmInstance.getServiceOfferingId()).thenReturn(1l);
+         when(_serviceOfferingMock.getId()).thenReturn(2l);
+ 
+         ServiceOfferingVO mockCurrentServiceOffering = mock(ServiceOfferingVO.class);
+ 
+         when(_offeringDao.findByIdIncludingRemoved(anyLong(), anyLong())).thenReturn(mockCurrentServiceOffering);
+         when(mockCurrentServiceOffering.getUseLocalStorage()).thenReturn(true);
+         when(_serviceOfferingMock.getUseLocalStorage()).thenReturn(true);
+         when(mockCurrentServiceOffering.getSystemUse()).thenReturn(true);
+         when(_serviceOfferingMock.getSystemUse()).thenReturn(true);
+         when(mockCurrentServiceOffering.getTags()).thenReturn("x,y");
+         when(_serviceOfferingMock.getTags()).thenReturn("z,x,y");
+ 
+         _vmMgr.checkIfCanUpgrade(_vmInstance, _serviceOfferingMock);
+     }
  }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d57ec04/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d57ec04/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
----------------------------------------------------------------------


Mime
View raw message