Merge branch 'sol006' into 'master'

Sol006 merge

See merge request !106

simple_ee_vnf/simple_ee_vnfd.yaml

-vnfd-catalog:
-    vnfd:
-    -   id: simple_ee-vnf
-        name: simple_ee-vnf
-        short-name: simple_ee-vnf
-        version: "1.0"
-        description: A VNF consisting of 1 VDU with cloud-init, and a monitoring ee
-        logo: osm.png
-        connection-point:
-        -   id: vnf-mgmt
-            name: vnf-mgmt
-            short-name: vnf-mgmt
-            type: VPORT
-        mgmt-interface:
-            cp: vnf-mgmt
-        vdu:
-        -   id: mgmtVM
-            name: mgmtVM
-            image: ubuntu16.04
-            count: 1
-            vm-flavor:
-                vcpu-count: 1
-                memory-mb: 1024
-                storage-gb: 20
-            guest-epa:
-                cpu-pinning-policy: DEDICATED
-                cpu-thread-pinning-policy: PREFER
-                mempage-size: LARGE
-                numa-node-policy:
-                    mem-policy: STRICT
-                    node-cnt: '1'
-                    node:
-                    -   id: '1'
-            interface:
-            -   name: mgmtVM-eth0
-                position: 1
-                type: EXTERNAL
-                virtual-interface:
-                    type: PARAVIRT
-                external-connection-point-ref: vnf-mgmt
-            cloud-init-file: cloud-config.txt
-        vnf-configuration:
-            config-access:
-                ssh-access:
-                    default-user: ubuntu
-                    required: true
-            execution-environment-list:
-            -   id: monitor
-                helm-chart: eechart
-                connection-point-ref: vnf-mgmt
-            initial-config-primitive:
-            -   seq: "1"
-                name: config
-                execution-environment-ref: monitor
-                parameter:
-                -   name: ssh-hostname
-                    value: <rw_mgmt_ip>
-                -   name: ssh-username
-                    value: ubuntu
-                -   name: ssh-password
-                    value: osm2020
-            -   seq: "2"
-                name: touch
-                execution-environment-ref: monitor
-                parameter:
-                -   name: file-path
-                    value: "/home/ubuntu/first-touch"
-            config-primitive:
-            -   name: touch
-                execution-environment-ref: monitor
-                execution-environment-primitive: touch
-                parameter:
-                -   name: file-path
-                    default-value: "/home/ubuntu/touched"
-                    data-type: STRING
-            -   name: sleep
-                execution-environment-ref: monitor
-                execution-environment-primitive: sleep
-    
+vnfd:
+  description: A VNF consisting of 1 VDU with cloud-init, and a monitoring ee
+  df:
+  - id: default-df
+    instantiation-level:
+    - id: default-instantiation-level
+      vdu-level:
+      - number-of-instances: 1
+        vdu-id: mgmtVM
+    vdu-profile:
+    - id: mgmtVM
+      min-number-of-instances: 1
+    vnf-configuration-id: default-vnf-configuration
+  ext-cpd:
+  - id: vnf-mgmt-ext
+    int-cpd:
+      cpd: mgmtVM-eth0-int
+      vdu-id: mgmtVM
+  id: simple_ee-vnf
+  mgmt-cp: vnf-mgmt-ext
+  product-name: simple_ee-vnf
+  sw-image-desc:
+  - id: ubuntu16.04
+    image: ubuntu16.04
+    name: ubuntu16.04
+  vdu:
+  - cloud-init-file: cloud-config.txt
+    id: mgmtVM
+    int-cpd:
+    - id: mgmtVM-eth0-int
+      virtual-network-interface-requirement:
+      - name: mgmtVM-eth0
+        position: 1
+        virtual-interface:
+          type: PARAVIRT
+    name: mgmtVM
+    sw-image-desc: ubuntu16.04
+    virtual-compute-desc: mgmtVM-compute
+    virtual-storage-desc:
+    - mgmtVM-storage
+  version: '1.0'
+  virtual-compute-desc:
+  - id: mgmtVM-compute
+    virtual-cpu:
+      num-virtual-cpu: 1
+      pinning:
+        policy: static
+        thread-policy: PREFER
+    virtual-memory:
+      mempage-size: LARGE
+      numa-enabled: true
+      numa-node-policy:
+        mem-policy: STRICT
+        node:
+        - id: '1'
+        node-cnt: '1'
+      size: 1.0
+  virtual-storage-desc:
+  - id: mgmtVM-storage
+    size-of-storage: 20
+  vnf-configuration:
+  - config-access:
+      ssh-access:
+        default-user: ubuntu
+        required: true
+    config-primitive:
+    - execution-environment-primitive: touch
+      execution-environment-ref: monitor
+      name: touch
+      parameter:
+      - data-type: STRING
+        default-value: /home/ubuntu/touched
+        name: file-path
+    - execution-environment-primitive: sleep
+      execution-environment-ref: monitor
+      name: sleep
+    execution-environment-list:
+    - connection-point-ref: vnf-mgmt
+      helm-chart: eechart
+      id: monitor
+    id: default-vnf-configuration
+    initial-config-primitive:
+    - execution-environment-ref: monitor
+      name: config
+      parameter:
+      - name: ssh-hostname
+        value: <rw_mgmt_ip>
+      - name: ssh-username
+        value: ubuntu
+      - name: ssh-password
+        value: osm2020
+      seq: '1'
+    - execution-environment-ref: monitor
+      name: touch
+      parameter:
+      - name: file-path
+        value: /home/ubuntu/first-touch
+      seq: '2'

simple_nopasswd_ns/simple_nopasswd_nsd.yaml

-nsd-catalog:
-    nsd:
-    -   id: simple_nopasswd-ns
-        name: simple_nopasswd-ns
-        short-name: simple_nopasswd-ns
-        description: NS with 2 VNFs simple_nopasswd-vnf connected by datanet and mgmtnet VLs
-        version: '1.0'
-        logo: osm.png
-        constituent-vnfd:
-        -   vnfd-id-ref: simple_nopasswd-vnf
-            member-vnf-index: '1'
-        # -   vnfd-id-ref: hackfest-simplecharm-vnf
-        #     member-vnf-index: '2'
-        vld:
-        -   id: mgmtnet
-            name: mgmtnet
-            short-name: mgmtnet
-            type: ELAN
-            mgmt-network: true
-            vim-network-name: mgmt
-            vnfd-connection-point-ref:
-            -   vnfd-id-ref: simple_nopasswd-vnf
-                member-vnf-index-ref: '1'
-                vnfd-connection-point-ref: vnf-mgmt
-            # -   vnfd-id-ref: hackfest-simplecharm-vnf
-            #     member-vnf-index-ref: '2'
-            #     vnfd-connection-point-ref: vnf-mgmt
-        -   id: datanet
-            name: datanet
-            short-name: datanet
-            type: ELAN
-            vnfd-connection-point-ref:
-            -   vnfd-id-ref: simple_nopasswd-vnf
-                member-vnf-index-ref: '1'
-                vnfd-connection-point-ref: vnf-data
-            # -   vnfd-id-ref: hackfest-simplecharm-vnf
-            #     member-vnf-index-ref: '2'
-            #     vnfd-connection-point-ref: vnf-data
-
+nsd:
+  nsd:
+  - description: NS with 2 VNFs simple_nopasswd-vnf connected by datanet and mgmtnet
+      VLs
+    df:
+    - id: default-df
+      vnf-profile:
+      - id: '1'
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: '1'
+            constituent-cpd-id: vnf-mgmt-ext
+          virtual-link-profile-id: mgmtnet
+        - constituent-cpd-id:
+          - constituent-base-element-id: '1'
+            constituent-cpd-id: vnf-data-ext
+          virtual-link-profile-id: datanet
+        vnfd-id: simple_nopasswd-vnf
+    id: simple_nopasswd-ns
+    name: simple_nopasswd-ns
+    version: '1.0'
+    virtual-link-desc:
+    - id: mgmtnet
+      mgmt-network: true
+    - id: datanet
+    vnfd-id:
+    - simple_nopasswd-vnf

simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml

-vnfd-catalog:
-  vnfd:
-  - connection-point:
-    - id: vnf-mgmt
-      name: vnf-mgmt
-      short-name: vnf-mgmt
-      type: VPORT
-    - id: vnf-data
-      name: vnf-data
-      short-name: vnf-data
-      type: VPORT
-    description: A VNF consisting of 2 VDUs connected to an internal VL, and one VDU
-      with cloud-init
-    id: simple_nopasswd-vnf
-    internal-vld:
-    - id: internal
-      internal-connection-point:
-      - id-ref: mgmtVM-internal
-      - id-ref: dataVM-internal
-      name: internal
-      short-name: internal
-      type: ELAN
-    logo: osm.png
-    mgmt-interface:
-      cp: vnf-mgmt
-    name: simple_nopasswd-vnf
-    short-name: simple_nopasswd-vnf
-    vdu:
-    - cloud-init-file: cloud-config.txt
-      count: '1'
-      id: mgmtVM
-      image: ubuntu16.04
-      interface:
-      - external-connection-point-ref: vnf-mgmt
-        name: mgmtVM-eth0
-        position: '1'
-        type: EXTERNAL
+vnfd:
+  description: A VNF consisting of 2 VDUs connected to an internal VL, and one VDU
+    with cloud-init
+  df:
+  - id: default-df
+    instantiation-level:
+    - id: default-instantiation-level
+      vdu-level:
+      - number-of-instances: 1
+        vdu-id: mgmtVM
+      - number-of-instances: 1
+        vdu-id: dataVM
+    vdu-profile:
+    - id: mgmtVM
+      min-number-of-instances: 1
+    - id: dataVM
+      min-number-of-instances: 1
+    vnf-configuration-id: default-vnf-configuration
+  ext-cpd:
+  - id: vnf-mgmt-ext
+    int-cpd:
+      cpd: mgmtVM-eth0-int
+      vdu-id: mgmtVM
+  - id: vnf-data-ext
+    int-cpd:
+      cpd: dataVM-xe0-int
+      vdu-id: dataVM
+  id: simple_nopasswd-vnf
+  int-virtual-link-desc:
+  - id: internal
+  mgmt-cp: vnf-mgmt-ext
+  product-name: simple_nopasswd-vnf
+  sw-image-desc:
+  - id: ubuntu16.04
+    image: ubuntu16.04
+    name: ubuntu16.04
+  vdu:
+  - cloud-init-file: cloud-config.txt
+    id: mgmtVM
+    int-cpd:
+    - id: mgmtVM-eth0-int
+      virtual-network-interface-requirement:
+      - name: mgmtVM-eth0
+        position: 1
         virtual-interface:
           type: PARAVIRT
-      - internal-connection-point-ref: mgmtVM-internal
-        name: mgmtVM-eth1
-        position: '2'
-        type: INTERNAL
+    - id: mgmtVM-eth1-int
+      int-virtual-link-desc: internal
+      virtual-network-interface-requirement:
+      - name: mgmtVM-eth1
+        position: 2
         virtual-interface:
           type: PARAVIRT
-      internal-connection-point:
-      - id: mgmtVM-internal
-        name: mgmtVM-internal
-        short-name: mgmtVM-internal
-        type: VPORT
-      name: mgmtVM
-      vm-flavor:
-        memory-mb: '1024'
-        storage-gb: '10'
-        vcpu-count: '1'
-    - count: '1'
-      id: dataVM
-      image: ubuntu16.04
-      interface:
-      - internal-connection-point-ref: dataVM-internal
-        name: dataVM-eth0
-        position: '1'
-        type: INTERNAL
+    name: mgmtVM
+    sw-image-desc: ubuntu16.04
+    virtual-compute-desc: mgmtVM-compute
+    virtual-storage-desc:
+    - mgmtVM-storage
+  - id: dataVM
+    int-cpd:
+    - id: dataVM-eth0-int
+      int-virtual-link-desc: internal
+      virtual-network-interface-requirement:
+      - name: dataVM-eth0
+        position: 1
         virtual-interface:
           type: PARAVIRT
-      - external-connection-point-ref: vnf-data
-        name: dataVM-xe0
-        position: '2'
-        type: EXTERNAL
+    - id: dataVM-xe0-int
+      virtual-network-interface-requirement:
+      - name: dataVM-xe0
+        position: 2
         virtual-interface:
           type: PARAVIRT
-      internal-connection-point:
-      - id: dataVM-internal
-        name: dataVM-internal
-        short-name: dataVM-internal
-        type: VPORT
-      name: dataVM
-      vm-flavor:
-        memory-mb: '1024'
-        storage-gb: '10'
-        vcpu-count: '1'
-    version: '1.0'
-    vnf-configuration:
-      config-access:
-        ssh-access:
-          default-user: ubuntu
-          required: true
-      config-primitive:
-      - name: touch
-        parameter:
-        - data-type: STRING
-          default-value: /home/ubuntu/touched
-          name: filename
-      initial-config-primitive:
-      - name: config
-        parameter:
-        - name: ssh-hostname
-          value: <rw_mgmt_ip>
-        - name: ssh-username
-          value: ubuntu
-        seq: '1'
-      - name: touch
-        parameter:
-        - name: filename
-          value: /home/ubuntu/first-touch
-        seq: '2'
-      juju:
-        charm: simple
+    name: dataVM
+    sw-image-desc: ubuntu16.04
+    virtual-compute-desc: dataVM-compute
+    virtual-storage-desc:
+    - dataVM-storage
+  version: '1.0'
+  virtual-compute-desc:
+  - id: mgmtVM-compute
+    virtual-cpu:
+      num-virtual-cpu: 1
+    virtual-memory:
+      size: 1.0
+  - id: dataVM-compute
+    virtual-cpu:
+      num-virtual-cpu: 1
+    virtual-memory:
+      size: 1.0
+  virtual-storage-desc:
+  - id: mgmtVM-storage
+    size-of-storage: 10
+  - id: dataVM-storage
+    size-of-storage: 10
+  vnf-configuration:
+  - config-access:
+      ssh-access:
+        default-user: ubuntu
+        required: true
+    config-primitive:
+    - name: touch
+      parameter:
+      - data-type: STRING
+        default-value: /home/ubuntu/touched
+        name: filename
+    id: default-vnf-configuration
+    initial-config-primitive:
+    - name: config
+      parameter:
+      - name: ssh-hostname
+        value: <rw_mgmt_ip>
+      - name: ssh-username
+        value: ubuntu
+      seq: '1'
+    - name: touch
+      parameter:
+      - name: filename
+        value: /home/ubuntu/first-touch
+      seq: '2'
+    juju:
+      charm: simple

slice_basic_middle_ns/slice_basic_middle_nsd.yaml

