cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tall...@apache.org
Subject git commit: updated refs/heads/master to cf82af9
Date Sat, 07 Feb 2015 19:22:49 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master b3cebdbbf -> cf82af956


CLOUDSTACK-8161: disabled vm migrate related test cases for LXC.


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

Branch: refs/heads/master
Commit: cf82af956727feab52a72f09909af02563a75a87
Parents: b3cebdb
Author: SrikanteswaraRao Talluri <talluri@apache.org>
Authored: Sun Feb 8 00:52:05 2015 +0530
Committer: SrikanteswaraRao Talluri <talluri@apache.org>
Committed: Sun Feb 8 00:52:05 2015 +0530

----------------------------------------------------------------------
 .../component/maint/test_host_high_availability.py     | 13 +++++++++++++
 test/integration/component/test_advancedsg_networks.py |  2 +-
 test/integration/component/test_cpu_domain_limits.py   |  3 +++
 test/integration/component/test_cpu_limits.py          |  6 ++++++
 test/integration/component/test_mm_domain_limits.py    |  3 +++
 test/integration/component/test_netscaler_lb.py        |  3 +++
 .../component/test_snapshots_improvement.py            |  3 +++
 test/integration/component/test_stopped_vm.py          |  3 +++
 test/integration/component/test_vpc_routers.py         |  6 ++++++
 test/integration/component/test_vpc_vm_life_cycle.py   |  9 +++++++++
 10 files changed, 50 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cf82af95/test/integration/component/maint/test_host_high_availability.py
----------------------------------------------------------------------
diff --git a/test/integration/component/maint/test_host_high_availability.py b/test/integration/component/maint/test_host_high_availability.py
index a4c43f0..8d20a60 100644
--- a/test/integration/component/maint/test_host_high_availability.py
+++ b/test/integration/component/maint/test_host_high_availability.py
@@ -390,6 +390,10 @@ class TestHostHighAvailability(cloudstackTestCase):
 
         # create and verify the virtual machine with HA enabled service
         # offering
