Translation of all packages to SOL006 format

charm-packages/ha_proxy_charm_ns/ha_proxy_charm_nsd.yaml

-nsd:nsd-catalog:
-    nsd:
-    -   id: ha_proxy_charm-ns
-        name: ha_proxy_charm-ns
-        short-name: ha_proxy_charm-ns
-        description: NS with 2 VNFs with cloudinit connected by datanet and mgmtnet VLs
-        version: '1.0'
-        logo: osm.png
-        constituent-vnfd:
-        -   vnfd-id-ref: ha_proxy_charm-vnf
-            member-vnf-index: '1'
-        -   vnfd-id-ref: ha_proxy_charm-vnf
-            member-vnf-index: '2'
-        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: ha_proxy_charm-vnf
-                member-vnf-index-ref: '1'
-                vnfd-connection-point-ref: vnf-mgmt
-            -   vnfd-id-ref: ha_proxy_charm-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: ha_proxy_charm-vnf
-                member-vnf-index-ref: '1'
-                vnfd-connection-point-ref: vnf-data
-            -   vnfd-id-ref: ha_proxy_charm-vnf
-                member-vnf-index-ref: '2'
-                vnfd-connection-point-ref: vnf-data
-
+nsd:
+  nsd:
+  - id: ha_proxy_charm-ns
+    name: ha_proxy_charm-ns
+    version: '1.0'
+    description: NS with 2 VNFs with cloudinit 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: ha_proxy_charm-vnf
+      - id: '2'
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: '2'
+            constituent-cpd-id: vnf-mgmt-ext
+          virtual-link-profile-id: mgmtnet
+        - constituent-cpd-id:
+          - constituent-base-element-id: '2'
+            constituent-cpd-id: vnf-data-ext
+          virtual-link-profile-id: datanet
+        vnfd-id: ha_proxy_charm-vnf
+    virtual-link-desc:
+    - id: mgmtnet
+      mgmt-network: 'true'
+    - id: datanet
+    vnfd-id:
+    - ha_proxy_charm-vnf

charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml

-vnfd:vnfd-catalog:
-    vnfd:
-    -   id: ha_proxy_charm-vnf
-        name: ha_proxy_charm-vnf
-        short-name: ha_proxy_charm-vnf
-        version: 1.0
-        description: A VNF consisting of 1 VDU connected to two external VL, and one for data and another one for management
-        logo: osm.png
-        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
-        mgmt-interface:
-            cp: vnf-mgmt
-        vdu:
-        -   id: mgmtVM
-            name: mgmtVM
-            image: ubuntu18.04
-            count: 1
-            vm-flavor:
-                vcpu-count: 1
-                memory-mb: 1024
-                storage-gb: 10
-            interface:
-            -   name: mgmtVM-eth0
-                position: 1
-                type: EXTERNAL
-                virtual-interface:
-                    type: PARAVIRT
-                external-connection-point-ref: vnf-mgmt
-            -   name: dataVM-xe0
-                position: 2
-                type: EXTERNAL
-                virtual-interface:
-                    type: PARAVIRT
-                external-connection-point-ref: vnf-data
-            cloud-init-file: cloud-config.txt
-        vnf-configuration:
-            juju:
-                charm: simple
-            initial-config-primitive:
-            -   seq: 1
-                name: config
-                parameter:
-                -   name: ssh-hostname
-                    value: <rw_mgmt_ip>
-                -   name: ssh-username
-                    value: ubuntu
-                -   name: ssh-password
-                    value: osm4u
-            -   seq: 2
-                name: touch
-                parameter:
-                -   name: filename
-                    data-type: STRING
-                    value: '/home/ubuntu/first-touch'
-            config-primitive:
-            -   name: touch
-                parameter:
-                -   name: filename
-                    data-type: STRING
-                    default-value: '/home/ubuntu/touched'
+vnfd:
+  id: ha_proxy_charm-vnf
+  mgmt-cp: vnf-mgmt-ext
+  product-name: ha_proxy_charm-vnf
+  description: A VNF consisting of 1 VDU connected to two external VL, and one for
+    data and another one for management
+  version: 1.0
+  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: vnf-data-ext
+    int-cpd:
+      cpd: dataVM-xe0-int
+      vdu-id: mgmtVM
+  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: dataVM-xe0-int
+      virtual-network-interface-requirement:
+      - name: dataVM-xe0
+        position: 2
+        virtual-interface:
+          type: PARAVIRT
+    name: mgmtVM
+    sw-image-desc: ubuntu18.04
+    virtual-compute-desc: mgmtVM-compute
+    virtual-storage-desc:
+    - mgmtVM-storage
+
+  virtual-compute-desc:
+  - id: mgmtVM-compute
+    virtual-cpu:
+      num-virtual-cpu: "1"
+    virtual-memory:
+      size: "1.0"
+  virtual-storage-desc:
+  - id: mgmtVM-storage
+    size-of-storage: "10"
+  vnf-configuration:
+  - id: default-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
+      - name: ssh-password
+        value: osm4u
+      seq: 1
+    - name: touch
+      parameter:
+      - data-type: STRING
+        name: filename
+        value: /home/ubuntu/first-touch
+      seq: 2
+    juju:
+      charm: simple

charm-packages/k8s_proxy_charm_ns/k8s_proxy_charm_nsd.yaml

-nsd:nsd-catalog:
-    nsd:
-    -   id: k8s_proxy_charm-ns
-        name: k8s_proxy_charm-ns
-        short-name: k8s_proxy_charm-ns
-        description: NS with 2 VNFs with cloudinit connected by datanet and mgmtnet VLs
-        version: '1.0'
-        logo: osm.png
-        constituent-vnfd:
-        -   vnfd-id-ref: k8s_proxy_charm-vnf
-            member-vnf-index: '1'
-        -   vnfd-id-ref: k8s_proxy_charm-vnf
-            member-vnf-index: '2'
-        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: k8s_proxy_charm-vnf
-                member-vnf-index-ref: '1'
-                vnfd-connection-point-ref: vnf-mgmt
-            -   vnfd-id-ref: k8s_proxy_charm-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: k8s_proxy_charm-vnf
-                member-vnf-index-ref: '1'
-                vnfd-connection-point-ref: vnf-data
-            -   vnfd-id-ref: k8s_proxy_charm-vnf
-                member-vnf-index-ref: '2'
-                vnfd-connection-point-ref: vnf-data
-
+nsd:
+  nsd:
+  - description: NS with 2 VNFs with cloudinit 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: k8s_proxy_charm-vnf
+      - id: '2'
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: '2'
+            constituent-cpd-id: vnf-mgmt-ext
+          virtual-link-profile-id: mgmtnet
+        - constituent-cpd-id:
+          - constituent-base-element-id: '2'
+            constituent-cpd-id: vnf-data-ext
+          virtual-link-profile-id: datanet
+        vnfd-id: k8s_proxy_charm-vnf
+    id: k8s_proxy_charm-ns
+    name: k8s_proxy_charm-ns
+    version: '1.0'
+    virtual-link-desc:
+    - id: mgmtnet
+      mgmt-network: 'true'
+    - id: datanet
+    vnfd-id:
+    - k8s_proxy_charm-vnf

charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml

-vnfd:vnfd-catalog:
-    vnfd:
-    -   id: k8s_proxy_charm-vnf
-        name: k8s_proxy_charm-vnf
-        short-name: k8s_proxy_charm-vnf
-        version: 1.0
-        description: A VNF consisting of 1 VDU connected to two external VL, and one for data and another one for management
-        logo: osm.png
-        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
-        mgmt-interface:
-            cp: vnf-mgmt
-        vdu:
-        -   id: mgmtVM
-            name: mgmtVM
-            image: ubuntu18.04
-            count: 1
-            vm-flavor:
-                vcpu-count: 1
-                memory-mb: 1024
-                storage-gb: 10
-            interface:
-            -   name: mgmtVM-eth0
-                position: 1
-                type: EXTERNAL
-                virtual-interface:
-                    type: PARAVIRT
-                external-connection-point-ref: vnf-mgmt
-            -   name: dataVM-xe0
-                position: 2
-                type: EXTERNAL
-                virtual-interface:
-                    type: PARAVIRT
-                external-connection-point-ref: vnf-data
-            cloud-init-file: cloud-config.txt
-        vnf-configuration:
-            juju:
-                charm: simple
-                cloud: k8s
-            initial-config-primitive:
-            -   seq: 1
-                name: config
-                parameter:
-                -   name: ssh-hostname
-                    value: <rw_mgmt_ip>
-                -   name: ssh-username
-                    value: ubuntu
-                -   name: ssh-password
-                    value: osm4u
-            -   seq: 2
-                name: touch
-                parameter:
-                -   name: filename
-                    data-type: STRING
-                    value: '/home/ubuntu/first-touch'
-            config-primitive:
-            -   name: touch
-                parameter:
-                -   name: filename
-                    data-type: STRING
-                    default-value: '/home/ubuntu/touched'
+vnfd:
+  description: A VNF consisting of 1 VDU connected to two external VL, and one for
+    data and another one for management
+  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: vnf-data-ext
+    int-cpd:
+      cpd: dataVM-xe0-int
+      vdu-id: mgmtVM
+  id: k8s_proxy_charm-vnf
+  mgmt-cp: vnf-mgmt-ext
+  product-name: k8s_proxy_charm-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: dataVM-xe0-int
+      virtual-network-interface-requirement:
+      - name: dataVM-xe0
+        position: 2
+        virtual-interface:
+          type: PARAVIRT
+    name: mgmtVM
+    sw-image-desc: ubuntu18.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
+    virtual-memory:
+      size: 1.0
+  virtual-storage-desc:
+  - id: mgmtVM-storage
+    size-of-storage: 10
+  vnf-configuration:
+  - config-primitive:
+    - name: touch
+      parameter:
+      - data-type: STRING
+        default-value: /home/ubuntu/touched
+        name: filename
+    config-access:
+      ssh-access:
+        default-user: ubuntu
+        required: true
+    id: default-vnf-configuration
+    initial-config-primitive:
+    - name: config
+      parameter:
+      - name: ssh-hostname
+        value: <rw_mgmt_ip>
+      - name: ssh-username
+        value: ubuntu
+      - name: ssh-password
+        value: osm4u
+      seq: 1
+    - name: touch
+      parameter:
+      - data-type: STRING
+        name: filename
+        value: /home/ubuntu/first-touch
+      seq: 2
+    juju:
+      charm: simple
+      cloud: k8s

charm-packages/native_charm_ns/native_charm_nsd.yaml

-nsd:nsd-catalog:
-    nsd:
-    -   id: native_charm-ns
-        name: native_charm-ns
-        short-name: native_charm-ns
-        description: NS with 2 VNFs with cloudinit connected by datanet and mgmtnet VLs
-        version: '1.0'
-        logo: osm.png
-        constituent-vnfd:
-        -   vnfd-id-ref: native_charm-vnf
-            member-vnf-index: '1'
-        -   vnfd-id-ref: native_charm-vnf
-            member-vnf-index: '2'
-        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: native_charm-vnf
-                member-vnf-index-ref: '1'
-                vnfd-connection-point-ref: vnf-mgmt
-            -   vnfd-id-ref: native_charm-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: native_charm-vnf
-                member-vnf-index-ref: '1'
-                vnfd-connection-point-ref: vnf-data
-            -   vnfd-id-ref: native_charm-vnf
-                member-vnf-index-ref: '2'
-                vnfd-connection-point-ref: vnf-data
-
+nsd:
+  nsd:
+  - description: NS with 2 VNFs with cloudinit 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: native_charm-vnf
+      - id: '2'
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: '2'
+            constituent-cpd-id: vnf-mgmt-ext
+          virtual-link-profile-id: mgmtnet
+        - constituent-cpd-id:
+          - constituent-base-element-id: '2'
+            constituent-cpd-id: vnf-data-ext
+          virtual-link-profile-id: datanet
+        vnfd-id: native_charm-vnf
+    id: native_charm-ns
+    name: native_charm-ns
+    version: '1.0'
+    virtual-link-desc:
+    - id: mgmtnet
+      mgmt-network: 'true'
+    - id: datanet
+    vnfd-id:
+    - native_charm-vnf

charm-packages/native_charm_vnf/native_charm_vnfd.yaml

-vnfd:vnfd-catalog:
-    vnfd:
-    -   id: native_charm-vnf
-        name: native_charm-vnf
-        short-name: native_charm-vnf
-        version: 1.0
-        description: A VNF consisting of 1 VDU connected to two external VL, and one for data and another one for management
-        logo: osm.png
-        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
-        mgmt-interface:
-            cp: vnf-mgmt
-        vdu:
-        -   id: mgmtVM
-            name: mgmtVM
-            image: ubuntu18.04
-            count: 1
-            vm-flavor:
-                vcpu-count: 1
-                memory-mb: 1024
-                storage-gb: 10
-            interface:
-            -   name: mgmtVM-eth0
-                position: 1
-                type: EXTERNAL
-                virtual-interface:
-                    type: PARAVIRT
-                external-connection-point-ref: vnf-mgmt
-            -   name: dataVM-xe0
-                position: 2
-                type: EXTERNAL
-                virtual-interface:
-                    type: PARAVIRT
-                external-connection-point-ref: vnf-data
-            cloud-init-file: cloud-config.txt
-            vdu-configuration:
-                juju:
-                    charm: simple
-                    proxy: false
-                config-access:
-                    ssh-access:
-                        required: True
-                        default-user: ubuntu
-                initial-config-primitive:
-                -   seq: 1
-                    name: touch
-                    parameter:
-                    -   name: filename
-                        data-type: STRING
-                        value: '/home/ubuntu/first-touch'
-                config-primitive:
-                -   name: touch
-                    parameter:
-                    -   name: filename
-                        data-type: STRING
-                        default-value: '/home/ubuntu/touched'
+vnfd:
+  description: A VNF consisting of 1 VDU connected to two external VL, and one for
+    data and another one for management
+  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
+      vdu-configuration-id: mgmtVM-vdu-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: mgmtVM
+  id: native_charm-vnf
+  mgmt-cp: vnf-mgmt-ext
+  product-name: native_charm-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: dataVM-xe0-int
+      virtual-network-interface-requirement:
+      - name: dataVM-xe0
+        position: 2
+        virtual-interface:
+          type: PARAVIRT
+    name: mgmtVM
+    sw-image-desc: ubuntu18.04
+    virtual-compute-desc: mgmtVM-compute
+    virtual-storage-desc:
+    - mgmtVM-storage
+  vdu-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: mgmtVM-vdu-configuration
+    initial-config-primitive:
+    - name: touch
+      parameter:
+      - data-type: STRING
+        name: filename
+        value: /home/ubuntu/first-touch
+      seq: 1
+    juju:
+      charm: simple
+      proxy: false
+  version: 1.0
+  virtual-compute-desc:
+  - id: mgmtVM-compute
+    virtual-cpu:
+      num-virtual-cpu: 1
+    virtual-memory:
+      size: 1.0
+  virtual-storage-desc:
+  - id: mgmtVM-storage
+    size-of-storage: 10

