Skip to content
Snippets Groups Projects
Commit 4252d44a authored by montesmoreno's avatar montesmoreno
Browse files

NSDs modified to set the management flag in management network. VNFDs modified... 

NSDs modified to set the management flag in management network. VNFDs modified to indicate the cp that will be used for management instead of using the interface type OM-MGMT

Signed-off-by: default avatarmontesmoreno <pablo.montesmoreno@telefonica.com>
parent 1cde0ebb
No related branches found
Tags v3.0.0rc15
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 41 additions and 24 deletions
descriptor-packages/nsd/VyOS_ns/src/VyOS_nsd.yaml
+ 1
− 0
View file @ 4252d44a
......@@ -23,6 +23,7 @@ nsd:nsd-catalog:
- id: management
name: management
short-name: management
mgmt-network: 'true'
type: ELAN
vim-network-name: net-mgmtOS
provider-network:
......
descriptor-packages/nsd/ims_allin1_corpa/src/IMS-corpA__nsd.yaml
+ 1
− 0
View file @ 4252d44a
......@@ -23,6 +23,7 @@ nsd:nsd-catalog:
vnfd-connection-point-ref: eth0
vnfd-id-ref: IMS-ALLIN1_2p
- id: management
mgmt-network: 'true'
name: management
short-name: management
type: ELAN
......
descriptor-packages/nsd/ref1_ns/src/ref1_nsd.yaml
+ 1
− 0
View file @ 4252d44a
......@@ -12,6 +12,7 @@ nsd:nsd-catalog:
vendor: ETSI
vld:
- description: Mgmt VL
mgmt-network: 'true'
id: 54c04
name: VL1
short-name: VL1
......
descriptor-packages/nsd/ref2_ns/src/ref2_nsd.yaml
+ 1
− 0
View file @ 4252d44a
......@@ -11,6 +11,7 @@ nsd:nsd-catalog:
vendor: ETSI
vld:
- id: '97465'
mgmt-network: 'true'
name: VL1
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
......
descriptor-packages/nsd/ubuntu_xenial_ns/src/ubuntu_xenial_nsd.yaml
+ 1
− 0
View file @ 4252d44a
......@@ -21,6 +21,7 @@ nsd:nsd-catalog:
vld:
# Networks for the VNFs
- id: ubuntu_xenial_nsd_vld1
mgmt-network: 'true'
name: management
short-name: management
type: ELAN
......
descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml
+ 2
− 2
View file @ 4252d44a
......@@ -6,7 +6,7 @@ vnfd:vnfd-catalog:
description: VyOS Router
logo: osm_2x.png
mgmt-interface:
vdu-id: VyOS-VM
cp: eth0
vnf-configuration:
service-primitive:
- name: config
......@@ -64,7 +64,7 @@ vnfd:vnfd-catalog:
type: EXTERNAL
virtual-interface:
bandwidth: '0'
type: OM-MGMT
type: VIRTIO
vpci: 0000:00:0a.0
external-connection-point-ref: eth0
- name: eth1
......
descriptor-packages/vnfd/cirros_noportsecurity_vnf/src/cirros_noportsecurity_vnfd.yaml
+ 3
− 2
View file @ 4252d44a
......@@ -12,7 +12,7 @@ vnfd:vnfd-catalog:
# Management interface
mgmt-interface:
vdu-id: cirros_vnfd-VM
cp: eth0
# Atleast one VDU need to be specified
vdu:
......@@ -36,8 +36,9 @@ vnfd:vnfd-catalog:
# Specify the external interfaces
# There can be multiple interfaces defined
- name: eth0
type: EXTERNAL
virtual-interface:
type: OM-MGMT
type: VIRTIO
bandwidth: '0'
vpci: 0000:00:0a.0
external-connection-point-ref: eth0
......
descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml
+ 2
− 2
View file @ 4252d44a
......@@ -12,7 +12,7 @@ vnfd:vnfd-catalog:
# Management interface
mgmt-interface:
vdu-id: cirros_vnfd-VM
cp: eth0
# Atleast one VDU need to be specified
vdu:
......@@ -38,7 +38,7 @@ vnfd:vnfd-catalog:
- name: eth0
type: EXTERNAL
virtual-interface:
type: OM-MGMT
type: VIRTIO
bandwidth: '0'
vpci: 0000:00:0a.0
external-connection-point-ref: eth0
......
descriptor-packages/vnfd/dns_aws_vnfd/src/dns_aws_vnfd.yaml
+ 3
− 2
View file @ 4252d44a
......@@ -8,7 +8,7 @@ vnfd:vnfd-catalog:
vnfd:id: dns_forwarder
vnfd:logo: dns.jpg
vnfd:mgmt-interface:
vnfd:vdu-id: dns_forwarder-VM
vnfd:cp: eth0
vnfd:name: dns_forwarder
vnfd:service-function-chain: UNAWARE
vnfd:short-name: dns_forwarder
......@@ -17,9 +17,10 @@ vnfd:vnfd-catalog:
vnfd:description: dns_forwarder-VM
vnfd:interface:
- vnfd:name: eth0
vnfd:type: EXTERNAL
vnfd:virtual-interface:
vnfd:bandwidth: '0'
vnfd:type: OM-MGMT
vnfd:type: VIRTIO
vnfd:vpci: 0000:00:0a.0
vnfd:external-connection-point-ref: eth0
vnfd:guest-epa:
......
descriptor-packages/vnfd/ims_allin1_2p_vnf/src/IMS-ALLIN1__vnfd.yaml
+ 2
− 2
View file @ 4252d44a
......@@ -6,7 +6,7 @@ vnfd:vnfd-catalog:
description: IMS-ALLIN1_2p
logo: metaswitch_2x.png
mgmt-interface:
vdu-id: IMS-ALLIN1_2p-VM
cp: eth1
vnf-configuration:
service-primitive:
- name: config
......@@ -67,7 +67,7 @@ vnfd:vnfd-catalog:
type: EXTERNAL
virtual-interface:
bandwidth: '0'
type: OM-MGMT
type: VIRTIO
vpci: 0000:00:0b.0
external-connection-point-ref: eth1
guest-epa:
......
descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
+ 1
− 1
View file @ 4252d44a
......@@ -37,7 +37,7 @@ vnfd:vnfd-catalog:
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
......
descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
+ 1
− 1
View file @ 4252d44a
......@@ -37,7 +37,7 @@ vnfd:vnfd-catalog:
path: api/v1/pong/stats
port: '18889'
port: '18889'
vdu-id: iovdu_0
cp: pong_vnfd/cp0
# placement-groups:
# - member-vdus:
# - member-vdu-ref: iovdu_0
......
descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml
+ 3
− 1
View file @ 4252d44a
......@@ -9,6 +9,8 @@ vnfd:vnfd-catalog:
id: Ref_Vnf_11
name: Ref_VNF_11
short-name: Ref_VNF_11
mgmt-interface:
cp: mgmt0
internal-vld:
- description: Internal VL
id: VL12
......@@ -24,7 +26,7 @@ vnfd:vnfd-catalog:
- name: iface10
type: EXTERNAL
virtual-interface:
type: OM-MGMT
type: VIRTIO
external-connection-point-ref: mgmt0
- name: iface11
type: INTERNAL
......
descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml
+ 3
− 1
View file @ 4252d44a
......@@ -11,6 +11,8 @@ vnfd:vnfd-catalog:
id: Ref_Vnf_12
name: Ref_Vnf_12
short-name: Ref_Vnf_12
mgmt-interface:
cp: mgmt0
internal-vld:
- description: Internal VL
id: VL34
......@@ -27,7 +29,7 @@ vnfd:vnfd-catalog:
- name: iface30
type: EXTERNAL
virtual-interface:
type: OM-MGMT
type: VIRTIO
external-connection-point-ref: mgmt0
- name: iface31
type: INTERNAL
......
descriptor-packages/vnfd/ref21_vnf/src/ref21_vnfd.yaml
+ 3
− 1
View file @ 4252d44a
......@@ -9,12 +9,14 @@ vnfd:vnfd-catalog:
id: Ref_Vnf_21
name: Ref_Vnf_21
short-name: Ref_Vnf_21
mgmt-interface:
cp: mgmt
vdu:
- interface:
- name: iface50
type: EXTERNAL
virtual-interface:
type: OM-MGMT
type: VIRTIO
external-connection-point-ref: mgmt
- name: iface51
type: EXTERNAL
......
descriptor-packages/vnfd/ref22_vnf/src/ref22_vnfd.yaml
+ 3
− 1
View file @ 4252d44a
......@@ -11,12 +11,14 @@ vnfd:vnfd-catalog:
id: Ref_Vnf_22
name: Ref_VNF_22
short-name: Ref_VNF_22
mgmt-interface:
cp: mgmt
vdu:
- interface:
- name: iface60
type: EXTERNAL
virtual-interface:
type: OM-MGMT
type: VIRTIO
external-connection-point-ref: mgmt
- name: iface61
type: EXTERNAL
......
descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/ubuntu_1iface_cloudinit_newfile_vnfd.yaml
+ 3
− 2
View file @ 4252d44a
......@@ -12,7 +12,7 @@ vnfd:vnfd-catalog:
# Management interface
mgmt-interface:
vdu-id: ubuntu_1iface_cloudinit_newfile_vnfd-VM
cp: eth0
# Atleast one VDU need to be specified
vdu:
......@@ -37,8 +37,9 @@ vnfd:vnfd-catalog:
# Specify the external interfaces
# There can be multiple interfaces defined
- name: eth0
type: EXTERNAL
virtual-interface:
type: OM-MGMT
type: VIRTIO
bandwidth: '0'
vpci: 0000:00:0a.0
external-connection-point-ref: eth0
......
descriptor-packages/vnfd/ubuntu_cirros_multidisk_vnf/src/ubuntu_cirros_multidisk_vnfd.yaml
+ 2
− 2
View file @ 4252d44a
......@@ -9,7 +9,7 @@ vnfd:vnfd-catalog:
# Management interface
mgmt-interface:
vdu-id: ubuntu_cirros_multidisk_vnfd-VM
cp: eth0
# Atleast one VDU need to be specified
vdu:
......@@ -33,7 +33,7 @@ vnfd:vnfd-catalog:
- name: eth0
type: EXTERNAL
virtual-interface:
type: OM-MGMT
type: VIRTIO
external-connection-point-ref: eth0
# Specify the volume
# There can be multiple interfaces defined
......
descriptor-packages/vnfd/ubuntu_epa_virtio_vnf/src/ubuntu_epa_virtio_vnfd.yaml
+ 3
− 2
View file @ 4252d44a
......@@ -12,7 +12,7 @@ vnfd:vnfd-catalog:
# Management interface
mgmt-interface:
vdu-id: ubuntu_epa_virtio_vnf-VM
cp: eth0
# Atleast one VDU need to be specified
vdu:
......@@ -33,8 +33,9 @@ vnfd:vnfd-catalog:
# Specify the external interfaces
# There can be multiple interfaces defined
- name: eth0
type: EXTERNAL
virtual-interface:
type: OM-MGMT
type: VIRTIO
bandwidth: '0'
vpci: 0000:00:0a.0
external-connection-point-ref: eth0
......
descriptor-packages/vnfd/ubuntu_xenial_vnf/src/ubuntu_xenial_vnfd.yaml
+ 2
− 2
View file @ 4252d44a
......@@ -12,7 +12,7 @@ vnfd:vnfd-catalog:
# Management interface
mgmt-interface:
vdu-id: ubuntu_xenial_vnfd-VM
cp: eth0
# Atleast one VDU need to be specified
vdu:
......@@ -39,7 +39,7 @@ vnfd:vnfd-catalog:
- name: eth0
type: EXTERNAL
virtual-interface:
type: OM-MGMT
type: VIRTIO
bandwidth: '0'
vpci: 0000:00:0a.0
external-connection-point-ref: eth0
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment