You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2012/09/12 15:24:10 UTC
[19/37] git commit: adding attributes to the smoke tests
adding attributes to the smoke tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/149bcb39
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/149bcb39
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/149bcb39
Branch: refs/heads/master
Commit: 149bcb390beda3482e74a38616e2f3f48d4a235a
Parents: 9043e49
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Mon Aug 20 11:01:22 2012 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Sep 12 18:48:32 2012 +0530
----------------------------------------------------------------------
test/integration/smoke/test_disk_offerings.py | 4 ++
test/integration/smoke/test_hosts.py | 2 +
test/integration/smoke/test_iso.py | 15 ++++++--
test/integration/smoke/test_network.py | 13 ++++++-
test/integration/smoke/test_primary_storage.py | 2 +
test/integration/smoke/test_routers.py | 14 +++++++-
test/integration/smoke/test_secondary_storage.py | 5 ++-
test/integration/smoke/test_service_offerings.py | 6 +++-
test/integration/smoke/test_snapshots.py | 21 ++++++++++--
test/integration/smoke/test_ssvm.py | 11 ++++++
test/integration/smoke/test_templates.py | 17 +++++++--
test/integration/smoke/test_vm_life_cycle.py | 31 ++++++++++-------
test/integration/smoke/test_volumes.py | 12 +++++-
13 files changed, 123 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/149bcb39/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 f5ac597..eeb514a 100644
--- a/test/integration/smoke/test_disk_offerings.py
+++ b/test/integration/smoke/test_disk_offerings.py
@@ -23,6 +23,7 @@ from marvin.cloudstackAPI import *
from integration.lib.utils import *
from integration.lib.base import *
from integration.lib.common import *
+from nose.plugins.attrib import attr
class Services:
"""Test Disk offerings Services
@@ -56,6 +57,7 @@ class TestCreateDiskOffering(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "simulator", "smoke"])
def test_01_create_disk_offering(self):
"""Test to create disk offering"""
@@ -142,6 +144,7 @@ class TestDiskOfferings(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "simulator", "smoke"])
def test_02_edit_disk_offering(self):
"""Test to update existing disk offering"""
@@ -192,6 +195,7 @@ class TestDiskOfferings(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "simulator", "smoke"])
def test_03_delete_disk_offering(self):
"""Test to delete disk offering"""
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/149bcb39/test/integration/smoke/test_hosts.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_hosts.py b/test/integration/smoke/test_hosts.py
index 78ed00f..ad44325 100644
--- a/test/integration/smoke/test_hosts.py
+++ b/test/integration/smoke/test_hosts.py
@@ -23,6 +23,7 @@ from marvin.cloudstackAPI import *
from integration.lib.utils import *
from integration.lib.base import *
from integration.lib.common import *
+from nose.plugins.attrib import attr
#Import System modules
import time
@@ -116,6 +117,7 @@ class TestHosts(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @unittest.skip("skipped - our environments will not add hosts")
def test_01_clusters(self):
"""Test Add clusters & hosts - XEN, KVM, VWARE
"""
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/149bcb39/test/integration/smoke/test_iso.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_iso.py b/test/integration/smoke/test_iso.py
index 358bbf8..17da99c 100644
--- a/test/integration/smoke/test_iso.py
+++ b/test/integration/smoke/test_iso.py
@@ -23,6 +23,7 @@ from marvin.cloudstackAPI import *
from integration.lib.utils import *
from integration.lib.base import *
from integration.lib.common import *
+from nose.plugins.attrib import attr
import urllib
from random import random
#Import System modules
@@ -42,7 +43,7 @@ class Services:
"username": "test",
# Random characters are appended in create account to
# ensure unique username generated each time
- "password": "fr3sca",
+ "password": "password",
},
"iso_1":
{
@@ -53,7 +54,7 @@ class Services:
"isextractable": True,
"isfeatured": True,
"ispublic": True,
- "ostypeid": '5776c0d2-f331-42db-ba3a-29f1f8319bc9',
+ "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
},
"iso_2":
{
@@ -64,7 +65,7 @@ class Services:
"isextractable": True,
"isfeatured": True,
"ispublic": True,
- "ostypeid": '5776c0d2-f331-42db-ba3a-29f1f8319bc9',
+ "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
"mode": 'HTTP_DOWNLOAD',
# Used in Extract template, value must be HTTP_DOWNLOAD
},
@@ -77,7 +78,7 @@ class Services:
"passwordenabled": True,
"sleep": 60,
"timeout": 10,
- "ostypeid": '5776c0d2-f331-42db-ba3a-29f1f8319bc9',
+ "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
# CentOS 5.3 (64 bit)
"mode": 'advanced'
# Networking mode: Basic or Advanced
@@ -117,6 +118,7 @@ class TestCreateIso(cloudstackTestCase):
return
+ @attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "smoke"])
def test_01_create_iso(self):
"""Test create public & private ISO
"""
@@ -254,6 +256,7 @@ class TestISO(cloudstackTestCase):
return
+ @attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "smoke"])
def test_02_edit_iso(self):
"""Test Edit ISO
"""
@@ -318,6 +321,7 @@ class TestISO(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "smoke"])
def test_03_delete_iso(self):
"""Test delete ISO
"""
@@ -345,6 +349,7 @@ class TestISO(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "smoke"])
def test_04_extract_Iso(self):
"Test for extract ISO"
@@ -395,6 +400,7 @@ class TestISO(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "smoke"])
def test_05_iso_permissions(self):
"""Update & Test for ISO permissions"""
@@ -446,6 +452,7 @@ class TestISO(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "smoke", "multizone"])
def test_06_copy_iso(self):
"""Test for copy ISO from one zone to another"""
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/149bcb39/test/integration/smoke/test_network.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py
index 89b37be..b0a793c 100644
--- a/test/integration/smoke/test_network.py
+++ b/test/integration/smoke/test_network.py
@@ -24,6 +24,7 @@ from marvin import remoteSSHClient
from integration.lib.utils import *
from integration.lib.base import *
from integration.lib.common import *
+from nose.plugins.attrib import attr
#Import System modules
import time
@@ -34,7 +35,7 @@ class Services:
def __init__(self):
self.services = {
- "ostypeid": '1a568aed-db2d-41ca-b644-416b0bdc067e',
+ "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
# Cent OS 5.3 (64 bit)
"mode": 'advanced',
# Networking mode: Basic or advanced
@@ -186,6 +187,7 @@ class TestPublicIP(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_public_ip_admin_account(self):
"""Test for Associate/Disassociate
public IP address for admin account"""
@@ -236,6 +238,7 @@ class TestPublicIP(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_public_ip_user_account(self):
"""Test for Associate/Disassociate
public IP address for user account"""
@@ -346,6 +349,7 @@ class TestPortForwarding(cloudstackTestCase):
cleanup_resources(self.apiclient, self.cleanup)
return
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_01_port_fwd_on_src_nat(self):
"""Test for port forwarding on source NAT"""
@@ -468,6 +472,7 @@ class TestPortForwarding(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_02_port_fwd_on_non_src_nat(self):
"""Test for port forwarding on non source NAT"""
@@ -664,6 +669,7 @@ class TestLoadBalancingRule(cloudstackTestCase):
cleanup_resources(cls.api_client, cls._cleanup)
return
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_01_create_lb_rule_src_nat(self):
"""Test to create Load balancing rule with source NAT"""
@@ -871,6 +877,7 @@ class TestLoadBalancingRule(cloudstackTestCase):
ssh_1.execute("hostname")[0]
return
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_02_create_lb_rule_non_nat(self):
"""Test to create Load balancing rule with source NAT"""
@@ -1141,6 +1148,7 @@ class TestRebootRouter(cloudstackTestCase):
]
return
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_reboot_router(self):
"""Test for reboot router"""
@@ -1276,6 +1284,7 @@ class TestAssignRemoveLB(cloudstackTestCase):
]
return
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_assign_and_removal_lb(self):
"""Test for assign & removing load balancing rule"""
@@ -1550,6 +1559,7 @@ class TestReleaseIP(cloudstackTestCase):
def tearDown(self):
cleanup_resources(self.apiclient, self.cleanup)
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_releaseIP(self):
"""Test for Associate/Disassociate public IP address"""
@@ -1678,6 +1688,7 @@ class TestDeleteAccount(cloudstackTestCase):
self.cleanup = []
return
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_delete_account(self):
"""Test for delete account"""
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/149bcb39/test/integration/smoke/test_primary_storage.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_primary_storage.py b/test/integration/smoke/test_primary_storage.py
index 7156991..5c804f7 100644
--- a/test/integration/smoke/test_primary_storage.py
+++ b/test/integration/smoke/test_primary_storage.py
@@ -22,6 +22,7 @@ from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
from integration.lib.utils import *
from integration.lib.base import *
+from nose.plugins.attrib import attr
from integration.lib.common import *
#Import System modules
@@ -83,6 +84,7 @@ class TestPrimaryStorageServices(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @unittest.skip("skipped - will not be adding storage in our environments")
def test_01_primary_storage(self):
"""Test primary storage pools - XEN, KVM, VMWare
"""
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/149bcb39/test/integration/smoke/test_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_routers.py b/test/integration/smoke/test_routers.py
index 0d9a630..e5f4735 100644
--- a/test/integration/smoke/test_routers.py
+++ b/test/integration/smoke/test_routers.py
@@ -24,6 +24,7 @@ from marvin import remoteSSHClient
from integration.lib.utils import *
from integration.lib.base import *
from integration.lib.common import *
+from nose.plugins.attrib import attr
#Import System modules
import time
@@ -59,7 +60,7 @@ class Services:
"username": "testuser",
"password": "password",
},
- "ostypeid":'1a568aed-db2d-41ca-b644-416b0bdc067e',
+ "ostypeid":'01853327-513e-4508-9628-f1f55db1946f',
"sleep": 60,
"timeout": 10,
"mode": 'advanced', #Networking mode: Basic, Advanced
@@ -129,6 +130,7 @@ class TestRouterServices(cloudstackTestCase):
self.apiclient = self.testClient.getApiClient()
return
+ @attr(tags = ["advanced", "basic", "sg", "smoke"])
def test_01_router_internal_basic(self):
"""Test router internal basic zone
"""
@@ -190,6 +192,7 @@ class TestRouterServices(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "smoke"])
def test_02_router_internal_adv(self):
"""Test router internal advanced zone
"""
@@ -267,6 +270,7 @@ class TestRouterServices(cloudstackTestCase):
self.debug("Haproxy process status: %s" % res)
return
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_03_restart_network_cleanup(self):
"""Test restart network
"""
@@ -344,6 +348,7 @@ class TestRouterServices(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_04_restart_network_wo_cleanup(self):
"""Test restart network without cleanup
"""
@@ -444,6 +449,7 @@ class TestRouterServices(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_05_router_basic(self):
"""Test router basic setup
"""
@@ -509,6 +515,7 @@ class TestRouterServices(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_06_router_advanced(self):
"""Test router advanced setup
"""
@@ -591,6 +598,7 @@ class TestRouterServices(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_07_stop_router(self):
"""Test stop router
"""
@@ -634,6 +642,7 @@ class TestRouterServices(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_08_start_router(self):
"""Test start router
"""
@@ -678,6 +687,7 @@ class TestRouterServices(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_09_reboot_router(self):
"""Test reboot router
"""
@@ -730,6 +740,8 @@ class TestRouterServices(cloudstackTestCase):
)
return
+ @attr(configuration = "network.gc")
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_10_network_gc(self):
"""Test network GC
"""
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/149bcb39/test/integration/smoke/test_secondary_storage.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_secondary_storage.py b/test/integration/smoke/test_secondary_storage.py
index d38f020..ef81d04 100644
--- a/test/integration/smoke/test_secondary_storage.py
+++ b/test/integration/smoke/test_secondary_storage.py
@@ -23,6 +23,7 @@ from marvin.cloudstackAPI import *
from integration.lib.utils import *
from integration.lib.base import *
from integration.lib.common import *
+from nose.plugins.attrib import attr
#Import System modules
import time
@@ -84,7 +85,7 @@ class TestSecStorageServices(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- @unittest.skip("do not add secondary storage")
+ @unittest.skip("skipped - do not add secondary storage")
def test_01_add_sec_storage(self):
"""Test secondary storage
"""
@@ -138,6 +139,7 @@ class TestSecStorageServices(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "eip", "sg"])
def test_02_sys_vm_start(self):
"""Test system VM start
"""
@@ -268,6 +270,7 @@ class TestSecStorageServices(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "eip", "sg"])
def test_03_sys_template_ready(self):
"""Test system templates are ready
"""
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/149bcb39/test/integration/smoke/test_service_offerings.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_service_offerings.py b/test/integration/smoke/test_service_offerings.py
index fec3f4b..5913338 100644
--- a/test/integration/smoke/test_service_offerings.py
+++ b/test/integration/smoke/test_service_offerings.py
@@ -23,6 +23,7 @@ from marvin.cloudstackAPI import *
from integration.lib.utils import *
from integration.lib.base import *
from integration.lib.common import *
+from nose.plugins.attrib import attr
class Services:
@@ -59,7 +60,8 @@ class TestCreateServiceOffering(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
-
+
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "eip", "sg"])
def test_01_create_service_offering(self):
"""Test to create service offering"""
@@ -165,6 +167,7 @@ class TestServiceOfferings(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "eip", "sg"])
def test_02_edit_service_offering(self):
"""Test to update existing service offering"""
@@ -215,6 +218,7 @@ class TestServiceOfferings(cloudstackTestCase):
return
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "eip", "sg"])
def test_03_delete_service_offering(self):
"""Test to delete service offering"""
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/149bcb39/test/integration/smoke/test_snapshots.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_snapshots.py b/test/integration/smoke/test_snapshots.py
index 657dec2..79a2c0a 100644
--- a/test/integration/smoke/test_snapshots.py
+++ b/test/integration/smoke/test_snapshots.py
@@ -24,6 +24,7 @@ from marvin.remoteSSHClient import remoteSSHClient
from integration.lib.utils import *
from integration.lib.base import *
from integration.lib.common import *
+from nose.plugins.attrib import attr
class Services:
@@ -39,7 +40,7 @@ class Services:
"username": "test",
# Random characters are appended for unique
# username
- "password": "fr3sca",
+ "password": "password",
},
"service_offering": {
"name": "Tiny Instance",
@@ -92,10 +93,10 @@ class Services:
{
"displaytext": 'Template from snapshot',
"name": 'Template from snapshot',
- "ostypeid": '5776c0d2-f331-42db-ba3a-29f1f8319bc9',
+ "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
"templatefilter": 'self',
},
- "ostypeid": '5776c0d2-f331-42db-ba3a-29f1f8319bc9',
+ "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
# Cent OS 5.3 (64 bit)
"diskdevice": "/dev/xvdb", # Data Disk
"rootdisk": "/dev/xvda", # Root Disk
@@ -191,6 +192,8 @@ class TestSnapshotRootDisk(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(speed = "slow")
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_01_snapshot_root_disk(self):
"""Test Snapshot Root Disk
"""
@@ -431,6 +434,8 @@ class TestSnapshots(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(speed = "slow")
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_02_snapshot_data_disk(self):
"""Test Snapshot Data Disk
"""
@@ -571,6 +576,8 @@ class TestSnapshots(cloudstackTestCase):
)
return
+ @attr(speed = "slow")
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_03_volume_from_snapshot(self):
"""Create volumes from snapshots
"""
@@ -752,6 +759,8 @@ class TestSnapshots(cloudstackTestCase):
self.new_virtual_machine.ipaddress)
return
+ @attr(speed = "slow")
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_04_delete_snapshot(self):
"""Test Delete Snapshot
"""
@@ -791,6 +800,8 @@ class TestSnapshots(cloudstackTestCase):
)
return
+ @attr(speed = "slow")
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_05_recurring_snapshot_root_disk(self):
"""Test Recurring Snapshot Root Disk
"""
@@ -882,6 +893,8 @@ class TestSnapshots(cloudstackTestCase):
)
return
+ @attr(speed = "slow")
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_06_recurring_snapshot_data_disk(self):
"""Test Recurring Snapshot data Disk
"""
@@ -976,6 +989,8 @@ class TestSnapshots(cloudstackTestCase):
)
return
+ @attr(speed = "slow")
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_07_template_from_snapshot(self):
"""Create Template from snapshot
"""
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/149bcb39/test/integration/smoke/test_ssvm.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_ssvm.py b/test/integration/smoke/test_ssvm.py
index fb98dd1..5c9d030 100644
--- a/test/integration/smoke/test_ssvm.py
+++ b/test/integration/smoke/test_ssvm.py
@@ -24,6 +24,7 @@ from marvin import remoteSSHClient
from integration.lib.utils import *
from integration.lib.base import *
from integration.lib.common import *
+from nose.plugins.attrib import attr
import telnetlib
#Import System modules
@@ -63,6 +64,7 @@ class TestSSVMs(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"])
def test_01_list_sec_storage_vm(self):
"""Test List secondary storage VMs
"""
@@ -180,6 +182,7 @@ class TestSSVMs(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"])
def test_02_list_cpvm_vm(self):
"""Test List console proxy VMs
"""
@@ -291,6 +294,7 @@ class TestSSVMs(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"])
def test_03_ssvm_internals(self):
"""Test SSVM Internals"""
@@ -371,6 +375,7 @@ class TestSSVMs(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"])
def test_04_cpvm_internals(self):
"""Test CPVM Internals"""
@@ -437,6 +442,7 @@ class TestSSVMs(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"])
def test_05_stop_ssvm(self):
"""Test stop SSVM
"""
@@ -512,6 +518,7 @@ class TestSSVMs(cloudstackTestCase):
self.test_03_ssvm_internals()
return
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"])
def test_06_stop_cpvm(self):
"""Test stop CPVM
"""
@@ -584,6 +591,7 @@ class TestSSVMs(cloudstackTestCase):
self.test_04_cpvm_internals()
return
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"])
def test_07_reboot_ssvm(self):
"""Test reboot SSVM
"""
@@ -669,6 +677,7 @@ class TestSSVMs(cloudstackTestCase):
self.test_03_ssvm_internals()
return
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"])
def test_08_reboot_cpvm(self):
"""Test reboot CPVM
"""
@@ -755,6 +764,7 @@ class TestSSVMs(cloudstackTestCase):
self.test_04_cpvm_internals()
return
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"])
def test_09_destroy_ssvm(self):
"""Test destroy SSVM
"""
@@ -836,6 +846,7 @@ class TestSSVMs(cloudstackTestCase):
self.test_03_ssvm_internals()
return
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"])
def test_10_destroy_cpvm(self):
"""Test destroy CPVM
"""
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/149bcb39/test/integration/smoke/test_templates.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_templates.py b/test/integration/smoke/test_templates.py
index 22309f4..d683716 100644
--- a/test/integration/smoke/test_templates.py
+++ b/test/integration/smoke/test_templates.py
@@ -24,6 +24,7 @@ from marvin.remoteSSHClient import remoteSSHClient
from integration.lib.utils import *
from integration.lib.base import *
from integration.lib.common import *
+from nose.plugins.attrib import attr
import urllib
from random import random
#Import System modules
@@ -43,7 +44,7 @@ class Services:
"username": "test",
# Random characters are appended for unique
# username
- "password": "fr3sca",
+ "password": "password",
},
"service_offering": {
"name": "Tiny Instance",
@@ -73,12 +74,12 @@ class Services:
"template_1": {
"displaytext": "Cent OS Template",
"name": "Cent OS Template",
- "ostypeid": '946b031b-0e10-4f4a-a3fc-d212ae2ea07f',
+ "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
},
"template_2": {
"displaytext": "Public Template",
"name": "Public template",
- "ostypeid": '946b031b-0e10-4f4a-a3fc-d212ae2ea07f',
+ "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
"isfeatured": True,
"ispublic": True,
"isextractable": True,
@@ -92,7 +93,7 @@ class Services:
"isextractable": False,
"bootable": True,
"passwordenabled": True,
- "ostypeid": '946b031b-0e10-4f4a-a3fc-d212ae2ea07f',
+ "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
"mode": 'advanced',
# Networking mode: Advanced, basic
"sleep": 30,
@@ -217,6 +218,7 @@ class TestCreateTemplate(cloudstackTestCase):
return
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_01_create_template(self):
"""Test create public & private template
"""
@@ -426,6 +428,7 @@ class TestTemplates(cloudstackTestCase):
return
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"])
def test_02_edit_template(self):
"""Test Edit template
"""
@@ -508,6 +511,7 @@ class TestTemplates(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"])
def test_03_delete_template(self):
"""Test delete template
"""
@@ -536,6 +540,7 @@ class TestTemplates(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"])
def test_04_extract_template(self):
"Test for extract template"
@@ -586,6 +591,7 @@ class TestTemplates(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"])
def test_05_template_permissions(self):
"""Update & Test for template permissions"""
@@ -638,6 +644,7 @@ class TestTemplates(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg", "multizone"])
def test_06_copy_template(self):
"""Test for copy template from one zone to another"""
@@ -693,6 +700,7 @@ class TestTemplates(cloudstackTestCase):
self.apiclient.deleteTemplate(cmd)
return
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"])
def test_07_list_public_templates(self):
"""Test only public templates are visible to normal user"""
@@ -724,6 +732,7 @@ class TestTemplates(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"])
def test_08_list_system_templates(self):
"""Test System templates are not visible to normal user"""
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/149bcb39/test/integration/smoke/test_vm_life_cycle.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py
index 772ec91..b47c164 100644
--- a/test/integration/smoke/test_vm_life_cycle.py
+++ b/test/integration/smoke/test_vm_life_cycle.py
@@ -24,6 +24,7 @@ from marvin.remoteSSHClient import remoteSSHClient
from integration.lib.utils import *
from integration.lib.base import *
from integration.lib.common import *
+from nose.plugins.attrib import attr
#Import System modules
import time
@@ -105,9 +106,9 @@ class Services:
{
"displaytext": "Test ISO",
"name": "testISO",
- "url": "http://nfs1.lab.vmops.com/isos_32bit/dsl-4.4.10.iso",
+ "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": '93ffa3ea-ef02-4e56-9940-f04158353555',
+ "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
"mode": 'HTTP_DOWNLOAD', # Downloading existing ISO
},
"template": {
@@ -121,7 +122,7 @@ class Services:
"sleep": 60,
"timeout": 10,
#Migrate VM to hostid
- "ostypeid": '93ffa3ea-ef02-4e56-9940-f04158353555',
+ "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
# CentOS 5.3 (64-bit)
"mode":'advanced',
}
@@ -168,7 +169,7 @@ class TestDeployVM(cloudstackTestCase):
self.account
]
-
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"])
def test_deploy_vm(self):
"""Test Deploy Virtual Machine
"""
@@ -317,6 +318,7 @@ class TestVMLifeCycle(cloudstackTestCase):
return
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"])
def test_01_stop_vm(self):
"""Test Stop Virtual Machine
"""
@@ -352,7 +354,7 @@ class TestVMLifeCycle(cloudstackTestCase):
)
return
-
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"])
def test_02_start_vm(self):
"""Test Start Virtual Machine
"""
@@ -390,7 +392,7 @@ class TestVMLifeCycle(cloudstackTestCase):
)
return
-
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"])
def test_03_reboot_vm(self):
"""Test Reboot Virtual Machine
"""
@@ -426,7 +428,7 @@ class TestVMLifeCycle(cloudstackTestCase):
)
return
-
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_04_change_offering_small(self):
"""Change Offering to a small capacity
"""
@@ -544,7 +546,7 @@ class TestVMLifeCycle(cloudstackTestCase):
)
return
-
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_05_change_offering_medium(self):
"""Change Offering to a medium capacity
"""
@@ -666,7 +668,7 @@ class TestVMLifeCycle(cloudstackTestCase):
)
return
-
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"])
def test_06_destroy_vm(self):
"""Test destroy Virtual Machine
"""
@@ -702,7 +704,7 @@ class TestVMLifeCycle(cloudstackTestCase):
)
return
-
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"])
def test_07_restore_vm(self):
"""Test recover Virtual Machine
"""
@@ -742,7 +744,7 @@ class TestVMLifeCycle(cloudstackTestCase):
return
-
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg", "multihost"])
def test_08_migrate_vm(self):
"""Test migrate VM
"""
@@ -813,6 +815,9 @@ class TestVMLifeCycle(cloudstackTestCase):
)
return
+ @attr(configuration = "expunge.interval")
+ @attr(configuration = "expunge.delay")
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"])
def test_09_expunge_vm(self):
"""Test destroy(expunge) Virtual Machine
"""
@@ -860,7 +865,7 @@ class TestVMLifeCycle(cloudstackTestCase):
)
return
-
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"])
def test_10_attachAndDetach_iso(self):
"""Test for detach ISO to virtual machine"""
@@ -1102,7 +1107,7 @@ class TestVMPasswordEnabled(cloudstackTestCase):
cleanup_resources(self.apiclient, self.cleanup)
return
-
+ @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"])
def test_11_get_vm_password(self):
"""Test get VM password for password enabled template"""
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/149bcb39/test/integration/smoke/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py
index 8e270d5..ed5cbaf 100644
--- a/test/integration/smoke/test_volumes.py
+++ b/test/integration/smoke/test_volumes.py
@@ -24,6 +24,7 @@ from marvin.remoteSSHClient import remoteSSHClient
from integration.lib.utils import *
from integration.lib.base import *
from integration.lib.common import *
+from nose.plugins.attrib import attr
#Import System modules
import os
import urllib
@@ -44,7 +45,7 @@ class Services:
"username": "test",
# Random characters are appended for unique
# username
- "password": "fr3sca",
+ "password": "password",
},
"service_offering": {
"name": "Tiny Instance",
@@ -73,7 +74,7 @@ class Services:
"publicport": 22,
"protocol": 'TCP',
"diskdevice": "/dev/xvdb",
- "ostypeid": '946b031b-0e10-4f4a-a3fc-d212ae2ea07f',
+ "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
"mode": 'advanced',
"sleep": 60,
"timeout": 10,
@@ -142,6 +143,7 @@ class TestCreateVolume(cloudstackTestCase):
self.dbclient = self.testClient.getDbConnection()
self.cleanup = []
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_01_create_volume(self):
"""Test Volume creation for all Disk Offerings (incl. custom)
"""
@@ -334,6 +336,7 @@ class TestVolumes(cloudstackTestCase):
self.apiClient = self.testClient.getApiClient()
self.dbclient = self.testClient.getDbConnection()
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_02_attach_volume(self):
"""Attach a created Volume to a Running VM
"""
@@ -379,6 +382,7 @@ class TestVolumes(cloudstackTestCase):
(self.virtual_machine.ipaddress, e))
return
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_03_download_attached_volume(self):
"""Download a Volume attached to a VM
"""
@@ -398,6 +402,7 @@ class TestVolumes(cloudstackTestCase):
with self.assertRaises(Exception):
self.apiClient.extractVolume(cmd)
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_04_delete_attached_volume(self):
"""Delete a Volume attached to a VM
"""
@@ -421,6 +426,7 @@ class TestVolumes(cloudstackTestCase):
"Check for delete download error while volume is attached"
)
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_05_detach_volume(self):
"""Detach a Volume attached to a VM
"""
@@ -461,6 +467,7 @@ class TestVolumes(cloudstackTestCase):
)
return
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_06_download_detached_volume(self):
"""Download a Volume unattached to an VM
"""
@@ -491,6 +498,7 @@ class TestVolumes(cloudstackTestCase):
% (extract_vol.url, self.volume.id)
)
+ @attr(tags = ["advanced", "advancedns", "smoke"])
def test_07_delete_detached_volume(self):
"""Delete a Volume unattached to an VM
"""