charm-packages/native_k8s_charm_ns/native_k8s_charm_nsd.yaml

-nsd-catalog:
-    nsd:
-    -   id: native_k8s_charm-ns
-        name: native_k8s_charm-ns
-        short-name: native_k8s_charm-ns
-        description: NS with 1 KDU connected to the mgmtnet VL
-        version: '1.0'
-        logo: osm.png
-        constituent-vnfd:
-        -   vnfd-id-ref: native_k8s_charm-vnf
-            member-vnf-index: native_k8s_charm-vnf
-        vld:
-        -   id: mgmtnet
-            name: mgmtnet
-            short-name: mgmtnet
-            type: ELAN
-            mgmt-network: true
-            vim-network-name: mgmt
-            vnfd-connection-point-ref:
-            -   member-vnf-index-ref: native_k8s_charm-vnf
-                vnfd-id-ref: native_k8s_charm-vnf
-                vnfd-connection-point-ref: mgmtnet
+nsd:
+  nsd:
+  - description: NS with 1 KDU connected to the mgmtnet VL
+    df:
+    - id: default-df
+      vnf-profile:
+      - id: native_k8s_charm-vnf
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: native_k8s_charm-vnf
+            constituent-cpd-id: mgmt-ext
+          virtual-link-profile-id: mgmtnet
+        vnfd-id: native_k8s_charm-vnf
+    id: native_k8s_charm-ns
+    name: native_k8s_charm-ns
+    version: '1.0'
+    virtual-link-desc:
+    - id: mgmtnet
+      mgmt-network: true
+    vnfd-id:
+    - native_k8s_charm-vnf

charm-packages/native_k8s_charm_vnf/native_k8s_charm_vnfd.yaml

-vnfd-catalog:
-    vnfd:
-    -   id: native_k8s_charm-vnf
-        name: native_k8s_charm-vnf
-        connection-point:
-        -   name: mgmtnet
-        mgmt-interface:
-            cp: mgmt
-        kdu:
-        -   name: native-kdu
-            juju-bundle: bundle.yaml
-            kdu-configuration:
-                initial-config-primitive:
-                -   seq: 1
-                    name: changecontent
-                    parameter:
-                    -   name: application-name
-                        data-type: STRING
-                        value: nginx
-                    -   name: customtitle
-                        data-type: STRING
-                        value: "Initial Config Primitive"
-                config-primitive:
-                -   name: changecontent
-                    parameter:
-                    -   name: application-name
-                        data-type: STRING
-                        default-value: nginx
-                    -   name: customtitle
-                        data-type: STRING
-                        default-value: ""
-        k8s-cluster:
-            nets:
-            -   id: mgmtnet
-                external-connection-point-ref: mgmt
+vnfd:
+  df:
+  - id: default-df
+    kdu-profile:
+    - kdu-configuration-id: native-kdu-kdu-configuration
+      kdu-model-id: native-kdu-model
+      name: native-kdu
+  ext-cpd:
+  - id: mgmt-ext
+    k8s-cluster-net: mgmtnet
+  id: native_k8s_charm-vnf
+  k8s-cluster:
+    nets:
+    - id: mgmtnet
+  kdu:
+  - name: native-kdu
+  kdu-configuration:
+  - config-primitive:
+    - name: changecontent
+      parameter:
+      - data-type: STRING
+        default-value: nginx
+        name: application-name
+      - data-type: STRING
+        default-value: ''
+        name: customtitle
+    id: native-kdu-kdu-configuration
+    initial-config-primitive:
+    - name: changecontent
+      parameter:
+      - data-type: STRING
+        name: application-name
+        value: nginx
+      - data-type: STRING
+        name: customtitle
+        value: Initial Config Primitive
+      seq: 1
+  kdu-model:
+  - id: native-kdu-model
+    kdu-model-locator: bundle.yaml
+    kdu-model-type: juju-bundle
+  mgmt-cp: mgmt-ext
+  product-name: native_k8s_charm-vnf

charm-packages/nopasswd_k8s_proxy_charm_ns/nopasswd_k8s_proxy_charm_nsd.yaml

-nsd:nsd-catalog:
-    nsd:
-    -   id: nopasswd_k8s_proxy_charm-ns
-        name: nopasswd_k8s_proxy_charm-ns
-        short-name: nopasswd_k8s_proxy_charm-ns
-        description: NS with 2 VNFs with cloudinit connected by datanet and mgmtnet VLs
-        version: '1.0'
-        logo: osm.png
-        constituent-vnfd:
-        -   vnfd-id-ref: nopasswd_k8s_proxy_charm-vnf
-            member-vnf-index: '1'
-        -   vnfd-id-ref: nopasswd_k8s_proxy_charm-vnf
-            member-vnf-index: '2'
-        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: nopasswd_k8s_proxy_charm-vnf
-                member-vnf-index-ref: '1'
-                vnfd-connection-point-ref: vnf-mgmt
-            -   vnfd-id-ref: nopasswd_k8s_proxy_charm-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: nopasswd_k8s_proxy_charm-vnf
-                member-vnf-index-ref: '1'
-                vnfd-connection-point-ref: vnf-data
-            -   vnfd-id-ref: nopasswd_k8s_proxy_charm-vnf
-                member-vnf-index-ref: '2'
-                vnfd-connection-point-ref: vnf-data
-
+nsd:
+  nsd:
+  - description: NS with 2 VNFs with cloudinit 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: nopasswd_k8s_proxy_charm-vnf
+      - id: '2'
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: '2'
+            constituent-cpd-id: vnf-mgmt-ext
+          virtual-link-profile-id: mgmtnet
+        - constituent-cpd-id:
+          - constituent-base-element-id: '2'
+            constituent-cpd-id: vnf-data-ext
+          virtual-link-profile-id: datanet
+        vnfd-id: nopasswd_k8s_proxy_charm-vnf
+    id: nopasswd_k8s_proxy_charm-ns
+    name: nopasswd_k8s_proxy_charm-ns
+    version: '1.0'
+    virtual-link-desc:
+    - id: mgmtnet
+      mgmt-network: 'true'
+    - id: datanet
+    vnfd-id:
+    - nopasswd_k8s_proxy_charm-vnf

charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml

-vnfd:vnfd-catalog:
-    vnfd:
-    -   id: nopasswd_k8s_proxy_charm-vnf
-        name: nopasswd_k8s_proxy_charm-vnf
-        short-name: nopasswd_k8s_proxy_charm-vnf
-        version: 1.0
-        description: A VNF consisting of 1 VDU connected to two external VL, and one for data and another one for management
-        logo: osm.png
-        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
-        mgmt-interface:
-            cp: vnf-mgmt
-        vdu:
-        -   id: mgmtVM
-            name: mgmtVM
-            image: ubuntu18.04
-            count: 1
-            vm-flavor:
-                vcpu-count: 1
-                memory-mb: 1024
-                storage-gb: 10
-            interface:
-            -   name: mgmtVM-eth0
-                position: 1
-                type: EXTERNAL
-                virtual-interface:
-                    type: PARAVIRT
-                external-connection-point-ref: vnf-mgmt
-            -   name: dataVM-xe0
-                position: 2
-                type: EXTERNAL
-                virtual-interface:
-                    type: PARAVIRT
-                external-connection-point-ref: vnf-data
-            cloud-init-file: cloud-config.txt
-        vnf-configuration:
-            juju:
-                charm: simple
-                cloud: k8s
-            initial-config-primitive:
-            -   seq: 1
-                name: config
-                parameter:
-                -   name: ssh-hostname
-                    value: <rw_mgmt_ip>
-                -   name: ssh-username
-                    value: ubuntu
-            -   seq: 2
-                name: touch
-                parameter:
-                -   name: filename
-                    data-type: STRING
-                    value: '/home/ubuntu/first-touch'
-            config-primitive:
-            -   name: touch
-                parameter:
-                -   name: filename
-                    data-type: STRING
-                    default-value: '/home/ubuntu/touched'
-            config-access:
-                ssh-access:
-                    default-user: ubuntu
-                    required: true
\ No newline at end of file
+vnfd:
+  description: A VNF consisting of 1 VDU connected to two external VL, and one for
+    data and another one for management
+  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: vnf-data-ext
+    int-cpd:
+      cpd: dataVM-xe0-int
+      vdu-id: mgmtVM
+  id: nopasswd_k8s_proxy_charm-vnf
+  mgmt-cp: vnf-mgmt-ext
+  product-name: nopasswd_k8s_proxy_charm-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: dataVM-xe0-int
+      virtual-network-interface-requirement:
+      - name: dataVM-xe0
+        position: 2
+        virtual-interface:
+          type: PARAVIRT
+    name: mgmtVM
+    sw-image-desc: ubuntu18.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
+    virtual-memory:
+      size: 1.0
+  virtual-storage-desc:
+  - id: mgmtVM-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:
+      - data-type: STRING
+        name: filename
+        value: /home/ubuntu/first-touch
+      seq: 2
+    juju:
+      charm: simple
+      cloud: k8s

charm-packages/nopasswd_proxy_charm_ns/nopasswd_proxy_charm_nsd.yaml

-nsd:nsd-catalog:
-    nsd:
-    -   id: nopasswd_proxy_charm-ns
-        name: nopasswd_proxy_charm-ns
-        short-name: nopasswd_proxy_charm-ns
-        description: NS with 2 VNFs with cloudinit connected by datanet and mgmtnet VLs
-        version: '1.0'
-        logo: osm.png
-        constituent-vnfd:
-        -   vnfd-id-ref: nopasswd_proxy_charm-vnf
-            member-vnf-index: '1'
-        -   vnfd-id-ref: nopasswd_proxy_charm-vnf
-            member-vnf-index: '2'
-        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: nopasswd_proxy_charm-vnf
-                member-vnf-index-ref: '1'
-                vnfd-connection-point-ref: vnf-mgmt
-            -   vnfd-id-ref: nopasswd_proxy_charm-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: nopasswd_proxy_charm-vnf
-                member-vnf-index-ref: '1'
-                vnfd-connection-point-ref: vnf-data
-            -   vnfd-id-ref: nopasswd_proxy_charm-vnf
-                member-vnf-index-ref: '2'
-                vnfd-connection-point-ref: vnf-data
-
+nsd:
+  nsd:
+  - description: NS with 2 VNFs with cloudinit 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: nopasswd_proxy_charm-vnf
+      - id: '2'
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: '2'
+            constituent-cpd-id: vnf-mgmt-ext
+          virtual-link-profile-id: mgmtnet
+        - constituent-cpd-id:
+          - constituent-base-element-id: '2'
+            constituent-cpd-id: vnf-data-ext
+          virtual-link-profile-id: datanet
+        vnfd-id: nopasswd_proxy_charm-vnf
+    id: nopasswd_proxy_charm-ns
+    name: nopasswd_proxy_charm-ns
+    version: '1.0'
+    virtual-link-desc:
+    - id: mgmtnet
+      mgmt-network: 'true'
+    - id: datanet
+    vnfd-id:
+    - nopasswd_proxy_charm-vnf

charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml

