From a725fdc3abca067652fa51ec782b54209b58f3ca Mon Sep 17 00:00:00 2001
From: Prasanna Santhanam <tsp@apache.org>
Date: Wed, 4 Jul 2012 18:14:28 +0530
Subject: [PATCH] Adding the tags for different configurations in to testcase

---
 .../component/test_resource_limits.py            | 16 ++++++++++++++++
 test/integration/component/test_routers.py       | 11 ++++++-----
 test/integration/component/test_snapshots.py     | 10 +++++-----
 test/integration/component/test_templates.py     |  6 +++++-
 test/integration/component/test_volumes.py       |  8 +++++++-
 5 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/test/integration/component/test_resource_limits.py b/test/integration/component/test_resource_limits.py
index e6d6d14196b..c7290ba0d5c 100644
--- a/test/integration/component/test_resource_limits.py
+++ b/test/integration/component/test_resource_limits.py
@@ -153,6 +153,7 @@ class TestResourceLimitsAccount(cloudstackTestCase):
     def test_01_vm_per_account(self):
         """Test VM limit per account
         """
+        tags = ["advanced","advancedns"]
 
         # Validate the following
         # 1. Set user_vm=1 limit for account 1.
@@ -245,6 +246,7 @@ class TestResourceLimitsAccount(cloudstackTestCase):
     def test_02_publicip_per_account(self):
         """Test Public IP limit per account
         """
+        tags = ["advanced","advancedns"]
 
         # Validate the following
         # 1. Set Public_IP= 2 limit for account 1.
@@ -387,6 +389,7 @@ class TestResourceLimitsAccount(cloudstackTestCase):
     def test_03_snapshots_per_account(self):
         """Test Snapshot limit per account
         """
+        tags = ["advanced","advancedns"]
 
         # Validate the following
         # 1. Set snapshot= 2 limit for account 1.
@@ -542,6 +545,7 @@ class TestResourceLimitsAccount(cloudstackTestCase):
     def test_04_volumes_per_account(self):
         """Test Volumes limit per account
         """
+        tags = ["advanced","advancedns"]
 
         # Validate the following
         # 1. Set volumes=2 limit for account 1.
@@ -683,6 +687,7 @@ class TestResourceLimitsAccount(cloudstackTestCase):
     def test_05_templates_per_account(self):
         """Test Templates limit per account
         """
+        tags = ["advanced","advancedns"]
 
         # Validate the following
         # 1. Set templates=1 limit for account 1.
@@ -912,6 +917,7 @@ class TestResourceLimitsDomain(cloudstackTestCase):
     def test_01_vm_per_domain(self):
         """Test VM limit per domain
         """
+        tags = ["advanced","advancedns"]
 
         # Validate the following
         # 1. Set max VM per domain to 2
@@ -977,6 +983,7 @@ class TestResourceLimitsDomain(cloudstackTestCase):
     def test_01_publicip_per_domain(self):
         """Test Public IP limit per domain
         """
+        tags = ["advanced","advancedns"]
 
         # Validate the following
         # 1. set max no of IPs per domain to 2.
@@ -1046,6 +1053,7 @@ class TestResourceLimitsDomain(cloudstackTestCase):
     def test_03_snapshots_per_domain(self):
         """Test Snapshot limit per domain
         """
+        tags = ["advanced","advancedns"]
 
         # Validate the following
         # 1. set max no of snapshots per domain to 1.
@@ -1128,6 +1136,7 @@ class TestResourceLimitsDomain(cloudstackTestCase):
     def test_04_volumes_per_domain(self):
         """Test Volumes limit per domain
         """
+        tags = ["advanced","advancedns"]
 
         # Validate the following
         # 1. set max no of volume per domain to 1.
@@ -1180,6 +1189,7 @@ class TestResourceLimitsDomain(cloudstackTestCase):
     def test_05_templates_per_domain(self):
         """Test Templates limit per domain
         """
+        tags = ["advanced","advancedns"]
 
         # Validate the following 
         # 1. set max no of templates per domain to 2.
@@ -1325,6 +1335,7 @@ class TestResources(cloudstackTestCase):
 
     def test_01_zones(self):
         """Check the status of zones"""
+        tags = ["advanced","advancedns"]
         
         # Validate the following
         # 1. List zones
@@ -1350,6 +1361,7 @@ class TestResources(cloudstackTestCase):
 
     def test_02_pods(self):
         """Check the status of pods"""
+        tags = ["advanced","advancedns"]
         
         # Validate the following
         # 1. List pods
@@ -1375,6 +1387,7 @@ class TestResources(cloudstackTestCase):
     
     def test_03_clusters(self):
         """Check the status of clusters"""
+        tags = ["advanced","advancedns"]
         
         # Validate the following
         # 1. List clusters
