diff options
Diffstat (limited to 'tosca/vCPE/vbrgemu')
| -rw-r--r-- | tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml | 99 |
1 files changed, 51 insertions, 48 deletions
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 } |