diff --git a/test/integration/smoke/test_disk_offerings.py b/test/integration/smoke/test_disk_offerings.py index f38e73ba2a7..1d26a6fe025 100644 --- a/test/integration/smoke/test_disk_offerings.py +++ b/test/integration/smoke/test_disk_offerings.py @@ -20,6 +20,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 @@ -53,6 +54,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""" @@ -139,6 +141,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""" @@ -189,6 +192,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""" diff --git a/test/integration/smoke/test_hosts.py b/test/integration/smoke/test_hosts.py index 2fafb76a50b..204ffddaa5f 100644 --- a/test/integration/smoke/test_hosts.py +++ b/test/integration/smoke/test_hosts.py @@ -20,6 +20,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 @@ -113,6 +114,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 """ diff --git a/test/integration/smoke/test_iso.py b/test/integration/smoke/test_iso.py index e1f8dfeb4b7..16089d8945e 100644 --- a/test/integration/smoke/test_iso.py +++ b/test/integration/smoke/test_iso.py @@ -20,6 +20,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 @@ -39,7 +40,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": { @@ -50,7 +51,7 @@ class Services: "isextractable": True, "isfeatured": True, "ispublic": True, - "ostypeid": '5776c0d2-f331-42db-ba3a-29f1f8319bc9', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', }, "iso_2": { @@ -61,7 +62,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 }, @@ -74,7 +75,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 @@ -114,6 +115,7 @@ class TestCreateIso(cloudstackTestCase): return + @attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "smoke"]) def test_01_create_iso(self): """Test create public & private ISO """ @@ -251,6 +253,7 @@ class TestISO(cloudstackTestCase): return + @attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "smoke"]) def test_02_edit_iso(self): """Test Edit ISO """ @@ -315,6 +318,7 @@ class TestISO(cloudstackTestCase): ) return + @attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "smoke"]) def test_03_delete_iso(self): """Test delete ISO """ @@ -342,6 +346,7 @@ class TestISO(cloudstackTestCase): ) return + @attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "smoke"]) def test_04_extract_Iso(self): "Test for extract ISO" @@ -392,6 +397,7 @@ class TestISO(cloudstackTestCase): ) return + @attr(tags = ["advanced", "basic", "eip", "sg", "advancedns", "smoke"]) def test_05_iso_permissions(self): """Update & Test for ISO permissions""" @@ -443,6 +449,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""" diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py index d61bbe1d69b..3385ac60bc6 100644 --- a/test/integration/smoke/test_network.py +++ b/test/integration/smoke/test_network.py @@ -21,6 +21,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 @@ -31,7 +32,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 @@ -183,6 +184,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""" @@ -233,6 +235,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""" @@ -343,6 +346,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""" @@ -465,6 +469,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""" @@ -661,6 +666,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""" @@ -868,6 +874,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""" @@ -1138,6 +1145,7 @@ class TestRebootRouter(cloudstackTestCase): ] return + @attr(tags = ["advanced", "advancedns", "smoke"]) def test_reboot_router(self): """Test for reboot router""" @@ -1273,6 +1281,7 @@ class TestAssignRemoveLB(cloudstackTestCase): ] return + @attr(tags = ["advanced", "advancedns", "smoke"]) def test_assign_and_removal_lb(self): """Test for assign & removing load balancing rule""" @@ -1547,6 +1556,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""" @@ -1675,6 +1685,7 @@ class TestDeleteAccount(cloudstackTestCase): self.cleanup = [] return + @attr(tags = ["advanced", "advancedns", "smoke"]) def test_delete_account(self): """Test for delete account""" diff --git a/test/integration/smoke/test_primary_storage.py b/test/integration/smoke/test_primary_storage.py index efceebe3cda..2629f5a3740 100644 --- a/test/integration/smoke/test_primary_storage.py +++ b/test/integration/smoke/test_primary_storage.py @@ -19,6 +19,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 @@ -80,6 +81,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 """ diff --git a/test/integration/smoke/test_routers.py b/test/integration/smoke/test_routers.py index 8b60933cfe6..2deabc295df 100644 --- a/test/integration/smoke/test_routers.py +++ b/test/integration/smoke/test_routers.py @@ -21,6 +21,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 @@ -56,7 +57,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 @@ -126,6 +127,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 """ @@ -187,6 +189,7 @@ class TestRouterServices(cloudstackTestCase): ) return + @attr(tags = ["advanced", "smoke"]) def test_02_router_internal_adv(self): """Test router internal advanced zone """ @@ -264,6 +267,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 """ @@ -341,6 +345,7 @@ class TestRouterServices(cloudstackTestCase): ) return + @attr(tags = ["advanced", "advancedns", "smoke"]) def test_04_restart_network_wo_cleanup(self): """Test restart network without cleanup """ @@ -441,6 +446,7 @@ class TestRouterServices(cloudstackTestCase): ) return + @attr(tags = ["advanced", "advancedns", "smoke"]) def test_05_router_basic(self): """Test router basic setup """ @@ -506,6 +512,7 @@ class TestRouterServices(cloudstackTestCase): ) return + @attr(tags = ["advanced", "advancedns", "smoke"]) def test_06_router_advanced(self): """Test router advanced setup """ @@ -588,6 +595,7 @@ class TestRouterServices(cloudstackTestCase): ) return + @attr(tags = ["advanced", "advancedns", "smoke"]) def test_07_stop_router(self): """Test stop router """ @@ -631,6 +639,7 @@ class TestRouterServices(cloudstackTestCase): ) return + @attr(tags = ["advanced", "advancedns", "smoke"]) def test_08_start_router(self): """Test start router """ @@ -675,6 +684,7 @@ class TestRouterServices(cloudstackTestCase): ) return + @attr(tags = ["advanced", "advancedns", "smoke"]) def test_09_reboot_router(self): """Test reboot router """ @@ -727,6 +737,8 @@ class TestRouterServices(cloudstackTestCase): ) return + @attr(configuration = "network.gc") + @attr(tags = ["advanced", "advancedns", "smoke"]) def test_10_network_gc(self): """Test network GC """ diff --git a/test/integration/smoke/test_secondary_storage.py b/test/integration/smoke/test_secondary_storage.py index 0edbe7bdfe2..474e2ee35eb 100644 --- a/test/integration/smoke/test_secondary_storage.py +++ b/test/integration/smoke/test_secondary_storage.py @@ -20,6 +20,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 @@ -81,7 +82,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 """ @@ -135,6 +136,7 @@ class TestSecStorageServices(cloudstackTestCase): ) return + @attr(tags = ["advanced", "advancedns", "smoke", "basic", "eip", "sg"]) def test_02_sys_vm_start(self): """Test system VM start """ @@ -265,6 +267,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 """ diff --git a/test/integration/smoke/test_service_offerings.py b/test/integration/smoke/test_service_offerings.py index bf9ccd14a6c..7f13c5c438d 100644 --- a/test/integration/smoke/test_service_offerings.py +++ b/test/integration/smoke/test_service_offerings.py @@ -20,6 +20,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: @@ -56,7 +57,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""" @@ -162,6 +164,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""" @@ -212,6 +215,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""" diff --git a/test/integration/smoke/test_snapshots.py b/test/integration/smoke/test_snapshots.py index 91e65a41a0d..526f80da91b 100644 --- a/test/integration/smoke/test_snapshots.py +++ b/test/integration/smoke/test_snapshots.py @@ -21,6 +21,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: @@ -36,7 +37,7 @@ class Services: "username": "test", # Random characters are appended for unique # username - "password": "fr3sca", + "password": "password", }, "service_offering": { "name": "Tiny Instance", @@ -89,10 +90,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 @@ -188,6 +189,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 """ @@ -428,6 +431,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 """ @@ -568,6 +573,8 @@ class TestSnapshots(cloudstackTestCase): ) return + @attr(speed = "slow") + @attr(tags = ["advanced", "advancedns", "smoke"]) def test_03_volume_from_snapshot(self): """Create volumes from snapshots """ @@ -749,6 +756,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 """ @@ -788,6 +797,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 """ @@ -879,6 +890,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 """ @@ -973,6 +986,8 @@ class TestSnapshots(cloudstackTestCase): ) return + @attr(speed = "slow") + @attr(tags = ["advanced", "advancedns", "smoke"]) def test_07_template_from_snapshot(self): """Create Template from snapshot """ diff --git a/test/integration/smoke/test_ssvm.py b/test/integration/smoke/test_ssvm.py index 0e341d5a74a..3a904edfda8 100644 --- a/test/integration/smoke/test_ssvm.py +++ b/test/integration/smoke/test_ssvm.py @@ -21,6 +21,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 @@ -60,6 +61,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 """ @@ -177,6 +179,7 @@ class TestSSVMs(cloudstackTestCase): ) return + @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"]) def test_02_list_cpvm_vm(self): """Test List console proxy VMs """ @@ -288,6 +291,7 @@ class TestSSVMs(cloudstackTestCase): ) return + @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"]) def test_03_ssvm_internals(self): """Test SSVM Internals""" @@ -368,6 +372,7 @@ class TestSSVMs(cloudstackTestCase): ) return + @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"]) def test_04_cpvm_internals(self): """Test CPVM Internals""" @@ -434,6 +439,7 @@ class TestSSVMs(cloudstackTestCase): ) return + @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"]) def test_05_stop_ssvm(self): """Test stop SSVM """ @@ -509,6 +515,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 """ @@ -581,6 +588,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 """ @@ -666,6 +674,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 """ @@ -752,6 +761,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 """ @@ -833,6 +843,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 """ diff --git a/test/integration/smoke/test_templates.py b/test/integration/smoke/test_templates.py index b17b93fda19..0e462785f8a 100644 --- a/test/integration/smoke/test_templates.py +++ b/test/integration/smoke/test_templates.py @@ -21,6 +21,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 @@ -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,12 +71,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, @@ -89,7 +90,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, @@ -214,6 +215,7 @@ class TestCreateTemplate(cloudstackTestCase): return + @attr(tags = ["advanced", "advancedns", "smoke"]) def test_01_create_template(self): """Test create public & private template """ @@ -423,6 +425,7 @@ class TestTemplates(cloudstackTestCase): return + @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"]) def test_02_edit_template(self): """Test Edit template """ @@ -505,6 +508,7 @@ class TestTemplates(cloudstackTestCase): ) return + @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"]) def test_03_delete_template(self): """Test delete template """ @@ -533,6 +537,7 @@ class TestTemplates(cloudstackTestCase): ) return + @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"]) def test_04_extract_template(self): "Test for extract template" @@ -583,6 +588,7 @@ class TestTemplates(cloudstackTestCase): ) return + @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"]) def test_05_template_permissions(self): """Update & Test for template permissions""" @@ -635,6 +641,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""" @@ -690,6 +697,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""" @@ -721,6 +729,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""" diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py index 33824743c0f..076edcfa7cf 100644 --- a/test/integration/smoke/test_vm_life_cycle.py +++ b/test/integration/smoke/test_vm_life_cycle.py @@ -21,6 +21,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 @@ -102,9 +103,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": { @@ -118,7 +119,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', } @@ -165,7 +166,7 @@ class TestDeployVM(cloudstackTestCase): self.account ] - + @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"]) def test_deploy_vm(self): """Test Deploy Virtual Machine """ @@ -314,6 +315,7 @@ class TestVMLifeCycle(cloudstackTestCase): return + @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"]) def test_01_stop_vm(self): """Test Stop Virtual Machine """ @@ -349,7 +351,7 @@ class TestVMLifeCycle(cloudstackTestCase): ) return - + @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"]) def test_02_start_vm(self): """Test Start Virtual Machine """ @@ -387,7 +389,7 @@ class TestVMLifeCycle(cloudstackTestCase): ) return - + @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"]) def test_03_reboot_vm(self): """Test Reboot Virtual Machine """ @@ -423,7 +425,7 @@ class TestVMLifeCycle(cloudstackTestCase): ) return - + @attr(tags = ["advanced", "advancedns", "smoke"]) def test_04_change_offering_small(self): """Change Offering to a small capacity """ @@ -541,7 +543,7 @@ class TestVMLifeCycle(cloudstackTestCase): ) return - + @attr(tags = ["advanced", "advancedns", "smoke"]) def test_05_change_offering_medium(self): """Change Offering to a medium capacity """ @@ -663,7 +665,7 @@ class TestVMLifeCycle(cloudstackTestCase): ) return - + @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"]) def test_06_destroy_vm(self): """Test destroy Virtual Machine """ @@ -699,7 +701,7 @@ class TestVMLifeCycle(cloudstackTestCase): ) return - + @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"]) def test_07_restore_vm(self): """Test recover Virtual Machine """ @@ -739,7 +741,7 @@ class TestVMLifeCycle(cloudstackTestCase): return - + @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg", "multihost"]) def test_08_migrate_vm(self): """Test migrate VM """ @@ -810,6 +812,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 """ @@ -857,7 +862,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""" @@ -1099,7 +1104,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""" diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py index f6b5e79db90..f8b23095336 100644 --- a/test/integration/smoke/test_volumes.py +++ b/test/integration/smoke/test_volumes.py @@ -21,6 +21,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 @@ -41,7 +42,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: "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, @@ -139,6 +140,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) """ @@ -331,6 +333,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 """ @@ -376,6 +379,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 """ @@ -395,6 +399,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 """ @@ -418,6 +423,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 """ @@ -458,6 +464,7 @@ class TestVolumes(cloudstackTestCase): ) return + @attr(tags = ["advanced", "advancedns", "smoke"]) def test_06_download_detached_volume(self): """Download a Volume unattached to an VM """ @@ -488,6 +495,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 """