Add init loop in prometheus sidecar container

[osm/devops.git] / descriptor-packages / vnfd / ping_vnf / src / ping_vnfd.yaml

diff --git a/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml b/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
index 60f00cf..d73baf6 100644 (file)
--- a/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
+++ b/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
@@ -15,8 +15,8 @@
 #
 #
 
-vnfd:vnfd-catalog:
-    vnfd:vnfd:
+vnfd-catalog:
+    vnfd:
      -  id: rift_ping_vnf
         name: ping_vnf
         short-name: ping_vnf
@@ -26,19 +26,18 @@ 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
+            cp: ping_vnfd/cp0
         placement-groups:
         -   member-vdus:
             -   member-vdu-ref: iovdu_0
@@ -48,15 +47,19 @@ vnfd:vnfd-catalog:
         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
+                    type: PARAVIRT
+                external-connection-point-ref: ping_vnfd/cp0
             -   name: eth1
+                position: 1
+                type: EXTERNAL
                 virtual-interface:
-                    type: VIRTIO
-                vnfd-connection-point-ref: ping_vnfd/cp1
+                    type: PARAVIRT
+                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