From 535e7a667049e37d6a03c7a3e2e5c9645e6ce1f6 Mon Sep 17 00:00:00 2001
From: sanjeev <sanjeev@apache.org>
Date: Mon, 8 Sep 2014 17:21:11 +0530
Subject: [PATCH] CLOUDSTACK-7508: Remove duplicate network offerings from
 test_data.py

---
 tools/marvin/marvin/config/test_data.py | 26 ++-----------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py
index b81d09ad9d4..4133aba5a60 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -572,7 +572,7 @@ test_data = {
         "supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,Lb,UserData,StaticNat,NetworkACL",
         "traffictype": "GUEST",
         "availability": "Optional",
-        "ispersistent": "False",
+        "ispersistent": "True",
         "useVpc": "on",
         "serviceProviderList": {
             "Dhcp": "VpcVirtualRouter",
@@ -593,7 +593,7 @@ test_data = {
         "supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,UserData,StaticNat,NetworkACL",
         "traffictype": "GUEST",
         "availability": "Optional",
-        "ispersistent": "False",
+        "ispersistent": "True",
         "useVpc": "on",
         "serviceProviderList": {
             "Dhcp": "VpcVirtualRouter",
@@ -653,28 +653,6 @@ test_data = {
             "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_acl_rule": {
 		   "protocol":"TCP",