Updated reference descriptor files for SOL001 and SOL006

SOL003/VNFLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml → SOL003/VNFLifecycleManagement-API/descriptors/SOL001/SOL002_VNFLifecycleManagement-API_descriptors_SOL001_reference_tst010_vnf_b_2vdu_SOL001.yaml

-tosca_definitions_version: tosca_simple_yaml_1_2
-description: "TST010 reference VNF-B"
-metadata:
-  descriptor_id: "VNF-B"
-  vendor: "ETSI TST WG"
-  version: "2.0"
-topology_template:
-  substitution_mappings:
-    node_type: "tosca.nodes.nfv.VNF"
-    requirements:
-      virtual_link_management:
-        [management, virtual_link_management]
-      virtual_link_left:
-        [left, virtual_link_left]
-      virtual_link_right:
-        [right, virtual_link_right]
-  node_templates:
-    VDU-B-1:
-      type: "tosca.nodes.nfv.Vdu.Compute"
-      properties:
-        name: "vdu-b-1-vcd"
-        descriptor: "Description of VDU-B-1"
-        vdu_profile:
-          min_number_of_instances: 1
-          max_number_of_instances: 2
-      capabilities:
-        virtual_compute:
-          properties:
-            virtual_memory:
-              virtual_mem_size: 4096
-              numa_enabled: false
-            virtual_cpu:
-              num_virtual_cpu: 2
-      requirements:
-        virtual_storage:
-        - "vdu-b-1-vsd"
-    VDU-B-2:
-      type: "tosca.nodes.nfv.Vdu.Compute"
-      properties:
-        name: "vdu-b-2-vcd"
-        descriptor: "Description of VDU-B-2"
-        vdu_profile:
-          min_number_of_instances: 1
-          max_number_of_instances: 4
-      capabilities:
-        virtual_compute:
-          properties:
-            virtual_memory:
-              virtual_mem_size: 6144
-              numa_enabled: false
-            virtual_cpu:
-              num_virtual_cpu: 2
-      requirements:
-        virtual_storage:
-        - "vdu-b-2-vsd"
-    right:
-      type: "tosca.nodes.nfv.VduCp"
-      properties:
-        order: 1
-      requirements:
-        virtual_link_right:
-        virtual_binding: VDU-B-2
-    management:
-      type: "tosca.nodes.nfv.VduCp"
-      properties:
-        order: 0
-      requirements:
-        virtual_link_management:
-        virtual_binding: VDU-B-1
-    left:
-      type: "tosca.nodes.nfv.VduCp"
-      properties:
-        order: 2
-      requirements:
-        virtual_link_left:
-        virtual_binding: VDU-B-1
-    internal_vl:
-      type: tosca.nodes.nfv.VnfVirtualLink
-      properties:
-        connectivity_type:
-          layer_protocols: [ ipv4 ]
-        description: Internal Virtual link in the VNF
-        vl_profile:
-          max_bitrate_requirements:
-            root: 100000
-            leaf: 20000
-          min_bitrate_requirements:
-            root: 10000
-            leaf: 10000
-    internal_vdu_b_1_cp:
-      type: tosca.nodes.nfv.VduCp
-      properties:
-        order: 2
-      requirements:
-        - virtual_binding: VDU-B-1
-        - virtual_link: internal_vl
-    internal_vdu_b_2_cp:
-      type: tosca.nodes.nfv.VduCp
-      properties:
-        order: 0
-      requirements:
-        - virtual_binding: VDU-B-2
-        - virtual_link: internal_vl
-    vdu-b-1-vsd:
-      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
-      properties:
-        virtual_block_storage_data:
-          size_of_storage: 20
-          rdma_enabled: false
-        sw_image_data:
-          name: "vdu-b-1 image"
-          version: "1.1"
-          checksum: 
-            algorithm: "sha-224"
-            hash: "somehashfortst010"
-          container_format: "bare"
-          disk-format: qcow2
-          min-disk: '1'
-          min-ram: '2'
-          size: '1'
-      artifacts:
-        sw_image:
-          type: tosca.artifacts.nfv.SwImage
-          file: vdu-b-1.qcow2
-    vdu-b-1-vsd:
-      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
-      properties:
-        virtual_block_storage_data:
-          size_of_storage: 20
-          rdma_enabled: false
-        sw_image_data:
-          name: "vdu-b-1 image"
-          version: "1.1"
-          checksum: 
-            algorithm: "sha-224"
-            hash: "somehashfortst010"
-          container_format: "bare"
-          disk-format: qcow2
-          min-disk: '1'
-          min-ram: '2'
-          size: '1'
-      artifacts:
-        sw_image:
-          type: tosca.artifacts.nfv.SwImage
-          file: vdu-b-2.qcow2
-    vnf_b_1_VNF:
-      type: "tosca.nodes.nfv.VNF"
-      properties:
-        descriptor_id: "VNF-B-2VDUs"
-        descriptor_version: "2.0"
-        provider: "ETSI TST WG"
-        product_name: "VNF-B-2VDUs"
-        software_version: "2.0"
-        product_info_name: "VNF-B-2VDUs"
-        product_info_description: "TST010 reference VNF-B with 2 VDUs"
-        flavour_id: "VNF-B-2VDU_flavor"
-        flavour_description: "VNF-B with 2 VDUs flavor"
-        vnfm_info: 
-          etsivnfm: 
-          - v2.3.1 
-        interfaces:
-            Vnflcm:
-              scale:
-                implementation: scale-example.yaml
-              terminate:
-                implementation: terminate-example.yaml
-              operate:
-                implementation: operate-example.yaml
-
+tosca_definitions_version: tosca_simple_yaml_1_2
+description: "TST010 reference VNF-B"
+metadata:
+  descriptor_id: "VNF-B"
+  vendor: "ETSI TST WG"
+  version: "2.0"
+topology_template:
+  substitution_mappings:
+    node_type: "tosca.nodes.nfv.VNF"
+    requirements:
+      virtual_link_management:
+        [management, virtual_link_management]
+      virtual_link_left:
+        [left, virtual_link_left]
+      virtual_link_right:
+        [right, virtual_link_right]
+  node_templates:
+    right:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 1
+      requirements:
+        virtual_link_right:
+        virtual_binding: VDU-B-2
+    management:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 0
+      requirements:
+        virtual_link_management:
+        virtual_binding: VDU-B-1
+    left:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 2
+      requirements:
+        virtual_link_left:
+        virtual_binding: VDU-B-1
+    internal_vl:
+      type: "tosca.nodes.nfv.VnfVirtualLink"
+      properties:
+        connectivity_type:
+          layer_protocols: [ ipv4 ]
+        description: Internal Virtual link in the VNF
+        vl_profile:
+          max_bitrate_requirements:
+            root: 100000
+            leaf: 20000
+          min_bitrate_requirements:
+            root: 10000
+            leaf: 10000
+    internal_vdu_b_1_cp:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 2
+      requirements:
+        - virtual_binding: VDU-B-1
+        - virtual_link: internal_vl
+    internal_vdu_b_2_cp:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 0
+      requirements:
+        - virtual_binding: VDU-B-2
+        - virtual_link: internal_vl
+    vdu_b_1_vsd:
+      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
+      properties:
+        virtual_block_storage_data:
+          size_of_storage: 20
+          rdma_enabled: false
+        sw_image_data:
+          name: "vdu-b-1 image"
+          version: "1.1"
+          checksum: 
+            algorithm: "sha-224"
+            hash: "somehashfortst010"
+          container_format: "bare"
+          disk-format: qcow2
+          min-disk: '1'
+          min-ram: '2'
+          size: '1'
+      artifacts:
+        sw_image:
+          type: "tosca.artifacts.nfv.SwImage"
+          file: vdu-b-1.qcow2
+    vdu_b_2_vsd:
+      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
+      properties:
+        virtual_block_storage_data:
+          size_of_storage: 20
+          rdma_enabled: false
+        sw_image_data:
+          name: "vdu-b-2 image"
+          version: "1.1"
+          checksum: 
+            algorithm: "sha-224"
+            hash: "somehashfortst010"
+          container_format: "bare"
+          disk-format: qcow2
+          min-disk: '1'
+          min-ram: '2'
+          size: '1'
+      artifacts:
+        sw_image:
+          type: tosca.artifacts.nfv.SwImage
+          file: vdu-b-2.qcow2
+    vnf_b_1_VNF:
+      type: "tosca.nodes.nfv.VNF"
+      properties:
+        descriptor_id: "VNF-B-2VDUs"
+        descriptor_version: "2.0"
+        provider: "ETSI TST WG"
+        product_name: "VNF-B-2VDUs"
+        software_version: "2.0"
+        product_info_name: "VNF-B-2VDUs"
+        product_info_description: "TST010 reference VNF-B with 2 VDUs"
+        flavour_id: "VNF-B-2VDU_flavor"
+        flavour_description: "VNF-B with 2 VDUs flavor"
+        vnfm_info: 
+          etsivnfm: 
+          - v2.3.1 
+        interfaces:
+            Vnflcm:
+              scale:
+                implementation: scale-example.yaml
+              terminate:
+                implementation: terminate-example.yaml
+              operate:
+                implementation: operate-example.yaml
+    VDU_B_1:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-1-vcd"
+        descriptor: "Description of VDU-B-1"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 2
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 4096
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-1-vsd"
+    VDU_B_2:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-2-vcd"
+        descriptor: "Description of VDU-B-2"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 4
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 6144
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-2-vsd"                
\ No newline at end of file

