From: Adam Israel <adam.israel@canonical.com>
Date: Mon, 16 Oct 2017 18:54:59 +0000 (-0400)
Subject: Update ping/pong example for R3
X-Git-Tag: v3.0.0rc11~1^2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F89%2F5589%2F1;p=osm%2Fdevops.git

Update ping/pong example for R3

This updates the descriptors for the ping/pong example to work with
Release THREE:
- Removing unused element(s)
- Renaming service-primitive to config-primitive
- Defaulting to a vim-network-name of mgmt for the mangement network

Signed-off-by: Adam Israel <adam.israel@canonical.com>
---

diff --git a/descriptor-packages/nsd/ping_pong_ns/src/ping_pong_nsd.yaml b/descriptor-packages/nsd/ping_pong_ns/src/ping_pong_nsd.yaml
index 347c78e9..ec13b26a 100644
--- a/descriptor-packages/nsd/ping_pong_ns/src/ping_pong_nsd.yaml
+++ b/descriptor-packages/nsd/ping_pong_ns/src/ping_pong_nsd.yaml
@@ -74,6 +74,7 @@ nsd:nsd-catalog:
             description: Management VL
             name: mgmt_vl
             short-name: mgmt_vl
+            vim-network-name: mgmt
             type: ELAN
             vendor: RIFT.io
             version: '1.0'
diff --git a/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml b/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
index 8aa7817a..f51012d7 100644
--- a/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
+++ b/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
@@ -31,7 +31,6 @@ vnfd:vnfd-catalog:
             type: VPORT
         http-endpoint:
         -   path: api/v1/ping/stats
-            polling_interval_secs: '2'
             port: '18888'
         mgmt-interface:
             dashboard-params:
@@ -50,11 +49,13 @@ vnfd:vnfd-catalog:
             count: '1'
             interface:
             -   name: eth0
+                position: 0
                 type: EXTERNAL
                 virtual-interface:
                     type: VIRTIO
                 external-connection-point-ref: ping_vnfd/cp0
             -   name: eth1
+                position: 1
                 type: EXTERNAL
                 virtual-interface:
                     type: VIRTIO
@@ -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
diff --git a/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml b/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
index 33082f13..4c498885 100644
--- a/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
+++ b/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
@@ -31,7 +31,6 @@ vnfd:vnfd-catalog:
             type: VPORT
         http-endpoint:
         -   path: api/v1/pong/stats
-            polling_interval_secs: '2'
             port: '18889'
         mgmt-interface:
             dashboard-params:
@@ -50,11 +49,13 @@ vnfd:vnfd-catalog:
             count: '1'
             interface:
             -   name: eth0
+                position: 0
                 type: EXTERNAL
                 virtual-interface:
                     type: VIRTIO
                 external-connection-point-ref: pong_vnfd/cp0
             -   name: eth1
+                position: 1
                 type: EXTERNAL
                 virtual-interface:
                     type: VIRTIO
@@ -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