Merge branch 'sol006' into 'master'

Sol006 merge See merge request !106

Merge branch 'sol006' into 'master'
Sol006 merge See merge request !106
61ee8eb5 · Mark Beierl · 17583c8b · 02ef75b6 · 61ee8eb5 · 61ee8eb5
Commit 61ee8eb5 authored 4 years ago by Mark Beierl
--- a/hackfest_simple_k8s_vnf/hackfest_simple_k8s_vnfd.yaml
+++ b/hackfest_simple_k8s_vnf/hackfest_simple_k8s_vnfd.yaml
-vnfd-catalog:
-    vnfd:
-    -   id: hackfest-simple-k8s-vnf
-        name: hackfest-simple-k8s-vnf
-        connection-point:
-        -   name: mgmtnet
-        mgmt-interface:
-            cp: mgmt
-        kdu:
-        -   name: mykdu
-            juju-bundle: cs:~dominik.f/bundle/hf-k8s-bundle-0
-        k8s-cluster:
-            nets:
-            -   id: mgmtnet
-                external-connection-point-ref: mgmt
+vnfd:
+  df:
+  - id: default-df
+    kdu-profile:
+    - kdu-model-id: mykdu-model
+      name: mykdu
+  ext-cpd:
+  - id: mgmt-ext
+    k8s-cluster-net: mgmtnet
+  id: hackfest-simple-k8s-vnf
+  k8s-cluster:
+    nets:
+    - id: mgmtnet
+  kdu:
+  - name: mykdu
+  kdu-model:
+  - id: mykdu-model
+    kdu-model-locator: cs:~dominik.f/bundle/hf-k8s-bundle-0
+    kdu-model-type: juju-bundle
+  mgmt-cp: mgmt-ext
+  product-name: hackfest-simple-k8s-vnf
--- a/hackfest_vyos_ns/hackfest_vyos_nsd.yaml
+++ b/hackfest_vyos_ns/hackfest_vyos_nsd.yaml
-nsd-catalog:
-    nsd:
-    -   id: hackfest_vyos-ns
-        name: hackfest_vyos-ns
-        short-name: hackfest_vyos-ns
-        description: Simple NS with a single VyOS Router VNF
-        version: '1.0'
-        logo: osm.png
-        constituent-vnfd:
-        -   vnfd-id-ref: hackfest_vyos-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: hackfest_vyos-vnf
-                member-vnf-index-ref: '1'
-                vnfd-connection-point-ref: vnf-mgmt
-                ip-address: 172.21.250.200
-        -   id: internal
-            name: internal
-            short-name: internal
-            type: ELAN
-            mgmt-network: true
-            vnfd-connection-point-ref:
-            -   vnfd-id-ref: hackfest_vyos-vnf
-                member-vnf-index-ref: '1'
-                vnfd-connection-point-ref: vnf-internal               
-        -   id: external
-            name: external
-            short-name: external
-            type: ELAN
-            mgmt-network: true
-            vnfd-connection-point-ref:
-            -   vnfd-id-ref: hackfest_vyos-vnf
-                member-vnf-index-ref: '1'
-                vnfd-connection-point-ref: vnf-external
+nsd:
+  nsd:
+  - description: Simple NS with a single VyOS Router VNF
+    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
+            ip-address: 172.21.250.200
+          virtual-link-profile-id: mgmtnet
+        - constituent-cpd-id:
+          - constituent-base-element-id: '1'
+            constituent-cpd-id: vnf-internal-ext
+          virtual-link-profile-id: internal
+        - constituent-cpd-id:
+          - constituent-base-element-id: '1'
+            constituent-cpd-id: vnf-external-ext
+          virtual-link-profile-id: external
+        vnfd-id: hackfest_vyos-vnf
+    id: hackfest_vyos-ns
+    name: hackfest_vyos-ns
+    version: '1.0'
+    virtual-link-desc:
+    - id: mgmtnet
+      mgmt-network: true
+    - id: internal
+      mgmt-network: true
+    - id: external
+      mgmt-network: true
+    vnfd-id:
+    - hackfest_vyos-vnf
--- a/hackfest_vyos_vnf/hackfest_vyos_vnfd.yaml
+++ b/hackfest_vyos_vnf/hackfest_vyos_vnfd.yaml
-vnfd-catalog:
-    vnfd:
-    -   id: hackfest_vyos-vnf
-        name: hackfest_vyos-vnf
-        short-name: hackfest_vyos-vnf
-        version: '1.0'
-        description: A basic virtual router
-        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
-
+vnfd:
+  description: A basic virtual router
+  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
+  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: hackfest_vyos-vnf
+  mgmt-cp: vnf-mgmt-ext
+  product-name: hackfest_vyos-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
--- a/k8s_juju_ns/k8s_juju_nsd.yaml
+++ b/k8s_juju_ns/k8s_juju_nsd.yaml
-nsd-catalog:
-    nsd:
-    -   id: k8s_juju
-        name: k8s_juju
-        short-name: k8s_juju
-        description: NS consisting of a 4 k8s_jujumachine VNFs and 1 k8s_jujucontroller VNF connected to mgmt network
-        vendor: OSM
-        version: '1.0'
-        logo: osm.png
-        constituent-vnfd:
-        -   member-vnf-index: k8s_vnf1
-            vnfd-id-ref: k8s_jujumachine_vnf
-        -   member-vnf-index: k8s_vnf2
-            vnfd-id-ref: k8s_jujumachine_vnf
-        -   member-vnf-index: k8s_vnf3
-            vnfd-id-ref: k8s_jujumachine_vnf
-        -   member-vnf-index: k8s_vnf4
-            vnfd-id-ref: k8s_jujumachine_vnf
-        -   member-vnf-index: k8s_juju
-            vnfd-id-ref: k8s_jujucontroller_vnf
-        vld:
-        -   id: mgmtnet
-            name: mgmtnet
-            type: ELAN
-            mgmt-network: 'true'
-            vim-network-name: mgmt
-            vnfd-connection-point-ref:
-            -   member-vnf-index-ref: k8s_vnf1
-                vnfd-id-ref: k8s_jujumachine_vnf
-                vnfd-connection-point-ref: mgmt
-            -   member-vnf-index-ref: k8s_vnf2
-                vnfd-id-ref: k8s_jujumachine_vnf
-                vnfd-connection-point-ref: mgmt
-            -   member-vnf-index-ref: k8s_vnf3
-                vnfd-id-ref: k8s_jujumachine_vnf
-                vnfd-connection-point-ref: mgmt
-            -   member-vnf-index-ref: k8s_vnf4
-                vnfd-id-ref: k8s_jujumachine_vnf
-                vnfd-connection-point-ref: mgmt
-            -   member-vnf-index-ref: k8s_juju
-                vnfd-id-ref: k8s_jujucontroller_vnf
-                vnfd-connection-point-ref: mgmt
-
+nsd:
+  nsd:
+  - description: NS consisting of a 4 k8s_jujumachine VNFs and 1 k8s_jujucontroller
+      VNF connected to mgmt network
+    designer: OSM
+    df:
+    - id: default-df
+      vnf-profile:
+      - id: k8s_vnf1
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: k8s_vnf1
+            constituent-cpd-id: mgmt-ext
+          virtual-link-profile-id: mgmtnet
+        vnfd-id: k8s_jujumachine_vnf
+      - id: k8s_vnf2
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: k8s_vnf2
+            constituent-cpd-id: mgmt-ext
+          virtual-link-profile-id: mgmtnet
+        vnfd-id: k8s_jujumachine_vnf
+      - id: k8s_vnf3
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: k8s_vnf3
+            constituent-cpd-id: mgmt-ext
+          virtual-link-profile-id: mgmtnet
+        vnfd-id: k8s_jujumachine_vnf
+      - id: k8s_vnf4
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: k8s_vnf4
+            constituent-cpd-id: mgmt-ext
+          virtual-link-profile-id: mgmtnet
+        vnfd-id: k8s_jujumachine_vnf
+      - id: k8s_juju
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: k8s_juju
+            constituent-cpd-id: mgmt-ext
+          virtual-link-profile-id: mgmtnet
+        vnfd-id: k8s_jujucontroller_vnf
+    id: k8s_juju
+    name: k8s_juju
+    version: '1.0'
+    virtual-link-desc:
+    - id: mgmtnet
+      mgmt-network: 'true'
+    vnfd-id:
+    - k8s_jujumachine_vnf
+    - k8s_jujucontroller_vnf
--- a/k8s_jujucontroller_vnf/k8s_jujucontroller_vnfd.yaml
+++ b/k8s_jujucontroller_vnf/k8s_jujucontroller_vnfd.yaml
-vnfd-catalog:
-    vnfd:
-    -   id: k8s_jujucontroller_vnf
-        name: k8s_jujucontroller_vnf
-        short-name: k8s_jujucontroller_vnf
-        version: 1.0
-        description: A VNF consisting of 1 VDU for juju to deploy K8s cluster
-        logo: osm.png
-        connection-point:
-        -   id: mgmt
-            name: mgmt
-            short-name: mgmt
-        mgmt-interface:
-            cp: mgmt
-        vdu:
-        -   id: k8svm
-            name: k8svm
-            image: ubuntu18.04
-            count: 1
-            vm-flavor:
-                vcpu-count: 2
-                memory-mb: 4096
-                storage-gb: 80
-            interface:
-            -   name: eth0
-                position: 1
-                type: EXTERNAL
-                virtual-interface:
-                    type: PARAVIRT
-                external-connection-point-ref: mgmt
-            cloud-init-file: cloud-config.txt
-        vnf-configuration:
-            config-access:
-                ssh-access:
-                    required: True
-                    default-user: ubuntu 
-            juju:
-                charm: tid-jujuk8s
-            initial-config-primitive:
-            -   seq: '1'
-                name: config
-                parameter:
-                -   name: ssh-hostname
-                    value: <rw_mgmt_ip>
-                -   name: ssh-username
-                    value: ubuntu
-            -   seq: '2'
-                name: setup-juju
-            -   seq: '3'
-                name: add-machines
-                parameter:
-                -   name: machine1
-                    value: <MACHINE1>
-                -   name: machine2
-                    value: <MACHINE2>
-                -   name: machine3
-                    value: <MACHINE3>
-                -   name: machine4
-                    value: <MACHINE4>
-                -   name: machine5
-                    value: <MACHINE5>
-                -   name: machine6
-                    value: <MACHINE6>
-                -   name: machine7
-                    value: <MACHINE7>
-                -   name: machine8
-                    value: <MACHINE8>
-                -   name: machine9
-                    value: <MACHINE9>
-                -   name: machine10
-                    value: <MACHINE10>
-            -   seq: '4'
-                name: deploy-bundle
-                parameter:
-                -   name: bundle
-                    value: <BUNDLE>
-            -   seq: '5'
-                name: post-deploy
-            -   seq: '6'
-                name: install-openebs-kubectl
-            # -   seq: '7'
-            #     name: init-helm
-            config-primitive:
-            -   name: setup-juju
-            -   name: deploy-bundle
-                parameter:
-                -   name: bundle
-                    data-type: STRING
-            -   name: undeploy-bundle
-            -   name: remove-machines
-            -   name: init-helm
-            -   name: install-openebs-chart
-            -   name: install-openebs-kubectl
-            -   name: post-deploy
-            -   name: add-machine
-                parameter:
-                -   name: machine
-                    data-type: STRING
-            -   name: add-machines
-                parameter:
-                -   name: machine1
-                    data-type: STRING
-                -   name: machine2
-                    data-type: STRING
-                -   name: machine3
-                    data-type: STRING
-                -   name: machine4
-                    data-type: STRING
-                -   name: machine5
-                    data-type: STRING
-                -   name: machine6
-                    data-type: STRING
-                -   name: machine7
-                    data-type: STRING
-                -   name: machine8
-                    data-type: STRING
-                -   name: machine9
-                    data-type: STRING
-                -   name: machine10
-                    data-type: STRING
-            -   name: remove-machines
-                parameter:
-                -   name: force
-                    data-type: STRING
-            -   name: add-repo
-                parameter:
-                -   name: name
-                    data-type: STRING
-                -   name: url
-                    data-type: STRING
-            -   name: remove-repo
-                parameter:
-                -   name: name
-                    data-type: STRING
-            -   name: install-chart
-                parameter:
-                -   name: chart
-                    data-type: STRING
-                -   name: name
-                    data-type: STRING
-                -   name: namespace
-                    data-type: STRING
-                -   name: atomic
-                    data-type: STRING
-                -   name: values
-                    data-type: STRING
-                -   name: valuesFile
-                    data-type: STRING
-            -   name: upgrade-release
-                parameter:
-                -   name: chart
-                    data-type: STRING
-                -   name: name
-                    data-type: STRING
-                -   name: namespace
-                    data-type: STRING
-                -   name: atomic
-                    data-type: STRING
-                -   name: values
-                    data-type: STRING
-                -   name: valuesFile
-                    data-type: STRING
-            -   name: rollback-release
-                parameter:
-                -   name: name
-                    data-type: STRING
-                -   name: revision
-                    data-type: STRING
-            -   name: delete-release
-                parameter:
-                -   name: name
-                    data-type: STRING
-
+vnfd:
+  description: A VNF consisting of 1 VDU for juju to deploy K8s cluster
+  df:
+  - id: default-df
+    instantiation-level:
+    - id: default-instantiation-level
+      vdu-level:
+      - number-of-instances: 1
+        vdu-id: k8svm
+    vdu-profile:
+    - id: k8svm
+      min-number-of-instances: 1
+    vnf-configuration-id: default-vnf-configuration
+  ext-cpd:
+  - id: mgmt-ext
+    int-cpd:
+      cpd: eth0-int
+      vdu-id: k8svm
+  id: k8s_jujucontroller_vnf
+  mgmt-cp: mgmt-ext
+  product-name: k8s_jujucontroller_vnf
+  sw-image-desc:
+  - id: ubuntu18.04
+    image: ubuntu18.04
+    name: ubuntu18.04
+  vdu:
+  - cloud-init-file: cloud-config.txt
+    id: k8svm
+    int-cpd:
+    - id: eth0-int
+      virtual-network-interface-requirement:
+      - name: eth0
+        position: 1
+        virtual-interface:
+          type: PARAVIRT
+    name: k8svm
+    sw-image-desc: ubuntu18.04
+    virtual-compute-desc: k8svm-compute
+    virtual-storage-desc:
+    - k8svm-storage
+  version: 1.0
+  virtual-compute-desc:
+  - id: k8svm-compute
+    virtual-cpu:
+      num-virtual-cpu: 2
+    virtual-memory:
+      size: 4.0
+  virtual-storage-desc:
+  - id: k8svm-storage
+    size-of-storage: 80
+  vnf-configuration:
+  - config-access:
+      ssh-access:
+        default-user: ubuntu
+        required: true
+    config-primitive:
+    - name: setup-juju
+    - name: deploy-bundle
+      parameter:
+      - data-type: STRING
+        name: bundle
+    - name: undeploy-bundle
+    - name: remove-machines
+    - name: init-helm
+    - name: install-openebs-chart
+    - name: install-openebs-kubectl
+    - name: post-deploy
+    - name: add-machine
+      parameter:
+      - data-type: STRING
+        name: machine
+    - name: add-machines
+      parameter:
+      - data-type: STRING
+        name: machine1
+      - data-type: STRING
+        name: machine2
+      - data-type: STRING
+        name: machine3
+      - data-type: STRING
+        name: machine4
+      - data-type: STRING
+        name: machine5
+      - data-type: STRING
+        name: machine6
+      - data-type: STRING
+        name: machine7
+      - data-type: STRING
+        name: machine8
+      - data-type: STRING
+        name: machine9
+      - data-type: STRING
+        name: machine10
+    - name: remove-machines
+      parameter:
+      - data-type: STRING
+        name: force
+    - name: add-repo
+      parameter:
+      - data-type: STRING
+        name: name
+      - data-type: STRING
+        name: url
+    - name: remove-repo
+      parameter:
+      - data-type: STRING
+        name: name
+    - name: install-chart
+      parameter:
+      - data-type: STRING
+        name: chart
+      - data-type: STRING
+        name: name
+      - data-type: STRING
+        name: namespace
+      - data-type: STRING
+        name: atomic
+      - data-type: STRING
+        name: values
+      - data-type: STRING
+        name: valuesFile
+    - name: upgrade-release
+      parameter:
+      - data-type: STRING
+        name: chart
+      - data-type: STRING
+        name: name
+      - data-type: STRING
+        name: namespace
+      - data-type: STRING
+        name: atomic
+      - data-type: STRING
+        name: values
+      - data-type: STRING
+        name: valuesFile
+    - name: rollback-release
+      parameter:
+      - data-type: STRING
+        name: name
+      - data-type: STRING
+        name: revision
+    - name: delete-release
+      parameter:
+      - data-type: STRING
+        name: name
+    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: setup-juju
+      seq: '2'
+    - name: add-machines
+      parameter:
+      - name: machine1
+        value: <MACHINE1>
+      - name: machine2
+        value: <MACHINE2>
+      - name: machine3
+        value: <MACHINE3>
+      - name: machine4
+        value: <MACHINE4>
+      - name: machine5
+        value: <MACHINE5>
+      - name: machine6
+        value: <MACHINE6>
+      - name: machine7
+        value: <MACHINE7>
+      - name: machine8
+        value: <MACHINE8>
+      - name: machine9
+        value: <MACHINE9>
+      - name: machine10
+        value: <MACHINE10>
+      seq: '3'
+    - name: deploy-bundle
+      parameter:
+      - name: bundle
+        value: <BUNDLE>
+      seq: '4'
+    - name: post-deploy
+      seq: '5'
+    - name: install-openebs-kubectl
+      seq: '6'
+    juju:
+      charm: tid-jujuk8s
--- a/k8s_jujumachine_vnf/k8s_jujumachine_vnfd.yaml
+++ b/k8s_jujumachine_vnf/k8s_jujumachine_vnfd.yaml
--- a/magma/fb_magma_knf/fb_magma_vnfd.yaml
+++ b/magma/fb_magma_knf/fb_magma_vnfd.yaml
-vnfd-catalog:
-  schema-version: '3.0'
-  vnfd:
-  - id: fb_magma_knf
-    name: fb_magma_knf
-    short-name: fb_magma_knf
-    description: KNF with KDU using a helm-chart for Facebook magma orc8r
-    vendor: ATOS
-    version: '1.0'
-    mgmt-interface:
-      cp: mgmt
-    connection-point:
-    - name: mgmt
-    k8s-cluster:
-      nets:
-      - id: mgmtnet
-        external-connection-point-ref: mgmt
-    kdu:
-    - name: orc8r
-      helm-chart: magma/orc8r
\ No newline at end of file
+vnfd:
+  description: KNF with KDU using a helm-chart for Facebook magma orc8r
+  df:
+  - id: default-df
+    kdu-profile:
+    - kdu-model-id: orc8r-model
+      name: orc8r
+  ext-cpd:
+  - id: mgmt-ext
+    k8s-cluster-net: mgmtnet
+  id: fb_magma_knf
+  k8s-cluster:
+    nets:
+    - id: mgmtnet
+  kdu:
+  - name: orc8r
+  kdu-model:
+  - id: orc8r-model
+    kdu-model-locator: magma/orc8r
+    kdu-model-type: helm-chart
+  mgmt-cp: mgmt-ext
+  product-name: fb_magma_knf
+  provider: ATOS
+  version: '1.0'
--- a/magma/fb_magma_ns/fb_magma_nsd.yaml
+++ b/magma/fb_magma_ns/fb_magma_nsd.yaml
--- a/magma/hackfest_gateway_vnfd/hackfest_gateway_vnfd.yaml
+++ b/magma/hackfest_gateway_vnfd/hackfest_gateway_vnfd.yaml
--- a/magma/hackfest_magma-agw-enb_nsd/magma-agw-enb_nsd.yaml
+++ b/magma/hackfest_magma-agw-enb_nsd/magma-agw-enb_nsd.yaml
--- a/magma/hackfest_magma-agw-enb_vnfd/magma-agw-enb_vnfd.yaml
+++ b/magma/hackfest_magma-agw-enb_vnfd/magma-agw-enb_vnfd.yaml
--- a/magma/pdu.yaml
+++ b/magma/pdu.yaml
@@ -6,7 +6,6 @@ shared:         false
 interfaces:
 -  name:       eth0
    ip-address: 172.21.250.200
-    vim-network-name: osm-ext
    mgmt:       true
 -  name:       eth1
    ip-address: 192.168.239.7

--- a/magma/squid_cnf/squid_vnfd.yaml
+++ b/magma/squid_cnf/squid_vnfd.yaml
--- a/magma/squid_cnf_ns/squid_cnf_nsd.yaml
+++ b/magma/squid_cnf_ns/squid_cnf_nsd.yaml
--- a/nscharm_ns/nscharm_nsd.yaml
+++ b/nscharm_ns/nscharm_nsd.yaml
--- a/nscharm_policy_vnf/nscharm_policy_vnfd.yaml
+++ b/nscharm_policy_vnf/nscharm_policy_vnfd.yaml
--- a/nscharm_user_vnf/nscharm_user_vnfd.yaml
+++ b/nscharm_user_vnf/nscharm_user_vnfd.yaml
--- a/openldap_knf/openldap_vnfd.yaml
+++ b/openldap_knf/openldap_vnfd.yaml
--- a/openldap_ns/openldap_nsd.yaml
+++ b/openldap_ns/openldap_nsd.yaml
--- a/simple_ee_ns/simple_ee_nsd.yaml
+++ b/simple_ee_ns/simple_ee_nsd.yaml