-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-nsd-catalog:
-    nsd:
-    -   id: slice_basic_middle_ns
-        name: slice_basic_middle_ns
-        short-name: slice_basic_middle_ns
-        description: NSD to be used on Slice Testing
-        vendor: OSM
-        version: '1.0'
-        logo: osm_2x.png
-
-        constituent-vnfd:
-        -   member-vnf-index: middle
-            vnfd-id-ref: slice_basic_middle_vnf
-
-        connection-point:
-        -   name: nsd_cp_mgmt
-            vld-id-ref: nsd_vnfd_vld_mgmt
-        -   name: nsd_cp_data1
-            vld-id-ref: nsd_vnfd_vld_data1
-        -   name: nsd_cp_data2
-            vld-id-ref: nsd_vnfd_vld_data2
-
-        vld:
-        -   id: nsd_vnfd_vld_mgmt
-            name: nsd_vnfd_vld_mgmt
-            short-name: nsd_vnfd_vld_mgmt
-            type: ELAN
-            mgmt-network: true
-            vnfd-connection-point-ref:
-            -   member-vnf-index-ref: middle
-                vnfd-id-ref: slice_basic_middle_vnf
-                vnfd-connection-point-ref: eth0
-        -   id: nsd_vnfd_vld_data1
-            name: nsd_vnfd_vld_data1
-            short-name: nsd_vnfd_vld_data1
-            type: ELAN
-            mgmt-network: false
-            vnfd-connection-point-ref:
-            -   member-vnf-index-ref: middle
-                vnfd-id-ref: slice_basic_middle_vnf
-                vnfd-connection-point-ref: eth1
-        -   id: nsd_vnfd_vld_data2
-            name: nsd_vnfd_vld_data2
-            short-name: nsd_vnfd_vld_data2
-            type: ELAN
-            mgmt-network: false
-            vnfd-connection-point-ref:
-            -   member-vnf-index-ref: middle
-                vnfd-id-ref: slice_basic_middle_vnf
-                vnfd-connection-point-ref: eth2
+nsd:
+  nsd:
+  - description: NSD to be used on Slice Testing
+    designer: OSM
+    df:
+    - id: default-df
+      vnf-profile:
+      - id: middle
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: middle
+            constituent-cpd-id: eth0-ext
+          virtual-link-profile-id: nsd_vnfd_vld_mgmt
+        - constituent-cpd-id:
+          - constituent-base-element-id: middle
+            constituent-cpd-id: eth1-ext
+          virtual-link-profile-id: nsd_vnfd_vld_data1
+        - constituent-cpd-id:
+          - constituent-base-element-id: middle
+            constituent-cpd-id: eth2-ext
+          virtual-link-profile-id: nsd_vnfd_vld_data2
+        vnfd-id: slice_basic_middle_vnf
+    id: slice_basic_middle_ns
+    name: slice_basic_middle_ns
+    version: '1.0'
+    virtual-link-desc:
+    - id: nsd_vnfd_vld_mgmt
+      mgmt-network: true
+    - id: nsd_vnfd_vld_data1
+    - id: nsd_vnfd_vld_data2
+    vnfd-id:
+    - slice_basic_middle_vnf

slice_basic_middle_vnf/slice_basic_middle_vnfd.yaml

-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vnfd-catalog:
-    vnfd:
-    -   id: slice_basic_middle_vnf
-        name: slice_basic_middle_vnf
-        short-name: slice_basic_middle_vnf
-        description: VNFD with 3 CPs to be used on Slice Testing
-        vendor: OSM
-        version: '1.0'
-
-        # Management interface
-        mgmt-interface:
-            cp: eth0
-
-        # Atleast one VDU need to be specified
-        vdu:
-        -   id: ubuntu_slice-VM
-            name: ubuntu_slice-VM
-            description: ubuntu_slice-VM
-            count: 1
-            cloud-init-file: cloud-config.txt
-            
-            # Flavour of the VM to be instantiated for the VDU
-            # flavor below can fit into m1.micro
-            vm-flavor:
-                vcpu-count: 1
-                memory-mb: 1024
-                storage-gb: 10
-
-            # Image/checksum or image including the full path
-            image: 'ubuntu18.04'
-            #checksum: 
-
-            interface:
-            # Specify the external interfaces
-            # There can be multiple interfaces defined
-            -   name: eth0
-                type: EXTERNAL
-                virtual-interface:
-                    type: VIRTIO
-                    bandwidth: 0
-                    vpci: 0000:00:0a.0
-                external-connection-point-ref: eth0
-            -   name: eth1
-                type: EXTERNAL
-                virtual-interface:
-                    type: VIRTIO
-                    bandwidth: 0
-                    vpci: 0000:00:0a.0
-                external-connection-point-ref: eth1
-            -   name: eth2
-                type: EXTERNAL
-                virtual-interface:
-                    type: VIRTIO
-                    bandwidth: 0
-                    vpci: 0000:00:0a.0
-                external-connection-point-ref: eth2
-
-        connection-point:
-        -   name: eth0
-            type: VPORT
-        -   name: eth1
-            type: VPORT
-        -   name: eth2
-            type: VPORT
+vnfd:
+  description: VNFD with 3 CPs to be used on Slice Testing
+  df:
+  - id: default-df
+    instantiation-level:
+    - id: default-instantiation-level
+      vdu-level:
+      - number-of-instances: 1
+        vdu-id: ubuntu_slice-VM
+    vdu-profile:
+    - id: ubuntu_slice-VM
+      min-number-of-instances: 1
+  ext-cpd:
+  - id: eth0-ext
+    int-cpd:
+      cpd: eth0-int
+      vdu-id: ubuntu_slice-VM
+  - id: eth1-ext
+    int-cpd:
+      cpd: eth1-int
+      vdu-id: ubuntu_slice-VM
+  - id: eth2-ext
+    int-cpd:
+      cpd: eth2-int
+      vdu-id: ubuntu_slice-VM
+  id: slice_basic_middle_vnf
+  mgmt-cp: eth0-ext
+  product-name: slice_basic_middle_vnf
+  provider: OSM
+  sw-image-desc:
+  - id: ubuntu18.04
+    image: ubuntu18.04
+    name: ubuntu18.04
+  vdu:
+  - cloud-init-file: cloud-config.txt
+    description: ubuntu_slice-VM
+    id: ubuntu_slice-VM
+    int-cpd:
+    - id: eth0-int
+      virtual-network-interface-requirement:
+      - name: eth0
+        virtual-interface:
+          bandwidth: 0
+          type: VIRTIO
+          vpci: 0000:00:0a.0
+    - id: eth1-int
+      virtual-network-interface-requirement:
+      - name: eth1
+        virtual-interface:
+          bandwidth: 0
+          type: VIRTIO
+          vpci: 0000:00:0a.0
+    - id: eth2-int
+      virtual-network-interface-requirement:
+      - name: eth2
+        virtual-interface:
+          bandwidth: 0
+          type: VIRTIO
+          vpci: 0000:00:0a.0
+    name: ubuntu_slice-VM
+    sw-image-desc: ubuntu18.04
+    virtual-compute-desc: ubuntu_slice-VM-compute
+    virtual-storage-desc:
+    - ubuntu_slice-VM-storage
+  version: '1.0'
+  virtual-compute-desc:
+  - id: ubuntu_slice-VM-compute
+    virtual-cpu:
+      num-virtual-cpu: 1
+    virtual-memory:
+      size: 1.0
+  virtual-storage-desc:
+  - id: ubuntu_slice-VM-storage
+    size-of-storage: 10

slice_basic_ns/slice_basic_nsd.yaml

