cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahu...@apache.org
Subject [50/50] [abbrv] Adding more classifications
Date Thu, 13 Sep 2012 18:43:50 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cef2ad17/test/integration/component/test_projects.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_projects.py b/test/integration/component/test_projects.py
index 201ee4a..26d4a6f 100644
--- a/test/integration/component/test_projects.py
+++ b/test/integration/component/test_projects.py
@@ -18,6 +18,7 @@
 """
 #Import Local Modules
 import marvin
+from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from integration.lib.utils import *
@@ -43,7 +44,7 @@ class Services:
                          "mgmt_server": {
                                    "ipaddress": '192.168.100.21',
                                    "username": 'root',
-                                   "password": 'fr3sca',
+                                   "password": 'password',
                                    "port": 22,
                         },
                         "account": {
@@ -53,7 +54,7 @@ class Services:
                                     "username": "test",
                                     # Random characters are appended for unique
                                     # username
-                                    "password": "fr3sca",
+                                    "password": "password",
                          },
                          "user": {
                                     "email": "administrator@clogeny.com",
@@ -62,7 +63,7 @@ class Services:
                                     "username": "User",
                                     # Random characters are appended for unique
                                     # username
-                                    "password": "fr3sca",
+                                    "password": "password",
                          },
                         "disk_offering": {
                                     "displaytext": "Tiny Disk Offering",
@@ -91,7 +92,7 @@ class Services:
                                     "publicport": 22,
                                     "protocol": 'TCP',
                          },
-                        "ostypeid": '7ddbbbb5-bb09-40de-b038-ee78995788ea',
+                        "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
                         # Cent OS 5.3 (64 bit)
                         "sleep": 60,
                         "timeout": 10,
@@ -167,7 +168,7 @@ class TestMultipleProjectCreation(cloudstackTestCase):
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
-    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
+    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator"])
     def test_01_create_multiple_projects_by_account(self):
         """ Verify an account can own multiple projects and can belong to
             multiple projects
@@ -383,7 +384,7 @@ class TestCrossDomainAccountAdd(cloudstackTestCase):
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
-    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
+    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator"])
     def test_02_cross_domain_account_add(self):
         """ Verify No cross domain projects
         """
@@ -503,7 +504,7 @@ class TestDeleteAccountWithProject(cloudstackTestCase):
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
-    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
+    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator"])
     def test_03_delete_account_with_project(self):
         """ Test As long as the project exists, its owner can't be removed
         """
@@ -617,7 +618,7 @@ class TestDeleteDomainWithProject(cloudstackTestCase):
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
-    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
+    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator"])
     def test_04_delete_domain_with_project(self):
         """ Test Verify delete domain with cleanup=true should delete projects
             belonging to the domain
@@ -762,7 +763,7 @@ class TestProjectOwners(cloudstackTestCase):
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
-    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
+    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator"])
     def test_05_user_project_owner_promotion(self):
         """ Test Verify a project user can be later promoted to become a
             owner
@@ -904,7 +905,7 @@ class TestProjectOwners(cloudstackTestCase):
                             )
         return
 
-    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
+    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator"])
     def test_06_max_one_project_owner(self):
         """ Test Verify there can only be one owner of a project at a time
         """
@@ -1194,7 +1195,7 @@ class TestProjectResources(cloudstackTestCase):
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
-    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
+    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator"])
     def test_07_project_resources_account_delete(self):
         """ Test Verify after an account is removed from the project, all his
             resources stay with the project.
@@ -1310,7 +1311,7 @@ class TestProjectResources(cloudstackTestCase):
                         )
         return
 
-    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
+    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator"])
     def test_08_cleanup_after_project_delete(self):
         """ Test accounts are unassigned from project after project deletion
         """
@@ -1524,7 +1525,7 @@ class TestProjectSuspendActivate(cloudstackTestCase):
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
-    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
+    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator"])
     def test_09_project_suspend(self):
         """ Test Verify after an account is removed from the project, all his
             resources stay with the project.
