projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug 1705 - Adding non-root user to run RO
[osm/devops.git]
/
descriptor-packages
/
vnfd
/
VyOS_vnf
/
src
/
VyOS__vnfd.yaml
diff --git
a/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml
b/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml
index
0ac926f
..
b49e42b
100644
(file)
--- a/
descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml
+++ b/
descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml
@@
-1,4
+1,4
@@
-vnfd
:vnfd
-catalog:
+vnfd-catalog:
vnfd:
- id: VyOS
name: VyOS
vnfd:
- id: VyOS
name: VyOS
@@
-6,12
+6,9
@@
vnfd:vnfd-catalog:
description: VyOS Router
logo: osm_2x.png
mgmt-interface:
description: VyOS Router
logo: osm_2x.png
mgmt-interface:
- vdu-id: VyOS-VM
+ cp: eth0
vnf-configuration:
vnf-configuration:
- config-attributes:
- config-delay: '0'
- config-priority: '1'
- service-primitive:
+ config-primitive:
- name: config
parameter:
- name: user
- name: config
parameter:
- name: user
@@
-43,15
+40,15
@@
vnfd:vnfd-catalog:
charm: vyos-proxy
connection-point:
- name: eth0
charm: vyos-proxy
connection-point:
- name: eth0
- type: VPORT
+
- name: eth1
- name: eth1
- type: VPORT
+
- name: eth2
- name: eth2
- type: VPORT
+
- name: eth3
- name: eth3
- type: VPORT
+
- name: eth4
- name: eth4
- type: VPORT
+
vdu:
- id: VyOS-VM
name: VyOS-VM
vdu:
- id: VyOS-VM
name: VyOS-VM
@@
-62,37
+59,42
@@
vnfd:vnfd-catalog:
storage-gb: '40'
vcpu-count: '1'
mgmt-vpci: 0000:00:0a.0
storage-gb: '40'
vcpu-count: '1'
mgmt-vpci: 0000:00:0a.0
-
external-
interface:
+ interface:
- name: eth0
- name: eth0
+ type: EXTERNAL
virtual-interface:
bandwidth: '0'
virtual-interface:
bandwidth: '0'
- type:
OM-MGM
T
+ type:
PARAVIR
T
vpci: 0000:00:0a.0
vpci: 0000:00:0a.0
-
vnfd
-connection-point-ref: eth0
+
external
-connection-point-ref: eth0
- name: eth1
- name: eth1
+ type: EXTERNAL
virtual-interface:
bandwidth: '0'
virtual-interface:
bandwidth: '0'
- type:
VIRTIO
+ type:
PARAVIRT
vpci: 0000:00:0b.0
vpci: 0000:00:0b.0
-
vnfd
-connection-point-ref: eth1
+
external
-connection-point-ref: eth1
- name: eth2
- name: eth2
+ type: EXTERNAL
virtual-interface:
bandwidth: '0'
virtual-interface:
bandwidth: '0'
- type:
VIRTIO
+ type:
PARAVIRT
vpci: 0000:00:0c.0
vpci: 0000:00:0c.0
-
vnfd
-connection-point-ref: eth2
+
external
-connection-point-ref: eth2
- name: eth3
- name: eth3
+ type: EXTERNAL
virtual-interface:
bandwidth: '0'
virtual-interface:
bandwidth: '0'
- type:
VIRTIO
+ type:
PARAVIRT
vpci: 0000:00:0d.0
vpci: 0000:00:0d.0
-
vnfd
-connection-point-ref: eth3
+
external
-connection-point-ref: eth3
- name: eth4
- name: eth4
+ type: EXTERNAL
virtual-interface:
bandwidth: '0'
virtual-interface:
bandwidth: '0'
- type:
VIRTIO
+ type:
PARAVIRT
vpci: 0000:00:0e.0
vpci: 0000:00:0e.0
-
vnfd
-connection-point-ref: eth4
+
external
-connection-point-ref: eth4
guest-epa:
cpu-pinning-policy: DEDICATED
cpu-thread-pinning-policy: PREFER
guest-epa:
cpu-pinning-policy: DEDICATED
cpu-thread-pinning-policy: PREFER