X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=descriptor-packages%2Fvnfd%2Fping_vnf%2Fsrc%2Fping_vnfd.yaml;h=bfea21061cd8cafd6a30355cb3500f81a5bfe105;hb=ae8b04e946f0e8028eaf49b87858582c46487004;hp=60f00cfee13ee06858daf54f09249ab1a983993f;hpb=230c540cf52f3fbe05d40d6650a97d1e55327249;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 60f00cfe..bfea2106 100644
--- a/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
+++ b/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
@@ -16,7 +16,7 @@
 #
 
 vnfd:vnfd-catalog:
-    vnfd:vnfd:
+    vnfd:
      -  id: rift_ping_vnf
         name: ping_vnf
         short-name: ping_vnf
@@ -31,32 +31,35 @@ vnfd:vnfd-catalog:
             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'
-            external-interface:
+            interface:
             -   name: eth0
+                position: 0
+                type: EXTERNAL
                 virtual-interface:
                     type: VIRTIO
-                vnfd-connection-point-ref: ping_vnfd/cp0
+                external-connection-point-ref: ping_vnfd/cp0
             -   name: eth1
+                position: 1
+                type: EXTERNAL
                 virtual-interface:
                     type: VIRTIO
-                vnfd-connection-point-ref: ping_vnfd/cp1
+                external-connection-point-ref: ping_vnfd/cp1
             id: iovdu_0
             image: Fedora-x86_64-20-20131211.1-sda-ping.qcow2
             name: iovdu_0
@@ -65,9 +68,7 @@ vnfd:vnfd-catalog:
                 storage-gb: '4'
                 vcpu-count: '1'
         vnf-configuration:
-            config-attributes:
-                config-delay: 10
-            service-primitive:
+            config-primitive:
             -   name: start
             -   name: stop
             -   name: restart