@@ -1661,7 +1662,7 @@ class TestProjectSuspendActivate(cloudstackTestCase):
                     )
         return
 
-    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
+    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator"])
     def test_10_project_activation(self):
         """ Test project activation after suspension
         """

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cef2ad17/test/integration/component/test_resource_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_resource_limits.py b/test/integration/component/test_resource_limits.py
index e0679a0..9855049 100644
--- a/test/integration/component/test_resource_limits.py
+++ b/test/integration/component/test_resource_limits.py
@@ -18,6 +18,7 @@
 """
 #Import Local Modules
 import marvin
+from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from integration.lib.utils import *
@@ -42,7 +43,7 @@ class Services:
                                     "username": "test",
                                     # Random characters are appended for unique
                                     # username
-                                    "password": "fr3sca",
+                                    "password": "password",
                          },
                          "service_offering": {
                                     "name": "Tiny Instance",
@@ -72,10 +73,10 @@ class Services:
                         "template": {
                                     "displaytext": "Cent OS Template",
                                     "name": "Cent OS Template",
-                                    "ostypeid": '144f66aa-7f74-4cfe-9799-80cc21439cb3',
+                                    "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
                                     "templatefilter": 'self',
                         },
-                        "ostypeid": '144f66aa-7f74-4cfe-9799-80cc21439cb3',
+                        "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
                         # Cent OS 5.3 (64 bit)
                         "sleep": 60,
                         "timeout": 10,
@@ -152,7 +153,7 @@ class TestResourceLimitsAccount(cloudstackTestCase):
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
-    @attr(tags = ["advanced", "advancedns"])
+    @attr(tags = ["advanced", "advancedns", "simulator"])
     def test_01_vm_per_account(self):
         """Test VM limit per account
         """
@@ -245,7 +246,7 @@ class TestResourceLimitsAccount(cloudstackTestCase):
                         )
         return
 
-    @attr(tags = ["advanced", "advancedns"])
+    @attr(tags = ["advanced", "advancedns", "simulator"])
     def test_02_publicip_per_account(self):
         """Test Public IP limit per account
         """
@@ -388,7 +389,8 @@ class TestResourceLimitsAccount(cloudstackTestCase):
                         )
         return
 
-    @attr(tags = ["advanced", "advancedns"])
+    @attr(speed = "slow")
+    @attr(tags = ["advanced", "advancedns", "simulator"])
     def test_03_snapshots_per_account(self):
         """Test Snapshot limit per account
         """
@@ -544,7 +546,7 @@ class TestResourceLimitsAccount(cloudstackTestCase):
                         )
         return
 
-    @attr(tags = ["advanced", "advancedns"])
+    @attr(tags = ["advanced", "advancedns", "simulator"])
     def test_04_volumes_per_account(self):
         """Test Volumes limit per account
         """
@@ -916,7 +918,7 @@ class TestResourceLimitsDomain(cloudstackTestCase):
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
-    @attr(tags = ["advanced", "advancedns"])
+    @attr(tags = ["advanced", "advancedns", "simulator"])
     def test_01_vm_per_domain(self):
         """Test VM limit per domain
         """
@@ -982,7 +984,7 @@ class TestResourceLimitsDomain(cloudstackTestCase):
                                 )
         return
 
-    @attr(tags = ["advanced", "advancedns"])
+    @attr(tags = ["advanced", "advancedns", "simulator"])
     def test_01_publicip_per_domain(self):
         """Test Public IP limit per domain
         """
@@ -1052,7 +1054,8 @@ class TestResourceLimitsDomain(cloudstackTestCase):
                                            )
         return
 
-    @attr(tags = ["advanced", "advancedns"])
+    @attr(speed = "slow")
+    @attr(tags = ["advanced", "advancedns", "simulator"])
     def test_03_snapshots_per_domain(self):
         """Test Snapshot limit per domain
         """
@@ -1135,7 +1138,7 @@ class TestResourceLimitsDomain(cloudstackTestCase):
                             )
         return
 
-    @attr(tags = ["advanced", "advancedns"])
+    @attr(tags = ["advanced", "advancedns", "simulator"])
     def test_04_volumes_per_domain(self):
         """Test Volumes limit per domain
         """
@@ -1297,198 +1300,3 @@ class TestResourceLimitsDomain(cloudstackTestCase):
                             )
         return
 
-
-class TestResources(cloudstackTestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        cls.api_client = super(
-                               TestResources,
-                               cls
-                               ).getClsTestClient().getApiClient()
-        cls.services = Services().services
-        # Get Zone, Domain and templates
-        cls.zone = get_zone(cls.api_client, cls.services)
-        cls._cleanup = []
-        return
-
-    @classmethod
-    def tearDownClass(cls):
-        try:
-            #Cleanup resources used
-            cleanup_resources(cls.api_client, cls._cleanup)
-        except Exception as e:
-            raise Exception("Warning: Exception during cleanup : %s" % e)
-        return
-
-    def setUp(self):
-        self.apiclient = self.testClient.getApiClient()
-        self.dbclient = self.testClient.getDbConnection()
-        self.cleanup = []
-        return
-
-    def tearDown(self):
-        try:
-            #Clean up, terminate the created instance, volumes and snapshots
-            cleanup_resources(self.apiclient, self.cleanup)
-        except Exception as e:
-            raise Exception("Warning: Exception during cleanup : %s" % e)
-        return
-
-    @attr(tags = ["advanced", "advancedns"])
-    def test_01_zones(self):
-        """Check the status of zones"""
-
-        # Validate the following
-        # 1. List zones
-        # 2. Check allocation state is "enabled" or not
-
-        zones = Zone.list(
-                          self.apiclient,
-                          id=self.zone.id,
-              listall=True
-                          )
-        self.assertEqual(
-                         isinstance(zones, list),
-                         True,
-                         "Check if listZones returns a valid response"
-                         )
-        for zone in zones:
-            self.assertEqual(
-                             zone.allocationstate,
-                             'Enabled',
-                             "Zone allocation state should be enabled"
-                             )
-        return
-
-    @attr(tags = ["advanced", "advancedns"]
-    def test_02_pods(self):
-        """Check the status of pods"""
-
-        # Validate the following
-        # 1. List pods
-        # 2. Check allocation state is "enabled" or not
-
-        pods = Pod.list(
-                          self.apiclient,
-                          zoneid=self.zone.id,
-              listall=True
-                          )
-        self.assertEqual(
-                         isinstance(pods, list),
-                         True,
-                         "Check if listPods returns a valid response"
-                         )
-        for pod in pods:
-            self.assertEqual(
-                             pod.allocationstate,
-                             'Enabled',
-                             "Pods allocation state should be enabled"
-                             )
-        return
-
-    @attr(tags = ["advanced", "advancedns"])
-    def test_03_clusters(self):
-        """Check the status of clusters"""
-
-        # Validate the following
-        # 1. List clusters
-        # 2. Check allocation state is "enabled" or not
-
-        clusters = Cluster.list(
-                          self.apiclient,
-                          zoneid=self.zone.id,
-              listall=True
-                          )
-        self.assertEqual(
-                         isinstance(clusters, list),
-                         True,
-                         "Check if listClusters returns a valid response"
-                         )
-        for cluster in clusters:
-            self.assertEqual(
-                             cluster.allocationstate,
-                             'Enabled',
-                             "Clusters allocation state should be enabled"
-                             )
-        return
-
-    @attr(tags = ["advanced", "advancedns"])
-    def test_04_hosts(self):
-        """Check the status of hosts"""
-
-        # Validate the following
-        # 1. List hosts with type=Routing
-        # 2. Check state is "Up" or not
-
-        hosts = Host.list(
-                          self.apiclient,
-                          zoneid=self.zone.id,
-                          type='Routing',
-              listall=True
-                          )
-        self.assertEqual(
-                         isinstance(hosts, list),
-                         True,
-                         "Check if listHosts returns a valid response"
-                         )
-        for host in hosts:
-            self.assertEqual(
-                             host.state,
-                             'Up',
-                             "Host should be in Up state and running"
-                             )
-        return
-
-    @attr(tags = ["advanced", "advancedns"])
-    def test_05_storage_pools(self):
-        """Check the status of Storage pools"""
-
-        # Validate the following
-        # 1. List storage pools for the zone
-        # 2. Check state is "enabled" or not
-
-        storage_pools = StoragePool.list(
-                          self.apiclient,
-                          zoneid=self.zone.id,
-              listall=True
-                          )
-        self.assertEqual(
-                         isinstance(storage_pools, list),
-                         True,
-                         "Check if listStoragePools returns a valid response"
-                         )
-        for storage_pool in storage_pools:
-            self.assertEqual(
-                             storage_pool.state,
-                             'Up',
-                             "storage pool should be in Up state and running"
-                             )
-        return
-
-    @attr(tags = ["advanced", "advancedns"])
-    def test_06_secondary_storage(self):
-        """Check the status of secondary storage"""
-
-        # Validate the following
-        # 1. List secondary storage
-        # 2. Check state is "Up" or not
-
-        sec_storages = Host.list(
-                          self.apiclient,
-                          zoneid=self.zone.id,
-                          type='SecondaryStorageVM',
-              listall=True
-                          )
-        self.assertEqual(
-                         isinstance(sec_storages, list),
-                         True,
-                         "Check if listHosts returns a valid response"
-                         )
-        for sec_storage in sec_storages:
-            self.assertEqual(
-                             sec_storage.state,
-                             'Up',
-                             "Secondary storage should be in Up state"
-                             )
-        return

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cef2ad17/test/integration/component/test_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_routers.py b/test/integration/component/test_routers.py
index e42792c..dde8aa4 100644
--- a/test/integration/component/test_routers.py
+++ b/test/integration/component/test_routers.py
@@ -18,6 +18,7 @@
 """
 #Import Local Modules
 import marvin
