Merge branch 'im-patch-10095' into 'master'

Im patch 10095

See merge request !110

charm-packages/native_k8s_charm_vnf/native_k8s_charm_vnfd.yaml

 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
@@ -14,30 +10,26 @@ vnfd:
     - 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
+    juju-bundle: bundle.yaml
+    kdu-configuration:
+      config-primitive:
+      - name: changecontent
+        parameter:
+        - data-type: STRING
+          default-value: nginx
+          name: application-name
+        - data-type: STRING
+          default-value: ''
+          name: customtitle
+      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
   mgmt-cp: mgmt-ext
   product-name: native_k8s_charm-vnf

hackfest_simple_k8s_vnf/hackfest_simple_k8s_vnfd.yaml

 vnfd:
   df:
   - id: default-df
-    kdu-profile:
-    - kdu-model-id: mykdu-model
-      name: mykdu
   ext-cpd:
   - id: mgmt-ext
     k8s-cluster-net: mgmtnet
@@ -13,9 +10,6 @@ vnfd:
     - 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
+    juju-bundle: cs:~dominik.f/bundle/hf-k8s-bundle-0
   mgmt-cp: mgmt-ext
   product-name: hackfest-simple-k8s-vnf

magma/fb_magma_knf/fb_magma_vnfd.yaml

@@ -2,9 +2,6 @@ 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
@@ -14,10 +11,7 @@ vnfd:
     - id: mgmtnet
   kdu:
   - name: orc8r
-  kdu-model:
-  - id: orc8r-model
-    kdu-model-locator: magma/orc8r
-    kdu-model-type: helm-chart
+    helm-chart: magma/orc8r
   mgmt-cp: mgmt-ext
   product-name: fb_magma_knf
   provider: ATOS

magma/squid_cnf/squid_vnfd.yaml

@@ -2,10 +2,6 @@ vnfd:
   description: K8s container deployment of Squid Web Proxy
   df:
   - id: default-df
-    kdu-profile:
-    - kdu-configuration-id: squid-kdu-kdu-configuration
-      kdu-model-id: squid-kdu-model
-      name: squid-kdu
   ext-cpd:
   - id: mgmt-ext
     k8s-cluster-net: mgmtnet
@@ -15,6 +11,7 @@ vnfd:
     - id: mgmtnet
   kdu:
   - name: squid-kdu
+    juju-bundle: bundle.yaml
   kdu-configuration:
   - config-primitive:
     - name: addurl
@@ -34,10 +31,6 @@ vnfd:
         default-value: ''
         name: url
     id: squid-kdu-kdu-configuration
-  kdu-model:
-  - id: squid-kdu-model
-    kdu-model-locator: bundle.yaml
-    kdu-model-type: juju-bundle
   mgmt-cp: mgmt-ext
   product-name: squid_cnf
   provider: Canonical

openldap_knf/openldap_vnfd.yaml

@@ -2,9 +2,6 @@ vnfd:
   description: KNF with single KDU using a helm-chart for openldap version 1.2.3
   df:
   - id: default-df
-    kdu-profile:
-    - kdu-model-id: ldap-model
-      name: ldap
   ext-cpd:
   - id: mgmt-ext
     k8s-cluster-net: mgmtnet
@@ -14,10 +11,7 @@ vnfd:
     - id: mgmtnet
   kdu:
   - name: ldap
-  kdu-model:
-  - id: ldap-model
-    kdu-model-locator: stable/openldap:1.2.3
-    kdu-model-type: helm-chart
+    helm-chart: stable/openldap:1.2.3
   mgmt-cp: mgmt-ext
   product-name: openldap_knf
   provider: Telefonica