From 8332cbbf4e68f68a5927403be646c26ab9667fae Mon Sep 17 00:00:00 2001 From: Huang Haibin Date: Thu, 18 Oct 2018 15:35:33 +0800 Subject: Fix Tosca csar with error variable a. We don't define oam_private_net_cidr but define onap_private_net_cidr b. sdnc_ip change to sdnc_ip_addr c. define mr_ip_port for infra Change-Id: If8f1b3062d5f1c78881967c24b8d8dd32e197781 Issue-ID: INT-693 Signed-off-by: Huang Haibin --- tosca/vCPE/vgw/MainServiceTemplate.yaml | 2 +- tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tosca/vCPE/vgw') diff --git a/tosca/vCPE/vgw/MainServiceTemplate.yaml b/tosca/vCPE/vgw/MainServiceTemplate.yaml index 96d7f65c..f36574d4 100644 --- a/tosca/vCPE/vgw/MainServiceTemplate.yaml +++ b/tosca/vCPE/vgw/MainServiceTemplate.yaml @@ -315,7 +315,7 @@ topology_template: vf_module_id: { get_input: vf_module_id } mux_gw_private_net_ipaddr: { get_input: vgw_private_ip_0 } oam_ipaddr: { get_input: vgw_private_ip_1 } - oam_cidr: { get_input: oam_private_net_cidr } + oam_cidr: { get_input: onap_private_net_cidr } cpe_public_net_cidr: { get_input: cpe_public_net_cidr } mux_gw_private_net_cidr: { get_input: mux_gw_private_net_cidr } mux_ip_addr: { get_input: mux_ip_addr } diff --git a/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml index f8a6adda..94ca7316 100644 --- a/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml +++ b/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml @@ -318,7 +318,7 @@ topology_template: vf_module_id: { get_input: vf_module_id } mux_gw_private_net_ipaddr: { get_input: vgw_private_ip_0 } oam_ipaddr: { get_input: vgw_private_ip_1 } - oam_cidr: { get_input: oam_private_net_cidr } + oam_cidr: { get_input: onap_private_net_cidr } cpe_public_net_cidr: { get_input: cpe_public_net_cidr } mux_gw_private_net_cidr: { get_input: mux_gw_private_net_cidr } mux_ip_addr: { get_input: mux_ip_addr } -- cgit 1.2.3-korg