From: Huang Haibin Date: Thu, 18 Oct 2018 07:35:33 +0000 (+0800) Subject: Fix Tosca csar with error variable X-Git-Tag: 1.3.0~11 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=demo.git;a=commitdiff_plain;h=8332cbbf4e68f68a5927403be646c26ab9667fae 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 --- diff --git a/tosca/vCPE/infra/MainServiceTemplate.yaml b/tosca/vCPE/infra/MainServiceTemplate.yaml index 22c3ad9e..bfb4c7e4 100644 --- a/tosca/vCPE/infra/MainServiceTemplate.yaml +++ b/tosca/vCPE/infra/MainServiceTemplate.yaml @@ -77,8 +77,12 @@ topology_template: default: 10.0.0.0/16 mr_ip_addr: type: string - description: message router ip that for vDHCP configuration + description: message router ip for vDHCP configuration default: 10.0.11.1 + mr_ip_port: + type: string + label: Message Router Port + description: message router port for vDHCP configuration dcae_collector_ip: type: string description: dcae collector ip @@ -327,7 +331,7 @@ topology_template: dcae_collector_port: { get_input: dcae_collector_port } cpe_signal_net_ipaddr: { get_input: vaaa_private_ip_0 } oam_ipaddr: { get_input: vaaa_private_ip_1 } - oam_cidr: { get_input: oam_private_net_cidr } + oam_cidr: { get_input: onap_private_net_cidr } cpe_signal_net_cidr: { get_input: cpe_signal_net_cidr } demo_artifacts_version: { get_input: demo_artifacts_version } install_script_version: { get_input: install_script_version } @@ -453,7 +457,7 @@ topology_template: vf_module_id: { get_input: vf_module_id } oam_ipaddr: { get_input: vdns_private_ip_1 } cpe_public_net_ipaddr: { get_input: vdns_private_ip_0 } - 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 } demo_artifacts_version: { get_input: demo_artifacts_version } install_script_version: { get_input: install_script_version } @@ -577,7 +581,7 @@ topology_template: vf_module_id: { get_input: vf_module_id } oam_ipaddr: { get_input: vdhcp_private_ip_1 } cpe_signal_ipaddr: { get_input: vdhcp_private_ip_0 } - oam_cidr: { get_input: oam_private_net_cidr } + oam_cidr: { get_input: onap_private_net_cidr } cpe_signal_net_cidr: { get_input: cpe_signal_net_cidr } mr_ip_addr: { get_input: mr_ip_addr } mr_ip_port: { get_input: mr_ip_port } @@ -705,7 +709,7 @@ topology_template: vf_module_id: { get_input: vf_module_id } oam_ipaddr: { get_input: vweb_private_ip_1 } cpe_public_ipaddr: { get_input: vweb_private_ip_0 } - 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 } demo_artifacts_version: { get_input: demo_artifacts_version } install_script_version: { get_input: install_script_version } diff --git a/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml b/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml index 22c3ad9e..52b44f69 100644 --- a/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml +++ b/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml @@ -77,8 +77,12 @@ topology_template: default: 10.0.0.0/16 mr_ip_addr: type: string - description: message router ip that for vDHCP configuration + description: message router ip that for vDHCP configuration default: 10.0.11.1 + mr_ip_port: + type: string + label: Message Router Port + description: IP port of the Message Router that for vDHCP configuration dcae_collector_ip: type: string description: dcae collector ip @@ -327,7 +331,7 @@ topology_template: dcae_collector_port: { get_input: dcae_collector_port } cpe_signal_net_ipaddr: { get_input: vaaa_private_ip_0 } oam_ipaddr: { get_input: vaaa_private_ip_1 } - oam_cidr: { get_input: oam_private_net_cidr } + oam_cidr: { get_input: onap_private_net_cidr } cpe_signal_net_cidr: { get_input: cpe_signal_net_cidr } demo_artifacts_version: { get_input: demo_artifacts_version } install_script_version: { get_input: install_script_version } @@ -453,7 +457,7 @@ topology_template: vf_module_id: { get_input: vf_module_id } oam_ipaddr: { get_input: vdns_private_ip_1 } cpe_public_net_ipaddr: { get_input: vdns_private_ip_0 } - 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 } demo_artifacts_version: { get_input: demo_artifacts_version } install_script_version: { get_input: install_script_version } @@ -577,7 +581,7 @@ topology_template: vf_module_id: { get_input: vf_module_id } oam_ipaddr: { get_input: vdhcp_private_ip_1 } cpe_signal_ipaddr: { get_input: vdhcp_private_ip_0 } - oam_cidr: { get_input: oam_private_net_cidr } + oam_cidr: { get_input: onap_private_net_cidr } cpe_signal_net_cidr: { get_input: cpe_signal_net_cidr } mr_ip_addr: { get_input: mr_ip_addr } mr_ip_port: { get_input: mr_ip_port } @@ -705,7 +709,7 @@ topology_template: vf_module_id: { get_input: vf_module_id } oam_ipaddr: { get_input: vweb_private_ip_1 } cpe_public_ipaddr: { get_input: vweb_private_ip_0 } - 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 } demo_artifacts_version: { get_input: demo_artifacts_version } install_script_version: { get_input: install_script_version } diff --git a/tosca/vCPE/vbng/MainServiceTemplate.yaml b/tosca/vCPE/vbng/MainServiceTemplate.yaml index 6764e054..a4e54bda 100644 --- a/tosca/vCPE/vbng/MainServiceTemplate.yaml +++ b/tosca/vCPE/vbng/MainServiceTemplate.yaml @@ -367,7 +367,7 @@ topology_template: cpe_signal_net_ipaddr: { get_input: vbng_private_ip_2 } bng_gmux_net_ipaddr: { get_input: vbng_private_ip_3 } oam_ipaddr: { get_input: vbng_private_ip_1 } - oam_cidr: { get_input: oam_private_net_cidr } + oam_cidr: { get_input: onap_private_net_cidr } bng_gmux_cidr: { get_input: bng_gmux_private_net_cidr } cpe_signal_cidr: { get_input: cpe_signal_private_net_cidr } brgemu_bng_cidr: { get_input: brgemu_bng_private_net_cidr } @@ -375,7 +375,7 @@ topology_template: dcae_collector_port: { get_input: dcae_collector_port } demo_artifacts_version: { get_input: demo_artifacts_version } install_script_version: { get_input: install_script_version } - sdnc_ip: { get_input: sdnc_ip } + sdnc_ip: { get_input: sdnc_ip_addr } cloud_env: { get_input: cloud_env } nexus_artifact_repo: { get_input: nexus_artifact_repo } user_data: | diff --git a/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml index 3e5f726b..2684899d 100644 --- a/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml +++ b/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml @@ -375,7 +375,7 @@ topology_template: cpe_signal_net_ipaddr: { get_input: vbng_private_ip_2 } bng_gmux_net_ipaddr: { get_input: vbng_private_ip_3 } oam_ipaddr: { get_input: vbng_private_ip_1 } - oam_cidr: { get_input: oam_private_net_cidr } + oam_cidr: { get_input: onap_private_net_cidr } bng_gmux_cidr: { get_input: bng_gmux_private_net_cidr } cpe_signal_cidr: { get_input: cpe_signal_private_net_cidr } brgemu_bng_cidr: { get_input: brgemu_bng_private_net_cidr } @@ -383,7 +383,7 @@ topology_template: dcae_collector_port: { get_input: dcae_collector_port } demo_artifacts_version: { get_input: demo_artifacts_version } install_script_version: { get_input: install_script_version } - sdnc_ip: { get_input: sdnc_ip } + sdnc_ip: { get_input: sdnc_ip_addr } cloud_env: { get_input: cloud_env } nexus_artifact_repo: { get_input: nexus_artifact_repo } user_data: | diff --git a/tosca/vCPE/vbrgemu/MainServiceTemplate.yaml b/tosca/vCPE/vbrgemu/MainServiceTemplate.yaml index cb0686e4..ffeceaac 100644 --- a/tosca/vCPE/vbrgemu/MainServiceTemplate.yaml +++ b/tosca/vCPE/vbrgemu/MainServiceTemplate.yaml @@ -112,7 +112,7 @@ topology_template: type: string description: cloud environment(openstack or rackspace) default: openstack - sdnc_ip: + sdnc_ip_addr: type: string description: SDNC ip address used to set NAT default: 10.0.7.1 @@ -238,7 +238,7 @@ topology_template: vbrgemu_bng_private_net_cidr: { get_input: vbrgemu_bng_private_net_cidr } demo_artifacts_version: { get_input: demo_artifacts_version } install_script_version: { get_input: install_script_version } - sdnc_ip: { get_input: sdnc_ip } + sdnc_ip: { get_input: sdnc_ip_addr } cloud_env: { get_input: cloud_env } nexus_artifact_repo: { get_input: nexus_artifact_repo } user_data: | diff --git a/tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml index b936821b..3af42434 100644 --- a/tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml +++ b/tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml @@ -110,7 +110,7 @@ topology_template: type: string description: cloud environment(openstack or rackspace) default: openstack - sdnc_ip: + sdnc_ip_addr: type: string description: SDNC ip address used to set NAT default: 10.0.7.1 @@ -241,7 +241,7 @@ topology_template: vbrgemu_bng_private_net_cidr: { get_input: vbrgemu_bng_private_net_cidr } demo_artifacts_version: { get_input: demo_artifacts_version } install_script_version: { get_input: install_script_version } - sdnc_ip: { get_input: sdnc_ip } + sdnc_ip: { get_input: sdnc_ip_addr } cloud_env: { get_input: cloud_env } nexus_artifact_repo: { get_input: nexus_artifact_repo } user_data: | diff --git a/tosca/vCPE/vgmux/MainServiceTemplate.yaml b/tosca/vCPE/vgmux/MainServiceTemplate.yaml index ee1c350e..0d1b8aa5 100644 --- a/tosca/vCPE/vgmux/MainServiceTemplate.yaml +++ b/tosca/vCPE/vgmux/MainServiceTemplate.yaml @@ -320,7 +320,7 @@ topology_template: mux_gw_net_ipaddr: { get_input: vgmux_private_ip_2 } bng_to_mux_net_ipaddr: { get_input: bng_gmux_private_ip } bng_mux_net_cidr: { get_input: bng_gmux_private_net_cidr } - oam_cidr: { get_input: oam_private_net_cidr } + oam_cidr: { get_input: onap_private_net_cidr } mux_gw_net_cidr: { get_input: mux_gw_private_net_cidr } brg_bng_net_cidr: { get_input: brgemu_bng_private_net_cidr } install_script_version: { get_input: install_script_version } diff --git a/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml index e96dc2b2..ff109750 100644 --- a/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml +++ b/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml @@ -328,7 +328,7 @@ topology_template: mux_gw_net_ipaddr: { get_input: vgmux_private_ip_2 } bng_to_mux_net_ipaddr: { get_input: bng_gmux_private_ip } bng_mux_net_cidr: { get_input: bng_gmux_private_net_cidr } - oam_cidr: { get_input: oam_private_net_cidr } + oam_cidr: { get_input: onap_private_net_cidr } mux_gw_net_cidr: { get_input: mux_gw_private_net_cidr } brg_bng_net_cidr: { get_input: brgemu_bng_private_net_cidr } install_script_version: { get_input: install_script_version } 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 }