summaryrefslogtreecommitdiffstats
path: root/tosca/vCPE
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
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')
-rw-r--r--tosca/vCPE/infra/MainServiceTemplate.yaml2
-rw-r--r--tosca/vCPE/infra/MainServiceTemplate_sriov.yaml301
-rw-r--r--tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml188
-rw-r--r--tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml99
-rw-r--r--tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml155
-rw-r--r--tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml150
6 files changed, 460 insertions, 435 deletions
diff --git a/tosca/vCPE/infra/MainServiceTemplate.yaml b/tosca/vCPE/infra/MainServiceTemplate.yaml
index 66e84515..b117c7e6 100644
--- a/tosca/vCPE/infra/MainServiceTemplate.yaml
+++ b/tosca/vCPE/infra/MainServiceTemplate.yaml
@@ -173,7 +173,7 @@ topology_template:
# root: 10000000
# leaf: 10000000
# min_bitrate_requirements:
-# root 10000000
+# root: 10000000
# leaf: 10000000
# virtual_link_protocol_data:
# - associated_layer_protocol: ipv4
diff --git a/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml b/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml
index 31c18f5c..2945555d 100644
--- a/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml
+++ b/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml
@@ -166,79 +166,95 @@ 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 }
#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_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_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:
+ ip_version: ipv4
+ name: { get_input: cpe_public_net_id}
+ cidr: { get_input: cpe_public_net_cidr }
+ dhcp_enabled: false
# vaaa related
Cp_vaaa_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_vaaa_0
# - virtual_link: VL_public
@@ -246,17 +262,17 @@ topology_template:
Cp_vaaa_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: vaaa_private_ip_1 }
+ - address_type: ip_address
+ l3_address_data:
+ ip_address_assignment: false
+ floating_ip_activated: false
+ fixed_ip_address:
+ - { get_input: vaaa_private_ip_1 }
requirements:
- virtual_binding: VDU_vaaa_0
# - virtual_link: VL_onap_private
@@ -264,35 +280,26 @@ topology_template:
Cp_vaaa_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: vaaa_private_ip_0 }
+ - address_type: ip_address
+ l3_address_data:
+ ip_address_assignment: false
+ floating_ip_activated: false
+ fixed_ip_address:
+ - { get_input: vaaa_private_ip_0 }
requirements:
- virtual_binding: VDU_vaaa_0
- virtual_link: VL_cpe_signal
- 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_vaaa_0:
type: tosca.nodes.nfv.Vdu.Compute
properties:
name: { get_input: vaaa_name_0 }
description: vaaa
- configurable_properties:
- additional_vnfc_configurable_properties: {}
vdu_profile:
min_number_of_instances: 1
max_number_of_instances: 1
@@ -313,7 +320,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
@@ -348,13 +355,12 @@ topology_template:
capabilities:
virtual_compute:
properties:
- #TODO add local disk size
virtual_memory:
virtual_mem_size: 4096 MB
virtual_cpu:
num_virtual_cpu: 2
- 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 }
@@ -365,15 +371,15 @@ topology_template:
Cp_vdns_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_vdns_0
# - virtual_link: VL_public
@@ -381,17 +387,17 @@ topology_template:
Cp_vdns_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: vdns_private_ip_1 }
+ - address_type: ip_address
+ l3_address_data:
+ ip_address_assignment: false
+ floating_ip_activated: false
+ fixed_ip_address:
+ - { get_input: vdns_private_ip_1 }
requirements:
- virtual_binding: VDU_vdns_0
#- virtual_link: VL_onap_private
@@ -399,17 +405,17 @@ topology_template:
Cp_vdns_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: vdns_private_ip_0 }
+ - address_type: ip_address
+ l3_address_data:
+ ip_address_assignment: false
+ floating_ip_activated: false
+ fixed_ip_address:
+ - { get_input: vdns_private_ip_0 }
requirements:
- virtual_binding: VDU_vdns_0
- virtual_link: VL_cpe_public
@@ -419,8 +425,6 @@ topology_template:
properties:
name: { get_input: vdns_name_0 }
description: vdns
- configurable_properties:
- additional_vnfc_configurable_properties: {}
vdu_profile:
min_number_of_instances: 1
max_number_of_instances: 1
@@ -439,7 +443,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
@@ -472,13 +476,12 @@ topology_template:
capabilities:
virtual_compute:
properties:
- #TODO add local disk size
virtual_memory:
virtual_mem_size: 4096 MB
virtual_cpu:
num_virtual_cpu: 2
- 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 }
@@ -489,15 +492,15 @@ topology_template:
Cp_vdhcp_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_vdhcp_0
# - virtual_link: VL_public
@@ -505,17 +508,17 @@ topology_template:
Cp_vdhcp_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: vdhcp_private_ip_1 }
+ - address_type: ip_address
+ l3_address_data:
+ ip_address_assignment: false
+ floating_ip_activated: false
+ fixed_ip_address:
+ - { get_input: vdhcp_private_ip_1 }
requirements:
- virtual_binding: VDU_vdhcp_0
# - virtual_link: VL_onap_private
@@ -523,17 +526,17 @@ topology_template:
Cp_vdhcp_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: vdhcp_private_ip_0 }
+ - address_type: ip_address
+ l3_address_data:
+ ip_address_assignment: false
+ floating_ip_activated: false
+ fixed_ip_address:
+ - { get_input: vdhcp_private_ip_0 }
requirements:
- virtual_binding: VDU_vdhcp_0
- virtual_link: VL_cpe_signal
@@ -543,8 +546,6 @@ topology_template:
properties:
name: { get_input: vdhcp_name_0 }
description: vdhcp
- configurable_properties:
- additional_vnfc_configurable_properties: {}
vdu_profile:
min_number_of_instances: 1
max_number_of_instances: 1
@@ -565,7 +566,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
@@ -600,13 +601,12 @@ topology_template:
capabilities:
virtual_compute:
properties:
- #TODO add local disk size
virtual_memory:
virtual_mem_size: 4096 MB
virtual_cpu:
num_virtual_cpu: 2
- 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 }
@@ -617,15 +617,15 @@ topology_template:
Cp_vweb_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_vweb_0
# - virtual_link: VL_public
@@ -633,17 +633,17 @@ topology_template:
Cp_vweb_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: vweb_private_ip_1 }
+ - address_type: ip_address
+ l3_address_data:
+ ip_address_assignment: false
+ floating_ip_activated: false
+ fixed_ip_address:
+ - { get_input: vweb_private_ip_1 }
requirements:
- virtual_binding: VDU_vweb_0
# - virtual_link: VL_onap_private
@@ -651,17 +651,17 @@ topology_template:
Cp_vweb_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: vweb_private_ip_0 }
+ - address_type: ip_address
+ l3_address_data:
+ ip_address_assignment: false
+ floating_ip_activated: false
+ fixed_ip_address:
+ - { get_input: vweb_private_ip_0 }
requirements:
- virtual_binding: VDU_vweb_0
- virtual_link: VL_cpe_public
@@ -671,8 +671,6 @@ topology_template:
properties:
name: { get_input: vweb_name_0 }
description: vweb
- configurable_properties:
- additional_vnfc_configurable_properties: {}
vdu_profile:
min_number_of_instances: 1
max_number_of_instances: 1
@@ -691,7 +689,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
@@ -724,13 +722,12 @@ topology_template:
capabilities:
virtual_compute:
properties:
- #TODO add local disk size
virtual_memory:
virtual_mem_size: 4096 MB
virtual_cpu:
num_virtual_cpu: 2
- 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 }
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 }
diff --git a/tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml
index 60161908..58153231 100644
--- a/tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml
+++ b/tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml
@@ -100,63 +100,76 @@ 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 vBRGEMU to vBNG
VL_vbrgemu_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: vbrgemu_bng_private_net_id}
- cidr: { get_input: vbrgemu_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: vbrgemu_bng_private_net_id}
+ cidr: { get_input: vbrgemu_bng_private_net_cidr }
+ dhcp_enabled: false
+ l2_protocol_data:
+ physical_network: "physnet1"
# vbrgemu related
Cp_vbrgemu_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_vbrgemu_0
#- virtual_link: VL_public
@@ -164,18 +177,18 @@ topology_template:
Cp_vbrgemu_vbrgemu_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: vbrgemu_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: vbrgemu_private_ip_0 }
+ vnic_type: "direct-physical"
virtual_network_interface_requirements:
- name: "sriov-support"
support_mandatory: true
@@ -190,26 +203,17 @@ topology_template:
- virtual_binding: VDU_vbrgemu_0
- virtual_link: VL_vbrgemu_bng_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_vbrgemu_0:
type: tosca.nodes.nfv.Vdu.Compute
properties:
name: { get_input: vbrgemu_name_0 }
description: vbrgemu
- configurable_properties:
- additional_vnfc_configurable_properties: {}
vdu_profile:
min_number_of_instances: 1
max_number_of_instances: 1
watchdog: none
inject_files: #TODO SDC bug
- source_path: ../Artifcats/keys/authorized_keys #SSH authorized_keys
+ source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys
dest_path: /home/ubuntu/.ssh/authorized_keys
meta_data:
vnf_id: { get_input: vnf_id }
@@ -220,7 +224,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
@@ -253,15 +257,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 }
diff --git a/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml
index ee4f56f8..3b727d27 100644
--- a/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml
+++ b/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml
@@ -8,7 +8,6 @@ description: vCPE_vgmux
imports:
- onap_dm.yaml
-
topology_template:
# substitution_mappings:
# node_type: onap.vcpe_vgmux
@@ -123,81 +122,99 @@ 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 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"
#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
- physicalNetwork: "physnet1"
+ virtual_link_protocol_data:
+ - associated_layer_protocol: ipv4
+ l3_protocol_data:
+ ip_version: ipv4
+ name: { get_input: mux_gw_private_net_id}
+ cidr: { get_input: mux_gw_private_net_cidr }
+ dhcp_enabled: false
+ l2_protocol_data:
+ physical_network: "physnet1"
# vgmux related
Cp_vgmux_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_vgmux_0
#- virtual_link: VL_public
@@ -205,17 +222,17 @@ topology_template:
Cp_vgmux_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: vgmux_private_ip_1 }
+ - address_type: ip_address
+ l3_address_data:
+ ip_address_assignment: false
+ floating_ip_activated: false
+ fixed_ip_address:
+ - { get_input: vgmux_private_ip_1 }
requirements:
- virtual_binding: VDU_vgmux_0
#- virtual_link: VL_onap_private
@@ -223,18 +240,18 @@ topology_template:
Cp_vgmux_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: vgmux_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: vgmux_private_ip_0 }
+ vnic_type: "direct-physical"
virtual_network_interface_requirements:
- name: "sriov-support"
support_mandatory: true
@@ -252,18 +269,18 @@ topology_template:
Cp_vgmux_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: vgmux_private_ip_2 }
- vnic_type: "direct"
+ - address_type: ip_address
+ l3_address_data:
+ ip_address_assignment: false
+ floating_ip_activated: false
+ fixed_ip_address:
+ - { get_input: vgmux_private_ip_2 }
+ vnic_type: "direct-physical"
virtual_network_interface_requirements:
- name: "sriov-support"
support_mandatory: true
@@ -278,20 +295,11 @@ topology_template:
- virtual_binding: VDU_vgmux_0
- virtual_link: VL_mux_gw_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_vgmux_0:
type: tosca.nodes.nfv.Vdu.Compute
properties:
name: { get_input: vgmux_name_0 }
description: vgmux
- configurable_properties:
- additional_vnfc_configurable_properties: {}
vdu_profile:
min_number_of_instances: 1
max_number_of_instances: 1
@@ -313,7 +321,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
@@ -351,15 +359,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 }
diff --git a/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml
index 13d2487f..bb7819f3 100644
--- a/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml
+++ b/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml
@@ -124,80 +124,97 @@ 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 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
- physicalNetwork: "physnet1"
+ 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
+ l2_protocol_data:
+ physical_network: "physnet1"
#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
@@ -205,17 +222,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
@@ -223,18 +240,18 @@ 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 }
- vnic_type: "direct"
+ - address_type: ip_address
+ l3_address_data:
+ ip_address_assignment: false
+ floating_ip_activated: false
+ fixed_ip_address:
+ - { get_input: vgw_private_ip_0 }
+ vnic_type: "direct-physical"
virtual_network_interface_requirements:
- name: "sriov-support"
support_mandatory: true
@@ -252,35 +269,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
@@ -301,7 +309,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
@@ -336,18 +344,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 }