+from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from integration.lib.utils import *
@@ -57,7 +58,7 @@ class Services:
                                 },
                         "host": {
                                         "username": "root",
-                                        "password": "fr3sca",
+                                        "password": "password",
                                         "publicport": 22,
                             },
                         "account": {
@@ -88,7 +89,7 @@ class Services:
                                     "cidr": '55.55.0.0/11',
                                     # Any network (For creating FW rule
                                     },
-                         "ostypeid": '5776c0d2-f331-42db-ba3a-29f1f8319bc9',
+                         "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
                          # Used for Get_Template : CentOS 5.3 (64 bit)
                          "mode": 'advanced',    # Networking mode: Advanced, basic
                         }
@@ -313,6 +314,7 @@ class TestRouterServices(cloudstackTestCase):
                     )
         return
 
+    @attr(configuration = "network.gc")
     @attr(tags = ["advanced"])
     def test_02_NetworkGarbageCollection(self):
         """Test network garbage collection
@@ -646,7 +648,7 @@ class TestRouterStopCreatePF(cloudstackTestCase):
         self._cleanup = []
         return
 
-    @attr(tags = ["advanced"])
+    @attr(tags = ["advanced", "advancedns"])
     def test_01_RouterStopCreatePF(self):
         """Test router stop create port forwarding
         """
@@ -856,7 +858,7 @@ class TestRouterStopCreateLB(cloudstackTestCase):
         self._cleanup = []
         return
 
-    @attr(tags = ["advanced"])
+    @attr(tags = ["advanced", "advancedns"])
     def test_01_RouterStopCreateLB(self):
         """Test router stop create Load balancing
         """
@@ -1066,7 +1068,7 @@ class TestRouterStopCreateFW(cloudstackTestCase):
         self._cleanup = []
         return
 
-    @attr(tags = ["advanced"])
+    @attr(tags = ["advanced", "advancedns"])
     def test_01_RouterStopCreateFW(self):
         """Test router stop create Firewall rule
         """

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cef2ad17/test/integration/component/test_security_groups.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_security_groups.py b/test/integration/component/test_security_groups.py
index f68b3a7..1cad467 100644
--- a/test/integration/component/test_security_groups.py
+++ b/test/integration/component/test_security_groups.py
@@ -19,6 +19,7 @@
 """
 #Import Local Modules
 import marvin
