apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-1530: Fix integration test scripts in the components folder for imports and ostypeid Fix the integration scripts for nose import and ostypeid corrections

Browse Source 
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 <Srikanteswararao.Talluri@citrix.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
Talluri 2013-03-06 17:20:25 +05:30 committed by Prasanna Santhanam
parent 713dff537b
commit 9342f561f7
17 changed files with 100 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/integration/component/test_accounts.py
View File

@ -23,6 +23,7 @@ from marvin.integration.lib.utils import *
from marvin.integration.lib.base import * from marvin.integration.lib.base import *
from marvin.integration.lib.common import * from marvin.integration.lib.common import *
from marvin import remoteSSHClient from marvin import remoteSSHClient
from nose.plugins.attrib import attr
import datetime import datetime
@ -90,7 +91,7 @@ class Services:
"privateport": 22, "privateport": 22,
"protocol": 'TCP', "protocol": 'TCP',
}, },
"ostypeid": 'bc66ada0-99e7-483b-befc-8fb0c2129b70', "ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit) # Cent OS 5.3 (64 bit)
"sleep": 60, "sleep": 60,
"timeout": 10, "timeout": 10,
@ -112,7 +113,7 @@ class TestAccounts(cloudstackTestCase):
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["template"] = cls.template.id cls.services["virtual_machine"]["template"] = cls.template.id

5
test/integration/component/test_allocation_states.py
View File

