CLOUDSTACK-1530: Fix integration test scripts in the components folder for
imports and ostypeid Fix the integration scripts for nose import and ostypeid
corrections
from nose.plugins.attrib import attr
"ostype": 'CentOS 5.3 (64-bit)',
template = get_template(
cls.api_client,
cls.zone.id,
cls.services["ostype"]
)
Signed-off-by: Talluri <[email protected]>
Signed-off-by: Prasanna Santhanam <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9342f561
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9342f561
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9342f561
Branch: refs/heads/ui-multiple-nics
Commit: 9342f561f73bc860a24c99ab1405152e070359a0
Parents: 713dff5
Author: Talluri <[email protected]>
Authored: Wed Mar 6 17:20:25 2013 +0530
Committer: Prasanna Santhanam <[email protected]>
Committed: Wed Mar 6 13:45:07 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_accounts.py | 5 ++-
.../component/test_allocation_states.py | 5 ++-
test/integration/component/test_blocker_bugs.py | 14 ++++----
test/integration/component/test_egress_rules.py | 24 +++++++-------
test/integration/component/test_eip_elb.py | 6 ++--
.../integration/component/test_network_offering.py | 10 +++---
test/integration/component/test_project_configs.py | 4 +-
test/integration/component/test_project_limits.py | 8 ++--
.../component/test_project_resources.py | 16 +++++-----
test/integration/component/test_project_usage.py | 22 +++++++-------
test/integration/component/test_projects.py | 4 +-
test/integration/component/test_resource_limits.py | 10 +++---
test/integration/component/test_routers.py | 10 +++---
test/integration/component/test_security_groups.py | 16 +++++-----
test/integration/component/test_templates.py | 8 ++--
test/integration/component/test_usage.py | 22 +++++++-------
test/integration/component/test_volumes.py | 14 ++++----
17 files changed, 100 insertions(+), 98 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9342f561/test/integration/component/test_accounts.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_accounts.py
b/test/integration/component/test_accounts.py
index d0b4434..cdb3e58 100644
--- a/test/integration/component/test_accounts.py
+++ b/test/integration/component/test_accounts.py
@@ -23,6 +23,7 @@ from marvin.integration.lib.utils import *
from marvin.integration.lib.base import *
from marvin.integration.lib.common import *
from marvin import remoteSSHClient
+from nose.plugins.attrib import attr
import datetime
@@ -90,7 +91,7 @@ class Services:
"privateport": 22,
"protocol": 'TCP',
},
- "ostypeid": 'bc66ada0-99e7-483b-befc-8fb0c2129b70',
+ "ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
@@ -112,7 +113,7 @@ class TestAccounts(cloudstackTestCase):
cls.template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["template"] = cls.template.id
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9342f561/test/integration/component/test_allocation_states.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_allocation_states.py
b/test/integration/component/test_allocation_states.py
index 006f879..103cb10 100644
--- a/test/integration/component/test_allocation_states.py
+++ b/test/integration/component/test_allocation_states.py
@@ -22,6 +22,7 @@ from marvin.cloudstackAPI import *
from marvin.integration.lib.utils import *
from marvin.integration.lib.base import *
from marvin.integration.lib.common import *
+from nose.plugins.attrib import attr
import datetime
@@ -74,7 +75,7 @@ class Services:
"ostypeid":
'01853327-513e-4508-9628-f1f55db1946f',
"templatefilter": 'self',
},
- "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
+ "ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
@@ -87,7 +88,7 @@ class TestAllocationState(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls.api_client = super(
- TestResources,
+ TestAllocationState,
cls
).getClsTestClient().getApiClient()
cls.services = Services().services
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9342f561/test/integration/component/test_blocker_bugs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_blocker_bugs.py
b/test/integration/component/test_blocker_bugs.py
index cc5da0a..33e4a73 100644
--- a/test/integration/component/test_blocker_bugs.py
+++ b/test/integration/component/test_blocker_bugs.py
@@ -76,7 +76,7 @@ class Services:
"templates": {
"displaytext": 'Template from snapshot',
"name": 'Template from snapshot',
- "ostypeid":
'01853327-513e-4508-9628-f1f55db1946f',
+ "ostype": 'CentOS 5.3 (64-bit)',
"templatefilter": 'self',
"url":
"http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.vhd.bz2";,
"hypervisor": 'XenServer',
@@ -98,7 +98,7 @@ class Services:
"endport": 22,
"protocol": "TCP"
},
- "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
+ "ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit)
"sleep": 60,
"mode": 'advanced',
@@ -122,7 +122,7 @@ class TestSnapshots(cloudstackTestCase):
cls.template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["volume"]["zoneid"] = cls.zone.id
@@ -546,7 +546,7 @@ class TestNATRules(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
#Create an account, network, VM and IP addresses
cls.account = Account.create(
@@ -740,7 +740,7 @@ class TestRouters(cloudstackTestCase):
cls.template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
# Create an account, domain etc
@@ -866,7 +866,7 @@ class TestRouterRestart(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -996,7 +996,7 @@ class TestTemplates(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.account = Account.create(
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9342f561/test/integration/component/test_egress_rules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_egress_rules.py
b/test/integration/component/test_egress_rules.py
index 73a91f4..6b9cd4f 100644
--- a/test/integration/component/test_egress_rules.py
+++ b/test/integration/component/test_egress_rules.py
@@ -118,7 +118,7 @@ class Services:
"password": "password",
"ipaddress": "192.168.100.21"
},
- "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
+ "ostype": 'CentOS 5.3 (64-bit)',
# CentOS 5.3 (64-bit)
"sleep": 60,
"timeout": 10,
@@ -160,7 +160,7 @@ class TestDefaultSecurityGroupEgress(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -318,7 +318,7 @@ class TestAuthorizeIngressRule(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -475,7 +475,7 @@ class TestDefaultGroupEgress(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -675,7 +675,7 @@ class TestDefaultGroupEgressAfterDeploy(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -857,7 +857,7 @@ class TestRevokeEgressRule(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -1118,7 +1118,7 @@ class TestInvalidAccountAuthroize(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -1239,7 +1239,7 @@ class
TestMultipleAccountsEgressRuleNeg(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -1486,7 +1486,7 @@ class TestMultipleAccountsEgressRule(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -1782,7 +1782,7 @@ class TestStartStopVMWithEgressRule(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -1993,7 +1993,7 @@ class TestInvalidParametersForEgress(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -2179,7 +2179,7 @@ class TestEgressAfterHostMaintainance(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9342f561/test/integration/component/test_eip_elb.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_eip_elb.py
b/test/integration/component/test_eip_elb.py
index 4c8dcbe..89fdd25 100644
--- a/test/integration/component/test_eip_elb.py
+++ b/test/integration/component/test_eip_elb.py
@@ -81,7 +81,7 @@ class Services:
"username": 'nsroot',
"password": 'nsroot'
},
- "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
+ "ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
@@ -100,7 +100,7 @@ class TestEIP(cloudstackTestCase):
cls.template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["template"] = cls.template.id
@@ -922,7 +922,7 @@ class TestELB(cloudstackTestCase):
cls.template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["template"] = cls.template.id
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9342f561/test/integration/component/test_network_offering.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_network_offering.py
b/test/integration/component/test_network_offering.py
index c1a518b..0de03aa 100644
--- a/test/integration/component/test_network_offering.py
+++ b/test/integration/component/test_network_offering.py
@@ -138,7 +138,7 @@ class Services:
"publicport": 22,
"protocol": 'TCP',
},
- "ostypeid": 'bc66ada0-99e7-483b-befc-8fb0c2129b70',
+ "ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
@@ -161,7 +161,7 @@ class TestNOVirtualRouter(cloudstackTestCase):
cls.template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["template"] = cls.template.id
@@ -739,7 +739,7 @@ class TestNOWithNetscaler(cloudstackTestCase):
cls.template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["template"] = cls.template.id
@@ -1374,7 +1374,7 @@ class TestNetworkUpgrade(cloudstackTestCase):
cls.template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["template"] = cls.template.id
@@ -1830,7 +1830,7 @@ class TestSharedNetworkWithoutIp(cloudstackTestCase):
cls.template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["template"] = cls.template.id
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9342f561/test/integration/component/test_project_configs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_configs.py
b/test/integration/component/test_project_configs.py
index d5ce9d6..854b5a4 100644
--- a/test/integration/component/test_project_configs.py
+++ b/test/integration/component/test_project_configs.py
@@ -87,7 +87,7 @@ class Services:
"template": {
"displaytext": "Public Template",
"name": "Public template",
- "ostypeid":
'01853327-513e-4508-9628-f1f55db1946f',
+ "ostype": 'CentOS 5.3 (64-bit)',
"url":
"http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.vhd.bz2";,
"hypervisor": 'XenServer',
"format": 'VHD',
@@ -98,7 +98,7 @@ class Services:
"configs": {
"project.invite.timeout": 300,
},
- "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
+ "ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9342f561/test/integration/component/test_project_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_limits.py
b/test/integration/component/test_project_limits.py
index 8f7c128..afae180 100644
--- a/test/integration/component/test_project_limits.py
+++ b/test/integration/component/test_project_limits.py
@@ -86,7 +86,7 @@ class Services:
"template": {
"displaytext": "Cent OS Template",
"name": "Cent OS Template",
- "ostypeid":
'01853327-513e-4508-9628-f1f55db1946f',
+ "ostype": 'CentOS 5.3 (64-bit)',
"templatefilter": 'self',
},
"network_offering": {
@@ -112,7 +112,7 @@ class Services:
"name": "Test Network",
"displaytext": "Test Network",
},
- "ostypeid": 'bc66ada0-99e7-483b-befc-8fb0c2129b70',
+ "ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
@@ -485,7 +485,7 @@ class TestResourceLimitsProject(cloudstackTestCase):
cls.template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["server"]["zoneid"] = cls.zone.id
@@ -924,7 +924,7 @@ class TestMaxProjectNetworks(cloudstackTestCase):
cls.template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.service_offering = ServiceOffering.create(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9342f561/test/integration/component/test_project_resources.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_resources.py
b/test/integration/component/test_project_resources.py
index 27452be..24091d2 100644
--- a/test/integration/component/test_project_resources.py
+++ b/test/integration/component/test_project_resources.py
@@ -87,7 +87,7 @@ class Services:
"template": {
"displaytext": "Cent OS Template",
"name": "Cent OS Template",
- "ostypeid":
'01853327-513e-4508-9628-f1f55db1946f',
+ "ostype": 'CentOS 5.3 (64-bit)',
"templatefilter": 'self',
"ispublic": False,
},
@@ -130,7 +130,7 @@ class Services:
"endport": 22,
"cidrlist": '0.0.0.0/0',
},
- "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
+ "ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
@@ -152,7 +152,7 @@ class TestOfferings(cloudstackTestCase):
cls.template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["server"]["zoneid"] = cls.zone.id
@@ -332,7 +332,7 @@ class TestNetwork(cloudstackTestCase):
cls.template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["server"]["zoneid"] = cls.zone.id
@@ -520,7 +520,7 @@ class TestTemplates(cloudstackTestCase):
cls.template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["server"]["zoneid"] = cls.zone.id
@@ -749,7 +749,7 @@ class TestSnapshots(cloudstackTestCase):
cls.template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["server"]["zoneid"] = cls.zone.id
@@ -895,7 +895,7 @@ class TestPublicIpAddress(cloudstackTestCase):
cls.template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["server"]["zoneid"] = cls.zone.id
@@ -1194,7 +1194,7 @@ class TestSecurityGroup(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["domainid"] = cls.domain.id
cls.services["server"]["zoneid"] = cls.zone.id
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9342f561/test/integration/component/test_project_usage.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_usage.py
b/test/integration/component/test_project_usage.py
index 4561576..16d5106 100644
--- a/test/integration/component/test_project_usage.py
+++ b/test/integration/component/test_project_usage.py
@@ -75,7 +75,7 @@ class Services:
"templates": {
"displaytext": 'Template',
"name": 'Template',
- "ostypeid":
'01853327-513e-4508-9628-f1f55db1946f',
+ "ostype": 'CentOS 5.3 (64-bit)',
"templatefilter": 'self',
"url":
"http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.qcow2.bz2";
},
@@ -87,7 +87,7 @@ class Services:
"isextractable": True,
"isfeatured": True,
"ispublic": True,
- "ostypeid":
'01853327-513e-4508-9628-f1f55db1946f',
+ "ostype": 'CentOS 5.3 (64-bit)',
},
"lbrule": {
"name": "SSH",
@@ -105,7 +105,7 @@ class Services:
"username": "test",
"password": "test",
},
- "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
+ "ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
@@ -129,7 +129,7 @@ class TestVmUsage(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["server"]["zoneid"] = cls.zone.id
@@ -323,7 +323,7 @@ class TestPublicIPUsage(cloudstackTestCase):
cls.template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["server"]["zoneid"] = cls.zone.id
@@ -497,7 +497,7 @@ class TestVolumeUsage(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["server"]["zoneid"] = cls.zone.id
cls.services["server"]["diskoffering"] = cls.disk_offering.id
@@ -678,7 +678,7 @@ class TestTemplateUsage(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["server"]["zoneid"] = cls.zone.id
cls.account = Account.create(
@@ -996,7 +996,7 @@ class TestLBRuleUsage(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["server"]["zoneid"] = cls.zone.id
@@ -1179,7 +1179,7 @@ class TestSnapshotUsage(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["server"]["zoneid"] = cls.zone.id
@@ -1355,7 +1355,7 @@ class TestNatRuleUsage(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["server"]["zoneid"] = cls.zone.id
@@ -1537,7 +1537,7 @@ class TestVpnUsage(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["server"]["zoneid"] = cls.zone.id
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9342f561/test/integration/component/test_projects.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_projects.py
b/test/integration/component/test_projects.py
index 811d092..3e45cae 100644
--- a/test/integration/component/test_projects.py
+++ b/test/integration/component/test_projects.py
@@ -92,7 +92,7 @@ class Services:
"publicport": 22,
"protocol": 'TCP',
},
- "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
+ "ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
@@ -1451,7 +1451,7 @@ class TestProjectSuspendActivate(cloudstackTestCase):
cls.template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
configs = Configurations.list(
cls.api_client,
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9342f561/test/integration/component/test_resource_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_resource_limits.py
b/test/integration/component/test_resource_limits.py
index cd007f1..c20770a 100644
--- a/test/integration/component/test_resource_limits.py
+++ b/test/integration/component/test_resource_limits.py
@@ -75,7 +75,7 @@ class Services:
"template": {
"displaytext": "Cent OS Template",
"name": "Cent OS Template",
- "ostypeid":
'01853327-513e-4508-9628-f1f55db1946f',
+ "ostype": 'CentOS 5.3 (64-bit)',
"templatefilter": 'self',
},
"network_offering": {
@@ -101,7 +101,7 @@ class Services:
"name": "test network",
"displaytext": "test network"
},
- "ostypeid": 'bc66ada0-99e7-483b-befc-8fb0c2129b70',
+ "ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
@@ -122,7 +122,7 @@ class TestResourceLimitsAccount(cloudstackTestCase):
cls.template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["server"]["zoneid"] = cls.zone.id
@@ -885,7 +885,7 @@ class TestResourceLimitsDomain(cloudstackTestCase):
cls.template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["server"]["zoneid"] = cls.zone.id
@@ -1341,7 +1341,7 @@ class TestMaxAccountNetworks(cloudstackTestCase):
cls.template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.service_offering = ServiceOffering.create(
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9342f561/test/integration/component/test_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_routers.py
b/test/integration/component/test_routers.py
index a65c5c3..02a08de 100644
--- a/test/integration/component/test_routers.py
+++ b/test/integration/component/test_routers.py
@@ -89,7 +89,7 @@ class Services:
"cidr": '55.55.0.0/11',
# Any network (For creating FW rule
},
- "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
+ "ostype": 'CentOS 5.3 (64-bit)',
# Used for Get_Template : CentOS 5.3 (64 bit)
"mode": 'advanced', # Networking mode: Advanced,
basic
}
@@ -108,7 +108,7 @@ class TestRouterServices(cloudstackTestCase):
cls.template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -595,7 +595,7 @@ class TestRouterStopCreatePF(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -806,7 +806,7 @@ class TestRouterStopCreateLB(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -1017,7 +1017,7 @@ class TestRouterStopCreateFW(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9342f561/test/integration/component/test_security_groups.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_security_groups.py
b/test/integration/component/test_security_groups.py
index 13a87b6..39f6d6f 100644
--- a/test/integration/component/test_security_groups.py
+++ b/test/integration/component/test_security_groups.py
@@ -90,7 +90,7 @@ class Services:
"endport": -1,
"cidrlist": '0.0.0.0/0',
},
- "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
+ "ostype": 'CentOS 5.3 (64-bit)',
# CentOS 5.3 (64-bit)
"sleep": 60,
"timeout": 10,
@@ -129,7 +129,7 @@ class TestDefaultSecurityGroup(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -401,7 +401,7 @@ class TestAuthorizeIngressRule(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -536,7 +536,7 @@ class TestRevokeIngressRule(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -694,7 +694,7 @@ class TestDhcpOnlyRouter(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["domainid"] = cls.domain.id
@@ -830,7 +830,7 @@ class TestdeployVMWithUserData(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["domainid"] = cls.domain.id
@@ -989,7 +989,7 @@ class TestDeleteSecurityGroup(cloudstackTestCase):
template = get_template(
self.apiclient,
self.zone.id,
- self.services["ostypeid"]
+ self.services["ostype"]
)
self.services["domainid"] = self.domain.id
@@ -1234,7 +1234,7 @@ class TestIngressRule(cloudstackTestCase):
template = get_template(
self.apiclient,
self.zone.id,
- self.services["ostypeid"]
+ self.services["ostype"]
)
self.services["domainid"] = self.domain.id
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9342f561/test/integration/component/test_templates.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_templates.py
b/test/integration/component/test_templates.py
index e9be63d..65d9fe0 100644
--- a/test/integration/component/test_templates.py
+++ b/test/integration/component/test_templates.py
@@ -77,7 +77,7 @@ class Services:
0: {
"displaytext": "Public Template",
"name": "Public template",
- "ostypeid":
'01853327-513e-4508-9628-f1f55db1946f',
+ "ostype": 'CentOS 5.3 (64-bit)',
"url":
"http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.vhd.bz2";,
"hypervisor": 'XenServer',
"format": 'VHD',
@@ -89,12 +89,12 @@ class Services:
"template": {
"displaytext": "Cent OS Template",
"name": "Cent OS Template",
- "ostypeid":
'01853327-513e-4508-9628-f1f55db1946f',
+ "ostype": 'CentOS 5.3 (64-bit)',
"templatefilter": 'self',
},
"templatefilter": 'self',
"destzoneid": 2, # For Copy template (Destination
zone)
- "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
+ "ostype": 'CentOS 5.3 (64-bit)',
"sleep": 60,
"timeout": 10,
"mode": 'advanced', # Networking mode: Advanced,
basic
@@ -294,7 +294,7 @@ class TestTemplates(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.account = Account.create(
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9342f561/test/integration/component/test_usage.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_usage.py
b/test/integration/component/test_usage.py
index 34dbc37..4251eab 100644
--- a/test/integration/component/test_usage.py
+++ b/test/integration/component/test_usage.py
@@ -71,7 +71,7 @@ class Services:
"templates": {
"displaytext": 'Template',
"name": 'Template',
- "ostypeid":
'01853327-513e-4508-9628-f1f55db1946f',
+ "ostype": 'CentOS 5.3 (64-bit)',
"templatefilter": 'self',
"url":
"http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.qcow2.bz2";
},
@@ -83,7 +83,7 @@ class Services:
"isextractable": True,
"isfeatured": True,
"ispublic": True,
- "ostypeid":
'01853327-513e-4508-9628-f1f55db1946f',
+ "ostype": 'CentOS 5.3 (64-bit)',
},
"lbrule": {
"name": "SSH",
@@ -101,7 +101,7 @@ class Services:
"username": "test",
"password": "test",
},
- "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
+ "ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
@@ -122,7 +122,7 @@ class TestVmUsage(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["server"]["zoneid"] = cls.zone.id
@@ -305,7 +305,7 @@ class TestPublicIPUsage(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["server"]["zoneid"] = cls.zone.id
@@ -459,7 +459,7 @@ class TestVolumeUsage(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["server"]["zoneid"] = cls.zone.id
cls.services["server"]["diskoffering"] = cls.disk_offering.id
@@ -629,7 +629,7 @@ class TestTemplateUsage(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["server"]["zoneid"] = cls.zone.id
cls.account = Account.create(
@@ -928,7 +928,7 @@ class TestLBRuleUsage(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["server"]["zoneid"] = cls.zone.id
@@ -1090,7 +1090,7 @@ class TestSnapshotUsage(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["server"]["zoneid"] = cls.zone.id
@@ -1255,7 +1255,7 @@ class TestNatRuleUsage(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["server"]["zoneid"] = cls.zone.id
@@ -1416,7 +1416,7 @@ class TestVpnUsage(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["server"]["zoneid"] = cls.zone.id
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9342f561/test/integration/component/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_volumes.py
b/test/integration/component/test_volumes.py
index 5819001..0a78130 100644
--- a/test/integration/component/test_volumes.py
+++ b/test/integration/component/test_volumes.py
@@ -79,14 +79,14 @@ 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": 'bc66ada0-99e7-483b-befc-8fb0c2129b70',
+ "ostype": 'CentOS 5.3 (64-bit)',
},
"custom_volume": {
"customdisksize": 2,
"diskname": "Custom disk",
},
"sleep": 50,
- "ostypeid": 'bc66ada0-99e7-483b-befc-8fb0c2129b70',
+ "ostype": 'CentOS 5.3 (64-bit)',
"mode": 'advanced',
}
@@ -108,7 +108,7 @@ class TestAttachVolume(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -378,7 +378,7 @@ class TestAttachDetachVolume(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -623,7 +623,7 @@ class TestAttachVolumeISO(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -814,7 +814,7 @@ class TestVolumes(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@@ -1054,7 +1054,7 @@ class TestDeployVmWithCustomDisk(cloudstackTestCase):
template = get_template(
cls.api_client,
cls.zone.id,
- cls.services["ostypeid"]
+ cls.services["ostype"]
)
cls.services["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
