X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=descriptor-packages%2Fvnfd%2Fref12_vnf%2Fsrc%2Fref12_vnfd.yaml;h=23742816d4fd82b10fff4fa639d7a7f7f64f7ad3;hb=84fe31f632166d2fbf566968bd25aa9545e96fdc;hp=2901c4aa749cdbef948aeae3a7868ed38a1b4d45;hpb=2c2374199270b5e71f419369a9a5e111ea0df375;p=osm%2Fdevops.git

diff --git a/descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml b/descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml
index 2901c4aa..23742816 100644
--- a/descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml
+++ b/descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml
@@ -1,33 +1,40 @@
-vnfd:vnfd-catalog:
+vnfd-catalog:
     vnfd:
     -   connection-point:
         -   name: mgmt0
-            type: VPORT
+
         -   name: west
-            type: VPORT
+
         -   name: east
-            type: VPORT
+
         description: A simple VNF descriptor w/ two VDU
         id: Ref_Vnf_12
         name: Ref_Vnf_12
         short-name: Ref_Vnf_12
+        mgmt-interface:
+            cp: mgmt0
         internal-vld:
         -   description: Internal VL
             id: VL34
             name: VL34
             short-name: VL34
             type: ELAN
-            vendor: ETSI
             internal-connection-point:
             -   id-ref: 'iface31'
             -   id-ref: 'iface41'
         vdu:
         -   description: Middlepoint
-            external-interface:
+            interface:
             -   name: iface30
+                type: EXTERNAL
                 virtual-interface:
-                    type: OM-MGMT
-                vnfd-connection-point-ref: mgmt0
+                    type: PARAVIRT
+                external-connection-point-ref: mgmt0
+            -   name: iface31
+                type: INTERNAL
+                internal-connection-point-ref: iface31
+                virtual-interface:
+                    type: PARAVIRT
             guest-epa:
                 cpu-pinning-policy: DEDICATED
                 mempage-size: "LARGE"
@@ -36,38 +43,35 @@ vnfd:vnfd-catalog:
             internal-connection-point:
             -   id: iface31
                 name: iface31
-                type: VPORT
-            internal-interface:
-            -   name: iface31
-                vdu-internal-connection-point-ref: iface31
-                virtual-interface:
-                    type: VIRTIO
+
             name: Ref_VM3
             vm-flavor:
                 memory-mb: '2048'
                 storage-gb: '8'
                 vcpu-count: '2'
-        -   external-interface:
+        -   interface:
             -   name: iface42
+                type: EXTERNAL
                 virtual-interface:
                     type: PCI-PASSTHROUGH
-                vnfd-connection-point-ref: west
+                external-connection-point-ref: west
             -   name: iface43
+                type: EXTERNAL
                 virtual-interface:
                     type: SR-IOV
-                vnfd-connection-point-ref: east
+                external-connection-point-ref: east
+            -   name: iface41
+                type: INTERNAL
+                internal-connection-point-ref: iface41
+                virtual-interface:
+                    type: PARAVIRT
             guest-epa:
                 cpu-pinning-policy: DEDICATED
             id: e526e
             internal-connection-point:
             -   id: iface41
                 name: iface41
-                type: VPORT
+
             name: Ref_VM4
-            internal-interface:
-            -   name: iface41
-                vdu-internal-connection-point-ref: iface41
-                virtual-interface:
-                    type: VIRTIO
         vendor: ETSI
         version: '1.0'