-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-nsd-catalog:
-    nsd:
-    -   id: slice_basic_ns
-        name: slice_basic_ns
-        short-name: slice_basic_ns
-        description: NSD to be used on Slice Testing
-        vendor: OSM
-        version: '1.0'
-        logo: osm_2x.png
-
-        constituent-vnfd:
-        -   member-vnf-index: edge
-            vnfd-id-ref: slice_basic_vnf
-
-        connection-point:
-        -   name: nsd_cp_mgmt
-            vld-id-ref: nsd_vnfd_vld_mgmt
-        -   name: nsd_cp_data
-            vld-id-ref: nsd_vnfd_vld_data
-
-        vld:
-        -   id: nsd_vnfd_vld_mgmt
-            name: nsd_vnfd_vld_mgmt
-            short-name: nsd_vnfd_vld_mgmt
-            type: ELAN
-            mgmt-network: true
-            vnfd-connection-point-ref:
-            -   member-vnf-index-ref: edge
-                vnfd-id-ref: slice_basic_vnf
-                vnfd-connection-point-ref: eth0
-        -   id: nsd_vnfd_vld_data
-            name: nsd_vnfd_vld_data
-            short-name: nsd_vnfd_vld_data
-            type: ELAN
-            mgmt-network: false
-            vnfd-connection-point-ref:
-            -   member-vnf-index-ref: edge
-                vnfd-id-ref: slice_basic_vnf
-                vnfd-connection-point-ref: eth1
+nsd:
+  nsd:
+  - description: NSD to be used on Slice Testing
+    designer: OSM
+    df:
+    - id: default-df
+      vnf-profile:
+      - id: edge
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: edge
+            constituent-cpd-id: eth0-ext
+          virtual-link-profile-id: nsd_vnfd_vld_mgmt
+        - constituent-cpd-id:
+          - constituent-base-element-id: edge
+            constituent-cpd-id: eth1-ext
+          virtual-link-profile-id: nsd_vnfd_vld_data
+        vnfd-id: slice_basic_vnf
+    id: slice_basic_ns
+    name: slice_basic_ns
+    version: '1.0'
+    virtual-link-desc:
+    - id: nsd_vnfd_vld_mgmt
+      mgmt-network: true
+    - id: nsd_vnfd_vld_data
+    vnfd-id:
+    - slice_basic_vnf

slice_basic_vnf/slice_basic_vnfd.yaml

-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-vnfd-catalog:
-    vnfd:
-    -   id: slice_basic_vnf
-        name: slice_basic_vnf
-        short-name: slice_basic_vnf
-        description: VNFD with 2 CPs to be used on Slice Testing
-        vendor: OSM
-        version: '1.0'
-
-        # Management interface
-        mgmt-interface:
-            cp: eth0
-
-        # Atleast one VDU need to be specified
-        vdu:
-        -   id: ubuntu_slice-VM
-            name: ubuntu_slice-VM
-            description: ubuntu_slice-VM
-            count: 1
-            cloud-init-file: cloud-config.txt
-
-            # Flavour of the VM to be instantiated for the VDU
-            # flavor below can fit into m1.micro
-            vm-flavor:
-                vcpu-count: 1
-                memory-mb: 1024
-                storage-gb: 10
-
-            # Image/checksum or image including the full path
-            image: 'ubuntu18.04'
-            #checksum: 
-
-            interface:
-            # Specify the external interfaces
-            # There can be multiple interfaces defined
-            -   name: eth0
-                type: EXTERNAL
-                virtual-interface:
-                    type: VIRTIO
-                    bandwidth: 0
-                    vpci: 0000:00:0a.0
-                external-connection-point-ref: eth0
-            -   name: eth1
-                type: EXTERNAL
-                virtual-interface:
-                    type: VIRTIO
-                    bandwidth: 0
-                    vpci: 0000:00:0a.0
-                external-connection-point-ref: eth1
-
-        connection-point:
-        -   name: eth0
-            type: VPORT
-        -   name: eth1
-            type: VPORT
+vnfd:
+  description: VNFD with 2 CPs to be used on Slice Testing
+  df:
+  - id: default-df
+    instantiation-level:
+    - id: default-instantiation-level
+      vdu-level:
+      - number-of-instances: 1
+        vdu-id: ubuntu_slice-VM
+    vdu-profile:
+    - id: ubuntu_slice-VM
+      min-number-of-instances: 1
+  ext-cpd:
+  - id: eth0-ext
+    int-cpd:
+      cpd: eth0-int
+      vdu-id: ubuntu_slice-VM
+  - id: eth1-ext
+    int-cpd:
+      cpd: eth1-int
+      vdu-id: ubuntu_slice-VM
+  id: slice_basic_vnf
+  mgmt-cp: eth0-ext
+  product-name: slice_basic_vnf
+  provider: OSM
+  sw-image-desc:
+  - id: ubuntu18.04
+    image: ubuntu18.04
+    name: ubuntu18.04
+  vdu:
+  - cloud-init-file: cloud-config.txt
+    description: ubuntu_slice-VM
+    id: ubuntu_slice-VM
+    int-cpd:
+    - id: eth0-int
+      virtual-network-interface-requirement:
+      - name: eth0
+        virtual-interface:
+          bandwidth: 0
+          type: VIRTIO
+          vpci: 0000:00:0a.0
+    - id: eth1-int
+      virtual-network-interface-requirement:
+      - name: eth1
+        virtual-interface:
+          bandwidth: 0
+          type: VIRTIO
+          vpci: 0000:00:0a.0
+    name: ubuntu_slice-VM
+    sw-image-desc: ubuntu18.04
+    virtual-compute-desc: ubuntu_slice-VM-compute
+    virtual-storage-desc:
+    - ubuntu_slice-VM-storage
+  version: '1.0'
+  virtual-compute-desc:
+  - id: ubuntu_slice-VM-compute
+    virtual-cpu:
+      num-virtual-cpu: 1
+    virtual-memory:
+      size: 1.0
+  virtual-storage-desc:
+  - id: ubuntu_slice-VM-storage
+    size-of-storage: 10

snmp_ee_ns/snmp_ee_nsd.yaml

-nsd-catalog:
-    nsd:
-        - id: snmp_ee-ns
-          name: snmp_ee-ns
-          short-name: snmp_ee-ns
-          description: Single VyOS Router VNF with SNMP metrics
-          version: "1.0"
-          logo: osm.png
-          constituent-vnfd:
-              - vnfd-id-ref: snmp_ee-vnf
-                member-vnf-index: "VyOS Router"
-          vld:
-              - id: mgmtnet
-                name: mgmtnet
-                short-name: mgmtnet
-                type: ELAN
-                mgmt-network: true
-                vim-network-name: osm-ext
-                vnfd-connection-point-ref:
-                    - vnfd-id-ref: snmp_ee-vnf
-                      member-vnf-index-ref: "VyOS Router"
-                      vnfd-connection-point-ref: vnf-mgmt
-              - id: internal
-                name: internal
-                short-name: internal
-                type: ELAN
-                vnfd-connection-point-ref:
-                    - vnfd-id-ref: snmp_ee-vnf
-                      member-vnf-index-ref: "VyOS Router"
-                      vnfd-connection-point-ref: vnf-internal
-              - id: external
-                name: external
-                short-name: external
-                type: ELAN
-                vnfd-connection-point-ref:
-                    - vnfd-id-ref: snmp_ee-vnf
-                      member-vnf-index-ref: "VyOS Router"
-                      vnfd-connection-point-ref: vnf-external
+nsd:
+  nsd:
+  - description: Single VyOS Router VNF with SNMP metrics
+    df:
+    - id: default-df
+      vnf-profile:
+      - id: VyOS Router
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: VyOS Router
+            constituent-cpd-id: vnf-mgmt-ext
+          virtual-link-profile-id: mgmtnet
+        - constituent-cpd-id:
+          - constituent-base-element-id: VyOS Router
+            constituent-cpd-id: vnf-internal-ext
+          virtual-link-profile-id: internal
+        - constituent-cpd-id:
+          - constituent-base-element-id: VyOS Router
+            constituent-cpd-id: vnf-external-ext
+          virtual-link-profile-id: external
+        vnfd-id: snmp_ee-vnf
+    id: snmp_ee-ns
+    name: snmp_ee-ns
+    version: '1.0'
+    virtual-link-desc:
+    - id: mgmtnet
+      mgmt-network: true
+    - id: internal
+    - id: external
+    vnfd-id:
+    - snmp_ee-vnf

