X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=descriptor-packages%2Fvnfd%2Fping_vnf%2Fsrc%2Fping_vnfd.yaml;h=d73baf63b0abef20ad11ce00633ba4bcbd3a963b;hb=7735f6a86e290c0c15c4f41f5f81b5930b14cc73;hp=8aa7817a7f2e5fc2c81ce29127cac23a096f3775;hpb=ce43e407eb825ff4e5adb63f36985e70d575022d;p=osm%2Fdevops.git

diff --git a/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml b/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
index 8aa7817a..d73baf63 100644
--- a/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
+++ b/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
@@ -15,7 +15,7 @@
 #
 #
 
-vnfd:vnfd-catalog:
+vnfd-catalog:
     vnfd:
      -  id: rift_ping_vnf
         name: ping_vnf
@@ -26,38 +26,39 @@ vnfd:vnfd-catalog:
         description: This is an example RIFT.ware VNF
         connection-point:
         -   name: ping_vnfd/cp0
-            type: VPORT
+
         -   name: ping_vnfd/cp1
-            type: VPORT
+
         http-endpoint:
         -   path: api/v1/ping/stats
-            polling_interval_secs: '2'
             port: '18888'
         mgmt-interface:
             dashboard-params:
                 path: api/v1/ping/stats
                 port: '18888'
             port: '18888'
-            vdu-id: iovdu_0
-        # placement-groups:
-        # -   member-vdus:
-        #     -   member-vdu-ref: iovdu_0
-        #     name: Eris
-        #     requirement: Place this VM on the Kuiper belt object Eris
-        #     strategy: COLOCATION
+            cp: ping_vnfd/cp0
+        placement-groups:
+        -   member-vdus:
+            -   member-vdu-ref: iovdu_0
+            name: Eris
+            requirement: Place this VM on the Kuiper belt object Eris
+            strategy: COLOCATION
         vdu:
         -   cloud-init-file: ping_cloud_init.cfg
             count: '1'
             interface:
             -   name: eth0
+                position: 0
                 type: EXTERNAL
                 virtual-interface:
-                    type: VIRTIO
+                    type: PARAVIRT
                 external-connection-point-ref: ping_vnfd/cp0
             -   name: eth1
+                position: 1
                 type: EXTERNAL
                 virtual-interface:
-                    type: VIRTIO
+                    type: PARAVIRT
                 external-connection-point-ref: ping_vnfd/cp1
             id: iovdu_0
             image: Fedora-x86_64-20-20131211.1-sda-ping.qcow2
@@ -67,7 +68,7 @@ vnfd:vnfd-catalog:
                 storage-gb: '4'
                 vcpu-count: '1'
         vnf-configuration:
-            service-primitive:
+            config-primitive:
             -   name: start
             -   name: stop
             -   name: restart