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

CLOUDSTACK-6316: fixed test data and their references in the test files and few more fixes in tests

This commit is contained in:
SrikanteswaraRao Talluri 2014-04-11 11:43:38 +05:30
parent 94fc4bf6bd
commit ca67e25f23
6 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,7 @@ class TestIpReservation(cloudstackTestCase):
cls.api_client = cls.testClient.getApiClient()
# Fill services from the external config file
cls.services = cls.testClient.getParsedTestDataConfig()
cls.testData = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client)
@ -532,7 +532,7 @@ class TestRestartNetwork(cloudstackTestCase):
cls.api_client = cls.testClient.getApiClient()
# Fill services from the external config file
cls.services = cls.testClient.getParsedTestDataConfig()
cls.testData = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client)
@ -657,7 +657,7 @@ class TestUpdateIPReservation(cloudstackTestCase):
cls.api_client = cls.testClient.getApiClient()
# Fill services from the external config file
cls.services = cls.testClient.getParsedTestDataConfig()
cls.testData = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client)
@ -807,7 +807,7 @@ class TestRouterOperations(cloudstackTestCase):
cls.api_client = cls.testClient.getApiClient()
# Fill services from the external config file
cls.services = cls.testClient.getParsedTestDataConfig()
cls.testData = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client)
@ -977,7 +977,7 @@ class TestFailureScnarios(cloudstackTestCase):
cls.api_client = cls.testClient.getApiClient()
# Fill services from the external config file
cls.services = cls.testClient.getParsedTestDataConfig()
cls.testData = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client)

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

@ -57,7 +57,7 @@ class TestPersistentNetworks(cloudstackTestCase):
cls.services["virtual_machine"]["template"] = cls.template.id
cls.service_offering = ServiceOffering.create(
cls.api_client,
cls.services["service_offerings"]["small"]
cls.services["service_offering"]
)
cls.isolated_persistent_network_offering = cls.createNetworkOffering("nw_off_isolated_persistent")
cls.isolated_persistent_network_offering_netscaler = cls.createNetworkOffering("nw_off_isolated_persistent_netscaler")
@ -1514,7 +1514,7 @@ class TestVPCNetworkOperations(cloudstackTestCase):
cls.services["virtual_machine"]["template"] = cls.template.id
cls.service_offering = ServiceOffering.create(
cls.api_client,
cls.services["service_offering"]
cls.services["service_offerings"]["small"]
)
cls.persistent_network_offering_NoLB = NetworkOffering.create(cls.api_client, cls.services["nw_off_persistent_VPCVR_NoLB"],
conservemode=False)

2
test/integration/component/test_portable_ip.py
View File

@ -653,7 +653,7 @@ class TestAssociatePublicIp(cloudstackTestCase):
self.cleanup = []
portable_ip_range_services = self.services["PortableIpRange"]
portable_ip_range_services = self.services["portableIpRange"]
if portable_ip_range_services is None:
self.skipTest('Failed to read config values related to portable ip range')

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

@ -182,7 +182,7 @@ class TestRegionVpcOffering(cloudstackTestCase):
cls.services["virtual_machine"]["template"] = cls.template.id
cls.service_offering = ServiceOffering.create(
cls.api_client,
cls.apiclient,
cls.services["service_offering"]
)
cls._cleanup = [
@ -194,7 +194,7 @@ class TestRegionVpcOffering(cloudstackTestCase):
def tearDownClass(cls):
try:
#Cleanup resources used
cleanup_resources(cls.api_client, cls._cleanup)
cleanup_resources(cls.apiclient, cls._cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return

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

@ -174,7 +174,7 @@ class TestVPCDistributedRouterOffering(cloudstackTestCase):
cls.services["virtual_machine"]["template"] = cls.template.id
cls.service_offering = ServiceOffering.create(
cls.api_client,
cls.apiclient,
cls.services["service_offering"]
)
cls._cleanup = [
@ -186,7 +186,7 @@ class TestVPCDistributedRouterOffering(cloudstackTestCase):
def tearDownClass(cls):
try:
#Cleanup resources used
cleanup_resources(cls.api_client, cls._cleanup)
cleanup_resources(cls.apiclient, cls._cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return

22
tools/marvin/marvin/config/test_data.py
View File

@ -47,6 +47,13 @@ test_data = {
"publicport": 22,
"protocol": 'TCP',
},
"service_offering": {
"name": "Tiny Instance",
"displaytext": "Tiny Instance",
"cpunumber": 1,
"cpuspeed": 100, # in MHz
"memory": 128, # In MBs
},
"service_offerings": {
"name": "Tiny Instance",
"displaytext": "Tiny Instance",
@ -122,6 +129,21 @@ test_data = {
"PortForwarding": 'VirtualRouter',
},
},
"nw_off_isolated_persistent":{
"name": 'Test Nw off isolated persistent',
"displaytext": 'Test Nw off isolated persistent',
"guestiptype": 'Isolated',
"supportedservices": 'Dhcp,Dns,SourceNat,PortForwarding',
"traffictype": 'GUEST',
"isPersistent":'True',
"availability": 'Optional',
"serviceProviderList" : {
"Dhcp": 'VirtualRouter',
"Dns": 'VirtualRouter',
"SourceNat": 'VirtualRouter',
"PortForwarding": 'VirtualRouter',
},
},
"isolated_network_offering": {
"name": "Network offering-DA services",
"displaytext": "Network offering-DA services",