aboutsummaryrefslogtreecommitdiffstats
path: root/tosca/vCPE/vgw
diff options
context:
space:
mode:
authorLianhao Lu <lianhao.lu@intel.com>2019-04-22 15:51:45 +0800
committerLianhao Lu <lianhao.lu@intel.com>2019-04-22 15:51:45 +0800
commit7d6e84da8bec7fc0d3d141992b97b0bb2d16ebdb (patch)
tree0649444a7626554fdac76c0086f0ab16b0728d23 /tosca/vCPE/vgw
parentaa92ee02641b8f24615736130fa2d7d63abd9934 (diff)
Adapt to latest tosca onboarding DM change
Adapted to latest tosca onboarding DM change in SDC to align with SOL001 v2.5.1. Change-Id: Ib3628fb9bba0d55e9c91aee85e2abb09c0c03b01 Issue-ID: INT-1037 Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Diffstat (limited to 'tosca/vCPE/vgw')
-rw-r--r--tosca/vCPE/vgw/MainServiceTemplate.yaml147
1 files changed, 75 insertions, 72 deletions
diff --git a/tosca/vCPE/vgw/MainServiceTemplate.yaml b/tosca/vCPE/vgw/MainServiceTemplate.yaml
index 2676007f..3fda350c 100644
--- a/tosca/vCPE/vgw/MainServiceTemplate.yaml
+++ b/tosca/vCPE/vgw/MainServiceTemplate.yaml
@@ -122,85 +122,100 @@ topology_template:
flavour_description: simple
vnfm_info: ['gvnfm']
-
#onap public net
# VL_public:
# type: tosca.nodes.nfv.VnfVirtualLink
# properties:
# connectivity_type:
-# layer_protocol: ipv4
+# layer_protocols: [ipv4]
# vl_profile:
-# max_bit_rate_requirements:
+# max_bitrate_requirements:
# root: 10000000
# leaf: 10000000
-# min_bit_rate_requirements:
+# min_bitrate_requirements:
# root: 10000000
# leaf: 10000000
-# networkName: { get_input: public_net_id }
+# virtual_link_protocol_data:
+# - associated_layer_protocol: ipv4
+# l3_protocol_data:
+# ip_version: ipv4
+# name: { get_input: public_net_id }
#
# #onap oam net
# VL_onap_private:
# type: tosca.nodes.nfv.VnfVirtualLink
# properties:
# connectivity_type:
-# layer_protocol: ipv4
+# layer_protocols: [ipv4]
# vl_profile:
-# max_bit_rate_requirements:
+# max_bitrate_requirements:
# root: 10000000
# leaf: 10000000
-# min_bit_rate_requirements:
+# min_bitrate_requirements:
# root: 10000000
# leaf: 10000000
-# networkName: { get_input: onap_private_net_id }
-# cidr: { get_input: onap_private_net_cidr }
+# virtual_link_protocol_data:
+# - associated_layer_protocol: ipv4
+# l3_protocol_data:
+# ip_version: ipv4
+# name: { get_input: onap_private_net_id }
+# cidr: { get_input: onap_private_net_cidr }
#Private network that connects vGMUX to vGWs
VL_mux_gw_private_net:
type: tosca.nodes.nfv.VnfVirtualLink
properties:
connectivity_type:
- layer_protocol: ipv4
+ layer_protocols: [ipv4]
vl_profile:
- max_bit_rate_requirements:
+ max_bitrate_requirements:
root: 10000000
leaf: 10000000
- min_bit_rate_requirements:
+ min_bitrate_requirements:
root: 10000000
leaf: 10000000
- networkName: { get_input: mux_gw_private_net_id}
- cidr: { get_input: mux_gw_private_net_cidr }
- dhcpEnabled: false
+ virtual_link_protocol_data:
+ - associated_layer_protocol: ipv4
+ l3_protocol_data:
+ name: { get_input: mux_gw_private_net_id }
+ ip_version: ipv4
+ cidr: { get_input: mux_gw_private_net_cidr }
+ dhcp_enabled: false
#cpe public network
VL_cpe_public:
type: tosca.nodes.nfv.VnfVirtualLink
properties:
connectivity_type:
- layer_protocol: ipv4
+ layer_protocols: [ipv4]
vl_profile:
- max_bit_rate_requirements:
+ max_bitrate_requirements:
root: 10000000
leaf: 10000000
- min_bit_rate_requirements:
+ min_bitrate_requirements:
root: 10000000
leaf: 10000000
- networkName: { get_input: cpe_public_net_id}
- cidr: { get_input: cpe_public_net_cidr }
- dhcpEnabled: false
+ virtual_link_protocol_data:
+ - associated_layer_protocol: ipv4
+ l3_protocol_data:
+ name: { get_input: cpe_public_net_id }
+ ip_version: ipv4
+ cidr: { get_input: cpe_public_net_cidr }
+ dhcp_enabled: false
# vgw related
Cp_vgw_public:
type: tosca.nodes.nfv.VduCp
properties:
- layer_protocol: [ipv4]
+ layer_protocols: [ipv4]
trunk_mode: false
- protocol_data:
- - asscociated_layer_protocol: ipv4
+ protocol:
+ - associated_layer_protocol: ipv4
address_data:
- address_type: ip_address
- l3_address_data:
- ip_address_assignment: false
- floating_ip_activated: false
+ - address_type: ip_address
+ l3_address_data:
+ ip_address_assignment: false
+ floating_ip_activated: false
requirements:
- virtual_binding: VDU_vgw_0
#- virtual_link: VL_public
@@ -208,17 +223,17 @@ topology_template:
Cp_vgw_onap_private:
type: tosca.nodes.nfv.VduCp
properties:
- layer_protocol: [ipv4]
+ layer_protocols: [ipv4]
trunk_mode: false
- protocol_data:
- - asscociated_layer_protocol: ipv4
+ protocol:
+ - associated_layer_protocol: ipv4
address_data:
- address_type: ip_address
- l3_address_data:
- ip_address_assignment: false
- floating_ip_activated: false
- fixed_ip_address:
- - { get_input: vgw_private_ip_1 }
+ - address_type: ip_address
+ l3_address_data:
+ ip_address_assignment: false
+ floating_ip_activated: false
+ fixed_ip_address:
+ - { get_input: vgw_private_ip_1 }
requirements:
- virtual_binding: VDU_vgw_0
#- virtual_link: VL_onap_private
@@ -226,21 +241,20 @@ topology_template:
Cp_vgw_mux_gw_private_net:
type: tosca.nodes.nfv.VduCp
properties:
- layer_protocol: [ipv4]
+ layer_protocols: [ipv4]
trunk_mode: false
- protocol_data:
- - asscociated_layer_protocol: ipv4
+ protocol:
+ - associated_layer_protocol: ipv4
address_data:
- address_type: ip_address
- l3_address_data:
- ip_address_assignment: false
- floating_ip_activated: false
- fixed_ip_address:
- - { get_input: vgw_private_ip_0 }
+ - address_type: ip_address
+ l3_address_data:
+ ip_address_assignment: false
+ floating_ip_activated: false
+ fixed_ip_address:
+ - { get_input: vgw_private_ip_0 }
virtual_network_interface_requirements:
- name: dpdk support
support_mandatory: true
- #TODO HPA
network_interface_requirements:
dataProcessingAccelerationLibrary: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "DPDK"}'
requirements:
@@ -250,35 +264,26 @@ topology_template:
Cp_vgw_cpe_public:
type: tosca.nodes.nfv.VduCp
properties:
- layer_protocol: [ipv4]
+ layer_protocols: [ipv4]
trunk_mode: false
- protocol_data:
- - asscociated_layer_protocol: ipv4
+ protocol:
+ - associated_layer_protocol: ipv4
address_data:
- address_type: ip_address
- l3_address_data:
- ip_address_assignment: false
- floating_ip_activated: false
- fixed_ip_address:
- - { get_input: vgw_private_ip_2 }
+ - address_type: ip_address
+ l3_address_data:
+ ip_address_assignment: false
+ floating_ip_activated: false
+ fixed_ip_address:
+ - { get_input: vgw_private_ip_2 }
requirements:
- virtual_binding: VDU_vgw_0
- virtual_link: VL_cpe_public
- VirtualStorage_root_all:
- # this indicate the VDU root storage size
- type: tosca.nodes.nfv.Vdu.VirtualStorage
- properties:
- type_of_storage: root
- size_of_storage: 40 GB
-
VDU_vgw_0:
type: tosca.nodes.nfv.Vdu.Compute
properties:
name: { get_input: vgw_name_0 }
description: vgw
- configurable_properties:
- additional_vnfc_configurable_properties: {}
vdu_profile:
min_number_of_instances: 1
max_number_of_instances: 1
@@ -299,7 +304,7 @@ topology_template:
install_script_version: { get_input: install_script_version }
cloud_env: { get_input: cloud_env }
nexus_artifact_repo: { get_input: nexus_artifact_repo }
- user_data: |
+ boot_data: |
#!/bin/bash
METADATA=`curl -s http://169.254.169.254/openstack/2012-08-10/meta_data.json`
apt-get -y install jq
@@ -334,18 +339,16 @@ topology_template:
capabilities:
virtual_compute:
properties:
- #TODO add local disk size
virtual_memory:
virtual_mem_size: 4096 MB
- # HPA requirements
- vdu_memory_requirements:
+ vdu_mem_requirements:
memoryPageSize: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "2 MB"}'
numberOfPages: '{"schemaVersion": "0","schemaSelector": "","hardwarePlatform": "generic","mandatory": "true", "configurationValue": "1024"}'
virtual_cpu:
num_virtual_cpu: 2
cpu_architecture: generic
- requirements:
- - virtual_storage: VirtualStorage_root_all
+ virtual_local_storage:
+ - size_of_storage: 40 GB
artifacts:
sw_image: #TODO need to put glance image name here
#file: { get_input: vcpe_image_name }