SOL003/VNFLifecycleManagement-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml

+nfv:
+  vnfd:
+    - id: VNF-B-2vdu
+      provider: ETSI TST WG
+      product_name: TST010 reference VNF-B with 2 VDUs
+      software_version: '2.2'
+      version: '2.2'
+      vnfm_info: ETSI VNFM
+      vdu:
+        - id: vdu-b-1
+          name: VNF-B VDU 1
+          int_cpd:
+           - id: left
+             layer_protocol: ethernet
+           - id: management
+             layer_protocol: ethernet
+           - id: internal
+             layer_protocol: ethernet
+             int_virtual_link_desc: internal-vl
+          virtual_compute_desc: vdu-b-1-vcd
+          virtual_storage_desc: vdu-b-1-vsd
+          sw_image_desc: vdu-b-1-image
+        - id: vdu-b-2
+          name: VNF-B VDU 2
+          int_cpd:
+           - id: right
+             layer_protocol: ethernet
+           - id: management
+             layer_protocol: ethernet
+           - id: internal
+             layer_protocol: ethernet
+             int_virtual_link_desc: internal-vl
+          virtual_compute_desc: vdu-b-2-vcd
+          virtual_storage_desc: vdu-b-2-vsd
+          sw_image_desc: vdu-b-2-image
+      virtual_compute_desc:
+        id: vdu-b-1-vcd
+        virtual_memory:
+          size: '4.0'
+        virtual_cpu:
+          num_virtual_cpu: '2'
+      virtual_storage_desc:
+        id: vdu-b-1-vsd
+        type_of_storage: root-storage
+        size_of_storage: '0'
+      sw_image_desc:
+        id: vdu-b-1-image
+        name: VNF-B image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container_format: bare
+        disk_format: qcow2
+        min_disk: '1'
+        min_ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B.qcow2'
+      virtual_compute_desc:
+        id: vdu-b-2-vcd
+        virtual_memory:
+          size: '6.0'
+        virtual_cpu:
+          num_virtual_cpu: '2'
+      virtual_storage_desc:
+        id: vdu-b-2-vsd
+        type_of_storage: root-storage
+        size_of_storage: '0'
+      sw_image_desc:
+        id: vdu-b-2-image
+        name: VNF-B-2 image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container_format: bare
+        disk_format: qcow2
+        min_disk: '1'
+        min_ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B-2.qcow2'
+      int_virtual_link_desc:
+        - id: internal-vl
+          flavour:
+            id: internal-vl-flavour
+            qos:
+              latency: '1'
+              packet_delay_variation: '1'
+              packet_loss_ratio: '0.05'
+          connectivity_type:
+            layer_protocol: ethernet     
+      ext_cpd:
+        - id: ext-b-left
+          int_cpd:
+            vdu_id: vdu-b-1
+            cpd: left
+          layer_protocol: ethernet
+        - id: management
+          int_cpd:
+            vdu_id: vdu-b-1
+            cpd: management
+          layer_protocol: ethernet
+        - id: ext-b-right
+          int_cpd:
+            vdu_id: vdu-b-2
+            cpd: right
+          layer_protocol: ethernet
+      df:
+        id: normal
+        vdu_profile:
+          - id: vdu-b-1
+            min_number_of_instances: '1'
+            max_number_of_instances: '2'
+          - id: vdu-b-2
+            min_number_of_instances: '1'
+            max_number_of_instances: '4'          
+        instantiation_level:
+          - id: double
+            vdu_level:
+              - vdu_id: vdu-b-1
+                number_of_instances: '2'
+              - vdu_id: vdu-b-2
+                number_of_instances: '2'
+          - id: single
+            vdu_level:
+              - vdu_id: vdu-b-1
+                number_of_instances: '1'
+              - vdu_id: vdu-b-2
+                number_of_instances: '1'
+        default_instantiation_level: single
+        lcm_operations_configuration:
+          scale_vnf_to_level_op_config:
+            arbitrary_target_levels_supported: 'true'
+          terminate_vnf_op_config:
+            min_graceful_termination: '1'
+          operate_vnf_op_config:
+            min_graceful_stop_timeout: '1'
\ No newline at end of file

