X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=descriptor-packages%2Fvnfd%2Fims_allin1_2p_vnf%2Fsrc%2FIMS-ALLIN1__vnfd.yaml;h=27b224702d353af73d1bfe422e4a0be6750eab62;hb=84fe31f632166d2fbf566968bd25aa9545e96fdc;hp=b73e110121da6fd9ebffe54ba050cbaf66c78e94;hpb=230c540cf52f3fbe05d40d6650a97d1e55327249;p=osm%2Fdevops.git

diff --git a/descriptor-packages/vnfd/ims_allin1_2p_vnf/src/IMS-ALLIN1__vnfd.yaml b/descriptor-packages/vnfd/ims_allin1_2p_vnf/src/IMS-ALLIN1__vnfd.yaml
index b73e1101..27b22470 100644
--- a/descriptor-packages/vnfd/ims_allin1_2p_vnf/src/IMS-ALLIN1__vnfd.yaml
+++ b/descriptor-packages/vnfd/ims_allin1_2p_vnf/src/IMS-ALLIN1__vnfd.yaml
@@ -1,4 +1,4 @@
-vnfd:vnfd-catalog:
+vnfd-catalog:
     vnfd:
     -   id: IMS-ALLIN1_2p
         name: IMS-ALLIN1_2p
@@ -6,12 +6,9 @@ vnfd:vnfd-catalog:
         description: IMS-ALLIN1_2p
         logo: metaswitch_2x.png
         mgmt-interface:
-            vdu-id: IMS-ALLIN1_2p-VM
+            cp: eth1
         vnf-configuration:
-            config-attributes:
-                config-delay: '0'
-                config-priority: '1'
-            service-primitive:
+            config-primitive:
             -   name: config
                 parameter:
                 -   name: home_domain
@@ -19,7 +16,7 @@ vnfd:vnfd-catalog:
                     mandatory: 'true'
                     default-value: ims.com
                 -   name: password
-                    data-type: string
+                    data-type: STRING
                     mandatory: 'true'
                     default-value: cw-aio
             -   name: create-update-user
@@ -45,9 +42,9 @@ vnfd:vnfd-catalog:
                 charm: clearwater-aio-proxy
         connection-point:
         -   name: eth0
-            type: VPORT
+
         -   name: eth1
-            type: VPORT
+
         vdu:
         -   id: IMS-ALLIN1_2p-VM
             name: IMS-ALLIN1_2p-VM
@@ -58,19 +55,21 @@ vnfd:vnfd-catalog:
                 storage-gb: '10'
                 vcpu-count: '2'
             mgmt-vpci: 0000:00:0a.0
-            external-interface:
+            interface:
             -   name: eth0
+                type: EXTERNAL
                 virtual-interface:
                     bandwidth: '0'
-                    type: VIRTIO
+                    type: PARAVIRT
                     vpci: 0000:00:0a.0
-                vnfd-connection-point-ref: eth0
+                external-connection-point-ref: eth0
             -   name: eth1
+                type: EXTERNAL
                 virtual-interface:
                     bandwidth: '0'
-                    type: OM-MGMT
+                    type: PARAVIRT
                     vpci: 0000:00:0b.0
-                vnfd-connection-point-ref: eth1
+                external-connection-point-ref: eth1
             guest-epa:
                 cpu-pinning-policy: DEDICATED
                 cpu-thread-pinning-policy: PREFER