Fix spacing issues in YAML files in tosca/
[demo.git] / tosca / vCPE / vgmux / MainServiceTemplate_sriov.yaml
index ff10975..f8a3a40 100644 (file)
@@ -3,48 +3,12 @@ metadata:
   template_name: vCPE_vgmux
   template_version: "1.0"
   template_author: onap
+  VNFD_SCHEMA_VERSION: "2.5.1+1"
 description: vCPE_vgmux
 
 imports:
   - onap_dm.yaml
 
-node_types:
-  onap.vcpe_vgmux:
-    derived_from: tosca.nodes.nfv.VNF
-    properties:
-      descriptor_id:
-        type: string
-        constraints: [ valid_values: [ b1bb0ce7-3333-4fa7-95ed-4840d70a1177 ] ]
-        default: b1bb0ce7-3333-4fa7-95ed-4840d70a1177
-      provider:
-        type: string
-        constraints: [ valid_values: [ onap ] ]
-        default: onap
-      product_name:
-        type: string
-        constraints: [ valid_values: [ vcpe_vgmux ] ]
-        default: vcpe_vgmux
-      software_version:
-        type: string
-        constraints: [ valid_values: [ '1.0' ] ]
-        default: '1.0'
-      descriptor_version:
-        type: string
-        constraints: [ valid_values: [ '1.0' ] ]
-        default: '1.0'
-      flavour_id:
-        type: string
-        constraints: [ valid_values: [ simple ] ]  #only one and only allowed one DF in this example
-        default: simple
-      flavour_description:
-        type: string
-        default: simple
-      vnfm_info:
-        type: list
-        entry_schema:
-          type: string
-        default: ['gvnfm']
-
 topology_template:
 #  substitution_mappings:
 #    node_type: onap.vcpe_vgmux
@@ -120,9 +84,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
@@ -141,86 +105,117 @@ topology_template:
       default: openstack
 
   node_templates:
+    LLU_VNF:
+      type: tosca.nodes.nfv.VNF
+      properties:
+        descriptor_id: b1bb0ce7-2222-4fa7-95ed-4840d70a1177
+        provider: onap
+        product_name: vcpe_vgmux
+        software_version: '1.0'
+        descriptor_version: '1.0'
+        flavour_id: simple
+        flavour_description: simple
+        vnfm_info: ['gvnfm']
+
+
     #onap public net
 #    VL_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: 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
@@ -228,17 +223,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
@@ -246,17 +241,17 @@ 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 }
         vnic_type: "direct"
         virtual_network_interface_requirements:
           - name: "sriov-support"
@@ -264,9 +259,10 @@ topology_template:
             network_interface_requirements:
               interfaceType: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "SR-IOV"}'
             nic_io_requirements:
-              pciVendorId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1234"}'
-              pciDeviceId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "5678"}'
-              pciNumDevices: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1"}'
+              logical_node_requirements:
+                pciVendorId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1234"}'
+                pciDeviceId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "5678"}'
+                pciNumDevices: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1"}'
       requirements:
         - virtual_binding: VDU_vgmux_0
         - virtual_link: VL_bng_gmux_private_net
@@ -274,17 +270,17 @@ 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 }
         vnic_type: "direct"
         virtual_network_interface_requirements:
           - name: "sriov-support"
@@ -292,33 +288,25 @@ topology_template:
             network_interface_requirements:
               interfaceType: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "SR-IOV"}'
             nic_io_requirements:
-              pciVendorId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1234"}'
-              pciDeviceId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "5678"}'
-              pciNumDevices: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1"}'
+              logical_node_requirements:
+                pciVendorId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1234"}'
+                pciDeviceId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "5678"}'
+                pciNumDevices: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1"}'
       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/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 }
@@ -334,7 +322,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
@@ -372,18 +360,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/images/ubuntu_16.04
+          file: ../Artifacts/Deployment/OTHER/image
           type: tosca.artifacts.nfv.SwImage
-