X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=tosca%2FvCPE%2Finfra%2FMainServiceTemplate.yaml;h=66e84515a813fb386d0fd755e2f8d570859a9d22;hb=7d6e84da8bec7fc0d3d141992b97b0bb2d16ebdb;hp=f2c6361831c70f54a9559724d4f3330b30cbd120;hpb=aa92ee02641b8f24615736130fa2d7d63abd9934;p=demo.git diff --git a/tosca/vCPE/infra/MainServiceTemplate.yaml b/tosca/vCPE/infra/MainServiceTemplate.yaml index f2c63618..66e84515 100644 --- a/tosca/vCPE/infra/MainServiceTemplate.yaml +++ b/tosca/vCPE/infra/MainServiceTemplate.yaml @@ -167,79 +167,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: -# root: 10000000 +# 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 @@ -247,17 +263,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 @@ -265,35 +281,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 @@ -314,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 @@ -349,13 +356,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 } @@ -366,15 +372,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 @@ -382,17 +388,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 @@ -400,17 +406,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 @@ -420,8 +426,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 @@ -440,7 +444,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 @@ -473,13 +477,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 } @@ -490,15 +493,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 @@ -506,17 +509,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 @@ -524,17 +527,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 @@ -544,8 +547,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 @@ -566,7 +567,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 @@ -601,13 +602,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 } @@ -618,15 +618,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 @@ -634,17 +634,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 @@ -652,17 +652,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 @@ -672,8 +672,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 @@ -692,7 +690,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 @@ -725,13 +723,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 }