snmp_ee_vnf/snmp_ee_vnfd.yaml

-vnfd-catalog:
-    vnfd:
-        - id: snmp_ee-vnf
-          name: snmp_ee-vnf
-          short-name: snmp_ee-vnf
-          version: "1.0"
-          description: A basic virtual router with SNMP metrics collection
-          connection-point:
-              - name: vnf-mgmt
-                type: VPORT
-              - name: vnf-internal
-                type: VPORT
-                port-security-enabled: false
-              - name: vnf-external
-                type: VPORT
-                port-security-enabled: false
-          vdu:
-              - id: vyos-VM
-                name: vyos-VM
-                cloud-init-file: vyos-userdata
-                image: vyos-1.1.7
-                count: 1
-                vm-flavor:
-                    vcpu-count: 1
-                    memory-mb: 2048
-                    storage-gb: 10
-                interface:
-                    - name: vdu-eth0
-                      type: EXTERNAL
-                      position: 0
-                      virtual-interface:
-                          type: PARAVIRT
-                      external-connection-point-ref: vnf-mgmt
-                    - name: vdu-eth1
-                      type: EXTERNAL
-                      position: 1
-                      virtual-interface:
-                          type: PARAVIRT
-                      external-connection-point-ref: vnf-internal
-                    - name: vdu-eth2
-                      type: EXTERNAL
-                      position: 2
-                      virtual-interface:
-                          type: PARAVIRT
-                      external-connection-point-ref: vnf-external
-                supplemental-boot-data:
-                    boot-data-drive: true
-          mgmt-interface:
-              cp: vnf-mgmt
-          vnf-configuration:
-              execution-environment-list:
-                  - id: monitor
-                    helm-chart: eechart
-                    metric-service: snmpexporter
-                    connection-point-ref: vnf-mgmt
-              initial-config-primitive:
-                  - seq: 1
-                    name: config
-                    execution-environment-ref: monitor
-                    parameter:
-                        - name: ssh-hostname
-                          value: <rw_mgmt_ip>
-                        - name: ssh-username
-                          value: osm
-                        - name: ssh-password
-                          value: osm2020
-                  - seq: 2
-                    name: generate_snmp
-                    execution-environment-ref: monitor
-              config-primitive:
-                  - name: generate_snmp
-                    execution-environment-ref: monitor
+vnfd:
+  description: A basic virtual router with SNMP metrics collection
+  df:
+  - id: default-df
+    instantiation-level:
+    - id: default-instantiation-level
+      vdu-level:
+      - number-of-instances: 1
+        vdu-id: vyos-VM
+    vdu-profile:
+    - id: vyos-VM
+      min-number-of-instances: 1
+    vnf-configuration-id: default-vnf-configuration
+  ext-cpd:
+  - id: vnf-mgmt-ext
+    int-cpd:
+      cpd: vdu-eth0-int
+      vdu-id: vyos-VM
+  - id: vnf-internal-ext
+    int-cpd:
+      cpd: vdu-eth1-int
+      vdu-id: vyos-VM
+  - id: vnf-external-ext
+    int-cpd:
+      cpd: vdu-eth2-int
+      vdu-id: vyos-VM
+  id: snmp_ee-vnf
+  mgmt-cp: vnf-mgmt-ext
+  product-name: snmp_ee-vnf
+  sw-image-desc:
+  - id: vyos-1.1.7
+    image: vyos-1.1.7
+    name: vyos-1.1.7
+  vdu:
+  - cloud-init-file: vyos-userdata
+    id: vyos-VM
+    int-cpd:
+    - id: vdu-eth0-int
+      virtual-network-interface-requirement:
+      - name: vdu-eth0
+        position: 0
+        virtual-interface:
+          type: PARAVIRT
+    - id: vdu-eth1-int
+      virtual-network-interface-requirement:
+      - name: vdu-eth1
+        position: 1
+        virtual-interface:
+          type: PARAVIRT
+    - id: vdu-eth2-int
+      virtual-network-interface-requirement:
+      - name: vdu-eth2
+        position: 2
+        virtual-interface:
+          type: PARAVIRT
+    name: vyos-VM
+    supplemental-boot-data:
+      boot-data-drive: true
+    sw-image-desc: vyos-1.1.7
+    virtual-compute-desc: vyos-VM-compute
+    virtual-storage-desc:
+    - vyos-VM-storage
+  version: '1.0'
+  virtual-compute-desc:
+  - id: vyos-VM-compute
+    virtual-cpu:
+      num-virtual-cpu: 1
+    virtual-memory:
+      size: 2.0
+  virtual-storage-desc:
+  - id: vyos-VM-storage
+    size-of-storage: 10
+  vnf-configuration:
+  - config-primitive:
+    - execution-environment-ref: monitor
+      name: generate_snmp
+    execution-environment-list:
+    - connection-point-ref: vnf-mgmt
+      helm-chart: eechart
+      id: monitor
+      metric-service: snmpexporter
+    id: default-vnf-configuration
+    initial-config-primitive:
+    - execution-environment-ref: monitor
+      name: config
+      parameter:
+      - name: ssh-hostname
+        value: <rw_mgmt_ip>
+      - name: ssh-username
+        value: osm
+      - name: ssh-password
+        value: osm2020
+      seq: 1
+    - execution-environment-ref: monitor
+      name: generate_snmp
+      seq: 2

snmp_setcomm_ee_ns/snmp_setcomm_ee_nsd.yaml

