Merge "cirros test code changes for VCD"
[osm/devops.git] / descriptor-packages / vnfd / pong_vnf / src / pong_vnfd.yaml
index 536198b..935f04e 100644 (file)
@@ -15,7 +15,7 @@
 #
 #
 
-vnfd:vnfd-catalog:
+vnfd-catalog:
     vnfd:
      -  id: rift_pong_vnf
         name: pong_vnf
@@ -38,12 +38,12 @@ vnfd:vnfd-catalog:
                 port: '18889'
             port: '18889'
             cp: pong_vnfd/cp0
-        placement-groups:
-        -   member-vdus:
-            -   member-vdu-ref: iovdu_0
-            name: Weywot
-            requirement: Place this VM on the Kuiper belt object Weywot
-            strategy: COLOCATION
+        placement-groups:
+        -   member-vdus:
+            -   member-vdu-ref: iovdu_0
+            name: Weywot
+            requirement: Place this VM on the Kuiper belt object Weywot
+            strategy: COLOCATION
         vdu:
         -   cloud-init-file: pong_cloud_init.cfg
             count: '1'
@@ -52,13 +52,13 @@ vnfd:vnfd-catalog:
                 position: 0
                 type: EXTERNAL
                 virtual-interface:
-                    type: VIRTIO
+                    type: PARAVIRT
                 external-connection-point-ref: pong_vnfd/cp0
             -   name: eth1
                 position: 1
                 type: EXTERNAL
                 virtual-interface:
-                    type: VIRTIO
+                    type: PARAVIRT
                 external-connection-point-ref: pong_vnfd/cp1
             id: iovdu_0
             image: Fedora-x86_64-20-20131211.1-sda-pong.qcow2