etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-2032: populate mode in the services dict from the list zones instead of hard coding 

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
Srikanteswararao Talluri 2013-04-15 16:47:40 +05:30 committed by Prasanna Santhanam
parent 97911e9fe6
commit e7090e6933
6 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/integration/smoke/test_iso.py
View File

@ -79,8 +79,6 @@ class Services:
"timeout": 10,
"ostype": "CentOS 5.3 (64-bit)",
# CentOS 5.3 (64 bit)
"mode": 'advanced'
# Networking mode: Basic or Advanced
}
@ -93,6 +91,7 @@ class TestCreateIso(cloudstackTestCase):
# Get Zone, Domain and templates
self.domain = get_domain(self.apiclient, self.services)
self.zone = get_zone(self.apiclient, self.services)
self.services['mode'] = zone.networktype
self.services["domainid"] = self.domain.id
self.services["iso_2"]["zoneid"] = self.zone.id

4
test/integration/smoke/test_network.py
View File

@ -38,8 +38,6 @@ class Services:
self.services = {
"ostype": "CentOS 5.3 (64-bit)",
# Cent OS 5.3 (64 bit)
"mode": 'advanced',
# Networking mode: Basic or advanced
"lb_switch_wait": 10,
# Time interval after which LB switches the requests
"sleep": 60,
@ -120,7 +118,7 @@ class TestPublicIP(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = zone.networktype
# Create Accounts & networks
cls.account = Account.create(
cls.api_client,

2
test/integration/smoke/test_routers.py
View File

@ -64,7 +64,6 @@ class Services:
"ostype": "CentOS 5.3 (64-bit)",
"sleep": 60,
"timeout": 10,
"mode": 'advanced', #Networking mode: Basic, Advanced
}
@ -81,6 +80,7 @@ class TestRouterServices(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
self.services['mode'] = zone.networktype
template = get_template(
cls.api_client,
cls.zone.id,

3
test/integration/smoke/test_templates.py
View File

@ -93,8 +93,6 @@ class Services:
"bootable": True,
"passwordenabled": True,
"ostype": "CentOS 5.3 (64-bit)",
"mode": 'advanced',
# Networking mode: Advanced, basic
"sleep": 30,
"timeout": 10,
}
@ -126,6 +124,7 @@ class TestCreateTemplate(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = zone.networktype
cls.disk_offering = DiskOffering.create(
cls.api_client,
cls.services["disk_offering"]

2
test/integration/smoke/test_vm_life_cycle.py
View File

@ -1038,4 +1038,4 @@ class TestVMLifeCycle(cloudstackTestCase):
False,
"Check if ISO is detached from virtual machine"
)
return
return

2
test/integration/smoke/test_volumes.py
View File

@ -84,7 +84,6 @@ class Services:
"protocol": 'TCP',
"diskdevice": "/dev/xvdb",
"ostype": 'CentOS 5.5 (64-bit)',
"mode": 'advanced',
"sleep": 10,
"timeout": 600,
}
@ -100,6 +99,7 @@ class TestCreateVolume(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
cls.services['mode'] = zone.networktype
cls.disk_offering = DiskOffering.create(
cls.api_client,
cls.services["disk_offering"]