X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=descriptor-packages%2Fvnfd%2Fref11_vnf%2Fsrc%2Fref11_vnfd.yaml;h=cd1115555dcabd48d86b2eef44cde33eb915d906;hb=84fe31f632166d2fbf566968bd25aa9545e96fdc;hp=f308282b4f3fab25161e780c084efd82bc0f42d2;hpb=230c540cf52f3fbe05d40d6650a97d1e55327249;p=osm%2Fdevops.git

diff --git a/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml b/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml
index f308282b..cd111555 100644
--- a/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml
+++ b/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml
@@ -1,39 +1,41 @@
-vnfd:vnfd-catalog:
+vnfd-catalog:
     vnfd:
     -   connection-point:
         -   name: mgmt0
-            type: VPORT
+
         -   name: west
-            type: VPORT
+
         description: A simple VNF descriptor w/ VM1 and VM2
         id: Ref_Vnf_11
         name: Ref_VNF_11
         short-name: Ref_VNF_11
+        mgmt-interface:
+            cp: mgmt0
         internal-vld:
         -   description: Internal VL
             id: VL12
             name: VL12
             short-name: VL12
             type: ELAN
-            vendor: ETSI
             internal-connection-point:
             -   id-ref: 'iface11'
             -   id-ref: 'iface21'
         vdu:
-        -   external-interface:
+        -   interface:
             -   name: iface10
+                type: EXTERNAL
                 virtual-interface:
-                    type: OM-MGMT
-                vnfd-connection-point-ref: mgmt0
-            internal-interface:
+                    type: PARAVIRT
+                external-connection-point-ref: mgmt0
             -   name: iface11
+                type: INTERNAL
                 virtual-interface:
-                    type: VIRTIO
-                vdu-internal-connection-point-ref: iface11
+                    type: PARAVIRT
+                internal-connection-point-ref: iface11
             internal-connection-point:
             -   name: iface11
                 id: iface11
-                type: VPORT
+
             id: Ref_VM1
             image: ref_vm1.qcow2
             name: Ref_VM1
@@ -41,20 +43,21 @@ vnfd:vnfd-catalog:
                 memory-mb: '2048'
                 storage-gb: '8'
                 vcpu-count: '2'
-        -   external-interface:
+        -   interface:
             -   name: iface22
+                type: EXTERNAL
                 virtual-interface:
-                    type: VIRTIO
-                vnfd-connection-point-ref: west
-            internal-interface:
+                    type: PARAVIRT
+                external-connection-point-ref: west
             -   name: iface21
+                type: INTERNAL
                 virtual-interface:
-                    type: VIRTIO
-                vdu-internal-connection-point-ref: iface21
+                    type: PARAVIRT
+                internal-connection-point-ref: iface21
             internal-connection-point:
             -   name: iface21
                 id: iface21
-                type: VPORT
+
             id: Ref_VM2
             image: ref_vm2.qcow2
             name: Ref_VM2