You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/07/28 17:44:37 UTC
[10/24] git commit: updated refs/heads/4.4 to e33d4a5
Fixing few issues in Multiple IPs test cases
(cherry picked from commit 4466ed1ce18fd5391b2b96fa551c171ae7e09723)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/38ef939e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/38ef939e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/38ef939e
Branch: refs/heads/4.4
Commit: 38ef939efd4a97346b0a4ef176b335266617ac40
Parents: acf70da
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Sat May 10 00:26:46 2014 -0400
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Jul 28 17:43:19 2014 +0200
----------------------------------------------------------------------
.../component/test_multiple_ips_per_nic.py | 22 +++++++++++---------
tools/marvin/marvin/config/test_data.py | 21 +++++++++++++++++++
2 files changed, 33 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/38ef939e/test/integration/component/test_multiple_ips_per_nic.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_multiple_ips_per_nic.py b/test/integration/component/test_multiple_ips_per_nic.py
index 03ebb83..abe9474 100644
--- a/test/integration/component/test_multiple_ips_per_nic.py
+++ b/test/integration/component/test_multiple_ips_per_nic.py
@@ -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":
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/38ef939e/tools/marvin/marvin/config/test_data.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py
index b862205..e682cf7 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -264,6 +264,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",