diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py
index 5e348a6f639..6e74950a66b 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -86,7 +86,7 @@ test_data = {
         "username": "User",
         # Random characters are appended for unique
         # username
-        "password": "fr3sca",
+        "password": "fr3sca"
     },
     "small": {
         "displayname": "testserver",
@@ -103,14 +103,14 @@ test_data = {
         "displaytext": "Tiny Instance",
         "cpunumber": 1,
         "cpuspeed": 256,  # in MHz
-        "memory": 256     # In MBs
+        "memory": 256  # In MBs
     },
     "service_offering_multiple_cores": {
         "name": "Tiny Instance",
         "displaytext": "Tiny Instance",
         "cpunumber": 4,
         "cpuspeed": 100,    # in MHz
-        "memory": 128       # In MBs
+        "memory": 128    # In MBs
     },
     "service_offerings": {
         "tiny": {
@@ -146,7 +146,7 @@ test_data = {
             "displaytext": "LargeInstance",
             "cpunumber": 1,
             "cpuspeed": 1024,
-            "memory": 2048,
+            "memory": 2048
         },
         "hasmall": {
             "name": "HA Small Instance",
@@ -251,7 +251,7 @@ test_data = {
         "traffictype": "GUEST",
         "availability": "Optional",
         "serviceProviderList": {
-        },
+        }
     },
     "nw_off_isolated_netscaler": {
         "name": "Netscaler",
@@ -326,12 +326,12 @@ test_data = {
         }
     },
     "nw_off_L2_persistent": {
-        "name": 'Test L2 Network Offering persistent',
-        "displaytext": 'Test L2 Network Offering persistent',
-        "guestiptype": 'L2',
-        "traffictype": 'GUEST',
-        "ispersistent": 'True',
-        "specifyVlan": 'True'
+        "name": "Test L2 Network Offering persistent",
+        "displaytext": "Test L2 Network Offering persistent",
+        "guestiptype": "L2",
+        "traffictype": "GUEST",
+        "ispersistent": "True",
+        "specifyVlan": "True"
     },
     "network_offering_vlan": {
         "name": "Test Network offering",
@@ -486,20 +486,6 @@ test_data = {
             "SecurityGroup": "SecurityGroupProvider"
         }
     },
-    "shared_network_config_drive_offering": {
-        "name": 'shared_network_config_drive_offering',
-        "displaytext": 'shared_network_config_drive_offering',
-        "guestiptype": 'shared',
-        "supportedservices": 'Dhcp,UserData',
-        "traffictype": 'GUEST',
-        "specifyVlan": "True",
-        "specifyIpRanges": "True",
-        "availability": 'Optional',
-        "serviceProviderList": {
-            "Dhcp": "VirtualRouter",
-            "UserData": 'ConfigDrive'
-        }
-    },
     "shared_network_sg": {
         "name": "Shared-Network-SG-Test",
         "displaytext": "Shared-Network_SG-Test",
@@ -660,7 +646,7 @@ test_data = {
         "serviceCapabilityList": {
             "SourceNat": {
                 "SupportedSourceNatTypes": "peraccount",
-                "RedundantRouter": "true"
+                "RedundantRouter": "true",
             },
             "lb": {
                 "SupportedLbIsolation": "dedicated"
@@ -690,16 +676,16 @@ test_data = {
         }
     },
     "nw_offering_reduced_vpc": {
-        "name": 'Reduced Network for VPC',
-        "displaytext": 'Reduced Network for VPC',
-        "guestiptype": 'Isolated',
-        "supportedservices": 'Dhcp,StaticNat,SourceNat,NetworkACL,UserData,'
-                             'Dns',
-        "traffictype": 'GUEST',
-        "availability": 'Optional',
+        "name": "Reduced Network for VPC",
+        "displaytext": "Reduced Network for VPC",
+        "guestiptype": "Isolated",
+        "supportedservices": "Dhcp,StaticNat,SourceNat,NetworkACL,UserData,"
+                             "Dns",
+        "traffictype": "GUEST",
+        "availability": "Optional",
         "tags": "native",
-        "useVpc": 'on',
-        "ispersistent": 'True',
+        "useVpc": "on",
+        "ispersistent": "True",
         "serviceProviderList": {
             "Dhcp": "VpcVirtualRouter",
             "StaticNat": "VpcVirtualRouter",
@@ -777,51 +763,51 @@ test_data = {
         "protocol": "TCP"
     },
     "nw_off_ncc_SharedSP": {
-        "name": 'SharedSP',
-        "displaytext": 'SharedSP',
-        "guestiptype": 'Isolated',
+        "name": "SharedSP",
+        "displaytext": "SharedSP",
+        "guestiptype": "Isolated",
         "supportedservices":
-            'Dhcp,Dns,SourceNat,Lb,StaticNat',
-        "traffictype": 'GUEST',
-        "availability": 'Optional',
+            "Dhcp,Dns,SourceNat,Lb,StaticNat",
+        "traffictype": "GUEST",
+        "availability": "Optional",
         "serviceProviderList": {
-            "Dhcp": 'VirtualRouter',
-            "Dns": 'VirtualRouter',
-            "SourceNat": 'VirtualRouter',
-            "Lb": 'Netscaler',
-            "StaticNat": 'VirtualRouter'
+            "Dhcp": "VirtualRouter",
+            "Dns": "VirtualRouter",
+            "SourceNat": "VirtualRouter",
+            "Lb": "Netscaler",
+            "StaticNat": "VirtualRouter"
         }
     },
     "nw_off_ncc_DedicatedSP": {
-        "name": 'DedicatedSP',
-        "displaytext": 'DedicatedSP',
-        "guestiptype": 'Isolated',
+        "name": "DedicatedSP",
+        "displaytext": "DedicatedSP",
+        "guestiptype": "Isolated",
         "supportedservices":
-            'Dhcp,Dns,SourceNat,Lb,StaticNat',
-        "traffictype": 'GUEST',
-        "availability": 'Optional',
+            "Dhcp,Dns,SourceNat,Lb,StaticNat",
+        "traffictype": "GUEST",
+        "availability": "Optional",
         "serviceProviderList": {
-            "Dhcp": 'VirtualRouter',
-            "Dns": 'VirtualRouter',
-            "SourceNat": 'VirtualRouter',
-            "Lb": 'Netscaler',
-            "StaticNat": 'VirtualRouter'
+            "Dhcp": "VirtualRouter",
+            "Dns": "VirtualRouter",
+            "SourceNat": "VirtualRouter",
+            "Lb": "Netscaler",
+            "StaticNat": "VirtualRouter"
         }
     },
     "NCC": {
-        "NCCIP": '10.102.195.215',
+        "NCCIP": "10.102.195.215"
     },
     "NSShared": {
-        "NSIP": '10.102.195.210',
+        "NSIP": "10.102.195.210"
     },
     "NSDedicated": {
-        "NSIP": '10.102.195.212'
+        "NSIP": "10.102.195.212"
     },
     "servicepackage_shared": {
-        "name": "SharedSP",
+        "name": "SharedSP"
     },
     "servicepackage_dedicated": {
-        "name": "DedicatedSP",
+        "name": "DedicatedSP"
     },
 
     "nw_off_isolated_persistent_netscaler": {
@@ -843,7 +829,7 @@ test_data = {
             "Lb": "Netscaler",
             "UserData": "VirtualRouter",
             "StaticNat": "VirtualRouter"
-        }
+        },
 
     },
     "network_acl_rule": {
@@ -890,7 +876,7 @@ test_data = {
     },
     "updatenatrulerange": {
         "privateport": 50,
-        "privateendport": 55,
+        "privateendport": 55
     },
     "egress_80": {
         "startport": 80,
@@ -989,7 +975,7 @@ test_data = {
         "isfeatured": True,
         "ispublic": True,
         "ostype": "Windows Server 2012 (64-bit)",
-        "mode": 'HTTP_DOWNLOAD',
+        "mode": "HTTP_DOWNLOAD"
     },
     "isfeatured": True,
     "ispublic": True,
@@ -1270,24 +1256,25 @@ test_data = {
         "url": "iscsi://192.168.100.21/iqn.2012-01.localdomain.clo-cstack-cos6:iser/1",
         "name": "Primary iSCSI"
     },
-    "volume": {"diskname": "Test Volume",
-               "size": 1
+    "volume": {
+        "diskname": "Test Volume",
+        "size": 1
     },
     "volume_write_path": {
         "diskname": "APP Data Volume",
         "size": 1,   # in GBs
         "xenserver": {"rootdiskdevice":"/dev/xvda",
                       "datadiskdevice_1": "/dev/xvdb",
-                      "datadiskdevice_2": "/dev/xvdc"  # Data Disk
-                     },
+                      "datadiskdevice_2": "/dev/xvdc",   # Data Disk
+                      },
         "kvm":       {"rootdiskdevice": "/dev/vda",
                       "datadiskdevice_1": "/dev/vdb",
                       "datadiskdevice_2": "/dev/vdc"
-                     },
+                      },
         "vmware":    {"rootdiskdevice": "/dev/hda",
                       "datadiskdevice_1": "/dev/hdb",
                       "datadiskdevice_2": "/dev/hdc"
-                     }
+                      }
     },
     "data_write_paths": {
         "mount_dir": "/mnt/tmp",
@@ -1319,23 +1306,23 @@ test_data = {
     "vpntest_vpc": {
         "name": "vpc_vpn",
         "displaytext": "vpc-vpn",
-        "cidr": "10.1.1.0/24"
+        "cidr": "10.254.1.0/24"
     },
     "ntwk": {
         "name": "tier1",
         "displaytext": "vpc-tier1",
-        "gateway": "10.1.1.1",
+        "gateway": "10.254.1.1",
         "netmask": "255.255.255.192"
     },
     "vpc2": {
         "name": "vpc2_vpn",
         "displaytext": "vpc2-vpn",
-        "cidr": "10.2.1.0/24"
+        "cidr": "10.253.1.0/24"
     },
     "ntwk2": {
         "name": "tier2",
         "displaytext": "vpc-tier2",
-        "gateway": "10.2.1.1",
+        "gateway": "10.253.1.1",
         "netmask": "255.255.255.192"
     },
     "privateport": 22,
@@ -1346,7 +1333,8 @@ test_data = {
     "diskname": "Test Volume",
     "sparse": {
         "name": "Sparse Type Disk offering",
-        "displaytext": "Sparse Type Disk offering",
+        "displaytext":
+            "Sparse Type Disk offering",
         "disksize": 1,  # in GB
         "provisioningtype": "sparse"
     },
@@ -1453,7 +1441,7 @@ test_data = {
                 "clustertype": "CloudManaged",
                 "url": "http://10.102.192.57",
                 "username": "root",
-                "password": "freebsd"
+                "password": "freebsd",
             }
         },
         "account": {
@@ -1473,7 +1461,7 @@ test_data = {
                         "displaytext": "vGPU260Q",
                         "cpunumber": 2,
                         "cpuspeed": 1600,  # in MHz
-                        "memory": 3072  # In MBs
+                        "memory": 3072,  # In MBs
                     },
                 "GRID K240Q":
                     {
@@ -1481,7 +1469,7 @@ test_data = {
                         "displaytext": "vGPU240Q",
                         "cpunumber": 2,
                         "cpuspeed": 1600,  # in MHz
-                        "memory": 3072  # In MBs
+                        "memory": 3072,  # In MBs
                     },
                 "GRID K220Q":
                     {
@@ -1489,7 +1477,7 @@ test_data = {
                         "displaytext": "vGPU220Q",
                         "cpunumber": 2,
                         "cpuspeed": 1600,  # in MHz
-                        "memory": 3072  # In MBs
+                        "memory": 3072,  # In MBs
                     },
                 "GRID K200":
                     {
@@ -1497,7 +1485,7 @@ test_data = {
                         "displaytext": "vGPU200",
                         "cpunumber": 2,
                         "cpuspeed": 1600,  # in MHz
-                        "memory": 3072  # In MBs
+                        "memory": 3072,  # In MBs
                     },
                 "passthrough":
                     {
@@ -1505,7 +1493,7 @@ test_data = {
                         "displaytext": "vGPU passthrough",
                         "cpunumber": 2,
                         "cpuspeed": 1600,  # in MHz
-                        "memory": 3072  # In MBs
+                        "memory": 3072,  # In MBs
                     },
                 "GRID K140Q":
                     {
@@ -1515,7 +1503,7 @@ test_data = {
                         "displaytext": "vGPU140Q",
                         "cpunumber": 2,
                         "cpuspeed": 1600,
-                        "memory": 3072
+                        "memory": 3072,
                     },
                 "GRID K120Q":
                     {
@@ -1523,7 +1511,7 @@ test_data = {
                         "displaytext": "vGPU120Q",
                         "cpunumber": 2,
                         "cpuspeed": 1600,
-                        "memory": 3072
+                        "memory": 3072,
                     },
                 "GRID K100":
                     {
@@ -1531,7 +1519,7 @@ test_data = {
                         "displaytext": "vGPU100",
                         "cpunumber": 2,
                         "cpuspeed": 1600,
-                        "memory": 3072
+                        "memory": 3072,
                     },
                 "nonvgpuoffering":
                     {
@@ -1539,7 +1527,7 @@ test_data = {
                         "displaytext": "nonvgpuoffering",
                         "cpunumber": 2,
                         "cpuspeed": 1600,
-                        "memory": 3072
+                        "memory": 3072,
                     }
 
             },
@@ -1829,8 +1817,8 @@ test_data = {
             "ldapPassword": ""
         },
         "systemVmDelay": 120,
-	"setUsageConfigurationThroughTestCase": False,
-	"vmware_cluster" : {
+        "setUsageConfigurationThroughTestCase": False,
+        "vmware_cluster" : {
             "hypervisor": "VMware",
             "clustertype": "ExternalManaged",
             "username": "",
@@ -1847,7 +1835,7 @@ test_data = {
                 "displaytext": "Small Instance",
                 "cpunumber": 1,
                 "cpuspeed": 100,
-                "memory": 128
+                "memory": 128,
             }
         },
         "ostype": "CentOS 5.6 (64-bit)"
@@ -1895,6 +1883,7 @@ test_data = {
                     "ostype": "Windows 8 (64-bit)",
                     "ispublic": "true",
                     "hypervisor": "XenServer"
+
                 },
             "OVA":
                 {
@@ -1913,10 +1902,8 @@ test_data = {
                 "passwordenabled": False,
                 "ostype": "Windows 8 (64-bit)"
             }
-        }
+        },
 
-    "configurableData":
-        {
     "browser_upload_volume":{
         "VHD": {
             "diskname": "XenUploadVol",
@@ -1939,156 +1926,6 @@ test_data = {
             "disksize": 3
         }
     },
-    "vpc_vpn": {
-        "account": {
-            "email": "test@test.com",
-            "firstname": "Test",
-            "lastname": "User",
-            "username": "test",
-            "password": "password",
-        },
-        "host1": None,
-        "host2": None,
-        "compute_offering": {
-            "name": "Tiny Instance",
-            "displaytext": "Tiny Instance",
-            "cpunumber": 1,
-            "cpuspeed": 100,
-            "memory": 128,
-        },
-        "network_offering": {
-            "name": 'VPC Network offering',
-            "displaytext": 'VPC Network',
-            "guestiptype": 'Isolated',
-            "supportedservices": 'Vpn,Dhcp,Dns,SourceNat,Lb,PortForwarding,UserData,StaticNat,NetworkACL',
-            "traffictype": 'GUEST',
-            "availability": 'Optional',
-            "useVpc": 'on',
-            "serviceProviderList": {
-                "Vpn": 'VpcVirtualRouter',
-                "Dhcp": 'VpcVirtualRouter',
-                "Dns": 'VpcVirtualRouter',
-                "SourceNat": 'VpcVirtualRouter',
-                "Lb": 'VpcVirtualRouter',
-                "PortForwarding": 'VpcVirtualRouter',
-                "UserData": 'VpcVirtualRouter',
-                "StaticNat": 'VpcVirtualRouter',
-                "NetworkACL": 'VpcVirtualRouter'
-            },
-        },
-        "network_offering_internal_lb": {
-            "name": 'VPC Network Internal Lb offering',
-            "displaytext": 'VPC Network internal lb',
-            "guestiptype": 'Isolated',
-            "supportedservices": 'Dhcp,Dns,SourceNat,PortForwarding,UserData,StaticNat,NetworkACL,Lb',
-            "traffictype": 'GUEST',
-            "availability": 'Optional',
-            "useVpc": 'on',
-            "serviceCapabilityList": {
-                "Lb": {
-                    "SupportedLbIsolation": 'dedicated',
-                    "lbSchemes": 'internal'
-                }
-            },
-            "serviceProviderList": {
-                "Dhcp": 'VpcVirtualRouter',
-                "Dns": 'VpcVirtualRouter',
-                "SourceNat": 'VpcVirtualRouter',
-                "PortForwarding": 'VpcVirtualRouter',
-                "UserData": 'VpcVirtualRouter',
-                "StaticNat": 'VpcVirtualRouter',
-                "NetworkACL": 'VpcVirtualRouter',
-                "Lb": 'InternalLbVm'
-            },
-            "egress_policy": "true",
-        },
-        "vpc_offering": {
-            "name": 'VPC off',
-            "displaytext": 'VPC off',
-            "supportedservices": 'Dhcp,Dns,SourceNat,PortForwarding,Vpn,Lb,UserData,StaticNat',
-        },
-        "redundant_vpc_offering": {
-            "name": 'Redundant VPC off',
-            "displaytext": 'Redundant VPC off',
-            "supportedservices": 'Dhcp,Dns,SourceNat,PortForwarding,Vpn,Lb,UserData,StaticNat',
-            "serviceProviderList": {
-                "Vpn": 'VpcVirtualRouter',
-                "Dhcp": 'VpcVirtualRouter',
-                "Dns": 'VpcVirtualRouter',
-                "SourceNat": 'VpcVirtualRouter',
-                "PortForwarding": 'VpcVirtualRouter',
-                "Lb": 'VpcVirtualRouter',
-                "UserData": 'VpcVirtualRouter',
-                "StaticNat": 'VpcVirtualRouter',
-                "NetworkACL": 'VpcVirtualRouter'
-            },
-            "serviceCapabilityList": {
-                "SourceNat": {
-                    "RedundantRouter": 'true'
-                }
-            },
-        },
-        "vpc": {
-            "name": "TestVPC",
-            "displaytext": "TestVPC",
-            "cidr": '10.254.0.0/16'
-        },
-        "vpc1": {
-            "name": "TestVPC",
-            "displaytext": "VPC1",
-            "cidr": '10.254.0.0/16'
-        },
-        "vpc2": {
-            "name": "TestVPC",
-            "displaytext": "VPC2",
-            "cidr": '10.253.0.0/16'
-        },
-        "network_1": {
-            "name": "Test Network",
-            "displaytext": "Test Network",
-            "netmask": '255.255.255.0',
-            "gateway": "10.254.1.1"
-        },
-        "network_2": {
-            "name": "Test Network",
-            "displaytext": "Test Network",
-            "netmask": '255.255.255.0',
-            "gateway": "10.253.1.1"
-        },
-        "vpn": {
-            "vpn_user": "root",
-            "vpn_pass": "Md1sdc",
-            "vpn_pass_fail": "abc!123",  # too short
-            "iprange": "10.253.2.1-10.253.2.10",
-            "fordisplay": "true"
-        },
-        "vpncustomergateway": {
-            "esppolicy": "3des-md5;modp1536",
-            "ikepolicy": "3des-md5;modp1536",
-            "ipsecpsk": "ipsecpsk"
-        },
-        "natrule": {
-            "protocol": "TCP",
-            "cidrlist": '0.0.0.0/0',
-        },
-        "http_rule": {
-            "privateport": 80,
-            "publicport": 80,
-            "startport": 80,
-            "endport": 80,
-            "cidrlist": '0.0.0.0/0',
-            "protocol": "TCP"
-        },
-        "virtual_machine": {
-            "displayname": "Test VM",
-            "username": "root",
-            "password": "password",
-            "ssh_port": 22,
-            "privateport": 22,
-            "publicport": 22,
-            "protocol": 'TCP',
-        }
-    },
     "browser_upload_template": {
         "VHD": {
             "templatename": "XenUploadtemplate",
@@ -2115,6 +1952,8 @@ test_data = {
             "ostypeid":"2e02e376-cdf3-11e4-beb3-8aa6272b57ef"
         }
     },
+    "configurableData":
+    {
         "portableIpRange": {
             "gateway": "10.223.59.1",
             "netmask": "255.255.255.0",
@@ -2188,15 +2027,16 @@ test_data = {
             "url": "http://download.cloudstack.org/releases/2.0.0/UbuntuServer-10-04-64bit.vhd.bz2",
             "checksum": ""
         },
-        "bootableIso": {
-            "displaytext": "Test Bootable ISO",
-            "name": "testISO",
-            "bootable": True,
-            "ispublic": False,
-            "url": "http://dl.openvm.eu/cloudstack/iso/TinyCore-8.0.iso",
-            "ostype": "Other Linux (64-bit)",
-            "mode": "HTTP_DOWNLOAD"
-        },
+        "bootableIso":
+            {
+                "displaytext": "Test Bootable ISO",
+                "name": "testISO",
+                "bootable": True,
+                "ispublic": False,
+                "url": "http://dl.openvm.eu/cloudstack/iso/TinyCore-8.0.iso",
+                "ostype": "Other Linux (64-bit)",
+                "mode": "HTTP_DOWNLOAD"
+            },
         "setHostConfigurationForIngressRule": False,
         "restartManagementServerThroughTestCase": False,
         "vmxnet3template": {
@@ -2222,12 +2062,162 @@ test_data = {
                 "url": ""
             },
             "hyperv": {
-	        "url": ""
-	    },
+                "url": ""
+            },
             "ostype": "CentOS 5.3 (64-bit)",
             "mode": "HTTP_DOWNLOAD"
         }
     },
+    "vpc_vpn": {
+        "account": {
+            "email": "test@test.com",
+            "firstname": "Test",
+            "lastname": "User",
+            "username": "test",
+            "password": "password"
+        },
+        "host1": None,
+        "host2": None,
+        "compute_offering": {
+            "name": "Tiny Instance",
+            "displaytext": "Tiny Instance",
+            "cpunumber": 1,
+            "cpuspeed": 100,
+            "memory": 128
+        },
+        "network_offering": {
+            "name": "VPC Network offering",
+            "displaytext": "VPC Network",
+            "guestiptype": "Isolated",
+            "supportedservices": "Vpn,Dhcp,Dns,SourceNat,Lb,PortForwarding,UserData,StaticNat,NetworkACL",
+            "traffictype": "GUEST",
+            "availability": "Optional",
+            "useVpc": "on",
+            "serviceProviderList": {
+                "Vpn": "VpcVirtualRouter",
+                "Dhcp": "VpcVirtualRouter",
+                "Dns": "VpcVirtualRouter",
+                "SourceNat": "VpcVirtualRouter",
+                "Lb": "VpcVirtualRouter",
+                "PortForwarding": "VpcVirtualRouter",
+                "UserData": "VpcVirtualRouter",
+                "StaticNat": "VpcVirtualRouter",
+                "NetworkACL": "VpcVirtualRouter"
+            }
+        },
+        "network_offering_internal_lb": {
+            "name": "VPC Network Internal Lb offering",
+            "displaytext": "VPC Network internal lb",
+            "guestiptype": "Isolated",
+            "supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,UserData,StaticNat,NetworkACL,Lb",
+            "traffictype": "GUEST",
+            "availability": "Optional",
+            "useVpc": "on",
+            "serviceCapabilityList": {
+                "Lb": {
+                    "SupportedLbIsolation": "dedicated",
+                    "lbSchemes": "internal"
+                }
+            },
+            "serviceProviderList": {
+                "Dhcp": "VpcVirtualRouter",
+                "Dns": "VpcVirtualRouter",
+                "SourceNat": "VpcVirtualRouter",
+                "PortForwarding": "VpcVirtualRouter",
+                "UserData": "VpcVirtualRouter",
+                "StaticNat": "VpcVirtualRouter",
+                "NetworkACL": "VpcVirtualRouter",
+                "Lb": "InternalLbVm"
+            },
+            "egress_policy": "true"
+        },
+        "vpc_offering": {
+            "name": "VPC off",
+            "displaytext": "VPC off",
+            "supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,Lb,UserData,StaticNat"
+        },
+        "redundant_vpc_offering": {
+            "name": "Redundant VPC off",
+            "displaytext": "Redundant VPC off",
+            "supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,Lb,UserData,StaticNat",
+            "serviceProviderList": {
+                "Vpn": "VpcVirtualRouter",
+                "Dhcp": "VpcVirtualRouter",
+                "Dns": "VpcVirtualRouter",
+                "SourceNat": "VpcVirtualRouter",
+                "PortForwarding": "VpcVirtualRouter",
+                "Lb": "VpcVirtualRouter",
+                "UserData": "VpcVirtualRouter",
+                "StaticNat": "VpcVirtualRouter",
+                "NetworkACL": "VpcVirtualRouter"
+            },
+            "serviceCapabilityList": {
+                "SourceNat": {
+                    "RedundantRouter": "true"
+                }
+            }
+        },
+        "vpc": {
+            "name": "TestVPC",
+            "displaytext": "TestVPC",
+            "cidr": "10.254.0.0/16"
+        },
+        "vpc1": {
+            "name": "TestVPC",
+            "displaytext": "VPC1",
+            "cidr": "10.254.0.0/16"
+        },
+        "vpc2": {
+            "name": "TestVPC",
+            "displaytext": "VPC2",
+            "cidr": "10.253.0.0/16"
+        },
+        "network_1": {
+            "name": "Test Network",
+            "displaytext": "Test Network",
+            "netmask": "255.255.255.0",
+            "gateway": "10.254.1.1"
+        },
+        "network_2": {
+            "name": "Test Network",
+            "displaytext": "Test Network",
+            "netmask": "255.255.255.0",
+            "gateway": "10.253.1.1"
+        },
+        "vpn": {
+            "vpn_user": "root",
+            "vpn_pass": "Md1sdc",
+            "vpn_pass_fail": "abc!123",  # too short
+            "iprange": "10.253.2.1-10.253.2.10",
+            "fordisplay": "true"
+        },
+        "vpncustomergateway": {
+            "esppolicy": "3des-md5;modp1536",
+            "ikepolicy": "3des-md5;modp1536",
+            "ipsecpsk": "ipsecpsk"
+        },
+        "natrule": {
+            "protocol": "TCP",
+            "cidrlist": "0.0.0.0/0"
+        },
+        "http_rule": {
+            "privateport": 80,
+            "publicport": 80,
+            "startport": 80,
+            "endport": 80,
+            "cidrlist": "0.0.0.0/0",
+            "protocol": "TCP"
+        },
+        "virtual_machine": {
+            "displayname": "Test VM",
+            "username": "root",
+            "password": "password",
+            "ssh_port": 22,
+            "privateport": 22,
+            "publicport": 22,
+            "protocol": "TCP"
+        }
+    },
     "cks_kubernetes_versions": {
         "1.15.0": {
             "semanticversion": "1.15.0",