@@ -1400,6 +1413,7 @@ class TestResources(cloudstackTestCase):
     
     def test_04_hosts(self):
         """Check the status of hosts"""
+        tags = ["advanced","advancedns"]
         
         # Validate the following
         # 1. List hosts with type=Routing
@@ -1426,6 +1440,7 @@ class TestResources(cloudstackTestCase):
     
     def test_05_storage_pools(self):
         """Check the status of Storage pools"""
+        tags = ["advanced","advancedns"]
         
         # Validate the following
         # 1. List storage pools for the zone
@@ -1451,6 +1466,7 @@ class TestResources(cloudstackTestCase):
     
     def test_06_secondary_storage(self):
         """Check the status of secondary storage"""
+        tags = ["advanced","advancedns"]
         
         # Validate the following
         # 1. List secondary storage
diff --git a/test/integration/component/test_routers.py b/test/integration/component/test_routers.py
index 9f37306e431..b6ff3072a17 100644
--- a/test/integration/component/test_routers.py
+++ b/test/integration/component/test_routers.py
@@ -170,7 +170,7 @@ class TestRouterServices(cloudstackTestCase):
     def test_01_AdvancedZoneRouterServices(self):
         """Test advanced zone router services
         """
-
+        tags = ["advanced"]
         # Validate the following:
         # 1. Verify that list of services provided by this network are running
         #    a. DNS
@@ -316,7 +316,7 @@ class TestRouterServices(cloudstackTestCase):
     def test_02_NetworkGarbageCollection(self):
         """Test network garbage collection
         """
-
+        tags = ["advanced"]
         # Validate the following
         # 1. wait for router to start and guest network to be created 
         #    a.listRouters account=user, domainid=1 (router state=Running)
@@ -474,6 +474,7 @@ class TestRouterServices(cloudstackTestCase):
     def test_03_RouterStartOnVmDeploy(self):
         """Test router start on VM deploy
         """
+        tags = ["advanced"]
         # Validate the following
         # 1. deployVirtualMachine in the account
         # 2. listVirtualMachines account=user, domainid=1
@@ -649,7 +650,7 @@ class TestRouterStopCreatePF(cloudstackTestCase):
     def test_01_RouterStopCreatePF(self):
         """Test router stop create port forwarding
         """
-
+        tags = ["advanced"]
         # validate the following
         # 1. wait for router to start, guest network to be implemented and
         #    VM to report Running
@@ -858,7 +859,7 @@ class TestRouterStopCreateLB(cloudstackTestCase):
     def test_01_RouterStopCreateLB(self):
         """Test router stop create Load balancing
         """
-
+        tags = ["advanced"]
         # validate the following
         # 1. listLoadBalancerRules (publicipid=ipaddressid of source NAT)
         # 2. rule should be for port 2222 as applied and
@@ -1068,7 +1069,7 @@ class TestRouterStopCreateFW(cloudstackTestCase):
     def test_01_RouterStopCreateFW(self):
         """Test router stop create Firewall rule
         """
-
+        tags = ["advanced"]
         # validate the following
         # 1. 1. listFirewallRules (filter by ipaddressid of sourcenat)
         # 2. rule should be for ports 1-600 and in state=Active
diff --git a/test/integration/component/test_snapshots.py b/test/integration/component/test_snapshots.py
index cab3bef435d..9273919d360 100644
--- a/test/integration/component/test_snapshots.py
+++ b/test/integration/component/test_snapshots.py
@@ -165,7 +165,7 @@ class TestCreateVMsnapshotTemplate(cloudstackTestCase):
     def test_01_createVM_snapshotTemplate(self):
         """Test create VM, Snapshot and Template
         """
-
+        tags = ["advanced","advancedns"] 
         # Validate the following
         # 1. Deploy VM using default template, small service offering
         #    and small data disk offering.
@@ -473,7 +473,7 @@ class TestAccountSnapshotClean(cloudstackTestCase):
     def test_02_accountSnapshotClean(self):
         """Test snapshot cleanup after account deletion
         """
-
+        tags = ["advanced","advancedns"] 
         # Validate the following
         # 1. listAccounts API should list out the newly created account
         # 2. listVirtualMachines() command should return the deployed VM.
@@ -804,7 +804,7 @@ class TestSnapshotDetachedDisk(cloudstackTestCase):
     def test_03_snapshot_detachedDisk(self):
         """Test snapshot from detached disk
         """
-
+        tags = ["advanced","advancedns"] 
         # Validate the following
         # 1. login in VM  and write some data on data disk(use fdisk to
         #    partition datadisk,fdisk /dev/sdb, and make filesystem using
@@ -1076,7 +1076,7 @@ class TestSnapshotLimit(cloudstackTestCase):
     def test_04_snapshot_limit(self):
         """Test snapshot limit in snapshot policies
         """