-vnfd:vnfd-catalog:
-    vnfd:
-    -   id: nopasswd_proxy_charm-vnf
-        name: nopasswd_proxy_charm-vnf
-        short-name: nopasswd_proxy_charm-vnf
-        version: 1.0
-        description: A VNF consisting of 1 VDU connected to two external VL, and one for data and another one for management
-        logo: osm.png
-        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
-        mgmt-interface:
-            cp: vnf-mgmt
-        vdu:
-        -   id: mgmtVM
-            name: mgmtVM
-            image: ubuntu18.04
-            count: 1
-            vm-flavor:
-                vcpu-count: 1
-                memory-mb: 1024
-                storage-gb: 10
-            interface:
-            -   name: mgmtVM-eth0
-                position: 1
-                type: EXTERNAL
-                virtual-interface:
-                    type: PARAVIRT
-                external-connection-point-ref: vnf-mgmt
-            -   name: dataVM-xe0
-                position: 2
-                type: EXTERNAL
-                virtual-interface:
-                    type: PARAVIRT
-                external-connection-point-ref: vnf-data
-            cloud-init-file: cloud-config.txt
-        vnf-configuration:
-            juju:
-                charm: simple
-            initial-config-primitive:
-            -   seq: 1
-                name: config
-                parameter:
-                -   name: ssh-hostname
-                    value: <rw_mgmt_ip>
-                -   name: ssh-username
-                    value: ubuntu
-            -   seq: 2
-                name: touch
-                parameter:
-                -   name: filename
-                    data-type: STRING
-                    value: '/home/ubuntu/first-touch'
-            config-primitive:
-            -   name: touch
-                parameter:
-                -   name: filename
-                    data-type: STRING
-                    default-value: '/home/ubuntu/touched'
-            config-access:
-                ssh-access:
-                    default-user: ubuntu
-                    required: true
\ No newline at end of file
+vnfd:
+  description: A VNF consisting of 1 VDU connected to two external VL, and one for
+    data and another one for management
+  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: vnf-data-ext
+    int-cpd:
+      cpd: dataVM-xe0-int
+      vdu-id: mgmtVM
+  id: nopasswd_proxy_charm-vnf
+  mgmt-cp: vnf-mgmt-ext
+  product-name: nopasswd_proxy_charm-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: dataVM-xe0-int
+      virtual-network-interface-requirement:
+      - name: dataVM-xe0
+        position: 2
+        virtual-interface:
+          type: PARAVIRT
+    name: mgmtVM
+    sw-image-desc: ubuntu18.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
+    virtual-memory:
+      size: 1.0
+  virtual-storage-desc:
+  - id: mgmtVM-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:
+      - data-type: STRING
+        name: filename
+        value: /home/ubuntu/first-touch
+      seq: 2
+    juju:
+      charm: simple

charm-packages/ns_relations_ns/ns_relations_nsd.yaml

-nsd:nsd-catalog:
-    nsd:
-    -   id: ns_relations-ns
-        name: ns_relations-ns
-        short-name: ns_relations-ns
-        description: NS with 2 VNFs with cloudinit connected by datanet and mgmtnet VLs
-        version: '1.0'
-        logo: osm.png
-        constituent-vnfd:
-        -   vnfd-id-ref: ns_relations_provides-vnf
-            member-vnf-index: '1'
-        -   vnfd-id-ref: ns_relations_requires-vnf
-            member-vnf-index: '2'
-        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: ns_relations_provides-vnf
-                member-vnf-index-ref: '1'
-                vnfd-connection-point-ref: provides-mgmt
-            -   vnfd-id-ref: ns_relations_requires-vnf
-                member-vnf-index-ref: '2'
-                vnfd-connection-point-ref: requires-mgmt
-
-        ns-configuration:
-            relation:
-            -   name: relation
-                entities:
-                -   id: '1'
-                    endpoint: interface
-                -   id: '2'
-                    endpoint: interface
\ No newline at end of file
+nsd:
+  nsd:
+  - description: NS with 2 VNFs with cloudinit 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: provides-mgmt-ext
+          virtual-link-profile-id: mgmtnet
+        vnfd-id: ns_relations_provides-vnf
+      - id: '2'
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: '2'
+            constituent-cpd-id: requires-mgmt-ext
+          virtual-link-profile-id: mgmtnet
+        vnfd-id: ns_relations_requires-vnf
+    id: ns_relations-ns
+    name: ns_relations-ns
+    version: '1.0'
+    virtual-link-desc:
+    - id: mgmtnet
+      mgmt-network: 'true'
+    vnfd-id:
+    - ns_relations_provides-vnf
+    - ns_relations_requires-vnf
+    ns-configuration:
+      relation:
+      - name: relation
+        entities:
+        - id: '1'
+          endpoint: interface
+        - id: '2'
+          endpoint: interface

charm-packages/ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml

-vnfd:vnfd-catalog:
-    vnfd:
-    -   id: ns_relations_provides-vnf
-        name: ns_relations_provides-vnf
-        short-name: ns_relations_provides-vnf
-        version: 1.0
-        description: A VNF consisting of 1 VDU connected to two external VL, and one for data and another one for management
-        logo: osm.png
-        connection-point:
-        -   id: provides-mgmt
-            name: provides-mgmt
-            short-name: provides-mgmt
-            type: VPORT
-        mgmt-interface:
-            cp: provides-mgmt
-        vdu:
-        -   id: simple_provides
-            name: simple_provides
-            image: ubuntu18.04
-            count: 1
-            vm-flavor:
-                vcpu-count: 1
-                memory-mb: 1024
-                storage-gb: 10
-            interface:
-            -   name: simple_provides-eth0
-                position: 1
-                type: EXTERNAL
-                virtual-interface:
-                    type: PARAVIRT
-                external-connection-point-ref: provides-mgmt
-            cloud-init-file: cloud-config.txt
-        vnf-configuration:
-            juju:
-                charm: simple_provides
-                proxy: false
-            config-access:
-                ssh-access:
-                    required: True
-                    default-user: ubuntu
-            initial-config-primitive:
-            -   seq: 1
-                name: touch
-                parameter:
-                -   name: filename
-                    data-type: STRING
-                    value: '/home/ubuntu/first-touch'
-            config-primitive:
-            -   name: touch
-                parameter:
-                -   name: filename
-                    data-type: STRING
-                    default-value: '/home/ubuntu/touched'
+vnfd:
+  description: A VNF consisting of 1 VDU connected to two external VL, and one for
+    data and another one for management
+  df:
+  - id: default-df
+    instantiation-level:
+    - id: default-instantiation-level
+      vdu-level:
+      - number-of-instances: 1
+        vdu-id: simple_provides
+    vdu-profile:
+    - id: simple_provides
+      min-number-of-instances: 1
+    vnf-configuration-id: default-vnf-configuration
+  ext-cpd:
+  - id: provides-mgmt-ext
+    int-cpd:
+      cpd: simple_provides-eth0-int
+      vdu-id: simple_provides
+  id: ns_relations_provides-vnf
+  mgmt-cp: provides-mgmt-ext
+  product-name: ns_relations_provides-vnf
+  sw-image-desc:
+  - id: ubuntu18.04
+    image: ubuntu18.04
+    name: ubuntu18.04
+  vdu:
+  - cloud-init-file: cloud-config.txt
+    id: simple_provides
+    int-cpd:
+    - id: simple_provides-eth0-int
+      virtual-network-interface-requirement:
+      - name: simple_provides-eth0
+        position: 1
+        virtual-interface:
+          type: PARAVIRT
+    name: simple_provides
+    sw-image-desc: ubuntu18.04
+    virtual-compute-desc: simple_provides-compute
+    virtual-storage-desc:
+    - simple_provides-storage
+  version: 1.0
+  virtual-compute-desc:
+  - id: simple_provides-compute
+    virtual-cpu:
+      num-virtual-cpu: 1
+    virtual-memory:
+      size: 1.0
+  virtual-storage-desc:
+  - id: simple_provides-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: touch
+      parameter:
+      - data-type: STRING
+        name: filename
+        value: /home/ubuntu/first-touch
+      seq: 1
+    juju:
+      charm: simple_provides
+      proxy: false

charm-packages/ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml

