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 b3cebdb
Date Sat, 07 Feb 2015 19:06:46 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master b9f705f23 -> b3cebdbbf


CLOUDSTACK-8161: fixed few more wrong references in the tests while
disabling LXC unsupported tests.


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

Branch: refs/heads/master
Commit: b3cebdbbf4706c84bbe37353d96de205d5d709a8
Parents: b9f705f
Author: SrikanteswaraRao Talluri <talluri@apache.org>
Authored: Sun Feb 8 00:36:01 2015 +0530
Committer: SrikanteswaraRao Talluri <talluri@apache.org>
Committed: Sun Feb 8 00:36:01 2015 +0530

----------------------------------------------------------------------
 test/integration/component/maint/test_high_availability.py  | 2 +-
 test/integration/component/test_advancedsg_networks.py      | 6 +++---
 test/integration/component/test_base_image_updation.py      | 6 +++---
 test/integration/component/test_dynamic_compute_offering.py | 4 ++--
 test/integration/component/test_escalations_instances.py    | 2 +-
 test/integration/component/test_project_resources.py        | 2 +-
 test/integration/component/test_ps_domain_limits.py         | 3 ++-
 test/integration/component/test_volumes.py                  | 2 +-
 test/integration/smoke/test_disk_offerings.py               | 4 +++-
 test/integration/testpaths/testpath_volumelifecycle.py      | 2 +-
 tools/marvin/marvin/deployDataCenter.py                     | 6 +++++-
 11 files changed, 23 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b3cebdbb/test/integration/component/maint/test_high_availability.py
----------------------------------------------------------------------
diff --git a/test/integration/component/maint/test_high_availability.py b/test/integration/component/maint/test_high_availability.py
index 6fe9392..9e8978b 100644
--- a/test/integration/component/maint/test_high_availability.py
+++ b/test/integration/component/maint/test_high_availability.py
@@ -20,7 +20,7 @@
 """
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
 from marvin.cloudstackAPI import (prepareHostForMaintenance,
                                   cancelHostMaintenance)
 from marvin.lib.utils import cleanup_resources

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b3cebdbb/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 14cd552..089967f 100644
--- a/test/integration/component/test_advancedsg_networks.py
+++ b/test/integration/component/test_advancedsg_networks.py
@@ -2082,9 +2082,9 @@ class TestNetworksInAdvancedSG_VmOperations(cloudstackTestCase):
         #  1. VM migration should be successful
 
         #Create admin account
-
-        if cls.hypervisor.lower() in ['lxc']:
-            raise unittest.SkipTest("Template creation from root volume is not supported
in LXC")
+        self.hypervisor = self.testClient.getHypervisorInfo()
+        if self.hypervisor.lower() in ['lxc']:
+            self.skipTest("vm migrate is not supported in LXC")
 
         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/b3cebdbb/test/integration/component/test_base_image_updation.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_base_image_updation.py b/test/integration/component/test_base_image_updation.py
index 7c52e42..c2d37c1 100644
--- a/test/integration/component/test_base_image_updation.py
+++ b/test/integration/component/test_base_image_updation.py
@@ -528,9 +528,9 @@ class TestBaseImageUpdate(cloudstackTestCase):
         1) New root disk should be formed
         2) The recurring snapshot rule should be deleted
         """