+from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from integration.lib.utils import *
@@ -49,7 +50,7 @@ class Services:
                     "username": "test",
                     # Random characters are appended in create account to
                     # ensure unique username generated each time
-                    "password": "fr3sca",
+                    "password": "password",
                 },
                 "virtual_machine": {
                 # Create a small virtual machine instance with disk offering
@@ -66,7 +67,7 @@ class Services:
                 "host": {
                          "publicport": 22,
                          "username": "root",    # Host creds for SSH
-                         "password": "fr3sca",
+                         "password": "password",
                 },
                 "service_offering": {
                     "name": "Tiny Instance",
@@ -89,7 +90,7 @@ class Services:
                     "endport": -1,
                     "cidrlist": '0.0.0.0/0',
                 },
-            "ostypeid": '0c2c5d19-525b-41be-a8c3-c6607412f82b',
+            "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
             # CentOS 5.3 (64-bit)
             "sleep": 60,
             "timeout": 10,

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cef2ad17/test/integration/component/test_snapshots.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_snapshots.py b/test/integration/component/test_snapshots.py
index 717e9d9..b368b85 100644
--- a/test/integration/component/test_snapshots.py
+++ b/test/integration/component/test_snapshots.py
@@ -18,6 +18,7 @@
 """
 #Import Local Modules
 import marvin
+from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from integration.lib.utils import *
@@ -39,7 +40,7 @@ class Services:
                                     "username": "test",
                                     # Random characters are appended for unique
                                     # username
-                                    "password": "fr3sca",
+                                    "password": "password",
                          },
                          "service_offering": {
                                     "name": "Tiny Instance",
@@ -66,7 +67,7 @@ class Services:
                          "mgmt_server": {
                                     "ipaddress": '192.168.100.21',
                                     "username": "root",
-                                    "password": "fr3sca",
+                                    "password": "password",
                                     "port": 22,
                                 },
                         "recurring_snapshot": {
@@ -80,7 +81,7 @@ class Services:
                         "templates": {
                                     "displaytext": 'Template',
                                     "name": 'Template',
-                                    "ostypeid": '7ddbbbb5-bb09-40de-b038-ee78995788ea',
+                                    "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
                                     "templatefilter": 'self',
                                 },
                         "diskdevice": "/dev/xvda",
@@ -93,7 +94,7 @@ class Services:
                         "sub_lvl_dir2": "test2",
                         "random_data": "random.data",
 
-                        "ostypeid": '7ddbbbb5-bb09-40de-b038-ee78995788ea',
+                        "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
                         # Cent OS 5.3 (64 bit)
                         "sleep": 60,
                         "timeout": 10,
@@ -163,6 +164,7 @@ class TestCreateVMsnapshotTemplate(cloudstackTestCase):
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
+    @attr(speed = "slow")
     @attr(tags = ["advanced", "advancedns"])
     def test_01_createVM_snapshotTemplate(self):
         """Test create VM, Snapshot and Template
@@ -476,6 +478,7 @@ class TestAccountSnapshotClean(cloudstackTestCase):
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
+    @attr(speed = "slow")
     @attr(tags = ["advanced", "advancedns"])
     def test_02_accountSnapshotClean(self):
         """Test snapshot cleanup after account deletion
@@ -819,6 +822,7 @@ class TestSnapshotDetachedDisk(cloudstackTestCase):
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
+    @attr(speed = "slow")
     @attr(tags = ["advanced", "advancedns"])
     def test_03_snapshot_detachedDisk(self):
         """Test snapshot from detached disk
@@ -1098,6 +1102,7 @@ class TestSnapshotLimit(cloudstackTestCase):
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
+    @attr(speed = "slow")
     @attr(tags = ["advanced", "advancedns"])
     def test_04_snapshot_limit(self):
         """Test snapshot limit in snapshot policies
@@ -1355,7 +1360,8 @@ class TestSnapshotEvents(cloudstackTestCase):
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
-
+    
+    @attr(speed = "slow")
     @attr(tags = ["advanced", "advancedns"])
     def test_05_snapshot_events(self):
         """Test snapshot events

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cef2ad17/test/integration/component/test_templates.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_templates.py b/test/integration/component/test_templates.py
index ced8732..0aa6061 100644
--- a/test/integration/component/test_templates.py
+++ b/test/integration/component/test_templates.py
@@ -18,6 +18,7 @@
 """
 #Import Local Modules
 import marvin
+from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from integration.lib.utils import *
@@ -43,7 +44,7 @@ class Services:
                                     "username": "test",
                                     # Random characters are appended for unique
                                     # username
-                                    "password": "fr3sca",
+                                    "password": "password",
                          },
                          "service_offering": {
                                     "name": "Tiny Instance",
@@ -76,7 +77,7 @@ class Services:
                             0: {
                                 "displaytext": "Public Template",
                                 "name": "Public template",
-                                "ostypeid": '5776c0d2-f331-42db-ba3a-29f1f8319bc9',
+                                "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
                                 "url": "http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.vhd.bz2",
                                 "hypervisor": 'XenServer',
                                 "format": 'VHD',
@@ -88,12 +89,12 @@ class Services:
                         "template": {
                                 "displaytext": "Cent OS Template",
                                 "name": "Cent OS Template",
-                                "ostypeid": '5776c0d2-f331-42db-ba3a-29f1f8319bc9',
+                                "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
                                 "templatefilter": 'self',
                         },
                         "templatefilter": 'self',
                         "destzoneid": 2,    # For Copy template (Destination zone)
-                        "ostypeid": '5776c0d2-f331-42db-ba3a-29f1f8319bc9',
+                        "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
                         "sleep": 60,
                         "timeout": 10,
                         "mode": 'advanced',     # Networking mode: Advanced, basic
@@ -415,7 +416,7 @@ class TestTemplates(cloudstackTestCase):
                         )
         return
 
-    @attr(tags = ["advanced", "advancedns"])
+    @attr(tags = ["advanced", "advancedns", "multizone"])
     def test_02_copy_template(self):
         """Test for copy template from one zone to another"""
 
@@ -528,6 +529,7 @@ class TestTemplates(cloudstackTestCase):
                         )
         return
 
+    @attr(speed = "slow")
     @attr(tags = ["advanced", "advancedns"])
     def test_04_template_from_snapshot(self):
         """Create Template from snapshot

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cef2ad17/test/integration/component/test_usage.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_usage.py b/test/integration/component/test_usage.py
index 6172e1e..e5684f8 100644
--- a/test/integration/component/test_usage.py
+++ b/test/integration/component/test_usage.py
@@ -18,6 +18,7 @@
 """
 #Import Local Modules
 import marvin
+from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from integration.lib.utils import *
@@ -40,7 +41,7 @@ class Services:
                                     "username": "test",
                                     # Random characters are appended for unique
                                     # username
-                                    "password": "fr3sca",
+                                    "password": "password",
                          },
                          "service_offering": {
                                     "name": "Tiny Instance",
@@ -70,7 +71,7 @@ class Services:
                         "templates": {
                                     "displaytext": 'Template',
                                     "name": 'Template',
-                                    "ostypeid": '144f66aa-7f74-4cfe-9799-80cc21439cb3',
+                                    "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
                                     "templatefilter": 'self',
                                     "url": "http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.qcow2.bz2"
                                 },
@@ -82,7 +83,7 @@ class Services:
                                   "isextractable": True,
                                   "isfeatured": True,
                                   "ispublic": True,
-                                  "ostypeid": '144f66aa-7f74-4cfe-9799-80cc21439cb3',
+                                  "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
                                 },
                         "lbrule": {
                                    "name": "SSH",
@@ -100,7 +101,7 @@ class Services:
                                    "username": "test",
                                    "password": "test",
                                 },
-                        "ostypeid": '144f66aa-7f74-4cfe-9799-80cc21439cb3',
+                        "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
                         # Cent OS 5.3 (64 bit)
                         "sleep": 60,
                         "timeout": 10,
@@ -177,7 +178,7 @@ class TestVmUsage(cloudstackTestCase):
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
-    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
+    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator"])
     def test_01_vm_usage(self):
         """Test Create/Destroy VM and verify usage calculation
         """
@@ -368,7 +369,7 @@ class TestPublicIPUsage(cloudstackTestCase):
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
-    @attr(tags = ["advanced", "eip", "advancedns"])
+    @attr(tags = ["advanced", "eip", "advancedns", "simulator"])
     def test_01_public_ip_usage(self):
         """Test Assign new IP and verify usage calculation
         """
@@ -515,7 +516,7 @@ class TestVolumeUsage(cloudstackTestCase):
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
-    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
+    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator"])
     def test_01_volume_usage(self):
         """Test Create/delete a volume and verify correct usage is recorded
         """
@@ -696,8 +697,8 @@ class TestTemplateUsage(cloudstackTestCase):
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
-    def test_01_template_usage(self):
     @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
+    def test_01_template_usage(self):
         """Test Upload/ delete a template and verify correct usage is generated
             for the template uploaded
         """
@@ -990,7 +991,7 @@ class TestLBRuleUsage(cloudstackTestCase):
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
-    @attr(tags = ["advanced", "eip", "advancedns"])
+    @attr(tags = ["advanced", "eip", "advancedns", "simulator"])
     def test_01_lb_usage(self):
         """Test Create/Delete a LB rule and verify correct usage is recorded
         """
@@ -1145,7 +1146,8 @@ class TestSnapshotUsage(cloudstackTestCase):
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
-    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"])
+    @attr(speed = "slow")
+    @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator"])
     def test_01_snapshot_usage(self):
         """Test Create/Delete a manual snap shot and verify
         correct usage is recorded
@@ -1316,7 +1318,7 @@ class TestNatRuleUsage(cloudstackTestCase):
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
-    @attr(tags = ["advanced", "advancedns"])
+    @attr(tags = ["advanced", "advancedns", "simulator"])
     def test_01_nat_usage(self):
         """Test Create/Delete a PF rule and verify correct usage is recorded
         """

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cef2ad17/test/integration/component/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_volumes.py b/test/integration/component/test_volumes.py
index 1eccf09..998ba2c 100644
--- a/test/integration/component/test_volumes.py
+++ b/test/integration/component/test_volumes.py
@@ -18,6 +18,7 @@
 """
 #Import Local Modules
 import marvin
+from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from integration.lib.utils import *
@@ -44,7 +45,7 @@ class Services:
                                     "username": "test",
                                     # Random characters are appended for unique
                                     # username
-                                    "password": "fr3sca",
+                                    "password": "password",
                          },
                          "service_offering": {
                                     "name": "Tiny Instance",
@@ -78,10 +79,10 @@ class Services:
                           "name": "testISO",
                           "url": "http://iso.linuxquestions.org/download/504/1819/http/gd4.tuwien.ac.at/dsl-4.4.10.iso",
                           # Source URL where ISO is located
-                          "ostypeid": '5776c0d2-f331-42db-ba3a-29f1f8319bc9',
+                          "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
                           },
                         "sleep": 50,
-                        "ostypeid": '5776c0d2-f331-42db-ba3a-29f1f8319bc9',
+                        "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
                         "mode": 'advanced',
                     }
 


Mime
View raw message