-vnfd:vnfd-catalog:
-    vnfd:
-    -   id: ns_relations_requires-vnf
-        name: ns_relations_requires-vnf
-        short-name: ns_relations_requires-vnf
-        version: 1.0
-        description: A VNF consisting of 1 VDU connected to two external VL, and one for data and another one for management
-        logo: osm.png
-        connection-point:
-        -   id: requires-mgmt
-            name: requires-mgmt
-            short-name: requires-mgmt
-            type: VPORT
-        mgmt-interface:
-            cp: requires-mgmt
-        vdu:
-        -   id: simple_requires
-            name: simple_requires
-            image: ubuntu18.04
-            count: 1
-            vm-flavor:
-                vcpu-count: 1
-                memory-mb: 1024
-                storage-gb: 10
-            interface:
-            -   name: simple_requires-eth0
-                position: 1
-                type: EXTERNAL
-                virtual-interface:
-                    type: PARAVIRT
-                external-connection-point-ref: requires-mgmt
-            cloud-init-file: cloud-config.txt
-        vnf-configuration:
-            juju:
-                charm: simple_requires
-                proxy: false
-            config-access:
-                ssh-access:
-                    required: True
-                    default-user: ubuntu
-            initial-config-primitive:
-            -   seq: 1
-                name: touch
-                parameter:
-                -   name: filename
-                    data-type: STRING
-                    value: '/home/ubuntu/first-touch'
-            config-primitive:
-            -   name: touch
-                parameter:
-                -   name: filename
-                    data-type: STRING
-                    default-value: '/home/ubuntu/touched'
+vnfd:
+  description: A VNF consisting of 1 VDU connected to two external VL, and one for
+    data and another one for management
+  df:
+  - id: default-df
+    instantiation-level:
+    - id: default-instantiation-level
+      vdu-level:
+      - number-of-instances: 1
+        vdu-id: simple_requires
+    vdu-profile:
+    - id: simple_requires
+      min-number-of-instances: 1
+    vnf-configuration-id: default-vnf-configuration
+  ext-cpd:
+  - id: requires-mgmt-ext
+    int-cpd:
+      cpd: simple_requires-eth0-int
+      vdu-id: simple_requires
+  id: ns_relations_requires-vnf
+  mgmt-cp: requires-mgmt-ext
+  product-name: ns_relations_requires-vnf
+  sw-image-desc:
+  - id: ubuntu18.04
+    image: ubuntu18.04
+    name: ubuntu18.04
+  vdu:
+  - cloud-init-file: cloud-config.txt
+    id: simple_requires
+    int-cpd:
+    - id: simple_requires-eth0-int
+      virtual-network-interface-requirement:
+      - name: simple_requires-eth0
+        position: 1
+        virtual-interface:
+          type: PARAVIRT
+    name: simple_requires
+    sw-image-desc: ubuntu18.04
+    virtual-compute-desc: simple_requires-compute
+    virtual-storage-desc:
+    - simple_requires-storage
+  version: 1.0
+  virtual-compute-desc:
+  - id: simple_requires-compute
+    virtual-cpu:
+      num-virtual-cpu: 1
+    virtual-memory:
+      size: 1.0
+  virtual-storage-desc:
+  - id: simple_requires-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: touch
+      parameter:
+      - data-type: STRING
+        name: filename
+        value: /home/ubuntu/first-touch
+      seq: 1
+    juju:
+      charm: simple_requires
+      proxy: false

charm-packages/proxy_native_relation_ns/proxy_native_relation_nsd.yaml

-nsd:nsd-catalog:
-    nsd:
-    -   id: proxy_native_relation-ns
-        name: proxy_native_relation-ns
-        short-name: proxy_native_relation-ns
-        description: NS with 2 VNFs with cloudinit connected by datanet and mgmtnet VLs
-        version: '1.0'
-        logo: osm.png
-        constituent-vnfd:
-        -   vnfd-id-ref: proxy_native_relation-vnf
-            member-vnf-index: '1'
-        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: proxy_native_relation-vnf
-                member-vnf-index-ref: '1'
-                vnfd-connection-point-ref: provides-mgmt
-            -   vnfd-id-ref: proxy_native_relation-vnf
-                member-vnf-index-ref: '1'
-                vnfd-connection-point-ref: requires-mgmt
-
+nsd:
+  nsd:
+  - description: NS with 2 VNFs with cloudinit 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: provides-mgmt-ext
+          - constituent-base-element-id: '1'
+            constituent-cpd-id: requires-mgmt-ext
+          virtual-link-profile-id: mgmtnet
+        vnfd-id: proxy_native_relation-vnf
+    id: proxy_native_relation-ns
+    name: proxy_native_relation-ns
+    version: '1.0'
+    virtual-link-desc:
+    - id: mgmtnet
+      mgmt-network: 'true'
+    vnfd-id:
+    - proxy_native_relation-vnf

charm-packages/proxy_native_relation_vnf/proxy_native_relation_vnfd.yaml

