projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes 1436 - docker/tests/Dockerfile: cryptography dependencies
[osm/devops.git]
/
descriptor-packages
/
vnfd
/
pong_vnf
/
src
/
pong_vnfd.yaml
diff --git
a/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
b/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
index
33082f1
..
f824f20
100644
(file)
--- a/
descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
+++ b/
descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
@@
-15,7
+15,7
@@
#
#
#
#
-vnfd
:vnfd
-catalog:
+vnfd-catalog:
vnfd:
- id: rift_pong_vnf
name: pong_vnf
vnfd:
- id: rift_pong_vnf
name: pong_vnf
@@
-26,38
+26,39
@@
vnfd:vnfd-catalog:
description: This is an example RIFT.ware VNF
connection-point:
- name: pong_vnfd/cp0
description: This is an example RIFT.ware VNF
connection-point:
- name: pong_vnfd/cp0
- type: VPORT
+
- name: pong_vnfd/cp1
- name: pong_vnfd/cp1
- type: VPORT
+
http-endpoint:
- path: api/v1/pong/stats
http-endpoint:
- path: api/v1/pong/stats
- polling_interval_secs: '2'
port: '18889'
mgmt-interface:
dashboard-params:
path: api/v1/pong/stats
port: '18889'
port: '18889'
port: '18889'
mgmt-interface:
dashboard-params:
path: api/v1/pong/stats
port: '18889'
port: '18889'
-
vdu-id: iovdu_
0
-
#
placement-groups:
-
#
- member-vdus:
-
#
- member-vdu-ref: iovdu_0
-
#
name: Weywot
-
#
requirement: Place this VM on the Kuiper belt object Weywot
-
#
strategy: COLOCATION
+
cp: pong_vnfd/cp
0
+ placement-groups:
+ - member-vdus:
+ - member-vdu-ref: iovdu_0
+ name: Weywot
+ requirement: Place this VM on the Kuiper belt object Weywot
+ strategy: COLOCATION
vdu:
- cloud-init-file: pong_cloud_init.cfg
count: '1'
interface:
- name: eth0
vdu:
- cloud-init-file: pong_cloud_init.cfg
count: '1'
interface:
- name: eth0
+ position: 0
type: EXTERNAL
virtual-interface:
type: EXTERNAL
virtual-interface:
- type:
VIRTIO
+ type:
PARAVIRT
external-connection-point-ref: pong_vnfd/cp0
- name: eth1
external-connection-point-ref: pong_vnfd/cp0
- name: eth1
+ position: 1
type: EXTERNAL
virtual-interface:
type: EXTERNAL
virtual-interface:
- type:
VIRTIO
+ type:
PARAVIRT
external-connection-point-ref: pong_vnfd/cp1
id: iovdu_0
image: Fedora-x86_64-20-20131211.1-sda-pong.qcow2
external-connection-point-ref: pong_vnfd/cp1
id: iovdu_0
image: Fedora-x86_64-20-20131211.1-sda-pong.qcow2
@@
-67,7
+68,7
@@
vnfd:vnfd-catalog:
storage-gb: '4'
vcpu-count: '1'
vnf-configuration:
storage-gb: '4'
vcpu-count: '1'
vnf-configuration:
-
service
-primitive:
+
config
-primitive:
- name: start
- name: stop
- name: restart
- name: start
- name: stop
- name: restart