mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Fixed failed tests in regression tests.
This commit is contained in:
SrikanteswaraRao Talluri
parent
ca67e25f23
commit
2f02abf364
@ -92,10 +92,10 @@ class TestIpReservation(cloudstackTestCase):
|
||||
cls.template = get_template(
|
||||
cls.api_client,
|
||||
cls.zone.id,
|
||||
cls.services["ostype"]
|
||||
cls.testData["ostype"]
|
||||
)
|
||||
if cls.template == FAILED:
|
||||
assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
|
||||
assert False, "get_template() failed to return template with description %s" % cls.testData["ostype"]
|
||||
cls.testData["domainid"] = cls.domain.id
|
||||
cls.testData["zoneid"] = cls.zone.id
|
||||
cls.testData["virtual_machine"]["zoneid"] = cls.zone.id
|
||||
@ -540,10 +540,10 @@ class TestRestartNetwork(cloudstackTestCase):
|
||||
cls.template = get_template(
|
||||
cls.api_client,
|
||||
cls.zone.id,
|
||||
cls.services["ostype"]
|
||||
cls.testData["ostype"]
|
||||
)
|
||||
if cls.template == FAILED:
|
||||
assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
|
||||
assert False, "get_template() failed to return template with description %s" % cls.testData["ostype"]
|
||||
cls.testData["domainid"] = cls.domain.id
|
||||
cls.testData["zoneid"] = cls.zone.id
|
||||
cls.testData["virtual_machine"]["zoneid"] = cls.zone.id
|
||||
@ -665,10 +665,10 @@ class TestUpdateIPReservation(cloudstackTestCase):
|
||||
cls.template = get_template(
|
||||
cls.api_client,
|
||||
cls.zone.id,
|
||||
cls.services["ostype"]
|
||||
cls.testData["ostype"]
|
||||
)
|
||||
if cls.template == FAILED:
|
||||
assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
|
||||
assert False, "get_template() failed to return template with description %s" % cls.testData["ostype"]
|
||||
cls.testData["domainid"] = cls.domain.id
|
||||
cls.testData["zoneid"] = cls.zone.id
|
||||
cls.testData["virtual_machine"]["zoneid"] = cls.zone.id
|
||||
@ -815,10 +815,10 @@ class TestRouterOperations(cloudstackTestCase):
|
||||
cls.template = get_template(
|
||||
cls.api_client,
|
||||
cls.zone.id,
|
||||
cls.services["ostype"]
|
||||
cls.testData["ostype"]
|
||||
)
|
||||
if cls.template == FAILED:
|
||||
assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
|
||||
assert False, "get_template() failed to return template with description %s" % cls.testData["ostype"]
|
||||
cls.testData["domainid"] = cls.domain.id
|
||||
cls.testData["zoneid"] = cls.zone.id
|
||||
cls.testData["virtual_machine"]["zoneid"] = cls.zone.id
|
||||
@ -985,10 +985,10 @@ class TestFailureScnarios(cloudstackTestCase):
|
||||
cls.template = get_template(
|
||||
cls.api_client,
|
||||
cls.zone.id,
|
||||
cls.services["ostype"]
|
||||
cls.testData["ostype"]
|
||||
)
|
||||
if cls.template == FAILED:
|
||||
assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
|
||||
assert False, "get_template() failed to return template with description %s" % cls.testData["ostype"]
|
||||
cls.testData["domainid"] = cls.domain.id
|
||||
cls.testData["zoneid"] = cls.zone.id
|
||||
cls.testData["virtual_machine"]["zoneid"] = cls.zone.id
|
||||
|
||||
@ -164,7 +164,7 @@ class TestRegionVpcOffering(cloudstackTestCase):
|
||||
cls.services = testClient.getParsedTestDataConfig()
|
||||
|
||||
# Get Zone, Domain and templates
|
||||
domain = get_domain(cls.apiclient)
|
||||
cls.domain = get_domain(cls.apiclient)
|
||||
cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
|
||||
cls.services['mode'] = cls.zone.networktype
|
||||
|
||||
|
||||
@ -159,7 +159,7 @@ class TestVPCDistributedRouterOffering(cloudstackTestCase):
|
||||
cls.services = testClient.getParsedTestDataConfig()
|
||||
|
||||
# Get Zone, Domain and templates
|
||||
domain = get_domain(cls.apiclient)
|
||||
cls.domain = get_domain(cls.apiclient)
|
||||
cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
|
||||
cls.services['mode'] = cls.zone.networktype
|
||||
|
||||
|
||||
@ -1,12 +1,14 @@
|
||||
test_data = {
|
||||
"region": {
|
||||
"regionid": "2",
|
||||
"regionname": "Region2",
|
||||
"regionendpoint": "http://region2:8080/client"
|
||||
"regionid": "2",
|
||||
"regionname": "Region2",
|
||||
"regionendpoint": "http://region2:8080/client"
|
||||
},
|
||||
"zone": "NA",
|
||||
"hypervisor": "XenServer",
|
||||
"vdomain": { "name": "domain" },
|
||||
"vdomain": {
|
||||
"name": "domain"
|
||||
},
|
||||
"email" : "test@test.com",
|
||||
"gateway" : "172.1.1.1",
|
||||
"netmask" : "255.255.255.0",
|
||||
@ -299,6 +301,77 @@ test_data = {
|
||||
"UserData": 'VirtualRouter',
|
||||
},
|
||||
},
|
||||
"nw_off_persistent_RVR":{
|
||||
"name": 'Network offering-RVR services',
|
||||
"displaytext": 'Network off-RVR services',
|
||||
"guestiptype": 'Isolated',
|
||||
"supportedservices": 'Vpn,Dhcp,Dns,SourceNat,PortForwarding,Firewall,Lb,UserData,StaticNat',
|
||||
"traffictype": 'GUEST',
|
||||
"isPersistent":'True',
|
||||
"availability": 'Optional',
|
||||
"serviceProviderList": {
|
||||
"Vpn": 'VirtualRouter',
|
||||
"Dhcp": 'VirtualRouter',
|
||||
"Dns": 'VirtualRouter',
|
||||
"SourceNat": 'VirtualRouter',
|
||||
"PortForwarding": 'VirtualRouter',
|
||||
"Firewall": 'VirtualRouter',
|
||||
"Lb": 'VirtualRouter',
|
||||
"UserData": 'VirtualRouter',
|
||||
"StaticNat": 'VirtualRouter',
|
||||
},
|
||||
"serviceCapabilityList": {
|
||||
"SourceNat": {
|
||||
"SupportedSourceNatTypes": "peraccount",
|
||||
"RedundantRouter": "true",
|
||||
},
|
||||
"lb": {
|
||||
"SupportedLbIsolation": "dedicated"
|
||||
},
|
||||
},
|
||||
},
|
||||
"nw_off_isolated_persistent_netscaler":{
|
||||
"name": 'Netscaler',
|
||||
"displaytext": 'Netscaler',
|
||||
"guestiptype": 'Isolated',
|
||||
"supportedservices": 'Dhcp,Dns,SourceNat,PortForwarding,Vpn,Firewall,Lb,UserData,StaticNat',
|
||||
"traffictype": 'GUEST',
|
||||
"isPersistent":'True',
|
||||
"availability": 'Optional',
|
||||
"serviceProviderList": {
|
||||
"Dhcp": 'VirtualRouter',
|
||||
"Dns": 'VirtualRouter',
|
||||
"SourceNat": 'VirtualRouter',
|
||||
"PortForwarding": 'VirtualRouter',
|
||||
"Vpn": 'VirtualRouter',
|
||||
"Firewall": 'VirtualRouter',
|
||||
"Lb": 'Netscaler',
|
||||
"UserData": 'VirtualRouter',
|
||||
"StaticNat": 'VirtualRouter',
|
||||
},
|
||||
|
||||
},
|
||||
"nw_off_persistent_VPCVR_NoLB":{
|
||||
"name": 'VPC Network offering',
|
||||
"displaytext": 'VPC Network off',
|
||||
"guestiptype": 'Isolated',
|
||||
"supportedservices": 'Vpn,Dhcp,Dns,SourceNat,PortForwarding,UserData,StaticNat,NetworkACL',
|
||||
"traffictype": 'GUEST',
|
||||
"availability": 'Optional',
|
||||
"isPersistent":'True',
|
||||
"useVpc": 'on',
|
||||
"serviceProviderList": {
|
||||
"Vpn": 'VpcVirtualRouter',
|
||||
"Dhcp": 'VpcVirtualRouter',
|
||||
"Dns": 'VpcVirtualRouter',
|
||||
"SourceNat": 'VpcVirtualRouter',
|
||||
"PortForwarding": 'VpcVirtualRouter',
|
||||
"UserData": 'VpcVirtualRouter',
|
||||
"StaticNat": 'VpcVirtualRouter',
|
||||
"NetworkACL": 'VpcVirtualRouter'
|
||||
},
|
||||
|
||||
},
|
||||
"network_offering_internal_lb": {
|
||||
"name": "Network offering for internal lb service",
|
||||
"displaytext": "Network offering for internal lb service",
|
||||
@ -481,10 +554,10 @@ test_data = {
|
||||
"customdisksize": 1,
|
||||
"diskname": "Test Volume",
|
||||
"portableIpRange": {
|
||||
"gateway" : "10.223.252.195",
|
||||
"netmask" : "255.255.255.192",
|
||||
"startip" : "10.223.252.196",
|
||||
"endip" : "10.223.252.197",
|
||||
"vlan" : "1001"
|
||||
"gateway" : "10.223.252.195",
|
||||
"netmask" : "255.255.255.192",
|
||||
"startip" : "10.223.252.196",
|
||||
"endip" : "10.223.252.197",
|
||||
"vlan" : "1001"
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user