From bcc543803635da179ae15975d71a7e98326129b8 Mon Sep 17 00:00:00 2001 From: "stark, steven" Date: Wed, 6 Feb 2019 16:42:10 -0800 Subject: [VVP] updating preload info for DEMO vnfs Change-Id: I6aa61145c75d7cfd513a623c5d772ddd2360f610 Issue-ID: VVP-145 Signed-off-by: stark, steven --- .../config/integration_preload_parameters.py | 307 ++++++++++++--------- 1 file changed, 176 insertions(+), 131 deletions(-) (limited to 'kubernetes') 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 4bcd3d93d5..4a738c4a44 100644 --- a/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py +++ b/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py @@ -40,38 +40,46 @@ GLOBAL_PRELOAD_PARAMETERS = { "unprotected_private_net_cidr" : "192.168.10.0/24", "protected_private_net_id" : "vofwl01_protected${hostid}", "protected_private_net_cidr" : "192.168.20.0/24", - "vfw_private_ip_0" : "192.168.10.100", - "vfw_private_ip_1" : "192.168.20.100", - "vfw_private_ip_2" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.1", - "vpg_private_ip_0" : "192.168.10.200", - "vpg_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.2", - "vsn_private_ip_0" : "192.168.20.250", - "vsn_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.3", + "vfw_int_unprotected_private_ip_0" : "192.168.10.100", + "vfw_int_protected_private_ip_0" : "192.168.20.100", + "vfw_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.1", + "vfw_int_protected_private_floating_ip" : "192.168.10.200", + "vpg_int_unprotected_private_ip_0" : "192.168.10.200", + "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.2", + "vsn_int_protected_private_ip_0" : "192.168.20.250", + "vsn_onap_private_ip_0" : "{{.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}", "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", + "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", + "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", 'vsn_name_0':'vofwl01snk${hostid}' }, "vfwsnk_preload.template": { - "unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}", - "unprotected_private_subnet_id" : "vofwlsnk_unprotected_sub${hostid}", + "int_unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}", + "int_unprotected_private_subnet_id" : "vofwlsnk_unprotected_sub${hostid}", "unprotected_private_net_cidr" : "192.168.10.0/24", - "protected_private_net_id" : "vofwlsnk_protected${hostid}", - "protected_private_subnet_id" : "vofwlsnk_protected_sub${hostid}", + "int_protected_private_net_id" : "vofwlsnk_protected${hostid}", + "int_protected_private_subnet_id" : "vofwlsnk_protected_sub${hostid}", "protected_private_net_cidr" : "192.168.20.0/24", - "vfw_private_ip_0" : "192.168.10.100", - "vfw_private_ip_1" : "192.168.20.100", - "vfw_private_ip_2" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.101", - "vpg_private_ip_0" : "192.168.10.200", - "vsn_private_ip_0" : "192.168.20.250", - "vsn_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.102", + "vfw_int_unprotected_private_ip_0" : "192.168.10.100", + # this should be the same value as vpg_private_ip_0 + "vfw_int_protected_private_floating_ip" : "192.168.10.200", + "vfw_int_protected_private_ip_0" : "192.168.20.100", + "vfw_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.101", + "vsn_int_protected_private_ip_0" : "192.168.20.250", + "vsn_onap_private_ip_0" : "{{.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}", - "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", + "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", + "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", }, "vpkg_preload.template": { "unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}", @@ -79,48 +87,55 @@ GLOBAL_PRELOAD_PARAMETERS = { "unprotected_private_net_cidr" : "192.168.10.0/24", "protected_private_net_cidr" : "192.168.20.0/24", "vfw_private_ip_0" : "192.168.10.100", - "vpg_private_ip_0" : "192.168.10.200", - "vpg_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.103", + "vpg_unprotected_private_ip_0" : "192.168.10.200", + "vpg_onap_private_ip_0" : "{{.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}", + "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", }, + # vLBMS "vlb_preload.template" : { "vlb_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}", "vlb_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "vlb_private_net_id" : "volb01_private${hostid}", - "pktgen_private_net_id" : "volb01_pktgen${hostid}", - "vlb_private_net_cidr" : "192.168.30.0/24", - "vlb_private_ip_0" : "192.168.30.100", - "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 }}", + "vdns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}", + "vdns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", + "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}", + "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", 'vlb_name_0':'vovlblb${hostid}', 'vdns_name_0':'vovlbdns${hostid}', + "vpg_name_0" : "vovlbpgn${hostid}", + "vlb_private_net_id" : "volb01_private${hostid}", + "vlb_private_net_cidr" : "192.168.30.0/24", + "pktgen_private_net_id" : "volb01_pktgen${hostid}", "pktgen_private_net_cidr" : "192.168.9.0/24", - "vpg_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.7", + "vlb_int_private_ip_0" : "192.168.30.100", + "vlb_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.4", + "vlb_int_pktgen_private_ip_0" : "192.168.9.111", + "vdns_int_private_ip_0" : "192.168.30.110", + "vdns_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.5", + "vpg_int_pktgen_private_ip_0" : "192.168.9.110", + "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.7", + "sec_group" : "{{ .Values.openStackSecurityGroup }}", "pg_int" : "192.168.9.109", - "vpg_private_ip_0" : "192.168.9.110", - "vlb_private_ip_2" : "192.168.9.111", "vip" : "192.168.9.112", "gre_ipaddr" : "192.168.30.112", - "vpg_name_0" : "vovlbpgn${hostid}", "vnf_id" : "vLoadBalancer_${hostid}", "vf_module_id" : "vLoadBalancer" }, "dnsscaling_preload.template" : { - "vlb_private_net_id" : "volb01_private${hostid}", - "vlb_private_ip_0" : "192.168.30.100", - "vlb_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.4", - "vdns_private_ip_0" : "192.168.30.222", - "vdns_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.6", + "int_private_net_id" : "vLBMS_volb01_private${hostid}", + "int_private_subnet_id" : "vLBMS_volb01_private${hostid}_subnet", + "vlb_int_private_ip_0" : "192.168.30.100", + "vlb_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.4", + "vlb_int_pktgen_private_ip_0" : "192.168.9.111", + "vdns_int_private_ip_0" : "192.168.30.222", + "vdns_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.6", "sec_group" : "{{ .Values.openStackSecurityGroup }}", - 'scaling_vdns_name_0':'vovlbscaling${hostid}', - "vlb_private_net_cidr" : "192.168.10.0/24" + 'vdns_name_0':'vovlbscaling${hostid}', + "vlb_private_net_cidr" : "192.168.30.0/24" }, "vims_preload.template" : { "bono_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", @@ -149,90 +164,105 @@ GLOBAL_PRELOAD_PARAMETERS = { }, # heat template parameter values for heat template instances created during Closed-Loop test cases "Closed-Loop" : { - "vfw_preload.template": { + "vfw_preload.template": { "unprotected_private_net_id" : "clfwl01_unprotected${hostid}", "unprotected_private_net_cidr" : "192.168.110.0/24", "protected_private_net_id" : "clfwl01_protected${hostid}", "protected_private_net_cidr" : "192.168.120.0/24", - "vfw_private_ip_0" : "192.168.110.100", - "vfw_private_ip_1" : "192.168.120.100", - "vfw_private_ip_2" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.11", - "vpg_private_ip_0" : "192.168.110.200", - "vpg_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.12", - "vsn_private_ip_0" : "192.168.120.250", - "vsn_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.13", + "vfw_int_unprotected_private_ip_0" : "192.168.110.100", + "vfw_int_protected_private_ip_0" : "192.168.120.100", + "vfw_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.11", + "vfw_int_protected_private_floating_ip" : "192.168.110.200", + "vpg_int_unprotected_private_ip_0" : "192.168.110.200", + "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.12", + "vsn_int_protected_private_ip_0" : "192.168.120.250", + "vsn_onap_private_ip_0" : "{{.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}", "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", + "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", + "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", 'vsn_name_0':'clfwl01snk${hostid}' }, "vfwsnk_preload.template": { - "unprotected_private_net_id" : "clfwlsnk_unprotected${hostid}", - "unprotected_private_subnet_id" : "clfwlsnk_unprotected_sub${hostid}", + "int_unprotected_private_net_id" : "clfwlsnk_unprotected${hostid}", + "int_unprotected_private_subnet_id" : "clfwlsnk_unprotected_sub${hostid}", "unprotected_private_net_cidr" : "192.168.10.0/24", - "protected_private_net_id" : "clfwlsnk_protected${hostid}", - "protected_private_subnet_id" : "clfwlsnk_protected_sub${hostid}", + "int_protected_private_net_id" : "clfwlsnk_protected${hostid}", + "int_protected_private_subnet_id" : "clfwlsnk_protected_sub${hostid}", "protected_private_net_cidr" : "192.168.20.0/24", - "vfw_private_ip_0" : "192.168.10.100", - "vfw_private_ip_1" : "192.168.20.100", - "vfw_private_ip_2" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.111", - "vpg_private_ip_0" : "192.168.10.200", - "vsn_private_ip_0" : "192.168.20.250", - "vsn_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.112", + "vfw_int_unprotected_private_ip_0" : "192.168.10.100", + # this should be the same value as vpg_private_ip_0 + "vfw_int_protected_private_floating_ip" : "192.168.10.200", + "vfw_int_protected_private_ip_0" : "192.168.20.100", + "vfw_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.111", + "vsn_int_protected_private_ip_0" : "192.168.20.250", + "vsn_onap_private_ip_0" : "{{.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}", - "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", + "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", + "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", }, "vpkg_preload.template": { - "unprotected_private_net_id" : "clfwlsnk_unprotected${hostid}", - "unprotected_private_subnet_id" : "clfwlsnk_unprotected_sub${hostid}", + "unprotected_private_net_id" : "vFWSNK_clfwlsnk_unprotected${hostid}", + "unprotected_private_subnet_id" : "vFWSNK_clfwlsnk_unprotected_sub${hostid}", "unprotected_private_net_cidr" : "192.168.10.0/24", "protected_private_net_cidr" : "192.168.20.0/24", "vfw_private_ip_0" : "192.168.10.100", - "vpg_private_ip_0" : "192.168.10.200", - "vpg_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.113", + "vpg_unprotected_private_ip_0" : "192.168.10.200", + "vpg_onap_private_ip_0" : "{{.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}", + "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", }, + # vLBMS "vlb_preload.template" : { "vlb_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}", "vlb_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "vlb_private_net_id" : "cllb01_private${hostid}", - "pktgen_private_net_id" : "cllb01_pktgen${hostid}", - "vlb_private_net_cidr" : "192.168.30.0/24", - "vlb_private_ip_0" : "192.168.30.100", - "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 }}", + "vdns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}", + "vdns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", + "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}", + "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", 'vlb_name_0':'clvlblb${hostid}', 'vdns_name_0':'clvlbdns${hostid}', + "vpg_name_0" : "clvlbpgn${hostid}", + "vlb_private_net_id" : "cllb01_private${hostid}", + "vlb_private_net_cidr" : "192.168.30.0/24", + "pktgen_private_net_id" : "cllb01_pktgen${hostid}", "pktgen_private_net_cidr" : "192.168.9.0/24", - "vpg_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.17", + "vlb_int_private_ip_0" : "192.168.30.100", + "vlb_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.14", + "vlb_int_pktgen_private_ip_0" : "192.168.9.111", + "vdns_int_private_ip_0" : "192.168.30.110", + "vdns_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.15", + "vpg_int_pktgen_private_ip_0" : "192.168.9.110", + "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.17", + "sec_group" : "{{ .Values.openStackSecurityGroup }}", "pg_int" : "192.168.9.109", - "vpg_private_ip_0" : "192.168.9.110", - "vlb_private_ip_2" : "192.168.9.111", "vip" : "192.168.9.112", "gre_ipaddr" : "192.168.30.112", - "vpg_name_0" : "clvlbpgn${hostid}", "vnf_id" : "vLoadBalancer_${hostid}", "vf_module_id" : "vLoadBalancer" }, "dnsscaling_preload.template" : { - "vlb_private_net_id" : "cllb01_private${hostid}", - "vlb_private_ip_0" : "192.168.130.100", - "vlb_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.14", - "vdns_private_ip_0" : "192.168.130.222", - "vdns_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.16", + "int_private_net_id" : "vLBMS_cllb01_private${hostid}", + "int_private_subnet_id" : "vLBMS_cllb01_private${hostid}_subnet", + "vlb_int_private_ip_0" : "192.168.30.100", + "vlb_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.14", + "vlb_int_pktgen_private_ip_0" : "192.168.9.111", + "vdns_int_private_ip_0" : "192.168.30.222", + "vdns_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.16", "sec_group" : "{{ .Values.openStackSecurityGroup }}", - 'scaling_vdns_name_0':'clvlbscaling${hostid}', + 'vdns_name_0':'clvlbscaling${hostid}', "vlb_private_net_cidr" : "192.168.10.0/24" }, "vims_preload.template" : { @@ -266,86 +296,101 @@ GLOBAL_PRELOAD_PARAMETERS = { "unprotected_private_net_cidr" : "192.168.110.0/24", "protected_private_net_id" : "demofwl_protected", "protected_private_net_cidr" : "192.168.120.0/24", - "vfw_private_ip_0" : "192.168.110.100", - "vfw_private_ip_1" : "192.168.120.100", - "vfw_private_ip_2" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.11", - "vpg_private_ip_0" : "192.168.110.200", - "vpg_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.12", - "vsn_private_ip_0" : "192.168.120.250", - "vsn_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.13", + "vfw_int_unprotected_private_ip_0" : "192.168.110.100", + "vfw_int_protected_private_ip_0" : "192.168.120.100", + "vfw_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.11", + "vpg_int_unprotected_private_ip_0" : "192.168.110.200", + "vfw_int_protected_private_floating_ip" : "192.168.110.200", + "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.12", + "vsn_int_protected_private_ip_0" : "192.168.120.250", + "vsn_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.13", "sec_group" : "{{ .Values.openStackSecurityGroup }}", 'vfw_name_0':'demofwl01fwl', 'vpg_name_0':'demofwl01pgn', "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", + "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", + "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", 'vsn_name_0':'demofwl01snk' }, "vfwsnk_preload.template": { - "unprotected_private_net_id" : "demofwlsnk_unprotected${hostid}", - "unprotected_private_subnet_id" : "demofwlsnk_unprotected_sub${hostid}", + "int_unprotected_private_net_id" : "demofwlsnk_unprotected${hostid}", + "int_unprotected_private_subnet_id" : "demofwlsnk_unprotected_sub${hostid}", "unprotected_private_net_cidr" : "192.168.10.0/24", - "protected_private_net_id" : "demofwlsnk_protected${hostid}", - "protected_private_subnet_id" : "vofwlsnk_protected_sub${hostid}", + "int_protected_private_net_id" : "demofwlsnk_protected${hostid}", + "int_protected_private_subnet_id" : "vofwlsnk_protected_sub${hostid}", "protected_private_net_cidr" : "192.168.20.0/24", - "vfw_private_ip_0" : "192.168.10.100", - "vfw_private_ip_1" : "192.168.20.100", - "vfw_private_ip_2" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.121", - "vpg_private_ip_0" : "192.168.10.200", - "vsn_private_ip_0" : "192.168.20.250", - "vsn_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.122", + "vfw_int_unprotected_private_ip_0" : "192.168.10.100", + # this should be the same value as vpg_private_ip_0 + "vfw_int_protected_private_floating_ip" : "192.168.10.200", + "vfw_int_protected_private_ip_0" : "192.168.20.100", + "vfw_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.121", + "vsn_int_protected_private_ip_0" : "192.168.20.250", + "vsn_onap_private_ip_0" : "{{.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}", - "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", + "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", + "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", }, "vpkg_preload.template": { - "unprotected_private_net_id" : "demofwlsnk_unprotected${hostid}", - "unprotected_private_subnet_id" : "demofwlsnk_unprotected_sub${hostid}", + "unprotected_private_net_id" : "vFWSNK_demofwlsnk_unprotected${hostid}", + "unprotected_private_subnet_id" : "vFWSNK_demofwlsnk_unprotected_sub${hostid}", "unprotected_private_net_cidr" : "192.168.10.0/24", "protected_private_net_cidr" : "192.168.20.0/24", "vfw_private_ip_0" : "192.168.10.100", - "vpg_private_ip_0" : "192.168.10.200", - "vpg_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.123", + "vpg_unprotected_private_ip_0" : "192.168.10.200", + "vpg_onap_private_ip_0" : "{{.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}" + "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}" }, + # vLBMS "vlb_preload.template" : { "vlb_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}", "vlb_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "vlb_private_net_id" : "demolb_private${hostid}", - "pktgen_private_net_id" : "demolb_pktgen${hostid}", - "vlb_private_net_cidr" : "192.168.30.0/24", - "vlb_private_ip_0" : "192.168.30.100", - "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 }}", + "vdns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}", + "vdns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", + "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}", + "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", 'vlb_name_0':'demovlblb${hostid}', 'vdns_name_0':'demovlbdns${hostid}', + "vpg_name_0" : "clvlbpgn${hostid}", + "vlb_private_net_id" : "demolb_private${hostid}", + "vlb_private_net_cidr" : "192.168.30.0/24", + "pktgen_private_net_id" : "demolb_pktgen${hostid}", "pktgen_private_net_cidr" : "192.168.9.0/24", - "vpg_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.27", + "vlb_int_private_ip_0" : "192.168.30.100", + "vlb_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.24", + "vlb_int_pktgen_private_ip_0" : "192.168.9.111", + "vdns_int_private_ip_0" : "192.168.30.110", + "vdns_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.25", + "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.27", + "vpg_int_pktgen_private_ip_0" : "192.168.9.110", "pg_int" : "192.168.9.109", - "vpg_private_ip_0" : "192.168.9.110", - "vlb_private_ip_2" : "192.168.9.111", "vip" : "192.168.9.112", "gre_ipaddr" : "192.168.30.112", - "vpg_name_0" : "clvlbpgn${hostid}", "vnf_id" : "vLoadBalancer_${hostid}", - "vf_module_id" : "vLoadBalancer" + "vf_module_id" : "vLoadBalancer", + "sec_group" : "{{ .Values.openStackSecurityGroup }}" }, "dnsscaling_preload.template" : { - "vlb_private_net_id" : "demolb_private${hostid}", - "vlb_private_ip_0" : "192.168.130.100", - "vlb_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.24", - "vdns_private_ip_0" : "192.168.130.222", - "vdns_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.26", + "int_private_net_id" : "vLBMS_demolb_private${hostid}", + "int_private_subnet_id" : "vLBMS_demolb_private${hostid}_subnet", + "vlb_int_private_ip_0" : "192.168.30.100", + "vlb_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.24", + "vlb_int_pktgen_private_ip_0" : "192.168.9.111", + "vdns_int_private_ip_0" : "192.168.30.222", + "vdns_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.26", "sec_group" : "{{ .Values.openStackSecurityGroup }}", - 'scaling_vdns_name_0':'demovlbscaling${hostid}', - "vlb_private_net_cidr" : "192.168.10.0/24" + 'vdns_name_0':'demovlbscaling${hostid}', + "vlb_private_net_cidr" : "192.168.30.0/24" }, "vims_preload.template" : { "bono_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", -- cgit 1.2.3-korg