Merge "Add sec_group parameter to robot helm charts"

2 files changed, 18 insertions, 1 deletions

diff --git a/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py b/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py
index a857e8300b..dd15e31fcb 100644
--- a/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py
+++ b/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py
@@ -23,6 +23,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
          "onap_private_net_id" : "${GLOBAL_INJECTED_NETWORK}",
          "onap_private_subnet_id" : "{{ .Values.openStackPrivateSubnetId }}",
          "onap_private_net_cidr" : "{{ .Values.openStackPrivateNetCidr }}",
+         "sec_group" : "{{ .Values.openStackSecurityGroup }}",
          "dcae_collector_ip" : "{{ .Values.dcaeCollectorIp }}",
          "dcae_collector_port" : "30235",
          "public_net_id" : "${GLOBAL_INJECTED_PUBLIC_NET_ID}",
@@ -46,6 +47,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vpg_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.2",
             "vsn_private_ip_0" : "192.168.20.250",
             "vsn_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.3",
+            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
             'vfw_name_0':'vofwl01fwl${hostid}',
             'vpg_name_0':'vofwl01pgn${hostid}',
             "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
@@ -65,6 +67,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vpg_private_ip_0" : "192.168.10.200",
             "vsn_private_ip_0" : "192.168.20.250",
             "vsn_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.102",
+            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
             'vfw_name_0':'vofwl01fwl${hostid}',
             'vsn_name_0':'vofwl01snk${hostid}',
             "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
@@ -79,6 +82,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vpg_private_ip_0" : "192.168.10.200",
             "vpg_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.103",
             "vsn_private_ip_0" : "192.168.20.250",
+            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
             'vpg_name_0':'vofwl01pgn${hostid}',
             "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
             "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
@@ -93,6 +97,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vlb_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.4",
             "vdns_private_ip_0" : "192.168.30.110",
             "vdns_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.5",
+            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
             'vlb_name_0':'vovlblb${hostid}',
             'vdns_name_0':'vovlbdns${hostid}',
             "pktgen_private_net_cidr" : "192.168.9.0/24",
@@ -113,6 +118,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vlb_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.4",
             "vdns_private_ip_0" : "192.168.30.222",
             "vdns_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.6",
+            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
             'scaling_vdns_name_0':'vovlbscaling${hostid}',
             "vlb_private_net_cidr" : "192.168.10.0/24"
         },
@@ -155,6 +161,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vpg_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.12",
             "vsn_private_ip_0" : "192.168.120.250",
             "vsn_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.13",
+            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
             'vfw_name_0':'clfwl01fwl${hostid}',
             'vpg_name_0':'clfwl01pgn${hostid}',
             "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
@@ -174,6 +181,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vpg_private_ip_0" : "192.168.10.200",
             "vsn_private_ip_0" : "192.168.20.250",
             "vsn_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.112",
+            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
             'vfw_name_0':'clfwl01fwl${hostid}',
             'vsn_name_0':'clfwl01snk${hostid}',
             "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
@@ -188,6 +196,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vpg_private_ip_0" : "192.168.10.200",
             "vpg_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.113",
             "vsn_private_ip_0" : "192.168.20.250",
+            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
             'vpg_name_0':'clfwl01pgn${hostid}',
             "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
             "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
@@ -202,6 +211,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vlb_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.14",
             "vdns_private_ip_0" : "192.168.30.110",
             "vdns_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.15",
+            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
             'vlb_name_0':'clvlblb${hostid}',
             'vdns_name_0':'clvlbdns${hostid}',
             "pktgen_private_net_cidr" : "192.168.9.0/24",
@@ -221,6 +231,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vlb_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.14",
             "vdns_private_ip_0" : "192.168.130.222",
             "vdns_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.16",
+            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
             'scaling_vdns_name_0':'clvlbscaling${hostid}',
             "vlb_private_net_cidr" : "192.168.10.0/24"
         },
@@ -262,6 +273,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vpg_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.12",
             "vsn_private_ip_0" : "192.168.120.250",
             "vsn_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.13",
+            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
             'vfw_name_0':'demofwl01fwl',
             'vpg_name_0':'demofwl01pgn',
             "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
@@ -281,6 +293,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vpg_private_ip_0" : "192.168.10.200",
             "vsn_private_ip_0" : "192.168.20.250",
             "vsn_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.122",
+            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
             'vfw_name_0':'${generic_vnf_name}',
             'vsn_name_0':'demofwl01snk${hostid}',
             "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
@@ -295,6 +308,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vpg_private_ip_0" : "192.168.10.200",
             "vpg_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.123",
             "vsn_private_ip_0" : "192.168.20.250",
+            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
             'vpg_name_0':'demofwl01pgn${hostid}',
             "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
             "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}"
@@ -309,6 +323,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vlb_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.24",
             "vdns_private_ip_0" : "192.168.30.110",
             "vdns_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.25",
+            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
             'vlb_name_0':'demovlblb${hostid}',
             'vdns_name_0':'demovlbdns${hostid}',
             "pktgen_private_net_cidr" : "192.168.9.0/24",
@@ -328,6 +343,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vlb_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.24",
             "vdns_private_ip_0" : "192.168.130.222",
             "vdns_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.26",
+            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
             'scaling_vdns_name_0':'demovlbscaling${hostid}',
             "vlb_private_net_cidr" : "192.168.10.0/24"
         },
diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml
index 6a11f2bf0c..086957e7dd 100755
--- a/kubernetes/robot/values.yaml
+++ b/kubernetes/robot/values.yaml
@@ -69,7 +69,8 @@ ubuntu16Image: "Ubuntu_16_xenial"
 scriptVersion: "1.2.0-SNAPSHOT"
 # Openstack network to which VNFs will bind their primary (first) interface.  Maps to GLOBAL_INJECTED_NETWORK
 openStackPrivateNetId: "e8f51956-00dd-4425-af36-045716781ffc"
-
+# Openstack security group for instantiating VNFs
+openStackSecurityGroup: "onap_sg"
 # SDNC Preload configuration
 # Openstack subnet UUID for the network defined by openStackPrivateNetId.  Maps to onap_private_subnet_id
 openStackPrivateSubnetId: "e8f51956-00dd-4425-af36-045716781ffc"