From 4396d3ef8557dace6653e39a552ce57d2e82e021 Mon Sep 17 00:00:00 2001
From: Adam Israel <adam.israel@canonical.com>
Date: Mon, 16 Oct 2017 14:54:59 -0400
Subject: [PATCH] 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>
---
descriptor-packages/nsd/ping_pong_ns/src/ping_pong_nsd.yaml | 1 +
descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml | 5 +++--
descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml | 5 +++--
3 files changed, 7 insertions(+), 4 deletions(-)
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
--
GitLab