-nsd-catalog:
-    nsd:
-        - id: snmp_setcomm_ee-ns
-          name: snmp_setcomm_ee-ns
-          short-name: snmp_setcomm_ee-ns
-          description: Single VyOS Router VNF with SNMP metrics
-          version: "1.0"
-          logo: osm.png
-          constituent-vnfd:
-              - vnfd-id-ref: snmp_setcomm_ee-vnf
-                member-vnf-index: "VyOS Router"
-          vld:
-              - id: mgmtnet
-                name: mgmtnet
-                short-name: mgmtnet
-                type: ELAN
-                mgmt-network: true
-                vim-network-name: osm-ext
-                vnfd-connection-point-ref:
-                    - vnfd-id-ref: snmp_setcomm_ee-vnf
-                      member-vnf-index-ref: "VyOS Router"
-                      vnfd-connection-point-ref: vnf-mgmt
-              - id: internal
-                name: internal
-                short-name: internal
-                type: ELAN
-                vnfd-connection-point-ref:
-                    - vnfd-id-ref: snmp_setcomm_ee-vnf
-                      member-vnf-index-ref: "VyOS Router"
-                      vnfd-connection-point-ref: vnf-internal
-              - id: external
-                name: external
-                short-name: external
-                type: ELAN
-                vnfd-connection-point-ref:
-                    - vnfd-id-ref: snmp_setcomm_ee-vnf
-                      member-vnf-index-ref: "VyOS Router"
-                      vnfd-connection-point-ref: vnf-external
+nsd:
+  nsd:
+  - description: Single VyOS Router VNF with SNMP metrics
+    df:
+    - id: default-df
+      vnf-profile:
+      - id: VyOS Router
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: VyOS Router
+            constituent-cpd-id: vnf-mgmt-ext
+          virtual-link-profile-id: mgmtnet
+        - constituent-cpd-id:
+          - constituent-base-element-id: VyOS Router
+            constituent-cpd-id: vnf-internal-ext
+          virtual-link-profile-id: internal
+        - constituent-cpd-id:
+          - constituent-base-element-id: VyOS Router
+            constituent-cpd-id: vnf-external-ext
+          virtual-link-profile-id: external
+        vnfd-id: snmp_setcomm_ee-vnf
+    id: snmp_setcomm_ee-ns
+    name: snmp_setcomm_ee-ns
+    version: '1.0'
+    virtual-link-desc:
+    - id: mgmtnet
+      mgmt-network: true
+    - id: internal
+    - id: external
+    vnfd-id:
+    - snmp_setcomm_ee-vnf

snmp_setcomm_ee_vnf/snmp_setcomm_ee_vnfd.yaml

-vnfd-catalog:
-    vnfd:
-        - id: snmp_setcomm_ee-vnf
-          name: snmp_setcomm_ee-vnf
-          short-name: snmp_setcomm_ee-vnf
-          version: "1.0"
-          description: A basic virtual router with SNMP metrics collection
-          connection-point:
-              - name: vnf-mgmt
-                type: VPORT
-              - name: vnf-internal
-                type: VPORT
-                port-security-enabled: false
-              - name: vnf-external
-                type: VPORT
-                port-security-enabled: false
-          vdu:
-              - id: vyos-VM
-                name: vyos-VM
-                cloud-init-file: vyos-userdata
-                image: vyos-1.1.7
-                count: 1
-                vm-flavor:
-                    vcpu-count: 1
-                    memory-mb: 2048
-                    storage-gb: 10
-                interface:
-                    - name: vdu-eth0
-                      type: EXTERNAL
-                      position: 0
-                      virtual-interface:
-                          type: PARAVIRT
-                      external-connection-point-ref: vnf-mgmt
-                    - name: vdu-eth1
-                      type: EXTERNAL
-                      position: 1
-                      virtual-interface:
-                          type: PARAVIRT
-                      external-connection-point-ref: vnf-internal
-                    - name: vdu-eth2
-                      type: EXTERNAL
-                      position: 2
-                      virtual-interface:
-                          type: PARAVIRT
-                      external-connection-point-ref: vnf-external
-                supplemental-boot-data:
-                    boot-data-drive: true
-          mgmt-interface:
-              cp: vnf-mgmt
-          vnf-configuration:
-              execution-environment-list:
-                  - id: monitor
-                    helm-chart: eechart
-                    metric-service: snmpexporter
-                    connection-point-ref: vnf-mgmt
-              initial-config-primitive:
-                  - seq: 1
-                    name: config
-                    execution-environment-ref: monitor
-                    parameter:
-                        - name: ssh-hostname
-                          value: <rw_mgmt_ip>
-                        - name: ssh-username
-                          value: osm
-                        - name: ssh-password
-                          value: osm2020
-                  - seq: 2
-                    name: generate_snmp
-                    execution-environment-ref: monitor
-                  - seq: 3
-                    name: ansible_playbook
-                    execution-environment-ref: monitor
-                    parameter:
-                        - name: playbook-name
-                          value: community.yaml
-                        - name: snmp_community
-                          value: secret
-              config-primitive:
-                  - name: generate_snmp
-                    execution-environment-ref: monitor
-                  - name: ansible_playbook
-                    execution-environment-ref: monitor
-                    execution-environment-primitive: ansible_playbook
-                    parameter:
-                        - name: playbook-name
-                          default-value: playbook.yaml
-                          data-type: STRING
+vnfd:
+  description: A basic virtual router with SNMP metrics collection
+  df:
+  - id: default-df
+    instantiation-level:
+    - id: default-instantiation-level
+      vdu-level:
+      - number-of-instances: 1
+        vdu-id: vyos-VM
+    vdu-profile:
+    - id: vyos-VM
+      min-number-of-instances: 1
+    vnf-configuration-id: default-vnf-configuration
+  ext-cpd:
+  - id: vnf-mgmt-ext
+    int-cpd:
+      cpd: vdu-eth0-int
+      vdu-id: vyos-VM
+  - id: vnf-internal-ext
+    int-cpd:
+      cpd: vdu-eth1-int
+      vdu-id: vyos-VM
+  - id: vnf-external-ext
+    int-cpd:
+      cpd: vdu-eth2-int
+      vdu-id: vyos-VM
+  id: snmp_setcomm_ee-vnf
+  mgmt-cp: vnf-mgmt-ext
+  product-name: snmp_setcomm_ee-vnf
+  sw-image-desc:
+  - id: vyos-1.1.7
+    image: vyos-1.1.7
+    name: vyos-1.1.7
+  vdu:
+  - cloud-init-file: vyos-userdata
+    id: vyos-VM
+    int-cpd:
+    - id: vdu-eth0-int
+      virtual-network-interface-requirement:
+      - name: vdu-eth0
+        position: 0
+        virtual-interface:
+          type: PARAVIRT
+    - id: vdu-eth1-int
+      virtual-network-interface-requirement:
+      - name: vdu-eth1
+        position: 1
+        virtual-interface:
+          type: PARAVIRT
+    - id: vdu-eth2-int
+      virtual-network-interface-requirement:
+      - name: vdu-eth2
+        position: 2
+        virtual-interface:
+          type: PARAVIRT
+    name: vyos-VM
+    supplemental-boot-data:
+      boot-data-drive: true
+    sw-image-desc: vyos-1.1.7
+    virtual-compute-desc: vyos-VM-compute
+    virtual-storage-desc:
+    - vyos-VM-storage
+  version: '1.0'
+  virtual-compute-desc:
+  - id: vyos-VM-compute
+    virtual-cpu:
+      num-virtual-cpu: 1
+    virtual-memory:
+      size: 2.0
+  virtual-storage-desc:
+  - id: vyos-VM-storage
+    size-of-storage: 10
+  vnf-configuration:
+  - config-primitive:
+    - execution-environment-ref: monitor
+      name: generate_snmp
+    - execution-environment-primitive: ansible_playbook
+      execution-environment-ref: monitor
+      name: ansible_playbook
+      parameter:
+      - data-type: STRING
+        default-value: playbook.yaml
+        name: playbook-name
+    execution-environment-list:
+    - connection-point-ref: vnf-mgmt
+      helm-chart: eechart
+      id: monitor
+      metric-service: snmpexporter
+    id: default-vnf-configuration
+    initial-config-primitive:
+    - execution-environment-ref: monitor
+      name: config
+      parameter:
+      - name: ssh-hostname
+        value: <rw_mgmt_ip>
+      - name: ssh-username
+        value: osm
+      - name: ssh-password
+        value: osm2020
+      seq: 1
+    - execution-environment-ref: monitor
+      name: generate_snmp
+      seq: 2
+    - execution-environment-ref: monitor
+      name: ansible_playbook
+      parameter:
+      - name: playbook-name
+        value: community.yaml
+      - name: snmp_community
+        value: secret
+      seq: 3