-
+        tags = ["advanced","advancedns"] 
         # Validate the following
         # 1. Perform hourly recurring snapshot on the root disk of VM and keep
         #    the maxsnapshots as 1
@@ -1328,7 +1328,7 @@ class TestSnapshotEvents(cloudstackTestCase):
     def test_05_snapshot_events(self):
         """Test snapshot events
         """
-
+        tags = ["advanced","advancedns"] 
         # Validate the following
         # 1. Perform snapshot on the root disk of this VM and check the events/alerts.
         # 2. delete the snapshots and check the events/alerts
diff --git a/test/integration/component/test_templates.py b/test/integration/component/test_templates.py
index 1be7a8455ab..8016a4349d2 100644
--- a/test/integration/component/test_templates.py
+++ b/test/integration/component/test_templates.py
@@ -162,7 +162,7 @@ class TestCreateTemplate(cloudstackTestCase):
     def test_01_create_template(self):
         """Test create public & private template
         """
-
+        tags = ["advanced","advancedns"]
         # Validate the following:
         # 1. Upload a templates in raw img format. Create a Vm instances from
         #    raw img template.
@@ -378,6 +378,7 @@ class TestTemplates(cloudstackTestCase):
     def test_01_create_template_volume(self):
         """Test Create template from volume
         """
+        tags = ["advanced","advancedns"]
 
         # Validate the following:
         # 1. Deploy new VM using the template created from Volume
@@ -416,6 +417,7 @@ class TestTemplates(cloudstackTestCase):
 
     def test_02_copy_template(self):
         """Test for copy template from one zone to another"""
+        tags = ["advanced","advancedns"]
 
         # Validate the following
         # 1. copy template should be successful and
@@ -474,6 +476,7 @@ class TestTemplates(cloudstackTestCase):
     def test_03_delete_template(self):
         """Test Delete template
         """
+        tags = ["advanced","advancedns"]
 
         # Validate the following:
         # 1. Create a template and verify it is shown in list templates response
@@ -528,6 +531,7 @@ class TestTemplates(cloudstackTestCase):
     def test_04_template_from_snapshot(self):
         """Create Template from snapshot
         """
+        tags = ["advanced","advancedns"]
 
         # Validate the following
         # 2. Snapshot the Root disk
diff --git a/test/integration/component/test_volumes.py b/test/integration/component/test_volumes.py
index f598385d26a..82fcfc96d7b 100644
--- a/test/integration/component/test_volumes.py
+++ b/test/integration/component/test_volumes.py
@@ -143,7 +143,7 @@ class TestAttachVolume(cloudstackTestCase):
     def test_01_volume_attach(self):
         """Test Attach volumes (max capacity)
         """
-
+        tags = ["advanced","advancedns"]
         # Validate the following
         # 1. Deploy a vm and create 5 data disk
         # 2. Attach all the created Volume to the vm.
@@ -295,6 +295,7 @@ class TestAttachVolume(cloudstackTestCase):
     def test_02_volume_attach_max(self):
         """Test attach volumes (more than max) to an instance
         """
+        tags = ["advanced","advancedns"]
 
         # Validate the following
         # 1. Attach one more data volume to VM (Already 5 attached)
@@ -425,6 +426,7 @@ class TestAttachDetachVolume(cloudstackTestCase):
     def test_01_volume_attach_detach(self):
         """Test Volume attach/detach to VM (5 data volumes)
         """
+        tags = ["advanced","advancedns"]
 
         # Validate the following
         # 1. Deploy a vm and create 5 data disk
@@ -672,6 +674,7 @@ class TestAttachVolumeISO(cloudstackTestCase):
     def test_01_volume_iso_attach(self):
         """Test Volumes and ISO attach
         """
+        tags = ["advanced","advancedns"]
 
         # Validate the following
         # 1. Create and attach 5 data volumes to VM
@@ -867,6 +870,7 @@ class TestVolumes(cloudstackTestCase):
     def test_01_attach_volume(self):
         """Attach a created Volume to a Running VM
         """
+        tags = ["advanced","advancedns"]
         # Validate the following
         # 1. Create a data volume.
         # 2. List Volumes should not have vmname and virtualmachineid fields in
@@ -950,6 +954,7 @@ class TestVolumes(cloudstackTestCase):
     def test_02_detach_volume(self):
         """Detach a Volume attached to a VM
         """
+        tags = ["advanced","advancedns"]
 
         # Validate the following
         # 1. Data disk should be detached from instance
@@ -997,6 +1002,7 @@ class TestVolumes(cloudstackTestCase):
     def test_03_delete_detached_volume(self):
         """Delete a Volume unattached to an VM
         """
+        tags = ["advanced","advancedns"]
         # Validate the following
         # 1. volume should be deleted successfully and listVolume should not
         #    contain the deleted volume details.