-vnfd:vnfd-catalog:
-    vnfd:
-    -   id: proxy_native_relation-vnf
-        name: proxy_native_relation-vnf
-        short-name: proxy_native_relation-vnf
-        version: 1.0
-        description: A VNF consisting of 1 VDU connected to two external VL, and one for data and another one for management
-        logo: osm.png
-        connection-point:
-        -   id: requires-mgmt
-            name: requires-mgmt
-            short-name: requires-mgmt
-            type: VPORT
-        -   id: provides-mgmt
-            name: provides-mgmt
-            short-name: provides-mgmt
-            type: VPORT
-        mgmt-interface:
-            cp: provides-mgmt
-        vdu:
-        -   id: simple_requires
-            name: simple_requires
-            image: ubuntu18.04
-            count: 1
-            vm-flavor:
-                vcpu-count: 1
-                memory-mb: 1024
-                storage-gb: 10
-            interface:
-            -   name: simple_requires-eth0
-                position: 1
-                type: EXTERNAL
-                virtual-interface:
-                    type: PARAVIRT
-                external-connection-point-ref: requires-mgmt
-                mgmt-interface: true
-            cloud-init-file: cloud-config.txt
-            vdu-configuration:
-                juju:
-                    charm: simple_requires
-                    proxy: false
-                config-access:
-                    ssh-access:
-                        required: True
-                        default-user: ubuntu
-                initial-config-primitive:
-                -   seq: 1
-                    name: touch
-                    parameter:
-                    -   name: filename
-                        data-type: STRING
-                        value: '/home/ubuntu/first-touch'
-                config-primitive:
-                -   name: touch
-                    parameter:
-                    -   name: filename
-                        data-type: STRING
-                        default-value: '/home/ubuntu/touched'
-        -   id: simple_provides
-            name: simple_provides
-            image: ubuntu18.04
-            count: 1
-            vm-flavor:
-                vcpu-count: 1
-                memory-mb: 1024
-                storage-gb: 10
-            interface:
-            -   name: simple_provides-eth0
-                position: 1
-                type: EXTERNAL
-                virtual-interface:
-                    type: PARAVIRT
-                external-connection-point-ref: provides-mgmt
-                mgmt-interface: true
-            cloud-init-file: cloud-config.txt
-        vnf-configuration:
-            juju:
-                charm: simple_provides_proxy
-                proxy: true
-            config-access:
-                ssh-access:
-                    required: True
-                    default-user: ubuntu
-            initial-config-primitive:
-            -   seq: 1
-                name: config
-                parameter:
-                -   name: ssh-hostname
-                    value: <rw_mgmt_ip>
-                -   name: ssh-username
-                    value: ubuntu
-            -   seq: 2
-                name: touch
-                parameter:
-                -   name: filename
-                    data-type: STRING
-                    value: '/home/ubuntu/first-touch'
-            config-primitive:
-            -   name: touch
-                parameter:
-                -   name: filename
-                    data-type: STRING
-                    default-value: '/home/ubuntu/touched'
-            relation:
-            -   name: relation
-                entities:
-                -   id: proxy_native_relation-vnf
-                    endpoint: interface
-                -   id: simple_requires
-                    endpoint: interface
\ No newline at end of file
+vnfd:
+  description: A VNF consisting of 1 VDU connected to two external VL, and one for
+    data and another one for management
+  df:
+  - id: default-df
+    instantiation-level:
+    - id: default-instantiation-level
+      vdu-level:
+      - number-of-instances: 1
+        vdu-id: simple_requires
+      - number-of-instances: 1
+        vdu-id: simple_provides
+    vdu-profile:
+    - id: simple_requires
+      min-number-of-instances: 1
+      vdu-configuration-id: simple_requires-vdu-configuration
+    - id: simple_provides
+      min-number-of-instances: 1
+    vnf-configuration-id: default-vnf-configuration
+  ext-cpd:
+  - id: requires-mgmt-ext
+    int-cpd:
+      cpd: simple_requires-eth0-int
+      vdu-id: simple_requires
+  - id: provides-mgmt-ext
+    int-cpd:
+      cpd: simple_provides-eth0-int
+      vdu-id: simple_provides
+  id: proxy_native_relation-vnf
+  mgmt-cp: provides-mgmt-ext
+  product-name: proxy_native_relation-vnf
+  sw-image-desc:
+  - id: ubuntu18.04
+    image: ubuntu18.04
+    name: ubuntu18.04
+  vdu:
+  - cloud-init-file: cloud-config.txt
+    id: simple_requires
+    int-cpd:
+    - id: simple_requires-eth0-int
+      virtual-network-interface-requirement:
+      - name: simple_requires-eth0
+        position: 1
+        virtual-interface:
+          type: PARAVIRT
+    name: simple_requires
+    sw-image-desc: ubuntu18.04
+    virtual-compute-desc: simple_requires-compute
+    virtual-storage-desc:
+    - simple_requires-storage
+  - cloud-init-file: cloud-config.txt
+    id: simple_provides
+    int-cpd:
+    - id: simple_provides-eth0-int
+      virtual-network-interface-requirement:
+      - name: simple_provides-eth0
+        position: 1
+        virtual-interface:
+          type: PARAVIRT
+    name: simple_provides
+    sw-image-desc: ubuntu18.04
+    virtual-compute-desc: simple_provides-compute
+    virtual-storage-desc:
+    - simple_provides-storage
+  vdu-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: simple_requires-vdu-configuration
+    initial-config-primitive:
+    - name: touch
+      parameter:
+      - data-type: STRING
+        name: filename
+        value: /home/ubuntu/first-touch
+      seq: 1
+    juju:
+      charm: simple_requires
+      proxy: false
+  version: 1.0
+  virtual-compute-desc:
+  - id: simple_requires-compute
+    virtual-cpu:
+      num-virtual-cpu: 1
+    virtual-memory:
+      size: 1.0
+  - id: simple_provides-compute
+    virtual-cpu:
+      num-virtual-cpu: 1
+    virtual-memory:
+      size: 1.0
+  virtual-storage-desc:
+  - id: simple_requires-storage
+    size-of-storage: 10
+  - id: simple_provides-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:
+      - data-type: STRING
+        name: filename
+        value: /home/ubuntu/first-touch
+      seq: 2
+    juju:
+      charm: simple_provides_proxy
+      proxy: true
+    relation:
+    - entities:
+      - endpoint: interface
+        id: proxy_native_relation-vnf
+      - endpoint: interface
+        id: simple_requires
+      name: relation

charm-packages/vnf_relations_ns/vnf_relations_nsd.yaml

-nsd:nsd-catalog:
-    nsd:
-    -   id: vnf_relations-ns
-        name: vnf_relations-ns
-        short-name: vnf_relations-ns
-        description: NS with 2 VNFs with cloudinit connected by datanet and mgmtnet VLs
-        version: '1.0'
-        logo: osm.png
-        constituent-vnfd:
-        -   vnfd-id-ref: vnf_relations-vnf
-            member-vnf-index: '1'
-        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: vnf_relations-vnf
-                member-vnf-index-ref: '1'
-                vnfd-connection-point-ref: provides-mgmt
-            -   vnfd-id-ref: vnf_relations-vnf
-                member-vnf-index-ref: '1'
-                vnfd-connection-point-ref: requires-mgmt
-
+nsd:
+  nsd:
+  - description: NS with 2 VNFs with cloudinit 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: provides-mgmt-ext
+          - constituent-base-element-id: '1'
+            constituent-cpd-id: requires-mgmt-ext
+          virtual-link-profile-id: mgmtnet
+        vnfd-id: vnf_relations-vnf
+    id: vnf_relations-ns
+    name: vnf_relations-ns
+    version: '1.0'
+    virtual-link-desc:
+    - id: mgmtnet
+      mgmt-network: 'true'
+    vnfd-id:
+    - vnf_relations-vnf

charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml

-vnfd:vnfd-catalog:
-    vnfd:
-    -   id: vnf_relations-vnf
-        name: vnf_relations-vnf
-        short-name: vnf_relations-vnf
-        version: 1.0
-        description: A VNF consisting of 1 VDU connected to two external VL, and one for data and another one for management
-        logo: osm.png
-        connection-point:
-        -   id: requires-mgmt
-            name: requires-mgmt
-            short-name: requires-mgmt
-            type: VPORT
-        -   id: provides-mgmt
-            name: provides-mgmt
-            short-name: provides-mgmt
-            type: VPORT
-        mgmt-interface:
-            cp: requires-mgmt
-        vdu:
-        -   id: simple_requires
-            name: simple_requires
-            image: ubuntu18.04
-            count: 1
-            vm-flavor:
-                vcpu-count: 1
-                memory-mb: 1024
-                storage-gb: 10
-            interface:
-            -   name: simple_requires-eth0
-                position: 1
-                type: EXTERNAL
-                virtual-interface:
-                    type: PARAVIRT
-                external-connection-point-ref: requires-mgmt
-                mgmt-interface: true
-            cloud-init-file: cloud-config.txt
-            vdu-configuration:
-                juju:
-                    charm: simple_requires
-                    proxy: false
-                config-access:
-                    ssh-access:
-                        required: True
-                        default-user: ubuntu
-                initial-config-primitive:
-                -   seq: 1
-                    name: touch
-                    parameter:
-                    -   name: filename
-                        data-type: STRING
-                        value: '/home/ubuntu/first-touch'
-                config-primitive:
-                -   name: touch
-                    parameter:
-                    -   name: filename
-                        data-type: STRING
-                        default-value: '/home/ubuntu/touched'
-        -   id: simple_provides
-            name: simple_provides
-            image: ubuntu18.04
-            count: 1
-            vm-flavor:
-                vcpu-count: 1
-                memory-mb: 1024
-                storage-gb: 10
-            interface:
-            -   name: simple_provides-eth0
-                position: 1
-                type: EXTERNAL
-                virtual-interface:
-                    type: PARAVIRT
-                external-connection-point-ref: provides-mgmt
-                mgmt-interface: true
-            cloud-init-file: cloud-config.txt
-            vdu-configuration:
-                juju:
-                    charm: simple_provides
-                    proxy: false
-                config-access:
-                    ssh-access:
-                        required: True
-                        default-user: ubuntu
-                initial-config-primitive:
-                -   seq: 1
-                    name: touch
-                    parameter:
-                    -   name: filename
-                        data-type: STRING
-                        value: '/home/ubuntu/first-touch'
-                config-primitive:
-                -   name: touch
-                    parameter:
-                    -   name: filename
-                        data-type: STRING
-                        default-value: '/home/ubuntu/touched'
-        vnf-configuration:
-            relation:
-            -   name: relation
-                entities:
-                -   id: simple_provides
-                    endpoint: interface
-                -   id: simple_requires
-                    endpoint: interface
\ No newline at end of file
+vnfd:
+  description: A VNF consisting of 1 VDU connected to two external VL, and one for
+    data and another one for management
+  df:
+  - id: default-df
+    instantiation-level:
+    - id: default-instantiation-level
+      vdu-level:
+      - number-of-instances: 1
+        vdu-id: simple_requires
+      - number-of-instances: 1
+        vdu-id: simple_provides
+    vdu-profile:
+    - id: simple_requires
+      min-number-of-instances: 1
+      vdu-configuration-id: simple_requires-vdu-configuration
+    - id: simple_provides
+      min-number-of-instances: 1
+      vdu-configuration-id: simple_provides-vdu-configuration
+    vnf-configuration-id: default-vnf-configuration
+  ext-cpd:
+  - id: requires-mgmt-ext
+    int-cpd:
+      cpd: simple_requires-eth0-int
+      vdu-id: simple_requires
+  - id: provides-mgmt-ext
+    int-cpd:
+      cpd: simple_provides-eth0-int
+      vdu-id: simple_provides
+  id: vnf_relations-vnf
+  mgmt-cp: requires-mgmt-ext
+  product-name: vnf_relations-vnf
+  sw-image-desc:
+  - id: ubuntu18.04
+    image: ubuntu18.04
+    name: ubuntu18.04
+  vdu:
+  - cloud-init-file: cloud-config.txt
+    id: simple_requires
+    int-cpd:
+    - id: simple_requires-eth0-int
+      virtual-network-interface-requirement:
+      - name: simple_requires-eth0
+        position: 1
+        virtual-interface:
+          type: PARAVIRT
+    name: simple_requires
+    sw-image-desc: ubuntu18.04
+    virtual-compute-desc: simple_requires-compute
+    virtual-storage-desc:
+    - simple_requires-storage
+  - cloud-init-file: cloud-config.txt
+    id: simple_provides
+    int-cpd:
+    - id: simple_provides-eth0-int
+      virtual-network-interface-requirement:
+      - name: simple_provides-eth0
+        position: 1
+        virtual-interface:
+          type: PARAVIRT
+    name: simple_provides
+    sw-image-desc: ubuntu18.04
+    virtual-compute-desc: simple_provides-compute
+    virtual-storage-desc:
+    - simple_provides-storage
+  vdu-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: simple_requires-vdu-configuration
+    initial-config-primitive:
+    - name: touch
+      parameter:
+      - data-type: STRING
+        name: filename
+        value: /home/ubuntu/first-touch
+      seq: 1
+    juju:
+      charm: simple_requires
+      proxy: false
+  - 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: simple_provides-vdu-configuration
+    initial-config-primitive:
+    - name: touch
+      parameter:
+      - data-type: STRING
+        name: filename
+        value: /home/ubuntu/first-touch
+      seq: 1
+    juju:
+      charm: simple_provides
+      proxy: false
+  version: 1.0
+  virtual-compute-desc:
+  - id: simple_requires-compute
+    virtual-cpu:
+      num-virtual-cpu: 1
+    virtual-memory:
+      size: 1.0
+  - id: simple_provides-compute
+    virtual-cpu:
+      num-virtual-cpu: 1
+    virtual-memory:
+      size: 1.0
+  virtual-storage-desc:
+  - id: simple_requires-storage
+    size-of-storage: 10
+  - id: simple_provides-storage
+    size-of-storage: 10
+  vnf-configuration:
+  - id: default-vnf-configuration
+    relation:
+    - entities:
+      - endpoint: interface
+        id: simple_provides
+      - endpoint: interface
+        id: simple_requires
+      name: relation

cirros_alarm_ns/cirros_alarm_nsd.yaml

-nsd-catalog:
-    nsd:
-    -   id: cirros_alarm-ns
-        name: cirros_alarm-ns
-        short-name: cirros_alarm-ns
-        description: Simple NS example with a cirros_alarm-vnf
-        vendor: OSM
-        version: '1.0'
-        constituent-vnfd:
-        -   member-vnf-index: '1'
-            vnfd-id-ref: cirros_alarm-vnf
-        vld:
-        -   id: mgmtnet
-            name: mgmtnet
-            short-name: mgmtnet
-            type: ELAN
-            mgmt-network: true
-            vnfd-connection-point-ref:
-            -   member-vnf-index-ref: '1'
-                vnfd-id-ref: cirros_alarm-vnf
-                vnfd-connection-point-ref: eth0
+nsd:
+  nsd:
+  - description: Simple NS example with a cirros_alarm-vnf
+    designer: OSM
+    df:
+    - id: default-df
+      vnf-profile:
+      - id: '1'
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: '1'
+            constituent-cpd-id: eth0-ext
+          virtual-link-profile-id: mgmtnet
+        vnfd-id: cirros_alarm-vnf
+    id: cirros_alarm-ns
+    name: cirros_alarm-ns
+    version: '1.0'
+    virtual-link-desc:
+    - id: mgmtnet
+      mgmt-network: true
+    vnfd-id:
+    - cirros_alarm-vnf