CLOUDSTACK-7385: Fixed LB creation issue in test_persistent_networks.py
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3e0c55ca Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3e0c55ca Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3e0c55ca Branch: refs/heads/saml2 Commit: 3e0c55cabebe6884b9a6f710bb2fe45d5f0b19e7 Parents: a67bc49 Author: Gaurav Aradhye <gaurav.arad...@clogeny.com> Authored: Thu Aug 21 20:31:35 2014 +0530 Committer: Girish Shilamkar <gir...@clogeny.com> Committed: Fri Aug 22 13:42:21 2014 +0530 ---------------------------------------------------------------------- .../component/test_persistent_networks.py | 2 +- tools/marvin/marvin/config/test_data.py | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3e0c55ca/test/integration/component/test_persistent_networks.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_persistent_networks.py b/test/integration/component/test_persistent_networks.py index 7364685..971edce 100644 --- a/test/integration/component/test_persistent_networks.py +++ b/test/integration/component/test_persistent_networks.py @@ -1348,7 +1348,7 @@ class TestRestartPersistentNetwork(cloudstackTestCase): cls.services["service_offering"] ) cls.isolated_persistent_network_offering = NetworkOffering.create(cls.api_client, - cls.services["nw_off_isolated_persistent"], + cls.services["nw_off_isolated_persistent_lb"], conservemode=False) cls.isolated_persistent_network_offering_netscaler = NetworkOffering.create(cls.api_client, http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3e0c55ca/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 a93b883..57a3891 100644 --- a/tools/marvin/marvin/config/test_data.py +++ b/tools/marvin/marvin/config/test_data.py @@ -224,6 +224,22 @@ test_data = { "PortForwarding": 'VirtualRouter', }, }, + "nw_off_isolated_persistent_lb": { + "name": 'Test Nw off isolated persistent', + "displaytext": 'Test Nw off isolated persistent', + "guestiptype": 'Isolated', + "supportedservices": 'Dhcp,Dns,SourceNat,PortForwarding, Lb', + "traffictype": 'GUEST', + "ispersistent": 'True', + "availability": 'Optional', + "serviceProviderList": { + "Dhcp": 'VirtualRouter', + "Dns": 'VirtualRouter', + "SourceNat": 'VirtualRouter', + "PortForwarding": 'VirtualRouter', + "Lb": "VirtualRouter" + }, + }, "isolated_network_offering": { "name": "Network offering-DA services", "displaytext": "Network offering-DA services",