+        self.hypervisor = self.testClient.getHypervisorInfo()
+        if self.hypervisor.lower() in ['lxc']:
+            self.skipTest("vm migrate is not supported in %s" % self.hypervisor)
+
         virtual_machine_with_ha = VirtualMachine.create(
             self.apiclient,
             self.services["virtual_machine"],
@@ -501,6 +505,9 @@ class TestHostHighAvailability(cloudstackTestCase):
         #By design, The Guest VM can STILL can be migrated to host3 if the admin chooses
to do so.
 
         #create and verify virtual machine with HA enabled service offering
+        self.hypervisor = self.testClient.getHypervisorInfo()
+        if self.hypervisor.lower() in ['lxc']:
+            self.skipTest("vm migrate is not supported in %s" % self.hypervisor)
         virtual_machine_with_ha = VirtualMachine.create(
             self.apiclient,
             self.services["virtual_machine"],
@@ -611,6 +618,9 @@ class TestHostHighAvailability(cloudstackTestCase):
         #2. Putting host1 into maintenance mode should trigger a live migration. Make sure
the VMs are not migrated to HA enabled host3.
 
         # create and verify virtual machine with HA disabled service offering
+        self.hypervisor = self.testClient.getHypervisorInfo()
+        if self.hypervisor.lower() in ['lxc']:
+            self.skipTest("vm migrate is not supported in %s" % self.hypervisor)
         virtual_machine_with_ha = VirtualMachine.create(
             self.apiclient,
             self.services["virtual_machine"],
@@ -739,6 +749,9 @@ class TestHostHighAvailability(cloudstackTestCase):
         #2. Putting host1 into maintenance mode should trigger a live migration. Make sure
the VMs are not migrated to HA enabled host3.
 
         # create and verify virtual machine with HA disabled service offering
+        self.hypervisor = self.testClient.getHypervisorInfo()
+        if self.hypervisor.lower() in ['lxc']:
+            self.skipTest("vm migrate is not supported in %s" % self.hypervisor)
         virtual_machine_without_ha = VirtualMachine.create(
             self.apiclient,
             self.services["virtual_machine"],

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cf82af95/test/integration/component/test_advancedsg_networks.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_advancedsg_networks.py b/test/integration/component/test_advancedsg_networks.py
index 089967f..2273e15 100644
--- a/test/integration/component/test_advancedsg_networks.py
+++ b/test/integration/component/test_advancedsg_networks.py
@@ -2084,7 +2084,7 @@ class TestNetworksInAdvancedSG_VmOperations(cloudstackTestCase):
         #Create admin account
         self.hypervisor = self.testClient.getHypervisorInfo()
         if self.hypervisor.lower() in ['lxc']:
-            self.skipTest("vm migrate is not supported in LXC")
+            self.skipTest("vm migrate is not supported in %s" % self.hypervisor)
 
         hosts = Host.list(self.api_client, zoneid=self.zone.id)
         self.assertEqual(validateList(hosts)[0], PASS, "hosts list validation failed, list
is %s" % hosts)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cf82af95/test/integration/component/test_cpu_domain_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_cpu_domain_limits.py b/test/integration/component/test_cpu_domain_limits.py
index 62ef12c..b2f0146 100644
--- a/test/integration/component/test_cpu_domain_limits.py
+++ b/test/integration/component/test_cpu_domain_limits.py
@@ -301,6 +301,9 @@ class TestDomainCPULimitsUpdateResources(cloudstackTestCase):
         # 3. Update Resource count for the domains
         # 4. Migrate instance to new host and check resource count
         # 5. Resource count should list properly.
+        self.hypervisor = self.testClient.getHypervisorInfo()
+        if self.hypervisor.lower() in ['lxc']:
+            self.skipTest("vm migrate is not supported in %s" % self.hypervisor)
 
         self.debug("Setting up account and domain hierarchy")
         self.setupAccounts()

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cf82af95/test/integration/component/test_cpu_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_cpu_limits.py b/test/integration/component/test_cpu_limits.py
index 4087c75..345d901 100644
--- a/test/integration/component/test_cpu_limits.py
+++ b/test/integration/component/test_cpu_limits.py
@@ -240,6 +240,9 @@ class TestCPULimits(cloudstackTestCase):
         # 1. Deploy VM with multiple core CPU & verify the usage
         # 2. Migrate VM & verify updated resource count of Root Admin Account
         # 3. Resource count should list properly.
+        self.hypervisor = self.testClient.getHypervisorInfo()
+        if self.hypervisor.lower() in ['lxc']:
+            self.skipTest("vm migrate is not supported in %s" % self.hypervisor)
 
         account_list = Account.list(self.apiclient, id=self.account.id)
         self.assertIsInstance(account_list,
@@ -546,6 +549,9 @@ class TestDomainCPULimitsConfiguration(cloudstackTestCase):
         # 2. List Resource count
         # 3. Migrate instance to another host
         # 4. Resource count should list properly.
+        self.hypervisor = self.testClient.getHypervisorInfo()
+        if self.hypervisor.lower() in ['lxc']:
+            self.skipTest("vm migrate is not supported in %s" % self.hypervisor)
 
         self.debug("Setting up account and domain hierarchy")
         self.setupAccounts()

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cf82af95/test/integration/component/test_mm_domain_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_mm_domain_limits.py b/test/integration/component/test_mm_domain_limits.py
index a6d64d5..51e92ce 100644
--- a/test/integration/component/test_mm_domain_limits.py
+++ b/test/integration/component/test_mm_domain_limits.py
@@ -359,6 +359,9 @@ class TestDomainMemoryLimits(cloudstackTestCase):
         # 3. Migrate vm to another host, resource count should list properly.
 
         #Resetting memory count in service offering
+        self.hypervisor = self.testClient.getHypervisorInfo()
+        if self.hypervisor.lower() in ['lxc']:
+            self.skipTest("vm migrate is not supported in %s" % self.hypervisor)
         self.services["service_offering"]["memory"] = 2048
 
         self.debug("Setting up account and domain hierarchy")

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cf82af95/test/integration/component/test_netscaler_lb.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_lb.py b/test/integration/component/test_netscaler_lb.py
index fce64b5..6f1df5c 100644
--- a/test/integration/component/test_netscaler_lb.py
+++ b/test/integration/component/test_netscaler_lb.py
@@ -2478,6 +2478,9 @@ class TestVmWithLb(cloudstackTestCase):
         # 2. migrate one Vm to another host.
         # 3. Test whether the request are sent to stopped user VM after migrate
         # 4. In netscaler, the LB rules are still configured.
+        self.hypervisor = self.testClient.getHypervisorInfo()
+        if self.hypervisor.lower() in ['lxc']:
+            self.skipTest("vm migrate is not supported in %s" % self.hypervisor)
 
         hosts = Host.list(
             self.apiclient,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cf82af95/test/integration/component/test_snapshots_improvement.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_snapshots_improvement.py b/test/integration/component/test_snapshots_improvement.py
index 39b96b4..fe738d4 100644
--- a/test/integration/component/test_snapshots_improvement.py
+++ b/test/integration/component/test_snapshots_improvement.py
@@ -557,6 +557,9 @@ class TestCreateSnapshot(cloudstackTestCase):
         # Validate the following
         # a. Check all snapshots jobs are running concurrently on backgrounds
         # b. listSnapshots should list this newly created snapshot.
+        self.hypervisor = self.testClient.getHypervisorInfo()
+        if self.hypervisor.lower() in ['lxc']:
+            self.skipTest("vm migrate is not supported in %s" % self.hypervisor)
 
         self.debug("Create virtual machine and snapshot on ROOT disk volume")
         self.create_Snapshot_VM()

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cf82af95/test/integration/component/test_stopped_vm.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_stopped_vm.py b/test/integration/component/test_stopped_vm.py
index 8954372..1cefc07 100644
--- a/test/integration/component/test_stopped_vm.py
+++ b/test/integration/component/test_stopped_vm.py
@@ -626,6 +626,9 @@ class TestDeployVM(cloudstackTestCase):
         # 4. Stop the vm
         # 5.list primary storages in the cluster , should be more than one
         # 6.Migrate voluem to another available primary storage
+        self.hypervisor = self.testClient.getHypervisorInfo()
+        if self.hypervisor.lower() in ['lxc']:
+            self.skipTest("vm migrate is not supported in %s" % self.hypervisor)
         clusters = Cluster.list(
                                 self.apiclient,
                                 zoneid = self.zone.id

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cf82af95/test/integration/component/test_vpc_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_routers.py b/test/integration/component/test_vpc_routers.py
index 5d3aae9..54f6a83 100644
--- a/test/integration/component/test_vpc_routers.py
+++ b/test/integration/component/test_vpc_routers.py
@@ -472,6 +472,9 @@ class TestVPCRoutersBasic(cloudstackTestCase):
     @attr(tags=["advanced", "intervlan"], required_hardware="true")
     def test_03_migrate_router_after_creating_vpc(self):
         """ Test migration of router to another host after creating VPC """
+        self.hypervisor = self.testClient.getHypervisorInfo()
+        if self.hypervisor.lower() in ['lxc']:
+            self.skipTest("vm migrate is not supported in %s" % self.hypervisor)
 
         self.validate_vpc_offering(self.vpc_off)
         self.validate_vpc_network(self.vpc)
@@ -1157,6 +1160,9 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
         #10. Make sure that we are able to access google.com from all the user Vms.
         #11. Make sure that the newly added private gateway's and VPN gateway's static routes
work as expected
 
+        self.hypervisor = self.testClient.getHypervisorInfo()
+        if self.hypervisor.lower() in ['lxc']:
+            self.skipTest("vm migrate is not supported in %s" % self.hypervisor)
         self.validate_vpc_offering(self.vpc_off)
         self.validate_vpc_network(self.vpc)
         self.assertEqual(

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cf82af95/test/integration/component/test_vpc_vm_life_cycle.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_vm_life_cycle.py b/test/integration/component/test_vpc_vm_life_cycle.py
index 78e4a18..694c924 100644
--- a/test/integration/component/test_vpc_vm_life_cycle.py
+++ b/test/integration/component/test_vpc_vm_life_cycle.py
@@ -798,6 +798,9 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
         # 3. Make sure that all the PF,LB and Static NAT rules on this VM
         #    works as expected.
         # 3. Make sure that we are able to access google.com from this user Vm
+        self.hypervisor = self.testClient.getHypervisorInfo()
+        if self.hypervisor.lower() in ['lxc']:
+            self.skipTest("vm migrate is not supported in %s" % self.hypervisor)
 
         self.debug("Validating if the network rules work properly or not?")
         self.validate_network_rules()
@@ -1548,6 +1551,9 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
         # 3. Make sure that all the PF,LB and Static NAT rules on this VM
         #    works as expected.
         # 3. Make sure that we are able to access google.com from this user Vm
+        self.hypervisor = self.testClient.getHypervisorInfo()
+        if self.hypervisor.lower() in ['lxc']:
+            self.skipTest("vm migrate is not supported in %s" % self.hypervisor)
 
         self.debug("Validating if network rules are coonfigured properly?")
         self.validate_network_rules()
@@ -3388,6 +3394,9 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
         # 3. Make sure that all the PF,LB and Static NAT rules on this VM
         #    works as expected.
         # 3. Make sure that we are able to access google.com from this user Vm
+        self.hypervisor = self.testClient.getHypervisorInfo()
+        if self.hypervisor.lower() in ['lxc']:
+            self.skipTest("vm migrate is not supported in %s" % self.hypervisor)
 
         self.debug("Validating if the network rules work properly or not?")
         self.validate_network_rules()


Mime
View raw message