cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [22/50] [abbrv] git commit: updated refs/heads/marvin_refactor to 2a99064
Date Tue, 09 Apr 2013 13:20:59 GMT
CLOUDSTACK-658 - Scaleup vm support for Xenserver
Added the framweork so that it can be extended for vmware and kvm as well.
Added unitests and marvin tests.


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

Branch: refs/heads/marvin_refactor
Commit: fae09fe19eb62040f7ac7e533ac573cfbb2e3966
Parents: 3e88a43
Author: Nitin Mehta <nitin.mehta@citrix.com>
Authored: Thu Mar 28 16:43:37 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Sun Mar 31 22:06:01 2013 +0530

----------------------------------------------------------------------
 .../xenserver/Add-To-VCPUs-Params-Live.sh          |    1 -
 test/integration/smoke/test_ScaleVm.py             |   26 +++++++-------
 2 files changed, 13 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fae09fe1/scripts/vm/hypervisor/xenserver/Add-To-VCPUs-Params-Live.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/Add-To-VCPUs-Params-Live.sh b/scripts/vm/hypervisor/xenserver/Add-To-VCPUs-Params-Live.sh
index 0fadcd8..b44fec9 100644
--- a/scripts/vm/hypervisor/xenserver/Add-To-VCPUs-Params-Live.sh
+++ b/scripts/vm/hypervisor/xenserver/Add-To-VCPUs-Params-Live.sh
@@ -30,4 +30,3 @@ if [[ $key == "cap" ]]
 then
     xe vm-param-set VCPUs-params:cap=$value uuid=$uuid
 fi
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fae09fe1/test/integration/smoke/test_ScaleVm.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_ScaleVm.py b/test/integration/smoke/test_ScaleVm.py
index 710d2ad..8f48c6f 100644
--- a/test/integration/smoke/test_ScaleVm.py
+++ b/test/integration/smoke/test_ScaleVm.py
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -41,12 +41,12 @@ class Services:
                     "firstname": "Test",
                     "lastname": "User",
                     "username": "test",
-                    # Random characters are appended in create account to 
+                    # Random characters are appended in create account to
                     # ensure unique username generated each time
                     "password": "password",
                 },
                 "small":
-                # Create a small virtual machine instance with disk offering 
+                # Create a small virtual machine instance with disk offering
                 {
                     "displayname": "testserver",
                     "username": "root", # VM creds for SSH
@@ -61,7 +61,7 @@ class Services:
                 {
                  "small":
                     {
-                     # Small service offering ID to for change VM 
+                     # Small service offering ID to for change VM
                      # service offering from medium to small
                         "name": "SmallInstance",
                         "displaytext": "SmallInstance",
@@ -71,7 +71,7 @@ class Services:
                     },
                 "big":
                     {
-                     # Big service offering ID to for change VM 
+                     # Big service offering ID to for change VM
                         "name": "BigInstance",
                         "displaytext": "BigInstance",
                         "cpunumber": 1,
@@ -127,7 +127,7 @@ class TestScaleVm(cloudstackTestCase):
                                     cls.api_client,
                                     cls.services["service_offerings"]["small"]
                                     )
-        
+
         cls.big_offering = ServiceOffering.create(
                                     cls.api_client,
                                     cls.services["service_offerings"]["big"]
@@ -166,22 +166,22 @@ class TestScaleVm(cloudstackTestCase):
 
     @attr(tags = ["advanced", "basic", "multicluster", "storagemotion", "xenserver"])
     def test_01_scale_vm(self):
-        """Test scale virtual machine 
+        """Test scale virtual machine
         """
         # Validate the following
         # Scale up the vm and see if it scales to the new svc offering and is finally in
running state
-        
-      
-      
+
+
+
         self.debug("Scaling VM-ID: %s to service offering: %s" % (
                                         self.virtual_machine.id,
                                         self.big_offering.id
                                         ))
-        
+
         cmd = scaleVirtualMachine.scaleVirtualMachineCmd()
         cmd.serviceofferingid = self.big_offering.id
         cmd.id = self.virtual_machine.id
-        self.apiclient.scaleVirtualMachine(cmd)  
+        self.apiclient.scaleVirtualMachine(cmd)
 
         list_vm_response = list_virtual_machines(
                                             self.apiclient,


Mime
View raw message