diff options
| author |   Huang Haibin <haibin.huang@intel.com> | 2018-10-18 15:35:33 +0800 |
|---|---|---|
| committer |   Gary Wu <gary.i.wu@huawei.com> | 2018-10-18 15:22:45 +0000 |
| commit | 8332cbbf4e68f68a5927403be646c26ab9667fae (patch) | |
| tree | b23d31b8a917204c37075faef83df9d285fb8cfa /tosca/vCPE/infra | |
| parent | 1e1a8bfbc608f7f144c7fbdfc7e7bb1281dd149e (diff) | |
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 <haibin.huang@intel.com>
Diffstat (limited to 'tosca/vCPE/infra')
| -rw-r--r-- | tosca/vCPE/infra/MainServiceTemplate.yaml | 14 | ||||
| -rw-r--r-- | tosca/vCPE/infra/MainServiceTemplate_sriov.yaml | 14 |
2 files changed, 18 insertions, 10 deletions
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 } |