Merge branch 'fixes_magma_squid_cnf' into 'master'

Fixes magma squid_cnf kdu and ext-cpd

See merge request !111

magma/squid_cnf/squid_vnfd.yaml

@@ -3,7 +3,7 @@ vnfd:
   df:
   - id: default-df
   ext-cpd:
-  - id: mgmt-ext
+  - id: mgmtnet-ext
     k8s-cluster-net: mgmtnet
   id: squid_cnf
   k8s-cluster:
@@ -12,26 +12,25 @@ vnfd:
   kdu:
   - name: squid-kdu
     juju-bundle: bundle.yaml
-  kdu-configuration:
-  - config-primitive:
-    - name: addurl
-      parameter:
-      - data-type: STRING
-        default-value: squid
-        name: application-name
-      - data-type: STRING
-        default-value: ''
-        name: url
-    - name: deleteurl
-      parameter:
-      - data-type: STRING
-        default-value: squid
-        name: application-name
-      - data-type: STRING
-        default-value: ''
-        name: url
-    id: squid-kdu-kdu-configuration
-  mgmt-cp: mgmt-ext
+    kdu-configuration:
+      config-primitive:
+      - name: addurl
+        parameter:
+        - data-type: STRING
+          default-value: squid
+          name: application-name
+        - data-type: STRING
+          default-value: ''
+          name: url
+      - name: deleteurl
+        parameter:
+        - data-type: STRING
+          default-value: squid
+          name: application-name
+        - data-type: STRING
+          default-value: ''
+          name: url
+  mgmt-cp: mgmtnet-ext
   product-name: squid_cnf
   provider: Canonical
   version: '1.0'