X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=tosca%2FvCPE%2Fvgmux%2FMainServiceTemplate.yaml;h=fb1e608280b3a635ecec29995d280016f4d1cb4c;hb=0f11467f0bf1d20212f94be2bbed75896b30d73f;hp=b028db5f895f52091dd932f7e619b1c0d1a4c4e0;hpb=9f8da0915c260757e4bb051d0cf66a9337dfb892;p=demo.git diff --git a/tosca/vCPE/vgmux/MainServiceTemplate.yaml b/tosca/vCPE/vgmux/MainServiceTemplate.yaml index b028db5f..fb1e6082 100644 --- a/tosca/vCPE/vgmux/MainServiceTemplate.yaml +++ b/tosca/vCPE/vgmux/MainServiceTemplate.yaml @@ -3,6 +3,7 @@ metadata: template_name: vCPE_vgmux template_version: "1.0" template_author: onap + VNFD_SCHEMA_VERSION: "2.5.1+1" description: vCPE_vgmux imports: @@ -85,9 +86,9 @@ topology_template: description: dcae collector ip default: 10.0.4.102 dcae_collector_port: - type: integer + type: string description: dcae collector port - default: 8080 + default: "8080" pub_key: type: string description: ssh public key @@ -124,79 +125,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 } #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 + 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 #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: + ip_version: ipv4 + name: { get_input: mux_gw_private_net_id} + cidr: { get_input: mux_gw_private_net_cidr } + dhcp_enabled: false # 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 @@ -204,17 +221,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 @@ -222,21 +239,20 @@ 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 } + - address_type: ip_address + l3_address_data: + ip_address_assignment: false + floating_ip_activated: false + fixed_ip_address: + - { get_input: vgmux_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: @@ -246,47 +262,37 @@ 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 } + - address_type: ip_address + l3_address_data: + ip_address_assignment: false + floating_ip_activated: false + fixed_ip_address: + - { get_input: vgmux_private_ip_2 } 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: - 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 watchdog: none inject_files: #TODO SDC bug - source_path: ../Artifacts/Deployment/Other/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 } @@ -302,7 +308,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 @@ -340,18 +346,16 @@ 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 } - file: ../Artifacts/Deployment/Other/image + file: ../Artifacts/Deployment/OTHER/image type: tosca.artifacts.nfv.SwImage -