-        cls.hypervisor = cls.testClient.getHypervisorInfo()
-        if cls.hypervisor.lower() in ['lxc']:
-            raise unittest.SkipTest("Template creation from root volume is not supported
in LXC")
+        self.hypervisor = self.testClient.getHypervisorInfo()
+        if self.hypervisor.lower() in ['lxc']:
+            self.skipTest("snapshot creation is not supported in LXC")
         vms = VirtualMachine.list(
                                   self.apiclient,
                                   id=self.vm_with_reset.id,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b3cebdbb/test/integration/component/test_dynamic_compute_offering.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_dynamic_compute_offering.py b/test/integration/component/test_dynamic_compute_offering.py
index 9d7fd9b..52e0cfa 100644
--- a/test/integration/component/test_dynamic_compute_offering.py
+++ b/test/integration/component/test_dynamic_compute_offering.py
@@ -1262,7 +1262,7 @@ class TestAccountLimits(cloudstackTestCase):
 
         # Fill services from the external config file
         cls.services = cloudstackTestClient.getParsedTestDataConfig()
-        cls.hypervisor = self.testClient.getHypervisorInfo()
+        cls.hypervisor = cls.testClient.getHypervisorInfo()
         if cls.hypervisor.lower() in ['lxc']:
             raise unittest.SkipTest("dynamic scaling feature is not supported on %s" % cls.hypervisor.lower())
 
@@ -1602,7 +1602,7 @@ class TestAffinityGroup(cloudstackTestCase):
 
         # Fill services from the external config file
         cls.services = cloudstackTestClient.getParsedTestDataConfig()
-        cls.hypervisor = self.testClient.getHypervisorInfo()
+        cls.hypervisor = cls.testClient.getHypervisorInfo()
         if cls.hypervisor.lower() in ['lxc']:
             raise unittest.SkipTest("dynamic scaling feature is not supported on %s" % cls.hypervisor.lower())
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b3cebdbb/test/integration/component/test_escalations_instances.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_escalations_instances.py b/test/integration/component/test_escalations_instances.py
index 5dfc7c6..4b22016 100644
--- a/test/integration/component/test_escalations_instances.py
+++ b/test/integration/component/test_escalations_instances.py
@@ -2687,7 +2687,7 @@ class TestInstances(cloudstackTestCase):
         """
         self.hypervisor = self.testClient.getHypervisorInfo()
         if self.hypervisor.lower() == 'lxc':
-            if not find_storage_pool_type(cls.api_client, storagetype='rbd'):
+            if not find_storage_pool_type(self.api_client, storagetype='rbd'):
                 self.skipTest("RBD storage type is required for data volumes for LXC")
         # Listing all the VM's for a User
         list_vms_before = VirtualMachine.list(

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b3cebdbb/test/integration/component/test_project_resources.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_resources.py b/test/integration/component/test_project_resources.py
index 6da36ae..142b08c 100644
--- a/test/integration/component/test_project_resources.py
+++ b/test/integration/component/test_project_resources.py
@@ -18,7 +18,7 @@
 """
 #Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
 from marvin.lib.base import (VirtualMachine,
                                          Account,
                                          Project,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b3cebdbb/test/integration/component/test_ps_domain_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_ps_domain_limits.py b/test/integration/component/test_ps_domain_limits.py
index 5879400..d9c1018 100644
--- a/test/integration/component/test_ps_domain_limits.py
+++ b/test/integration/component/test_ps_domain_limits.py
@@ -39,7 +39,8 @@ from marvin.lib.common import (get_domain,
                                get_template,
                                createSnapshotFromVirtualMachineVolume,
                                isVmExpunged,
-                               isDomainResourceCountEqualToExpectedCount)
+                               isDomainResourceCountEqualToExpectedCount,
+                               find_storage_pool_type)
 from marvin.lib.utils import (cleanup_resources)
 from marvin.codes import (PASS,
                           FAIL,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b3cebdbb/test/integration/component/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_volumes.py b/test/integration/component/test_volumes.py
index 309d80b..1b01e77 100644
--- a/test/integration/component/test_volumes.py
+++ b/test/integration/component/test_volumes.py
@@ -18,7 +18,7 @@
 """
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
 from marvin.cloudstackAPI import (listHypervisorCapabilities,
                                   attachIso,
                                   deleteVolume)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b3cebdbb/test/integration/smoke/test_disk_offerings.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_disk_offerings.py b/test/integration/smoke/test_disk_offerings.py
index bf89ee3..75f2452 100644
--- a/test/integration/smoke/test_disk_offerings.py
+++ b/test/integration/smoke/test_disk_offerings.py
@@ -24,6 +24,7 @@ from marvin.lib.utils import *
 from marvin.lib.base import *
 from marvin.lib.common import *
 from nose.plugins.attrib import attr
+import pdb
 
 _multiprocess_shared_ = True
 
@@ -45,7 +46,7 @@ class TestCreateDiskOffering(cloudstackTestCase):
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
-    @attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "smoke"], required_hardware="false")
+    @attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "smoke", "test"], required_hardware="false")
     def test_01_create_disk_offering(self):
         """Test to create disk offering
 
@@ -65,6 +66,7 @@ class TestCreateDiskOffering(cloudstackTestCase):
                                                 self.apiclient,
                                                 id=disk_offering.id
                                                 )
+        pdb.set_trace()
         self.assertEqual(
                             isinstance(list_disk_response, list),
                             True,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b3cebdbb/test/integration/testpaths/testpath_volumelifecycle.py
----------------------------------------------------------------------
diff --git a/test/integration/testpaths/testpath_volumelifecycle.py b/test/integration/testpaths/testpath_volumelifecycle.py
index c5a537f..6e56697 100644
--- a/test/integration/testpaths/testpath_volumelifecycle.py
+++ b/test/integration/testpaths/testpath_volumelifecycle.py
@@ -17,7 +17,7 @@
 """Utilities functions
 """
 # All tests inherit from cloudstackTestCase
-from marvin.cloudstackTestCase import cloudstackTestCase
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
 # Import Integration Libraries
 from marvin.codes import FAILED, PASS
 # base - contains all resources as entities and defines create, delete,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b3cebdbb/tools/marvin/marvin/deployDataCenter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py
index 85057d2..5716de3 100644
--- a/tools/marvin/marvin/deployDataCenter.py
+++ b/tools/marvin/marvin/deployDataCenter.py
@@ -243,8 +243,12 @@ class DeployDataCenters(object):
                 primarycmd.podid = podId
                 primarycmd.tags = primary.tags
                 primarycmd.url = primary.url
+                if primary.scope.lower() == 'zone':
+                    primarycmd.scope = primary.scope
+                else:
+                    primarycmd.clusterid = clusterId
                 primarycmd.zoneid = zoneId
-                primarycmd.clusterid = clusterId
+
                 ret = self.__apiClient.createStoragePool(primarycmd)
                 if ret.id:
                     self.__tcRunLogger.debug(


Mime
View raw message