aboutsummaryrefslogtreecommitdiffstats
path: root/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml
diff options
context:
space:
mode:
authorLianhao Lu <lianhao.lu@intel.com>2019-04-25 12:22:21 +0800
committerLianhao Lu <lianhao.lu@intel.com>2019-04-25 12:23:19 +0800
commit36fca494483ecfa7c2d74b24c3b602cf12823aa4 (patch)
tree4e2f7f2119cec3874f760d677ccef225338fa472 /tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml
parent201fa9289e32676b40d1095766e38c74e1653e75 (diff)
Adapt to latest tosca onboarding DM for vCPE tosca
Adapted to latest tosca onboarding DM change in SDC to align with SOL001 v2.5.1, for sriov vCPE use case. Change-Id: I2c2fd4cdfbd5d72cfc3a1c7cdfab53763f17d782 Issue-ID: INT-1037 Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Diffstat (limited to 'tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml')
-rw-r--r--tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml188
1 files changed, 100 insertions, 88 deletions
diff --git a/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml
index f04cd98a..4dfd3d0b 100644
--- a/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml
+++ b/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml
@@ -134,98 +134,120 @@ topology_template:
# 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 vBRG to vBNG
VL_brgemu_bng_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: brgemu_bng_private_net_id}
- cidr: { get_input: brgemu_bng_private_net_cidr }
- dhcpEnabled: false
- physicalNetwork: "physnet1"
+ virtual_link_protocol_data:
+ - associated_layer_protocol: ipv4
+ l3_protocol_data:
+ ip_version: ipv4
+ name: { get_input: brgemu_bng_private_net_id}
+ cidr: { get_input: brgemu_bng_private_net_cidr }
+ dhcp_enabled: false
+ l2_protocol_data:
+ physical_network: "physnet1"
#cpe signal network
VL_cpe_signal:
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_signal_net_id}
- cidr: { get_input: cpe_signal_private_net_cidr }
- dhcpEnabled: false
+ virtual_link_protocol_data:
+ - associated_layer_protocol: ipv4
+ l3_protocol_data:
+ ip_version: ipv4
+ name: { get_input: cpe_signal_net_id}
+ cidr: { get_input: cpe_signal_private_net_cidr }
+ dhcp_enabled: false
#Private network that connects vBNG to vGMUX
VL_bng_gmux_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: bng_gmux_private_net_id}
- cidr: { get_input: bng_gmux_private_net_cidr }
- dhcpEnabled: false
- physicalNetwork: "physnet1"
+ virtual_link_protocol_data:
+ - associated_layer_protocol: ipv4
+ l3_protocol_data:
+ ip_version: ipv4
+ name: { get_input: bng_gmux_private_net_id}
+ cidr: { get_input: bng_gmux_private_net_cidr }
+ dhcp_enabled: false
+ l2_protocol_data:
+ physical_network: "physnet1"
# vbng related
Cp_vbng_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_vbng_0
#- virtual_link: VL_public
@@ -233,17 +255,17 @@ topology_template:
Cp_vbng_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: vbng_private_ip_1 }
+ - address_type: ip_address
+ l3_address_data:
+ ip_address_assignment: false
+ floating_ip_activated: false
+ fixed_ip_address:
+ - { get_input: vbng_private_ip_1 }
requirements:
- virtual_binding: VDU_vbng_0
#- virtual_link: VL_onap_private
@@ -251,18 +273,18 @@ topology_template:
Cp_vbng_brgemu_bng_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: vbng_private_ip_0 }
- vnic_type: "direct"
+ - address_type: ip_address
+ l3_address_data:
+ ip_address_assignment: false
+ floating_ip_activated: false
+ fixed_ip_address:
+ - { get_input: vbng_private_ip_0 }
+ vnic_type: "direct-physical"
virtual_network_interface_requirements:
- name: "sriov-support"
support_mandatory: true
@@ -280,17 +302,17 @@ topology_template:
Cp_vbng_cpe_signal:
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: vbng_private_ip_2 }
+ - address_type: ip_address
+ l3_address_data:
+ ip_address_assignment: false
+ floating_ip_activated: false
+ fixed_ip_address:
+ - { get_input: vbng_private_ip_2 }
requirements:
- virtual_binding: VDU_vbng_0
- virtual_link: VL_cpe_signal
@@ -298,18 +320,18 @@ topology_template:
Cp_vbng_bng_gmux_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: vbng_private_ip_3 }
- vnic_type: "direct"
+ - address_type: ip_address
+ l3_address_data:
+ ip_address_assignment: false
+ floating_ip_activated: false
+ fixed_ip_address:
+ - { get_input: vbng_private_ip_3 }
+ vnic_type: "direct-physical"
virtual_network_interface_requirements:
- name: "sriov-support"
support_mandatory: true
@@ -324,20 +346,11 @@ topology_template:
- virtual_binding: VDU_vbng_0
- virtual_link: VL_bng_gmux_private_net
- 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_vbng_0:
type: tosca.nodes.nfv.Vdu.Compute
properties:
name: { get_input: vbng_name_0 }
description: vbng
- configurable_properties:
- additional_vnfc_configurable_properties: {}
vdu_profile:
min_number_of_instances: 1
max_number_of_instances: 1
@@ -364,7 +377,7 @@ topology_template:
sdnc_ip: { get_input: sdnc_ip_addr }
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
@@ -406,15 +419,14 @@ topology_template:
properties:
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 }