ubuntu_cloudinit_ns/ubuntu_cloudinit_nsd.yaml

-nsd-catalog:
-    nsd:
-    -   id: ubuntu_cloudinit-ns
-        name: ubuntu_cloudinit-ns
-        short-name: ubuntu_cloudinit-ns
-        description: Generated by OSM package generator
-        vendor: OSM
-        version: '1.0'
-
-
-        constituent-vnfd:
-        -   member-vnf-index: 1
-            vnfd-id-ref: ubuntu_cloudinit-vnf
-
-        vld:
-        # Networks for the VNFs
-        -   id: mgmtnet
-            name: mgmtnet
-            short-name: mgmtnet
-            type: ELAN
-            mgmt-network: true
-            # vim-network-name: <update>
-            vnfd-connection-point-ref:
-            -   member-vnf-index-ref: 1
-                vnfd-id-ref: ubuntu_cloudinit-vnf
-                vnfd-connection-point-ref: vnf-cp0
+nsd:
+  nsd:
+  - description: Generated by OSM package generator
+    designer: OSM
+    df:
+    - id: default-df
+      vnf-profile:
+      - id: '1'
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: '1'
+            constituent-cpd-id: vnf-cp0-ext
+          virtual-link-profile-id: mgmtnet
+        vnfd-id: ubuntu_cloudinit-vnf
+    id: ubuntu_cloudinit-ns
+    name: ubuntu_cloudinit-ns
+    version: '1.0'
+    virtual-link-desc:
+    - id: mgmtnet
+      mgmt-network: true
+    vnfd-id:
+    - ubuntu_cloudinit-vnf

ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml

-vnfd-catalog:
-    vnfd:
-    -   id: ubuntu_cloudinit-vnf
-        name: ubuntu_cloudinit-vnf
-        short-name: ubuntu_cloudinit-vnf
-        description: Generated by OSM package generator
-        vendor: OSM
-        version: '1.0'
-
-        # Management interface
-        mgmt-interface:
-            cp: vnf-cp0
-
-        vdu:
-        -   id: ubuntu_cloudinit-vnf-VM
-            name: ubuntu_cloudinit-vnf-VM
-            description: ubuntu_cloudinit-vnf-VM
-            count: 1
-            cloud-init-file: cloud-init.cfg
-
-            vm-flavor:
-                vcpu-count: 2
-                memory-mb: 2048
-                storage-gb: 10
-
-            # Image including the full path
-            image: 'ubuntu16.04'
-
-            interface:
-            -   name: eth0
-                type: EXTERNAL
-                virtual-interface:
-                    type: PARAVIRT
-                external-connection-point-ref: vnf-cp0
-
-        connection-point:
-        -   name: vnf-cp0
-
+vnfd:
+  description: Generated by OSM package generator
+  df:
+  - id: default-df
+    instantiation-level:
+    - id: default-instantiation-level
+      vdu-level:
+      - number-of-instances: 1
+        vdu-id: ubuntu_cloudinit-vnf-VM
+    vdu-profile:
+    - id: ubuntu_cloudinit-vnf-VM
+      min-number-of-instances: 1
+  ext-cpd:
+  - id: vnf-cp0-ext
+    int-cpd:
+      cpd: eth0-int
+      vdu-id: ubuntu_cloudinit-vnf-VM
+  id: ubuntu_cloudinit-vnf
+  mgmt-cp: vnf-cp0-ext
+  product-name: ubuntu_cloudinit-vnf
+  provider: OSM
+  sw-image-desc:
+  - id: ubuntu16.04
+    image: ubuntu16.04
+    name: ubuntu16.04
+  vdu:
+  - cloud-init-file: cloud-init.cfg
+    description: ubuntu_cloudinit-vnf-VM
+    id: ubuntu_cloudinit-vnf-VM
+    int-cpd:
+    - id: eth0-int
+      virtual-network-interface-requirement:
+      - name: eth0
+        virtual-interface:
+          type: PARAVIRT
+    name: ubuntu_cloudinit-vnf-VM
+    sw-image-desc: ubuntu16.04
+    virtual-compute-desc: ubuntu_cloudinit-vnf-VM-compute
+    virtual-storage-desc:
+    - ubuntu_cloudinit-vnf-VM-storage
+  version: '1.0'
+  virtual-compute-desc:
+  - id: ubuntu_cloudinit-vnf-VM-compute
+    virtual-cpu:
+      num-virtual-cpu: 2
+    virtual-memory:
+      size: 2.0
+  virtual-storage-desc:
+  - id: ubuntu_cloudinit-vnf-VM-storage
+    size-of-storage: 10

vdu_replicas_ns/vdu_replicas_nsd.yaml

-nsd-catalog:
-    nsd:
-    -   id: vdu-replicas-ns
-        name: vdu-replicas-ns
-        short-name: vdu-replicas-ns
-        description: NS with 2 VNFs connected by datanet and mgmtnet VLs
-        version: '1.0'
-        logo: osm.png
-        constituent-vnfd:
-        -   vnfd-id-ref: vdu-replicas-vnf
-            member-vnf-index: 'vnf1'
-        -   vnfd-id-ref: vdu-replicas-vnf
-            member-vnf-index: 'vnf2'
-        vld:
-        -   id: mgmtnet
-            name: mgmtnet
-            short-name: mgmtnet
-            type: ELAN
-            mgmt-network: true
-            vnfd-connection-point-ref:
-            -   vnfd-id-ref: vdu-replicas-vnf
-                member-vnf-index-ref: 'vnf1'
-                vnfd-connection-point-ref: vnf-mgmt
-            -   vnfd-id-ref: vdu-replicas-vnf
-                member-vnf-index-ref: 'vnf2'
-                vnfd-connection-point-ref: vnf-mgmt
-        -   id: datanet
-            name: datanet
-            short-name: datanet
-            type: ELAN
-            vnfd-connection-point-ref:
-            -   vnfd-id-ref: vdu-replicas-vnf
-                member-vnf-index-ref: 'vnf1'
-                vnfd-connection-point-ref: vnf-data
-            -   vnfd-id-ref: vdu-replicas-vnf
-                member-vnf-index-ref: 'vnf2'
-                vnfd-connection-point-ref: vnf-data
-
+nsd:
+  nsd:
+  - description: NS with 2 VNFs connected by datanet and mgmtnet VLs
+    df:
+    - id: default-df
+      vnf-profile:
+      - id: vnf1
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: vnf1
+            constituent-cpd-id: vnf-mgmt-ext
+          virtual-link-profile-id: mgmtnet
+        - constituent-cpd-id:
+          - constituent-base-element-id: vnf1
+            constituent-cpd-id: vnf-data-ext
+          virtual-link-profile-id: datanet
+        vnfd-id: vdu-replicas-vnf
+      - id: vnf2
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: vnf2
+            constituent-cpd-id: vnf-mgmt-ext
+          virtual-link-profile-id: mgmtnet
+        - constituent-cpd-id:
+          - constituent-base-element-id: vnf2
+            constituent-cpd-id: vnf-data-ext
+          virtual-link-profile-id: datanet
+        vnfd-id: vdu-replicas-vnf
+    id: vdu-replicas-ns
+    name: vdu-replicas-ns
+    version: '1.0'
+    virtual-link-desc:
+    - id: mgmtnet
+      mgmt-network: true
+    - id: datanet
+    vnfd-id:
+    - vdu-replicas-vnf

