Merge "cirros test code changes for VCD"

[osm/devops.git] / descriptor-packages / vnfd / ref11_vnf / src / ref11_vnfd.yaml

diff --git a/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml b/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml
index f308282..a022a85 100644 (file)
--- a/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml
+++ b/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml
@@ -1,4 +1,4 @@
-vnfd:vnfd-catalog:
+vnfd-catalog:
     vnfd:
     -   connection-point:
         -   name: mgmt0
@@ -9,27 +9,29 @@ vnfd:vnfd-catalog:
         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
@@ -41,16 +43,17 @@ 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