@ -22,6 +22,7 @@ from marvin.cloudstackAPI import *
from marvin.integration.lib.utils import * from marvin.integration.lib.utils import *
from marvin.integration.lib.base import * from marvin.integration.lib.base import *
from marvin.integration.lib.common import * from marvin.integration.lib.common import *
from nose.plugins.attrib import attr
import datetime import datetime
@ -74,7 +75,7 @@ class Services:
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "ostypeid": '01853327-513e-4508-9628-f1f55db1946f',
"templatefilter": 'self', "templatefilter": 'self',
}, },
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit) # Cent OS 5.3 (64 bit)
"sleep": 60, "sleep": 60,
"timeout": 10, "timeout": 10,
@ -87,7 +88,7 @@ class TestAllocationState(cloudstackTestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.api_client = super( cls.api_client = super(
TestResources, TestAllocationState,
cls cls
).getClsTestClient().getApiClient() ).getClsTestClient().getApiClient()
cls.services = Services().services cls.services = Services().services

14
test/integration/component/test_blocker_bugs.py
View File

@ -76,7 +76,7 @@ class Services:
"templates": { "templates": {
"displaytext": 'Template from snapshot', "displaytext": 'Template from snapshot',
"name": 'Template from snapshot', "name": 'Template from snapshot',
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "ostype": 'CentOS 5.3 (64-bit)',
"templatefilter": 'self', "templatefilter": 'self',
"url": "http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.vhd.bz2", "url": "http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.vhd.bz2",
"hypervisor": 'XenServer', "hypervisor": 'XenServer',
@ -98,7 +98,7 @@ class Services:
"endport": 22, "endport": 22,
"protocol": "TCP" "protocol": "TCP"
}, },
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit) # Cent OS 5.3 (64 bit)
"sleep": 60, "sleep": 60,
"mode": 'advanced', "mode": 'advanced',
@ -122,7 +122,7 @@ class TestSnapshots(cloudstackTestCase):
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["volume"]["zoneid"] = cls.zone.id cls.services["volume"]["zoneid"] = cls.zone.id
@ -546,7 +546,7 @@ class TestNATRules(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
#Create an account, network, VM and IP addresses #Create an account, network, VM and IP addresses
cls.account = Account.create( cls.account = Account.create(
@ -740,7 +740,7 @@ class TestRouters(cloudstackTestCase):
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
# Create an account, domain etc # Create an account, domain etc
@ -866,7 +866,7 @@ class TestRouterRestart(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -996,7 +996,7 @@ class TestTemplates(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.account = Account.create( cls.account = Account.create(

24
test/integration/component/test_egress_rules.py
View File

@ -118,7 +118,7 @@ class Services:
"password": "password", "password": "password",
"ipaddress": "192.168.100.21" "ipaddress": "192.168.100.21"
}, },
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "ostype": 'CentOS 5.3 (64-bit)',
# CentOS 5.3 (64-bit) # CentOS 5.3 (64-bit)
"sleep": 60, "sleep": 60,
"timeout": 10, "timeout": 10,
@ -160,7 +160,7 @@ class TestDefaultSecurityGroupEgress(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -318,7 +318,7 @@ class TestAuthorizeIngressRule(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -475,7 +475,7 @@ class TestDefaultGroupEgress(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -675,7 +675,7 @@ class TestDefaultGroupEgressAfterDeploy(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -857,7 +857,7 @@ class TestRevokeEgressRule(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -1118,7 +1118,7 @@ class TestInvalidAccountAuthroize(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -1239,7 +1239,7 @@ class TestMultipleAccountsEgressRuleNeg(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -1486,7 +1486,7 @@ class TestMultipleAccountsEgressRule(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -1782,7 +1782,7 @@ class TestStartStopVMWithEgressRule(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -1993,7 +1993,7 @@ class TestInvalidParametersForEgress(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -2179,7 +2179,7 @@ class TestEgressAfterHostMaintainance(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id

6
test/integration/component/test_eip_elb.py
View File

@ -81,7 +81,7 @@ class Services:
"username": 'nsroot', "username": 'nsroot',
"password": 'nsroot' "password": 'nsroot'
}, },
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit) # Cent OS 5.3 (64 bit)
"sleep": 60, "sleep": 60,
"timeout": 10, "timeout": 10,
@ -100,7 +100,7 @@ class TestEIP(cloudstackTestCase):
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["template"] = cls.template.id cls.services["virtual_machine"]["template"] = cls.template.id
@ -922,7 +922,7 @@ class TestELB(cloudstackTestCase):
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["template"] = cls.template.id cls.services["virtual_machine"]["template"] = cls.template.id

10
test/integration/component/test_network_offering.py
View File

@ -138,7 +138,7 @@ class Services:
"publicport": 22, "publicport": 22,
"protocol": 'TCP', "protocol": 'TCP',
}, },
"ostypeid": 'bc66ada0-99e7-483b-befc-8fb0c2129b70', "ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit) # Cent OS 5.3 (64 bit)
"sleep": 60, "sleep": 60,
"timeout": 10, "timeout": 10,
@ -161,7 +161,7 @@ class TestNOVirtualRouter(cloudstackTestCase):
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["template"] = cls.template.id cls.services["virtual_machine"]["template"] = cls.template.id
@ -739,7 +739,7 @@ class TestNOWithNetscaler(cloudstackTestCase):
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["template"] = cls.template.id cls.services["virtual_machine"]["template"] = cls.template.id
@ -1374,7 +1374,7 @@ class TestNetworkUpgrade(cloudstackTestCase):
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["template"] = cls.template.id cls.services["virtual_machine"]["template"] = cls.template.id
@ -1830,7 +1830,7 @@ class TestSharedNetworkWithoutIp(cloudstackTestCase):
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["template"] = cls.template.id cls.services["virtual_machine"]["template"] = cls.template.id

4
test/integration/component/test_project_configs.py
View File

@ -87,7 +87,7 @@ class Services:
"template": { "template": {
"displaytext": "Public Template", "displaytext": "Public Template",
"name": "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", "url": "http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.vhd.bz2",
"hypervisor": 'XenServer', "hypervisor": 'XenServer',
"format": 'VHD', "format": 'VHD',
@ -98,7 +98,7 @@ class Services:
"configs": { "configs": {
"project.invite.timeout": 300, "project.invite.timeout": 300,
}, },
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit) # Cent OS 5.3 (64 bit)
"sleep": 60, "sleep": 60,
"timeout": 10, "timeout": 10,

8
test/integration/component/test_project_limits.py
View File

@ -86,7 +86,7 @@ class Services:
"template": { "template": {
"displaytext": "Cent OS Template", "displaytext": "Cent OS Template",
"name": "Cent OS Template", "name": "Cent OS Template",
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "ostype": 'CentOS 5.3 (64-bit)',
"templatefilter": 'self', "templatefilter": 'self',
}, },
"network_offering": { "network_offering": {
@ -112,7 +112,7 @@ class Services:
"name": "Test Network", "name": "Test Network",
"displaytext": "Test Network", "displaytext": "Test Network",
}, },
"ostypeid": 'bc66ada0-99e7-483b-befc-8fb0c2129b70', "ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit) # Cent OS 5.3 (64 bit)
"sleep": 60, "sleep": 60,
"timeout": 10, "timeout": 10,
@ -485,7 +485,7 @@ class TestResourceLimitsProject(cloudstackTestCase):
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
@ -924,7 +924,7 @@ class TestMaxProjectNetworks(cloudstackTestCase):
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.service_offering = ServiceOffering.create( cls.service_offering = ServiceOffering.create(
cls.api_client, cls.api_client,

16
test/integration/component/test_project_resources.py
View File

@ -87,7 +87,7 @@ class Services:
"template": { "template": {
"displaytext": "Cent OS Template", "displaytext": "Cent OS Template",
"name": "Cent OS Template", "name": "Cent OS Template",
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "ostype": 'CentOS 5.3 (64-bit)',
"templatefilter": 'self', "templatefilter": 'self',
"ispublic": False, "ispublic": False,
}, },
@ -130,7 +130,7 @@ class Services:
"endport": 22, "endport": 22,
"cidrlist": '0.0.0.0/0', "cidrlist": '0.0.0.0/0',
}, },
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit) # Cent OS 5.3 (64 bit)
"sleep": 60, "sleep": 60,
"timeout": 10, "timeout": 10,
@ -152,7 +152,7 @@ class TestOfferings(cloudstackTestCase):
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
@ -332,7 +332,7 @@ class TestNetwork(cloudstackTestCase):
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
@ -520,7 +520,7 @@ class TestTemplates(cloudstackTestCase):
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
@ -749,7 +749,7 @@ class TestSnapshots(cloudstackTestCase):
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
@ -895,7 +895,7 @@ class TestPublicIpAddress(cloudstackTestCase):
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
@ -1194,7 +1194,7 @@ class TestSecurityGroup(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id

22
test/integration/component/test_project_usage.py
View File

@ -75,7 +75,7 @@ class Services:
"templates": { "templates": {
"displaytext": 'Template', "displaytext": 'Template',
"name": 'Template', "name": 'Template',
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "ostype": 'CentOS 5.3 (64-bit)',
"templatefilter": 'self', "templatefilter": 'self',
"url": "http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.qcow2.bz2" "url": "http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.qcow2.bz2"
}, },
@ -87,7 +87,7 @@ class Services:
"isextractable": True, "isextractable": True,
"isfeatured": True, "isfeatured": True,
"ispublic": True, "ispublic": True,
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "ostype": 'CentOS 5.3 (64-bit)',
}, },
"lbrule": { "lbrule": {
"name": "SSH", "name": "SSH",
@ -105,7 +105,7 @@ class Services:
"username": "test", "username": "test",
"password": "test", "password": "test",
}, },
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit) # Cent OS 5.3 (64 bit)
"sleep": 60, "sleep": 60,
"timeout": 10, "timeout": 10,
@ -129,7 +129,7 @@ class TestVmUsage(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
@ -323,7 +323,7 @@ class TestPublicIPUsage(cloudstackTestCase):
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
@ -497,7 +497,7 @@ class TestVolumeUsage(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
cls.services["server"]["diskoffering"] = cls.disk_offering.id cls.services["server"]["diskoffering"] = cls.disk_offering.id
@ -678,7 +678,7 @@ class TestTemplateUsage(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
cls.account = Account.create( cls.account = Account.create(
@ -996,7 +996,7 @@ class TestLBRuleUsage(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
@ -1179,7 +1179,7 @@ class TestSnapshotUsage(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
@ -1355,7 +1355,7 @@ class TestNatRuleUsage(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
@ -1537,7 +1537,7 @@ class TestVpnUsage(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id

4
test/integration/component/test_projects.py
View File

@ -92,7 +92,7 @@ class Services:
"publicport": 22, "publicport": 22,
"protocol": 'TCP', "protocol": 'TCP',
}, },
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit) # Cent OS 5.3 (64 bit)
"sleep": 60, "sleep": 60,
"timeout": 10, "timeout": 10,
@ -1451,7 +1451,7 @@ class TestProjectSuspendActivate(cloudstackTestCase):
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
configs = Configurations.list( configs = Configurations.list(
cls.api_client, cls.api_client,

10
test/integration/component/test_resource_limits.py
View File

@ -75,7 +75,7 @@ class Services:
"template": { "template": {
"displaytext": "Cent OS Template", "displaytext": "Cent OS Template",
"name": "Cent OS Template", "name": "Cent OS Template",
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "ostype": 'CentOS 5.3 (64-bit)',
"templatefilter": 'self', "templatefilter": 'self',
}, },
"network_offering": { "network_offering": {
@ -101,7 +101,7 @@ class Services:
"name": "test network", "name": "test network",
"displaytext": "test network" "displaytext": "test network"
}, },
"ostypeid": 'bc66ada0-99e7-483b-befc-8fb0c2129b70', "ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit) # Cent OS 5.3 (64 bit)
"sleep": 60, "sleep": 60,
"timeout": 10, "timeout": 10,
@ -122,7 +122,7 @@ class TestResourceLimitsAccount(cloudstackTestCase):
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
@ -885,7 +885,7 @@ class TestResourceLimitsDomain(cloudstackTestCase):
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
@ -1341,7 +1341,7 @@ class TestMaxAccountNetworks(cloudstackTestCase):
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.service_offering = ServiceOffering.create( cls.service_offering = ServiceOffering.create(

10
test/integration/component/test_routers.py
View File

@ -89,7 +89,7 @@ class Services:
"cidr": '55.55.0.0/11', "cidr": '55.55.0.0/11',
# Any network (For creating FW rule # 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) # Used for Get_Template : CentOS 5.3 (64 bit)
"mode": 'advanced', # Networking mode: Advanced, basic "mode": 'advanced', # Networking mode: Advanced, basic
} }
@ -108,7 +108,7 @@ class TestRouterServices(cloudstackTestCase):
cls.template = get_template( cls.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -595,7 +595,7 @@ class TestRouterStopCreatePF(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -806,7 +806,7 @@ class TestRouterStopCreateLB(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -1017,7 +1017,7 @@ class TestRouterStopCreateFW(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id

16
test/integration/component/test_security_groups.py
View File

@ -90,7 +90,7 @@ class Services:
"endport": -1, "endport": -1,
"cidrlist": '0.0.0.0/0', "cidrlist": '0.0.0.0/0',
}, },
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "ostype": 'CentOS 5.3 (64-bit)',
# CentOS 5.3 (64-bit) # CentOS 5.3 (64-bit)
"sleep": 60, "sleep": 60,
"timeout": 10, "timeout": 10,
@ -129,7 +129,7 @@ class TestDefaultSecurityGroup(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -401,7 +401,7 @@ class TestAuthorizeIngressRule(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -536,7 +536,7 @@ class TestRevokeIngressRule(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -694,7 +694,7 @@ class TestDhcpOnlyRouter(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
@ -830,7 +830,7 @@ class TestdeployVMWithUserData(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["domainid"] = cls.domain.id cls.services["domainid"] = cls.domain.id
@ -989,7 +989,7 @@ class TestDeleteSecurityGroup(cloudstackTestCase):
template = get_template( template = get_template(
self.apiclient, self.apiclient,
self.zone.id, self.zone.id,
self.services["ostypeid"] self.services["ostype"]
) )
self.services["domainid"] = self.domain.id self.services["domainid"] = self.domain.id
@ -1234,7 +1234,7 @@ class TestIngressRule(cloudstackTestCase):
template = get_template( template = get_template(
self.apiclient, self.apiclient,
self.zone.id, self.zone.id,
self.services["ostypeid"] self.services["ostype"]
) )
self.services["domainid"] = self.domain.id self.services["domainid"] = self.domain.id

8
test/integration/component/test_templates.py
View File

@ -77,7 +77,7 @@ class Services:
0: { 0: {
"displaytext": "Public Template", "displaytext": "Public Template",
"name": "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", "url": "http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.vhd.bz2",
"hypervisor": 'XenServer', "hypervisor": 'XenServer',
"format": 'VHD', "format": 'VHD',
@ -89,12 +89,12 @@ class Services:
"template": { "template": {
"displaytext": "Cent OS Template", "displaytext": "Cent OS Template",
"name": "Cent OS Template", "name": "Cent OS Template",
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "ostype": 'CentOS 5.3 (64-bit)',
"templatefilter": 'self', "templatefilter": 'self',
}, },
"templatefilter": 'self', "templatefilter": 'self',
"destzoneid": 2, # For Copy template (Destination zone) "destzoneid": 2, # For Copy template (Destination zone)
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "ostype": 'CentOS 5.3 (64-bit)',
"sleep": 60, "sleep": 60,
"timeout": 10, "timeout": 10,
"mode": 'advanced', # Networking mode: Advanced, basic "mode": 'advanced', # Networking mode: Advanced, basic
@ -294,7 +294,7 @@ class TestTemplates(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.account = Account.create( cls.account = Account.create(

22
test/integration/component/test_usage.py
View File

@ -71,7 +71,7 @@ class Services:
"templates": { "templates": {
"displaytext": 'Template', "displaytext": 'Template',
"name": 'Template', "name": 'Template',
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "ostype": 'CentOS 5.3 (64-bit)',
"templatefilter": 'self', "templatefilter": 'self',
"url": "http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.qcow2.bz2" "url": "http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.qcow2.bz2"
}, },
@ -83,7 +83,7 @@ class Services:
"isextractable": True, "isextractable": True,
"isfeatured": True, "isfeatured": True,
"ispublic": True, "ispublic": True,
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "ostype": 'CentOS 5.3 (64-bit)',
}, },
"lbrule": { "lbrule": {
"name": "SSH", "name": "SSH",
@ -101,7 +101,7 @@ class Services:
"username": "test", "username": "test",
"password": "test", "password": "test",
}, },
"ostypeid": '01853327-513e-4508-9628-f1f55db1946f', "ostype": 'CentOS 5.3 (64-bit)',
# Cent OS 5.3 (64 bit) # Cent OS 5.3 (64 bit)
"sleep": 60, "sleep": 60,
"timeout": 10, "timeout": 10,
@ -122,7 +122,7 @@ class TestVmUsage(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
@ -305,7 +305,7 @@ class TestPublicIPUsage(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
@ -459,7 +459,7 @@ class TestVolumeUsage(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
cls.services["server"]["diskoffering"] = cls.disk_offering.id cls.services["server"]["diskoffering"] = cls.disk_offering.id
@ -629,7 +629,7 @@ class TestTemplateUsage(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
cls.account = Account.create( cls.account = Account.create(
@ -928,7 +928,7 @@ class TestLBRuleUsage(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
@ -1090,7 +1090,7 @@ class TestSnapshotUsage(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
@ -1255,7 +1255,7 @@ class TestNatRuleUsage(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id
@ -1416,7 +1416,7 @@ class TestVpnUsage(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["server"]["zoneid"] = cls.zone.id cls.services["server"]["zoneid"] = cls.zone.id

14
test/integration/component/test_volumes.py
View File

@ -79,14 +79,14 @@ class Services:
"name": "testISO", "name": "testISO",
"url": "http://iso.linuxquestions.org/download/504/1819/http/gd4.tuwien.ac.at/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 # Source URL where ISO is located
"ostypeid": 'bc66ada0-99e7-483b-befc-8fb0c2129b70', "ostype": 'CentOS 5.3 (64-bit)',
}, },
"custom_volume": { "custom_volume": {
"customdisksize": 2, "customdisksize": 2,
"diskname": "Custom disk", "diskname": "Custom disk",
}, },
"sleep": 50, "sleep": 50,
"ostypeid": 'bc66ada0-99e7-483b-befc-8fb0c2129b70', "ostype": 'CentOS 5.3 (64-bit)',
"mode": 'advanced', "mode": 'advanced',
} }
@ -108,7 +108,7 @@ class TestAttachVolume(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["zoneid"] = cls.zone.id cls.services["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -378,7 +378,7 @@ class TestAttachDetachVolume(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["zoneid"] = cls.zone.id cls.services["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -623,7 +623,7 @@ class TestAttachVolumeISO(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["zoneid"] = cls.zone.id cls.services["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -814,7 +814,7 @@ class TestVolumes(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["zoneid"] = cls.zone.id cls.services["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
@ -1054,7 +1054,7 @@ class TestDeployVmWithCustomDisk(cloudstackTestCase):
template = get_template( template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostypeid"] cls.services["ostype"]
) )
cls.services["zoneid"] = cls.zone.id cls.services["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id