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

Fixing few issues in Multiple IPs test cases

This commit is contained in:
Gaurav Aradhye 2014-05-10 00:26:46 -04:00 committed by girish@clogeny.com
parent daadc45122
commit 6c8a0a1f96
2 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,11 +143,11 @@ class TestBasicOperations(cloudstackTestCase):
cls.services["service_offering"]
)
cls._cleanup = [cls.service_offering]
cls.services["shared_network_offering"]["specifyVlan"] = "True"
cls.services["shared_network_offering"]["specifyIpRanges"] = "True"
cls.services["shared_network_offering_all_services"]["specifyVlan"] = "True"
cls.services["shared_network_offering_all_services"]["specifyIpRanges"] = "True"
cls.shared_network_offering = CreateEnabledNetworkOffering(cls.api_client,
cls.services["shared_network_offering"])
cls.services["shared_network_offering_all_services"])
cls._cleanup.append(cls.shared_network_offering)
cls.mode = cls.zone.networktype
if cls.mode == "advanced":
@ -443,7 +443,7 @@ class TestBasicOperations(cloudstackTestCase):
try:
ipaddress_1 = NIC.addIp(apiclient, id=virtual_machine.nic[0].id)
except Exception as e:
self.fail("Failed while adding secondary IP to NIC of vm %s" % virtual_machine.id)
self.fail("Failed while adding secondary IP to NIC of vm %s: %s" % (virtual_machine.id, e))
try:
NIC.list(apiclient, virtualmachineid=virtual_machine.id)
@ -494,10 +494,11 @@ class TestNetworkRules(cloudstackTestCase):
cls.services["service_offering"]
)
cls._cleanup = [cls.service_offering]
cls.services["shared_network_offering"]["specifyVlan"] = "True"
cls.services["shared_network_offering"]["specifyIpRanges"] = "True"
cls.services["shared_network_offering_all_services"]["specifyVlan"] = "True"
cls.services["shared_network_offering_all_services"]["specifyIpRanges"] = "True"
cls.shared_network_offering = CreateEnabledNetworkOffering(cls.api_client, cls.services["shared_network_offering"])
cls.shared_network_offering = CreateEnabledNetworkOffering(cls.api_client,
cls.services["shared_network_offering_all_services"])
cls._cleanup.append(cls.shared_network_offering)
cls.mode = cls.zone.networktype
if cls.mode == "advanced":
@ -868,10 +869,11 @@ class TestVmNetworkOperations(cloudstackTestCase):
cls.services["service_offering"]
)
cls._cleanup = [cls.service_offering]
cls.services["shared_network_offering"]["specifyVlan"] = "True"
cls.services["shared_network_offering"]["specifyIpRanges"] = "True"
cls.services["shared_network_offering_all_services"]["specifyVlan"] = "True"
cls.services["shared_network_offering_all_services"]["specifyIpRanges"] = "True"
cls.shared_network_offering = CreateEnabledNetworkOffering(cls.api_client, cls.services["shared_network_offering"])
cls.shared_network_offering = CreateEnabledNetworkOffering(cls.api_client,
cls.services["shared_network_offering_all_services"])
cls._cleanup.append(cls.shared_network_offering)
cls.mode = cls.zone.networktype
if cls.mode == "advanced":

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

@ -296,6 +296,27 @@ test_data = {
"UserData": "VirtualRouter"
}
},
"shared_network_offering_all_services": {
"name":"shaared network offering with services enabled",
"displaytext": "Shard network offering",
"guestiptype": "Shared",
"supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,Firewall,Lb,UserData,StaticNat",
"specifyVlan" : "False",
"specifyIpRanges" : "False",
"traffictype": "GUEST",
"serviceProviderList" : {
"Dhcp": "VirtualRouter",
"Dns": "VirtualRouter",
"UserData": "VirtualRouter",
"SourceNat": "VirtualRouter",
"PortForwarding": "VirtualRouter",
"Vpn": "VirtualRouter",
"Firewall": "VirtualRouter",
"Lb": "VirtualRouter",
"UserData": "VirtualRouter",
"StaticNat": "VirtualRouter"
}
},
"shared_network_offering_sg": {
"name": "MySharedOffering-sg",
"displaytext": "MySharedOffering-sg",