vdu_replicas_vnf/vdu_replicas_vnfd.yaml

-vnfd-catalog:
-    vnfd:
-    -   id: vdu-replicas-vnf
-        name: vdu-replicas-vnf
-        short-name: vdu-replicas-vnf
-        version: '1.0'
-        description: A VNF with 2 replicas of vdu, internal vld and scaling
-        logo: osm.png
-        connection-point:
-        -   name: vnf-mgmt
-        -   name: vnf-data
-        mgmt-interface:
-            cp: vnf-mgmt
-        internal-vld:
-        -   id: internal
-            name: internal
-            type: ELAN
-            internal-connection-point:
-            -   id-ref: mgmtVM-internal
-            -   id-ref: dataVM-internal
-        -   id: interdata
-            name: interdata
-            type: ELAN
-            ip-profile-ref: interdataip
-            internal-connection-point:
-            -   id-ref: dataVM-interdata
-                ip-address: 192.168.101.20
-        ip-profiles:
-        - name: interdataip
-          description: internal data 
-          ip-profile-params:
-            ip-version: ipv4
-            subnet-address: 192.168.101.0/24
-            dhcp-params:
-              enabled: false
-        vdu:
-        -   id: mgmtVM
-            name: mgmtVM
-            image: ubuntu18.04
-            count: 1
-            vm-flavor:
-                vcpu-count: 1
-                memory-mb: 2048
-                storage-gb: 10
-            interface:
-            -   name: mgmtVM-eth0
-                position: 1
-                type: EXTERNAL
-                virtual-interface:
-                    type: PARAVIRT
-                external-connection-point-ref: vnf-mgmt
-            -   name: mgmtVM-eth1
-                position: 2
-                type: INTERNAL
-                virtual-interface:
-                    type: PARAVIRT
-                internal-connection-point-ref: mgmtVM-internal
-            internal-connection-point:
-            -   id: mgmtVM-internal
-            cloud-init-file: cloud-config.txt
-        -   id: dataVM
-            name: dataVM
-            image: ubuntu18.04
-            count: 2
-            vm-flavor:
-                vcpu-count: 1
-                memory-mb: 2048
-                storage-gb: 10
-            interface:
-            -   name: dataVM-eth0
-                position: 1
-                type: INTERNAL
-                virtual-interface:
-                    type: PARAVIRT
-                internal-connection-point-ref: dataVM-internal
-                mgmt-interface: True
-            -   name: dataVM-eth1
-                position: 2
-                type: INTERNAL
-                virtual-interface:
-                    type: PARAVIRT
-                internal-connection-point-ref: dataVM-interdata
-                mac-address: "00:11:22:33:aa:20"
-            -   name: dataVM-xe0
-                position: 3
-                type: EXTERNAL
-                virtual-interface:
-                    type: PARAVIRT
-                external-connection-point-ref: vnf-data
-            internal-connection-point:
-            -   id: dataVM-internal
-            -   id: dataVM-interdata
-            cloud-init-file: cloud-config.txt
-
-        scaling-group-descriptor:
-        -   max-instance-count: 10
-            name: scale_dataVM
-            vdu:
-            -   count: 2
-                vdu-id-ref: dataVM
-
-        vnf-configuration:
-            config-access:
-                ssh-access:
-                    default-user: ubuntu
-                    required: true
+vnfd:
+  description: A VNF with 2 replicas of vdu, internal vld and scaling
+  df:
+  - id: default-df
+    instantiation-level:
+    - id: default-instantiation-level
+      vdu-level:
+      - number-of-instances: 1
+        vdu-id: mgmtVM
+      - number-of-instances: 1
+        vdu-id: dataVM
+    scaling-aspect:
+    - aspect-delta-details:
+        deltas:
+        - id: scale_dataVM-delta
+          vdu-delta:
+          - id: dataVM
+            number-of-instances: 2
+      id: scale_dataVM
+      max-scale-level: 10
+      name: scale_dataVM
+    vdu-profile:
+    - id: mgmtVM
+      min-number-of-instances: 1
+    - id: dataVM
+      max-number-of-instances: 10
+      min-number-of-instances: 2
+    virtual-link-profile:
+    - flavour: ''
+      id: interdata
+      virtual-link-protocol-data:
+        l3-protocol-data:
+          cidr: 192.168.101.0/24
+          description: internal data
+          ip-version: ipv4
+          name: interdata-l3-protocol-data
+    vnf-configuration-id: default-vnf-configuration
+  ext-cpd:
+  - id: vnf-mgmt-ext
+    int-cpd:
+      cpd: mgmtVM-eth0-int
+      vdu-id: mgmtVM
+  - id: vnf-data-ext
+    int-cpd:
+      cpd: dataVM-xe0-int
+      vdu-id: dataVM
+  id: vdu-replicas-vnf
+  int-virtual-link-desc:
+  - id: internal
+  - id: interdata
+  mgmt-cp: vnf-mgmt-ext
+  product-name: vdu-replicas-vnf
+  sw-image-desc:
+  - id: ubuntu18.04
+    image: ubuntu18.04
+    name: ubuntu18.04
+  vdu:
+  - cloud-init-file: cloud-config.txt
+    id: mgmtVM
+    int-cpd:
+    - id: mgmtVM-eth0-int
+      virtual-network-interface-requirement:
+      - name: mgmtVM-eth0
+        position: 1
+        virtual-interface:
+          type: PARAVIRT
+    - id: mgmtVM-eth1-int
+      int-virtual-link-desc: internal
+      virtual-network-interface-requirement:
+      - name: mgmtVM-eth1
+        position: 2
+        virtual-interface:
+          type: PARAVIRT
+    name: mgmtVM
+    sw-image-desc: ubuntu18.04
+    virtual-compute-desc: mgmtVM-compute
+    virtual-storage-desc:
+    - mgmtVM-storage
+  - cloud-init-file: cloud-config.txt
+    id: dataVM
+    int-cpd:
+    - id: dataVM-eth0-int
+      int-virtual-link-desc: internal
+      virtual-network-interface-requirement:
+      - name: dataVM-eth0
+        position: 1
+        virtual-interface:
+          type: PARAVIRT
+    - id: dataVM-eth1-int
+      int-virtual-link-desc: interdata
+      virtual-network-interface-requirement:
+      - name: dataVM-eth1
+        position: 2
+        virtual-interface:
+          type: PARAVIRT
+    - id: dataVM-xe0-int
+      virtual-network-interface-requirement:
+      - name: dataVM-xe0
+        position: 3
+        virtual-interface:
+          type: PARAVIRT
+    name: dataVM
+    sw-image-desc: ubuntu18.04
+    virtual-compute-desc: dataVM-compute
+    virtual-storage-desc:
+    - dataVM-storage
+  version: '1.0'
+  virtual-compute-desc:
+  - id: mgmtVM-compute
+    virtual-cpu:
+      num-virtual-cpu: 1
+    virtual-memory:
+      size: 2.0
+  - id: dataVM-compute
+    virtual-cpu:
+      num-virtual-cpu: 1
+    virtual-memory:
+      size: 2.0
+  virtual-storage-desc:
+  - id: mgmtVM-storage
+    size-of-storage: 10
+  - id: dataVM-storage
+    size-of-storage: 10
+  vnf-configuration:
+  - config-access:
+      ssh-access:
+        default-user: ubuntu
+        required: true
+    id: default-vnf-configuration