SOL003/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml

-nfv:
-  vnfd:
-    - id: VNF-B-2df
-      provider: ETSI TST WG
-      product-name: TST010 reference VNF-B with 2 DFs
-      software-version: '2.1'
-      version: '2.1'
-      vnfm-info: ETSI VNFM
-      vdu:
-        id: vdu-b-1
-        name: VNF-B VDU 1
-        int-cpd:
-          - id: left
-            layer-protocol: ethernet
-          - id: management
-            layer-protocol: ethernet
-          - id: right
-            layer-protocol: ethernet
-        virtual-compute-desc: vdu-b-1-vcd
-        virtual-storage-desc: vdu-b-1-vsd
-        sw-image-desc: vdu-b-1-image
-      virtual-compute-desc:
-        id: vdu-b-1-vcd
-        virtual-memory:
-          size: '4.0'
-        virtual-cpu:
-          num-virtual-cpu: '2'
-      virtual-storage-desc:
-        id: vdu-b-1-vsd
-        type-of-storage: root-storage
-        size-of-storage: '0'
-      sw-image-desc:
-        id: vdu-b-1-image
-        name: VNF-B image
-        version: '1.1'
-        checksum:
-          algorithm: sha-224
-          hash: somehashfortst010
-        container-format: bare
-        disk-format: qcow2
-        min-disk: '1'
-        min-ram: '2.0'
-        size: '1'
-        image: 'http://someurl.com/VNF-B.qcow2'
-      ext-cpd:
-        - id: ext-b-left
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: left
-          layer-protocol: ethernet
-        - id: management
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: management
-          layer-protocol: ethernet
-        - id: ext-b-right
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: right
-          layer-protocol: ethernet
-      df:
-        - id: small
-          vdu-profile:
-            id: vdu-b-1
-            min-number-of-instances: '1'
-            max-number-of-instances: '2'
-          instantiation-level:
-            - id: double
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '2'
-            - id: single
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '1'
-          default-instantiation-level: single
-          lcm-operations-configuration:
-            scale-vnf-to-level-op-config:
-              arbitrary-target-levels-supported: 'true'
-            terminate-vnf-op-config:
-              min-graceful-termination: '1'
-            operate-vnf-op-config:
-              min-graceful-stop-timeout: '1'
-        - id: big
-          vdu-profile:
-            id: vdu-b-1
-            min-number-of-instances: '1'
-            max-number-of-instances: '4'
-          instantiation-level:
-            - id: double
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '2'
-            - id: triple
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '3'
-          default-instantiation-level: double
-          lcm-operations-configuration:
-            scale-vnf-to-level-op-config:
-              arbitrary-target-levels-supported: 'true'
-            terminate-vnf-op-config:
-              min-graceful-termination: '1'
-            operate-vnf-op-config:
-              min-graceful-stop-timeout: '1'
\ No newline at end of file