Fix misspelling of security group parameter 80/70980/1
authorGary Wu <gary.i.wu@huawei.com>
Mon, 22 Oct 2018 21:52:56 +0000 (14:52 -0700)
committerGary Wu <gary.i.wu@huawei.com>
Mon, 22 Oct 2018 21:52:56 +0000 (14:52 -0700)
Change-Id: I442ac088f3a089ffadd878c2af4b5848065ae0f5
Issue-ID: INT-586
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
boot/robot/integration_preload_parameters.py

index 13e9621..e430abe 100644 (file)
@@ -8,7 +8,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
          "onap_private_net_id" : "${GLOBAL_INJECTED_NETWORK}",
          "onap_private_subnet_id" : "${GLOBAL_INJECTED_NETWORK}",
          "onap_private_net_cidr" : "10.0.0.0/8",
-         "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
+         "sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
          "dcae_collector_ip" : "${GLOBAL_INJECTED_DCAE_COLLECTOR_IP}",
          "dcae_collector_port" : "8081",
          "public_net_id" : "${GLOBAL_INJECTED_PUBLIC_NET_ID}",
@@ -32,7 +32,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vpg_private_ip_1" : "10.0.${ecompnet}.2",
             "vsn_private_ip_0" : "192.168.20.250",
             "vsn_private_ip_1" : "10.0.${ecompnet}.3",
-            "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
+            "sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
             'vfw_name_0':'vofwl01fwl${hostid}',
             'vpg_name_0':'vofwl01pgn${hostid}',
             "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
@@ -52,7 +52,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vpg_private_ip_0" : "192.168.10.200",
             "vsn_private_ip_0" : "192.168.20.250",
             "vsn_private_ip_1" : "10.0.${ecompnet}.102",
-            "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
+            "sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
             'vfw_name_0':'vofwl01fwl${hostid}',
             'vsn_name_0':'vofwl01snk${hostid}',
             "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
@@ -67,7 +67,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vpg_private_ip_0" : "192.168.10.200",
             "vpg_private_ip_1" : "10.0.${ecompnet}.103",
             "vsn_private_ip_0" : "192.168.20.250",
-            "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
+            "sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
             'vpg_name_0':'vofwl01pgn${hostid}',
             "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
             "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
@@ -82,7 +82,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vlb_private_ip_1" : "10.0.${ecompnet}.4",
             "vdns_private_ip_0" : "192.168.30.110",
             "vdns_private_ip_1" : "10.0.${ecompnet}.5",
-            "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
+            "sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
             'vlb_name_0':'vovlblb${hostid}',
             'vdns_name_0':'vovlbdns${hostid}',
             "pktgen_private_net_cidr" : "192.168.9.0/24",
@@ -103,7 +103,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vlb_private_ip_1" : "10.0.${ecompnet}.4",
             "vdns_private_ip_0" : "192.168.30.222",
             "vdns_private_ip_1" : "10.0.${ecompnet}.6",
-            "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
+            "sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
             'scaling_vdns_name_0':'vovlbscaling${hostid}',
             "vlb_private_net_cidr" : "192.168.10.0/24"
         },
@@ -146,7 +146,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vpg_private_ip_1" : "10.0.${ecompnet}.12",
             "vsn_private_ip_0" : "192.168.120.250",
             "vsn_private_ip_1" : "10.0.${ecompnet}.13",
-            "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
+            "sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
             'vfw_name_0':'clfwl01fwl${hostid}',
             'vpg_name_0':'clfwl01pgn${hostid}',
             "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
@@ -166,7 +166,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vpg_private_ip_0" : "192.168.10.200",
             "vsn_private_ip_0" : "192.168.20.250",
             "vsn_private_ip_1" : "10.0.${ecompnet}.112",
-            "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
+            "sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
             'vfw_name_0':'clfwl01fwl${hostid}',
             'vsn_name_0':'clfwl01snk${hostid}',
             "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
@@ -181,7 +181,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vpg_private_ip_0" : "192.168.10.200",
             "vpg_private_ip_1" : "10.0.${ecompnet}.113",
             "vsn_private_ip_0" : "192.168.20.250",
-            "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
+            "sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
             'vpg_name_0':'clfwl01pgn${hostid}',
             "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
             "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
@@ -196,7 +196,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vlb_private_ip_1" : "10.0.${ecompnet}.14",
             "vdns_private_ip_0" : "192.168.30.110",
             "vdns_private_ip_1" : "10.0.${ecompnet}.15",
-            "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
+            "sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
             'vlb_name_0':'clvlblb${hostid}',
             'vdns_name_0':'clvlbdns${hostid}',
             "pktgen_private_net_cidr" : "192.168.9.0/24",
@@ -216,7 +216,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vlb_private_ip_1" : "10.0.${ecompnet}.14",
             "vdns_private_ip_0" : "192.168.130.222",
             "vdns_private_ip_1" : "10.0.${ecompnet}.16",
-            "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
+            "sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
             'scaling_vdns_name_0':'clvlbscaling${hostid}',
             "vlb_private_net_cidr" : "192.168.10.0/24"
         },
@@ -258,7 +258,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vpg_private_ip_1" : "10.0.${ecompnet}.12",
             "vsn_private_ip_0" : "192.168.120.250",
             "vsn_private_ip_1" : "10.0.${ecompnet}.13",
-            "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
+            "sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
             'vfw_name_0':'demofwl01fwl',
             'vpg_name_0':'demofwl01pgn',
             "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
@@ -278,7 +278,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vpg_private_ip_0" : "192.168.10.200",
             "vsn_private_ip_0" : "192.168.20.250",
             "vsn_private_ip_1" : "10.0.${ecompnet}.122",
-            "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
+            "sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
             'vfw_name_0':'demofwl01fwl${hostid}',
             'vsn_name_0':'demofwl01snk${hostid}',
             "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
@@ -294,7 +294,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vpg_private_ip_1" : "10.0.${ecompnet}.123",
             "vsn_private_ip_0" : "192.168.20.250",
             'vpg_name_0':'demofwl01pgn${hostid}',
-            "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
+            "sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
             "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
             "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}"
         },
@@ -308,7 +308,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vlb_private_ip_1" : "10.0.${ecompnet}.24",
             "vdns_private_ip_0" : "192.168.30.110",
             "vdns_private_ip_1" : "10.0.${ecompnet}.25",
-            "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
+            "sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
             'vlb_name_0':'demovlblb${hostid}',
             'vdns_name_0':'demovlbdns${hostid}',
             "pktgen_private_net_cidr" : "192.168.9.0/24",
@@ -328,7 +328,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vlb_private_ip_1" : "10.0.${ecompnet}.24",
             "vdns_private_ip_0" : "192.168.130.222",
             "vdns_private_ip_1" : "10.0.${ecompnet}.26",
-            "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
+            "sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
             'scaling_vdns_name_0':'demovlbscaling${hostid}',
             "vlb_private_net_cidr" : "192.168.10.0/24"
         },