From b3c88f759455f3e0ece0de8ff0a1904cb4c94cec Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Mon, 20 Aug 2012 11:03:22 +0530 Subject: [PATCH] Adding more classifications - maintenance (host goes to maitnenance) - multihost, multizone, multistorage --- test/integration/component/test_accounts.py | 9 +- .../component/test_blocker_bugs.py | 10 +- .../component/test_egress_rules.py | 10 +- test/integration/component/test_eip_elb.py | 13 +- .../component/test_high_availability.py | 9 +- .../component/test_host_high_availability.py | 22 +- .../component/test_netscaler_configs.py | 5 +- .../component/test_netscaler_lb.py | 5 +- .../component/test_netscaler_lb_algo.py | 3 +- .../component/test_netscaler_lb_sticky.py | 3 +- .../component/test_netscaler_nw_off.py | 8 +- .../component/test_network_offering.py | 7 +- .../component/test_project_configs.py | 36 +-- .../component/test_project_limits.py | 23 +- .../component/test_project_resources.py | 18 +- .../component/test_project_usage.py | 24 +- test/integration/component/test_projects.py | 29 +-- .../component/test_resource_limits.py | 220 ++---------------- test/integration/component/test_routers.py | 12 +- .../component/test_security_groups.py | 7 +- .../test_security_keys_encryption.py | 7 +- test/integration/component/test_snapshots.py | 16 +- test/integration/component/test_stopped_vm.py | 9 +- test/integration/component/test_templates.py | 12 +- .../component/test_upload_volumes.py | 11 +- test/integration/component/test_usage.py | 24 +- test/integration/component/test_vmware_drs.py | 9 +- test/integration/component/test_volumes.py | 7 +- 28 files changed, 217 insertions(+), 351 deletions(-) diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py index 4c08f8ad863..52ff10a3aa6 100644 --- a/test/integration/component/test_accounts.py +++ b/test/integration/component/test_accounts.py @@ -20,6 +20,7 @@ from integration.lib.utils import * from integration.lib.base import * from integration.lib.common import * from marvin.remoteSSHClient import remoteSSHClient +from nose.plugins.attrib import attr import datetime @@ -39,7 +40,7 @@ class Services: "username": "test", # Random characters are appended for unique # username - "password": "fr3sca", + "password": "password", }, "user": { "email": "user@test.com", @@ -48,7 +49,7 @@ class Services: "username": "User", # Random characters are appended for unique # username - "password": "fr3sca", + "password": "password", }, "service_offering": { "name": "Tiny Instance", @@ -72,7 +73,7 @@ class Services: "template": { "displaytext": "Public Template", "name": "Public template", - "ostypeid": 'aaf6e8c9-b609-441d-9ebd-b4eaa030a275', + "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', @@ -80,7 +81,7 @@ class Services: "ispublic": True, "isextractable": True, }, - "ostypeid": 'aaf6e8c9-b609-441d-9ebd-b4eaa030a275', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 10, diff --git a/test/integration/component/test_blocker_bugs.py b/test/integration/component/test_blocker_bugs.py index 08747a99f9c..fd9c1a4ee79 100644 --- a/test/integration/component/test_blocker_bugs.py +++ b/test/integration/component/test_blocker_bugs.py @@ -14,6 +14,7 @@ """ Tests for Blocker bugs """ import marvin +from nose.plugins.attrib import attr from integration.lib.base import * from integration.lib.utils import * from integration.lib.common 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", @@ -72,7 +73,7 @@ class Services: "templates": { "displaytext": 'Template from snapshot', "name": 'Template from snapshot', - "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.vhd.bz2", "hypervisor": 'XenServer', @@ -94,7 +95,7 @@ class Services: "endport": 22, "protocol": "TCP" }, - "ostypeid": '144f66aa-7f74-4cfe-9799-80cc21439cb3', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', # Cent OS 5.3 (64 bit) "sleep": 60, "mode": 'advanced', @@ -1068,6 +1069,7 @@ class TestTemplates(cloudstackTestCase): return + @attr(speed = "slow") @attr(tags = ["advanced", "advancedns", "basic", "sg", "eip"]) def test_01_check_template_size(self): """TS_BUG_009-Test the size of template created from root disk @@ -1095,6 +1097,7 @@ class TestTemplates(cloudstackTestCase): ) return + @attr(speed = "slow") @attr(tags = ["advanced", "advancedns", "basic", "sg", "eip"]) def test_02_check_size_snapshotTemplate(self): """TS_BUG_010-Test check size of snapshot and template @@ -1175,6 +1178,7 @@ class TestTemplates(cloudstackTestCase): ) return + @attr(speed = "slow") @attr(tags = ["advanced", "advancedns", "basic", "sg", "eip"]) def test_03_resuse_template_name(self): """TS_BUG_011-Test Reusing deleted template name diff --git a/test/integration/component/test_egress_rules.py b/test/integration/component/test_egress_rules.py index 7f745e73f26..d5e39beb540 100644 --- a/test/integration/component/test_egress_rules.py +++ b/test/integration/component/test_egress_rules.py @@ -16,6 +16,7 @@ """ #Import Local Modules import marvin +from nose.plugins.attrib import attr from marvin.cloudstackTestCase import * from marvin.cloudstackAPI import * from marvin.remoteSSHClient import remoteSSHClient @@ -46,7 +47,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 @@ -111,10 +112,10 @@ class Services: }, "mgmt_server": { "username": "root", - "password": "fr3sca", + "password": "password", "ipaddress": "192.168.100.21" }, - "ostypeid": '85cb528f-72ed-4df9-ac6a-f6ccf0892ff2', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', # CentOS 5.3 (64-bit) "sleep": 60, "timeout": 10, @@ -2219,7 +2220,8 @@ class TestEgressAfterHostMaintainance(cloudstackTestCase): return - @attr(tags = ["sg", "eip"]) + @attr(speed = "slow") + @attr(tags = ["sg", "eip", "maintenance"]) def test_egress_after_host_maintainance(self): """Test maintenance case for egress """ diff --git a/test/integration/component/test_eip_elb.py b/test/integration/component/test_eip_elb.py index ea9e7d4a058..c5648bad661 100644 --- a/test/integration/component/test_eip_elb.py +++ b/test/integration/component/test_eip_elb.py @@ -16,6 +16,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 * @@ -77,7 +78,7 @@ class Services: "username": 'nsroot', "password": 'nsroot' }, - "ostypeid": '593341d7-879b-451e-804c-0c01bdea10c1', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 10, @@ -179,7 +180,7 @@ class TestEIP(cloudstackTestCase): @attr(tags = ["eip"]) - @unittest.skip("skipped") + @unittest.skip("skipped - Framework DB Exception") def test_01_eip_by_deploying_instance(self): """Test EIP by deploying an instance """ @@ -347,7 +348,7 @@ class TestEIP(cloudstackTestCase): return @attr(tags = ["eip"]) - @unittest.skip("skipped") + @unittest.skip("skipped - Framework DB Exception") def test_02_acquire_ip_enable_static_nat(self): """Test associate new IP and enable static NAT for new IP and the VM """ @@ -492,7 +493,7 @@ class TestEIP(cloudstackTestCase): return @attr(tags = ["eip"]) - @unittest.skip("skipped") + @unittest.skip("skipped - Framework DB Exception") def test_03_disable_static_nat(self): """Test disable static NAT and release EIP acquired """ @@ -692,7 +693,7 @@ class TestEIP(cloudstackTestCase): return @attr(tags = ["eip"]) - @unittest.skip("skipped") + @unittest.skip("skipped - Framework DB Exception") def test_04_disable_static_nat_system(self): """Test disable static NAT with system = True """ @@ -762,7 +763,7 @@ class TestEIP(cloudstackTestCase): return @attr(tags = ["eip"]) - @unittest.skip("skipped") + @unittest.skip("skipped - Framework DB Exception") def test_05_destroy_instance(self): """Test EIO after destroying instance """ diff --git a/test/integration/component/test_high_availability.py b/test/integration/component/test_high_availability.py index 2376d61d5b7..5d7a1747f29 100644 --- a/test/integration/component/test_high_availability.py +++ b/test/integration/component/test_high_availability.py @@ -16,6 +16,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 * @@ -80,7 +81,7 @@ class Services: "templates": { "displaytext": "Public Template", "name": "Public template", - "ostypeid": '1d4a6dce-8db1-4c08-8752-e88b360d8287', + "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', @@ -89,7 +90,7 @@ class Services: "isextractable": True, "templatefilter": 'self', }, - "ostypeid": '1d4a6dce-8db1-4c08-8752-e88b360d8287', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 100, @@ -169,7 +170,7 @@ class TestHighAvailability(cloudstackTestCase): raise Exception("Warning: Exception during cleanup : %s" % e) return - @attr(tags = ["advanced", "advancedns"]) + @attr(tags = ["advanced", "advancedns", "multihost"]) def test_01_host_maintenance_mode(self): """Test host maintenance mode """ @@ -560,7 +561,7 @@ class TestHighAvailability(cloudstackTestCase): ) return - @attr(tags = ["advanced", "advancedns"]) + @attr(tags = ["advanced", "advancedns", "multihost"]) def test_02_host_maintenance_mode_with_activities(self): """Test host maintenance mode with activities """ diff --git a/test/integration/component/test_host_high_availability.py b/test/integration/component/test_host_high_availability.py index fd1dd28e5bf..7adf4078246 100644 --- a/test/integration/component/test_host_high_availability.py +++ b/test/integration/component/test_host_high_availability.py @@ -16,6 +16,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 * @@ -65,7 +66,7 @@ class Services: "publicport": 22, "protocol": 'TCP', }, - "ostypeid": '6a6b23aa-5e59-4b53-8161-0ad1aa5990f1', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "timeout": 100, } @@ -146,7 +147,7 @@ class TestHostHighAvailability(cloudstackTestCase): raise Exception("Warning: Exception during cleanup : %s" % e) return - + @attr(configuration = "ha.tag") @attr(tags = ["advanced", "advancedns", "sg", "basic", "eip", "simulator"]) def test_01_vm_deployment_with_compute_offering_with_ha_enabled(self): """ Test VM deployments (Create HA enabled Compute Service Offering and VM) """ @@ -211,7 +212,8 @@ class TestHostHighAvailability(cloudstackTestCase): "VM not created with HA enable tag" ) - @attr(tags = ["advanced", "advancedns", "sg", "basic", "eip", "simulator"]) + @attr(configuration = "ha.tag") + @attr(tags = ["advanced", "advancedns", "sg", "basic", "eip", "simulator", "multihost"]) def test_02_no_vm_creation_on_host_with_haenabled(self): """ Verify you can not create new VMs on hosts with an ha.tag """ @@ -335,7 +337,8 @@ class TestHostHighAvailability(cloudstackTestCase): "VM migrated to HA enabled host." ) - @attr(tags = ["advanced", "advancedns", "sg", "basic", "eip", "simulator"]) + @attr(configuration = "ha.tag") + @attr(tags = ["advanced", "advancedns", "sg", "basic", "eip", "simulator", "multihost"]) def test_03_cant_migrate_vm_to_host_with_ha_positive(self): """ Verify you can not migrate VMs to hosts with an ha.tag (positive) """ @@ -440,7 +443,8 @@ class TestHostHighAvailability(cloudstackTestCase): "The VM is not migrated to targeted suitable host." ) - @attr(tags = ["advanced", "advancedns", "sg", "basic", "eip", "simulator"]) + @attr(configuration = "ha.tag") + @attr(tags = ["advanced", "advancedns", "sg", "basic", "eip", "simulator", "multihost"]) def test_04_cant_migrate_vm_to_host_with_ha_negative(self): """ Verify you can not migrate VMs to hosts with an ha.tag (negative) """ @@ -544,7 +548,9 @@ class TestHostHighAvailability(cloudstackTestCase): "The detination host id of migrated VM is not matching." ) - @attr(tags = ["advanced", "advancedns", "sg", "basic", "eip", "simulator"]) + @attr(configuration = "ha.tag") + @attr(speed = "slow") + @attr(tags = ["advanced", "advancedns", "sg", "basic", "eip", "simulator", "multihost"]) def test_05_no_vm_with_ha_gets_migrated_to_ha_host_in_live_migration(self): """ Verify that none of the VMs with HA enabled migrate to an ha tagged host during live migration """ @@ -674,7 +680,9 @@ class TestHostHighAvailability(cloudstackTestCase): cmd.id = vm_with_ha_enabled.hostid self.apiclient.cancelHostMaintenance(cmd) - @attr(tags = ["advanced", "advancedns", "sg", "basic", "eip", "simulator"]) + @attr(configuration = "ha.tag") + @attr(speed = "slow") + @attr(tags = ["advanced", "advancedns", "sg", "basic", "eip", "simulator", "multihost"]) def test_06_no_vm_without_ha_gets_migrated_to_ha_host_in_live_migration(self): """ Verify that none of the VMs without HA enabled migrate to an ha tagged host during live migration """ diff --git a/test/integration/component/test_netscaler_configs.py b/test/integration/component/test_netscaler_configs.py index 24083028f17..a5d282be2c6 100644 --- a/test/integration/component/test_netscaler_configs.py +++ b/test/integration/component/test_netscaler_configs.py @@ -16,6 +16,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 * @@ -38,7 +39,7 @@ class Services: "username": "test", # Random characters are appended for unique # username - "password": "fr3sca", + "password": "password", }, "service_offering": { "name": "Tiny Instance", @@ -140,7 +141,7 @@ class Services: "publicport": 22, "openfirewall": False, }, - "ostypeid": '946b031b-0e10-4f4a-a3fc-d212ae2ea07f', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 10, diff --git a/test/integration/component/test_netscaler_lb.py b/test/integration/component/test_netscaler_lb.py index 3e3753f5a6d..22433378b1a 100644 --- a/test/integration/component/test_netscaler_lb.py +++ b/test/integration/component/test_netscaler_lb.py @@ -16,6 +16,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 * @@ -134,7 +135,7 @@ class Services: "publicport": 22, "protocol": "TCP" }, - "ostypeid": '2b58909b-7d9e-45d9-80d8-e58d0bbcbf07', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 10, @@ -2624,7 +2625,7 @@ class TestVmWithLb(cloudstackTestCase): (self.services["netscaler"]["ipaddress"], e)) return - @attr(tags = ["advancedns"]) + @attr(tags = ["advancedns", "multihost"]) def test_04_migrate_user_vm(self): """Test migrate user VM with LB""" diff --git a/test/integration/component/test_netscaler_lb_algo.py b/test/integration/component/test_netscaler_lb_algo.py index 24ab66c3e9f..5f69564d3a8 100644 --- a/test/integration/component/test_netscaler_lb_algo.py +++ b/test/integration/component/test_netscaler_lb_algo.py @@ -16,6 +16,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 * @@ -100,7 +101,7 @@ class Services: "publicport": 22, "openfirewall": False, }, - "ostypeid": '946b031b-0e10-4f4a-a3fc-d212ae2ea07f', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 10, diff --git a/test/integration/component/test_netscaler_lb_sticky.py b/test/integration/component/test_netscaler_lb_sticky.py index e3f02da3bbc..008fef8643c 100644 --- a/test/integration/component/test_netscaler_lb_sticky.py +++ b/test/integration/component/test_netscaler_lb_sticky.py @@ -16,6 +16,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 * @@ -100,7 +101,7 @@ class Services: "publicport": 22, "openfirewall": False, }, - "ostypeid": '946b031b-0e10-4f4a-a3fc-d212ae2ea07f', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 10, diff --git a/test/integration/component/test_netscaler_nw_off.py b/test/integration/component/test_netscaler_nw_off.py index d57b4bb753c..9cf97dbb93f 100644 --- a/test/integration/component/test_netscaler_nw_off.py +++ b/test/integration/component/test_netscaler_nw_off.py @@ -16,6 +16,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 * @@ -38,7 +39,7 @@ class Services: "username": "test", # Random characters are appended for unique # username - "password": "fr3sca", + "password": "password", }, "service_offering": { "name": "Tiny Instance", @@ -153,7 +154,7 @@ class Services: "publicport": 22, "openfirewall": False, }, - "ostypeid": '946b031b-0e10-4f4a-a3fc-d212ae2ea07f', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 10, @@ -359,7 +360,7 @@ class TestAddMultipleNSDiffZone(cloudstackTestCase): raise Exception("Warning: Exception during cleanup : %s" % e) return - @attr(tags = ["advancedns"]) + @attr(tags = ["advancedns", "multizone"]) def test_add_mul_netscaler_diff_zone(self): """Test add netscaler devices in different zones """ @@ -989,6 +990,7 @@ class TestNetScalerSharedMode(cloudstackTestCase): self.debug("Deploy VM failed as Netscaler device capacity is full!") return + @attr(configuration = "network.gc") @attr(tags = ["advancedns"]) def test_04_delete_account_after_capacity_full(self): """Test delete and add resouces after netscaler device capacity is full diff --git a/test/integration/component/test_network_offering.py b/test/integration/component/test_network_offering.py index b351de355af..66850e2feee 100644 --- a/test/integration/component/test_network_offering.py +++ b/test/integration/component/test_network_offering.py @@ -16,6 +16,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 * @@ -38,7 +39,7 @@ class Services: "username": "test", # Random characters are appended for unique # username - "password": "fr3sca", + "password": "password", }, "service_offering": { "name": "Tiny Instance", @@ -133,7 +134,7 @@ class Services: "publicport": 22, "protocol": 'TCP', }, - "ostypeid": '9958b10f-9e5d-4ef1-908d-a047372d823b', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 10, @@ -1428,6 +1429,7 @@ class TestNetworkUpgrade(cloudstackTestCase): raise Exception("Warning: Exception during cleanup : %s" % e) return + @attr(speed = "slow") @attr(tags = ["advancedns"]) def test_01_nwupgrade_netscaler_conserve_on(self): """Test Nw upgrade to netscaler lb service and conserve mode ON @@ -1627,6 +1629,7 @@ class TestNetworkUpgrade(cloudstackTestCase): ) return + @attr(speed = "slow") @attr(tags = ["advancedns"]) def test_02_nwupgrade_netscaler_conserve_off(self): """Test Nw upgrade to netscaler lb service and conserve mode OFF diff --git a/test/integration/component/test_project_configs.py b/test/integration/component/test_project_configs.py index 9272250abfe..545f8ee3274 100644 --- a/test/integration/component/test_project_configs.py +++ b/test/integration/component/test_project_configs.py @@ -15,6 +15,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: "mgmt_server": { "ipaddress": '192.168.100.21', "username": 'root', - "password": 'fr3sca', + "password": 'password', "port": 22, }, "account": { @@ -50,7 +51,7 @@ class Services: "username": "test", # Random characters are appended for unique # username - "password": "fr3sca", + "password": "password", }, "user": { "email": "administrator@clogeny.com", @@ -59,7 +60,7 @@ class Services: "username": "User", # Random characters are appended for unique # username - "password": "fr3sca", + "password": "password", }, "service_offering": { "name": "Tiny Instance", @@ -83,7 +84,7 @@ class Services: "template": { "displaytext": "Public Template", "name": "Public template", - "ostypeid": '7ddbbbb5-bb09-40de-b038-ee78995788ea', + "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', @@ -94,7 +95,7 @@ class Services: "configs": { "project.invite.timeout": 300, }, - "ostypeid": '7ddbbbb5-bb09-40de-b038-ee78995788ea', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 10, @@ -170,7 +171,8 @@ class TestUserProjectCreation(cloudstackTestCase): raise Exception("Warning: Exception during cleanup : %s" % e) return - @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"]) + @attr(configuration = "allow.user.create.projects") + @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator"]) def test_admin_project_creation(self): """Test create project as a domain admin and domain user """ @@ -318,7 +320,8 @@ class TestProjectCreationNegative(cloudstackTestCase): raise Exception("Warning: Exception during cleanup : %s" % e) return - @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"]) + @attr(configuration = "allow.user.create.projects") + @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator"]) @unittest.skip("Known bug-able to create project as a domain user") def test_user_project_creation(self): """Test create project as a domain admin and domain user @@ -443,7 +446,7 @@ class TestProjectInviteRequired(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_add_user_to_project(self): """Add user to project when 'project.invite.required' is false""" @@ -595,10 +598,11 @@ class TestProjectInviteRequiredTrue(cloudstackTestCase): raise Exception("Warning: Exception during cleanup : %s" % e) return + @attr(configuration = "project.invite.required") + @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"]) def test_add_user_to_project(self): """Add user to project when 'project.invite.required' is true""" - tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following: # 1. Create a Project @@ -759,10 +763,11 @@ class TestProjectInviteTimeout(cloudstackTestCase): raise Exception("Warning: Exception during cleanup : %s" % e) return + @attr(configuration = "project.invite.timeout") + @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator"]) def test_01_invitation_timeout(self): """Test global config project invitation timeout""" - tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following: # 1. Set configuration to 5 mins @@ -884,10 +889,11 @@ class TestProjectInviteTimeout(cloudstackTestCase): ) return + @attr(configuration = "project.invite.timeout") + @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator"]) def test_02_invitation_timeout_after_expiry(self): """Test global config project invitation timeout""" - tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following: # 1. Set configuration to 5 mins @@ -1014,11 +1020,11 @@ class TestProjectInviteTimeout(cloudstackTestCase): ) return + @attr(configuration = "project.invite.timeout") + @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator"]) def test_03_invite_after_expiry(self): """Test global config project invitation timeout""" - tags = ["advanced", "basic", "sg", "eip", "advancedns"] - # Validate the following: # 1. Set configuration to 5 mins # 2. Create a Project @@ -1143,11 +1149,11 @@ class TestProjectInviteTimeout(cloudstackTestCase): ) return + @attr(configuration = "project.invite.timeout") + @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator"]) def test_04_decline_invitation(self): """Test decline invitation""" - tags = ["advanced", "basic", "sg", "eip", "advancedns"] - # Validate the following: # 1. Set configuration to 5 mins # 2. Create a Project diff --git a/test/integration/component/test_project_limits.py b/test/integration/component/test_project_limits.py index 917595e7166..f4a99e1bba4 100644 --- a/test/integration/component/test_project_limits.py +++ b/test/integration/component/test_project_limits.py @@ -15,6 +15,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", }, "user": { "email": "administrator@clogeny.com", @@ -52,7 +53,7 @@ class Services: "username": "User", # Random characters are appended for unique # username - "password": "fr3sca", + "password": "password", }, "service_offering": { "name": "Tiny Instance", @@ -82,10 +83,10 @@ class Services: "template": { "displaytext": "Cent OS Template", "name": "Cent OS Template", - "ostypeid": '471a4b5b-5523-448f-9608-7d6218995733', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "templatefilter": 'self', }, - "ostypeid": '471a4b5b-5523-448f-9608-7d6218995733', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 10, @@ -152,7 +153,7 @@ class TestProjectLimits(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_project_limits(self): """ Test project limits """ @@ -299,7 +300,7 @@ class TestProjectLimits(cloudstackTestCase): ) return - @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"]) + @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator"]) @unittest.skip("No provision for updating resource limits from account through API") def test_02_project_limits_normal_user(self): """ Test project limits @@ -523,7 +524,7 @@ class TestResourceLimitsProject(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_vm_per_project(self): """Test VM limit per project """ @@ -585,10 +586,10 @@ class TestResourceLimitsProject(cloudstackTestCase): ) return + @attr(tags = ["advanced", "eip", "advancedns", "simulator"]) def test_04_publicip_per_project(self): """Test Public IP limit per project """ - tags = ["advanced", "eip", "advancedns"] # Validate the following # 1. set max no of IPs per project to 2. # 2. Create an account in this domain @@ -670,10 +671,10 @@ class TestResourceLimitsProject(cloudstackTestCase): ) return + @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator"]) def test_05_snapshots_per_project(self): """Test Snapshot limit per project """ - tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. set max no of snapshots per project to 1. # 2. Create one snapshot in the project. Snapshot should be @@ -747,10 +748,10 @@ class TestResourceLimitsProject(cloudstackTestCase): ) return + @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator"]) def test_06_volumes_per_project(self): """Test Volumes limit per project """ - tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. set max no of volume per project to 1. # 2. Create 1 VM in this project @@ -796,10 +797,10 @@ class TestResourceLimitsProject(cloudstackTestCase): ) return + @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"]) def test_07_templates_per_project(self): """Test Templates limit per project """ - tags = ["advanced", "basic", "sg", "eip", "advancedns"] # Validate the following # 1. set max no of templates per project to 1. # 2. Create a template in this project. Both template should be in diff --git a/test/integration/component/test_project_resources.py b/test/integration/component/test_project_resources.py index 835b021a154..86b902815dc 100644 --- a/test/integration/component/test_project_resources.py +++ b/test/integration/component/test_project_resources.py @@ -15,6 +15,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", }, "user": { "email": "administrator@clogeny.com", @@ -53,7 +54,7 @@ class Services: "username": "User", # Random characters are appended for unique # username - "password": "fr3sca", + "password": "password", }, "service_offering": { "name": "Tiny Instance", @@ -83,7 +84,7 @@ 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', "ispublic": False, }, @@ -126,7 +127,7 @@ class Services: "endport": 22, "cidrlist": '0.0.0.0/0', }, - "ostypeid": '5776c0d2-f331-42db-ba3a-29f1f8319bc9', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 10, @@ -203,7 +204,7 @@ class TestOfferings(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_service_offerings(self): """ Test service offerings in a project """ @@ -245,7 +246,7 @@ class TestOfferings(cloudstackTestCase): return - @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns"]) + @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator"]) def test_02_project_disk_offerings(self): """ Test project disk offerings """ @@ -377,7 +378,7 @@ class TestNetwork(cloudstackTestCase): raise Exception("Warning: Exception during cleanup : %s" % e) return - @attr(tags = ["advanced", "advancedns"]) + @attr(tags = ["advanced", "advancedns", "simulator"]) def test_03_network_create(self): """ Test create network in project """ @@ -806,7 +807,8 @@ class TestSnapshots(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_06_create_snapshots_in_project(self): """Test create snapshots in project """ diff --git a/test/integration/component/test_project_usage.py b/test/integration/component/test_project_usage.py index f1f70ccf562..8a6d4d1439d 100644 --- a/test/integration/component/test_project_usage.py +++ b/test/integration/component/test_project_usage.py @@ -15,6 +15,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 * @@ -37,7 +38,7 @@ class Services: "username": "test", # Random characters are appended for unique # username - "password": "fr3sca", + "password": "password", }, "project": { "name": "Project", @@ -71,7 +72,7 @@ class Services: "templates": { "displaytext": 'Template', "name": 'Template', - "ostypeid": '471a4b5b-5523-448f-9608-7d6218995733', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "templatefilter": 'self', "url": "http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.qcow2.bz2" }, @@ -83,7 +84,7 @@ class Services: "isextractable": True, "isfeatured": True, "ispublic": True, - "ostypeid": '471a4b5b-5523-448f-9608-7d6218995733', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', }, "lbrule": { "name": "SSH", @@ -101,7 +102,7 @@ class Services: "username": "test", "password": "test", }, - "ostypeid": '471a4b5b-5523-448f-9608-7d6218995733', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 10, @@ -188,7 +189,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 """ @@ -399,7 +400,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 """ @@ -557,7 +558,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 """ @@ -1072,7 +1073,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 """ @@ -1238,7 +1239,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 @@ -1430,7 +1432,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 """ @@ -1613,7 +1615,7 @@ class TestVpnUsage(cloudstackTestCase): raise Exception("Warning: Exception during cleanup : %s" % e) return - @attr(tags = ["advanced", "advancedns"]) + @attr(tags = ["advanced", "advancedns", "simulator"]) def test_01_vpn_usage(self): """Test Create/Delete a VPN and verify correct usage is recorded """ diff --git a/test/integration/component/test_projects.py b/test/integration/component/test_projects.py index 5eee677c432..d2922d5d7d1 100644 --- a/test/integration/component/test_projects.py +++ b/test/integration/component/test_projects.py @@ -15,6 +15,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: "mgmt_server": { "ipaddress": '192.168.100.21', "username": 'root', - "password": 'fr3sca', + "password": 'password', "port": 22, }, "account": { @@ -50,7 +51,7 @@ class Services: "username": "test", # Random characters are appended for unique # username - "password": "fr3sca", + "password": "password", }, "user": { "email": "administrator@clogeny.com", @@ -59,7 +60,7 @@ class Services: "username": "User", # Random characters are appended for unique # username - "password": "fr3sca", + "password": "password", }, "disk_offering": { "displaytext": "Tiny Disk Offering", @@ -88,7 +89,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, @@ -164,7 +165,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 @@ -380,7 +381,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 """ @@ -500,7 +501,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 """ @@ -614,7 +615,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 @@ -759,7 +760,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 @@ -901,7 +902,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 """ @@ -1191,7 +1192,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. @@ -1307,7 +1308,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 """ @@ -1521,7 +1522,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. @@ -1658,7 +1659,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 """ diff --git a/test/integration/component/test_resource_limits.py b/test/integration/component/test_resource_limits.py index aad83292bfb..b8e3df9e269 100644 --- a/test/integration/component/test_resource_limits.py +++ b/test/integration/component/test_resource_limits.py @@ -15,6 +15,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", @@ -69,10 +70,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, @@ -149,7 +150,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 """ @@ -242,7 +243,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 """ @@ -385,7 +386,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 """ @@ -541,7 +543,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 """ @@ -913,7 +915,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 """ @@ -979,7 +981,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 """ @@ -1049,7 +1051,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 """ @@ -1132,7 +1135,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 """ @@ -1294,198 +1297,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 diff --git a/test/integration/component/test_routers.py b/test/integration/component/test_routers.py index 1805207b14b..378b1f43ba7 100644 --- a/test/integration/component/test_routers.py +++ b/test/integration/component/test_routers.py @@ -15,6 +15,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 * @@ -54,7 +55,7 @@ class Services: }, "host": { "username": "root", - "password": "fr3sca", + "password": "password", "publicport": 22, }, "account": { @@ -85,7 +86,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 } @@ -310,6 +311,7 @@ class TestRouterServices(cloudstackTestCase): ) return + @attr(configuration = "network.gc") @attr(tags = ["advanced"]) def test_02_NetworkGarbageCollection(self): """Test network garbage collection @@ -643,7 +645,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 """ @@ -853,7 +855,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 """ @@ -1063,7 +1065,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 """ diff --git a/test/integration/component/test_security_groups.py b/test/integration/component/test_security_groups.py index df4d41b4f01..16b244219c1 100644 --- a/test/integration/component/test_security_groups.py +++ b/test/integration/component/test_security_groups.py @@ -16,6 +16,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 * @@ -46,7 +47,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 @@ -63,7 +64,7 @@ class Services: "host": { "publicport": 22, "username": "root", # Host creds for SSH - "password": "fr3sca", + "password": "password", }, "service_offering": { "name": "Tiny Instance", @@ -86,7 +87,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, diff --git a/test/integration/component/test_security_keys_encryption.py b/test/integration/component/test_security_keys_encryption.py index d33c2181ec1..4fcfe2903ed 100644 --- a/test/integration/component/test_security_keys_encryption.py +++ b/test/integration/component/test_security_keys_encryption.py @@ -1,6 +1,7 @@ """ P1 tests for Security Keys Encryption """ #Import Local Modules +from nose.plugins.attrib import attr from integration.lib.base import * from integration.lib.common import * from integration.lib.utils import * @@ -24,7 +25,7 @@ class Services: "username": "test", # Random characters are appended for unique # username - "password": "fr3sca", + "password": "password", }, "service_offering": { "name": "Tiny Instance", @@ -49,7 +50,7 @@ class Services: }, "host": { "username": "root", - "password": "fr3sca", + "password": "password", }, "globalconfig": { "security.hash.key" : "test", @@ -70,7 +71,7 @@ class Services: "alert.smtp.password" : "test", "project.smtp.password" : "test", }, - "ostypeid": '7ddbbbb5-bb09-40de-b038-ee78995788ea', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 10, diff --git a/test/integration/component/test_snapshots.py b/test/integration/component/test_snapshots.py index 95627b6a9cc..d2675108850 100644 --- a/test/integration/component/test_snapshots.py +++ b/test/integration/component/test_snapshots.py @@ -15,6 +15,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 * @@ -36,7 +37,7 @@ class Services: "username": "test", # Random characters are appended for unique # username - "password": "fr3sca", + "password": "password", }, "service_offering": { "name": "Tiny Instance", @@ -63,7 +64,7 @@ class Services: "mgmt_server": { "ipaddress": '192.168.100.21', "username": "root", - "password": "fr3sca", + "password": "password", "port": 22, }, "recurring_snapshot": { @@ -77,7 +78,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", @@ -90,7 +91,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, @@ -160,6 +161,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 @@ -473,6 +475,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 @@ -816,6 +819,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 @@ -1095,6 +1099,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 @@ -1352,7 +1357,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 diff --git a/test/integration/component/test_stopped_vm.py b/test/integration/component/test_stopped_vm.py index c256655ebb5..cf6e6c504f4 100644 --- a/test/integration/component/test_stopped_vm.py +++ b/test/integration/component/test_stopped_vm.py @@ -16,6 +16,7 @@ """ #Import Local Modules import marvin +from nose.plugins.attrib import attr from marvin.cloudstackTestCase import * from marvin.cloudstackAPI import * from marvin.remoteSSHClient import remoteSSHClient @@ -74,9 +75,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": '19e6a39f-92db-4d2c-b375-33e7f42d86be', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "mode": 'HTTP_DOWNLOAD', # Downloading existing ISO }, "template": { @@ -88,14 +89,14 @@ class Services: "isextractable": True, "displaytext": "Cent OS Template", "name": "Cent OS Template", - "ostypeid": '19e6a39f-92db-4d2c-b375-33e7f42d86be', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "templatefilter": 'self', "passwordenabled": True, }, "sleep": 60, "timeout": 10, #Migrate VM to hostid - "ostypeid": '19e6a39f-92db-4d2c-b375-33e7f42d86be', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', # CentOS 5.3 (64-bit) } diff --git a/test/integration/component/test_templates.py b/test/integration/component/test_templates.py index 0f0614872dd..dbff5ea3f40 100644 --- a/test/integration/component/test_templates.py +++ b/test/integration/component/test_templates.py @@ -15,6 +15,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", @@ -73,7 +74,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', @@ -85,12 +86,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 @@ -412,7 +413,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""" @@ -525,6 +526,7 @@ class TestTemplates(cloudstackTestCase): ) return + @attr(speed = "slow") @attr(tags = ["advanced", "advancedns"]) def test_04_template_from_snapshot(self): """Create Template from snapshot diff --git a/test/integration/component/test_upload_volumes.py b/test/integration/component/test_upload_volumes.py index e5ba376892d..5f4713ab8ec 100644 --- a/test/integration/component/test_upload_volumes.py +++ b/test/integration/component/test_upload_volumes.py @@ -17,6 +17,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", @@ -89,7 +90,7 @@ class Services: "publicport": 22, }, "sleep": 50, - "ostypeid": 'e6e3dd0f-03c8-4cab-9c32-89769c17ccb3', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "mode": 'basic', } @@ -158,6 +159,7 @@ class TestUploadDataDisk(cloudstackTestCase): except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) + @attr(speed = "slow") @attr(tags = ["advanced", "basic", "eip", "advancedns", "sg"]) def test_01_upload_data_disk(self): """Test Upload a data disk @@ -211,6 +213,7 @@ class TestUploadDataDisk(cloudstackTestCase): ) return + @attr(speed = "slow") @attr(tags = ["advanced", "basic", "eip", "advancedns", "sg"]) def test_02_upload_volume_limit(self): """Test upload volume limits @@ -757,7 +760,7 @@ class TestUploadDiskMultiStorage(cloudstackTestCase): except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) - @attr(tags = ["advanced", "basic", "eip", "advancedns", "sg"]) + @attr(tags = ["advanced", "basic", "eip", "advancedns", "sg", "multistorage"]) def test_01_upload_volume_multi_sec_storage(self): """Test Upload a data disk when multiple sec storages are present """ @@ -826,7 +829,7 @@ class TestUploadDiskMultiStorage(cloudstackTestCase): ) return - @attr(tags = ["advanced", "basic", "eip", "advancedns", "sg"]) + @attr(tags = ["advanced", "basic", "eip", "advancedns", "sg", "multistorage"]) def test_02_upload_volume_multi_pri_storage(self): """Test Upload a data disk when multiple primary storages are present """ diff --git a/test/integration/component/test_usage.py b/test/integration/component/test_usage.py index 166b75a02a6..7103c0f7a6c 100644 --- a/test/integration/component/test_usage.py +++ b/test/integration/component/test_usage.py @@ -15,6 +15,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 * @@ -37,7 +38,7 @@ class Services: "username": "test", # Random characters are appended for unique # username - "password": "fr3sca", + "password": "password", }, "service_offering": { "name": "Tiny Instance", @@ -67,7 +68,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" }, @@ -79,7 +80,7 @@ class Services: "isextractable": True, "isfeatured": True, "ispublic": True, - "ostypeid": '144f66aa-7f74-4cfe-9799-80cc21439cb3', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', }, "lbrule": { "name": "SSH", @@ -97,7 +98,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, @@ -174,7 +175,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 """ @@ -365,7 +366,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 """ @@ -512,7 +513,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 """ @@ -693,8 +694,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 """ @@ -987,7 +988,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 """ @@ -1142,7 +1143,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 @@ -1313,7 +1315,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 """ diff --git a/test/integration/component/test_vmware_drs.py b/test/integration/component/test_vmware_drs.py index 090e9388f96..5420083dad6 100644 --- a/test/integration/component/test_vmware_drs.py +++ b/test/integration/component/test_vmware_drs.py @@ -16,6 +16,7 @@ """ #Import Local Modules import marvin +from nose.plugins.attrib import attr from marvin.cloudstackTestCase import * from marvin.cloudstackAPI import * from marvin.remoteSSHClient import remoteSSHClient @@ -77,7 +78,7 @@ class Services: "sleep": 60, "timeout": 10, "full_host": "10.147.29.53", - "ostypeid": 'd96fc3f0-a1d3-4498-88aa-a7a1ca96c1bb', + "ostypeid": '01853327-513e-4508-9628-f1f55db1946f', # CentOS 5.3 (64-bit) } @@ -154,7 +155,7 @@ class TestVMPlacement(cloudstackTestCase): raise Exception("Warning: Exception during cleanup : %s" % e) return - @attr(tags = ["advanced", "vmware"])_ + @attr(tags = ["advanced", "vmware", "multihost"]) def test_vm_creation_in_fully_automated_mode(self): """ Test VM Creation in automation mode = Fully automated This test requires following preconditions: @@ -280,7 +281,7 @@ class TestAntiAffinityRules(cloudstackTestCase): raise Exception("Warning: Exception during cleanup : %s" % e) return - @attr(tags = ["advanced", "vmware"]) + @attr(tags = ["advanced", "vmware", "multihost"]) def test_vmware_anti_affinity(self): """ Test Set up anti-affinity rules @@ -481,7 +482,7 @@ class TestAffinityRules(cloudstackTestCase): raise Exception("Warning: Exception during cleanup : %s" % e) return - @attr(tags = ["advanced", "vmware"]) + @attr(tags = ["advanced", "vmware", "multihost"]) def test_vmware_affinity(self): """ Test Set up affinity rules diff --git a/test/integration/component/test_volumes.py b/test/integration/component/test_volumes.py index 55acc4c6a41..679455acacc 100644 --- a/test/integration/component/test_volumes.py +++ b/test/integration/component/test_volumes.py @@ -15,6 +15,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 * @@ -41,7 +42,7 @@ class Services: "username": "test", # Random characters are appended for unique # username - "password": "fr3sca", + "password": "password", }, "service_offering": { "name": "Tiny Instance", @@ -75,10 +76,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', }