Skip to content
Snippets Groups Projects
Commit 330ebb0b authored by garciadeblas's avatar garciadeblas
Browse files

Removed VPORT in all VNFDs and generate_descriptor_pkg.sh 


Change-Id: I8c8102d6b16b8001762fcd3650db8cc688006ece
Signed-off-by: default avatargarciadeblas <gerardo.garciadeblas@telefonica.com>
parent 0dc45d8a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 51 additions and 52 deletions
descriptor-packages/tools/generate_descriptor_pkg.sh
+ 0
− 1
View file @ 330ebb0b
......@@ -256,7 +256,6 @@ EOF
eth=$(($i))
cat >>$desc_file <<EOF
- name: vnf-cp${eth}
type: ${CP_TYPE}
EOF
done
......
descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml
+ 5
− 5
View file @ 330ebb0b
......@@ -40,15 +40,15 @@ vnfd-catalog:
charm: vyos-proxy
connection-point:
- name: eth0
type: VPORT
- name: eth1
type: VPORT
- name: eth2
type: VPORT
- name: eth3
type: VPORT
- name: eth4
type: VPORT
vdu:
- id: VyOS-VM
name: VyOS-VM
......
descriptor-packages/vnfd/cirros_noportsecurity_vnf/src/cirros_noportsecurity_vnfd.yaml
+ 1
− 1
View file @ 330ebb0b
......@@ -45,5 +45,5 @@ vnfd-catalog:
connection-point:
- name: eth0
type: VPORT
port-security-enabled: "false"
descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml
+ 1
− 1
View file @ 330ebb0b
......@@ -45,4 +45,4 @@ vnfd-catalog:
connection-point:
- name: eth0
type: VPORT
descriptor-packages/vnfd/dns_aws_vnfd/src/dns_aws_vnfd.yaml
+ 1
− 1
View file @ 330ebb0b
......@@ -2,7 +2,7 @@ vnfd-catalog:
vnfd:
- connection-point:
- name: eth0
type: VPORT
description: Simple VNF example with a DNS forwarder
id: dns_forwarder
logo: dns.jpg
......
descriptor-packages/vnfd/hackfest_ansible_vnf/src/ansiblecharm_vnfd.yaml
+ 1
− 1
View file @ 330ebb0b
......@@ -9,7 +9,7 @@ vnfd:vnfd-catalog:
version: '1.0'
connection-point:
- name: vnf-cp0
type: VPORT
mgmt-interface:
cp: vnf-cp0
vdu:
......
descriptor-packages/vnfd/hackfest_basic_vnf/src/hackfest_basic_vnfd.yaml
+ 1
− 1
View file @ 330ebb0b
......@@ -8,7 +8,7 @@ vnfd:vnfd-catalog:
logo: osm.png
connection-point:
- name: vnf-cp0
type: VPORT
vdu:
- id: hackfest_basic-VM
name: hackfest_basic-VM
......
descriptor-packages/vnfd/hackfest_cloudinit_vnf/src/hackfest_cloudinit_vnfd.yaml
+ 4
− 4
View file @ 330ebb0b
......@@ -10,11 +10,11 @@ vnfd:vnfd-catalog:
- id: vnf-mgmt
name: vnf-mgmt
short-name: vnf-mgmt
type: VPORT
- id: vnf-data
name: vnf-data
short-name: vnf-data
type: VPORT
mgmt-interface:
cp: vnf-mgmt
internal-vld:
......@@ -51,7 +51,7 @@ vnfd:vnfd-catalog:
- id: mgmtVM-internal
name: mgmtVM-internal
short-name: mgmtVM-internal
type: VPORT
cloud-init-file: cloud-config.txt
- id: dataVM
name: dataVM
......@@ -78,5 +78,5 @@ vnfd:vnfd-catalog:
- id: dataVM-internal
name: dataVM-internal
short-name: dataVM-internal
type: VPORT
descriptor-packages/vnfd/hackfest_epasriov_vnf/src/hackfest_epasriov_vnfd.yaml
+ 4
− 4
View file @ 330ebb0b
......@@ -10,11 +10,11 @@ vnfd:vnfd-catalog:
- id: vnf-mgmt
name: vnf-mgmt
short-name: vnf-mgmt
type: VPORT
- id: vnf-data
name: vnf-data
short-name: vnf-data
type: VPORT
mgmt-interface:
cp: vnf-mgmt
internal-vld:
......@@ -60,7 +60,7 @@ vnfd:vnfd-catalog:
- id: mgmtVM-internal
name: mgmtVM-internal
short-name: mgmtVM-internal
type: VPORT
cloud-init-file: cloud-config.txt
- id: dataVM
name: dataVM
......@@ -96,5 +96,5 @@ vnfd:vnfd-catalog:
- id: dataVM-internal
name: dataVM-internal
short-name: dataVM-internal
type: VPORT
descriptor-packages/vnfd/hackfest_multivdu_vnf/src/hackfest_multivdu_vnfd.yaml
+ 4
− 4
View file @ 330ebb0b
......@@ -10,11 +10,11 @@ vnfd:vnfd-catalog:
- id: vnf-mgmt
name: vnf-mgmt
short-name: vnf-mgmt
type: VPORT
- id: vnf-data
name: vnf-data
short-name: vnf-data
type: VPORT
mgmt-interface:
cp: vnf-mgmt
internal-vld:
......@@ -51,7 +51,7 @@ vnfd:vnfd-catalog:
- id: mgmtVM-internal
name: mgmtVM-internal
short-name: mgmtVM-internal
type: VPORT
- id: dataVM
name: dataVM
image: US1604
......@@ -77,5 +77,5 @@ vnfd:vnfd-catalog:
- id: dataVM-internal
name: dataVM-internal
short-name: dataVM-internal
type: VPORT
descriptor-packages/vnfd/hackfest_simplecharm_vnf/src/hackfest_simplecharm_vnfd.yaml
+ 4
− 4
View file @ 330ebb0b
......@@ -10,11 +10,11 @@ vnfd:vnfd-catalog:
- id: vnf-mgmt
name: vnf-mgmt
short-name: vnf-mgmt
type: VPORT
- id: vnf-data
name: vnf-data
short-name: vnf-data
type: VPORT
mgmt-interface:
cp: vnf-mgmt
internal-vld:
......@@ -51,7 +51,7 @@ vnfd:vnfd-catalog:
- id: mgmtVM-internal
name: mgmtVM-internal
short-name: mgmtVM-internal
type: VPORT
cloud-init-file: cloud-config.txt
- id: dataVM
name: dataVM
......@@ -78,7 +78,7 @@ vnfd:vnfd-catalog:
- id: dataVM-internal
name: dataVM-internal
short-name: dataVM-internal
type: VPORT
vnf-configuration:
juju:
charm: simple
......
descriptor-packages/vnfd/ims_allin1_2p_vnf/src/IMS-ALLIN1__vnfd.yaml
+ 2
− 2
View file @ 330ebb0b
......@@ -42,9 +42,9 @@ vnfd-catalog:
charm: clearwater-aio-proxy
connection-point:
- name: eth0
type: VPORT
- name: eth1
type: VPORT
vdu:
- id: IMS-ALLIN1_2p-VM
name: IMS-ALLIN1_2p-VM
......
descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
+ 2
− 2
View file @ 330ebb0b
......@@ -26,9 +26,9 @@ vnfd-catalog:
description: This is an example RIFT.ware VNF
connection-point:
- name: ping_vnfd/cp0
type: VPORT
- name: ping_vnfd/cp1
type: VPORT
http-endpoint:
- path: api/v1/ping/stats
port: '18888'
......
descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
+ 2
− 2
View file @ 330ebb0b
......@@ -26,9 +26,9 @@ vnfd-catalog:
description: This is an example RIFT.ware VNF
connection-point:
- name: pong_vnfd/cp0
type: VPORT
- name: pong_vnfd/cp1
type: VPORT
http-endpoint:
- path: api/v1/pong/stats
port: '18889'
......
descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml
+ 4
− 4
View file @ 330ebb0b
......@@ -2,9 +2,9 @@ vnfd-catalog:
vnfd:
- connection-point:
- name: mgmt0
type: VPORT
- name: west
type: VPORT
description: A simple VNF descriptor w/ VM1 and VM2
id: Ref_Vnf_11
name: Ref_VNF_11
......@@ -35,7 +35,7 @@ vnfd-catalog:
internal-connection-point:
- name: iface11
id: iface11
type: VPORT
id: Ref_VM1
image: ref_vm1.qcow2
name: Ref_VM1
......@@ -57,7 +57,7 @@ vnfd-catalog:
internal-connection-point:
- name: iface21
id: iface21
type: VPORT
id: Ref_VM2
image: ref_vm2.qcow2
name: Ref_VM2
......
descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml
+ 5
− 5
View file @ 330ebb0b
......@@ -2,11 +2,11 @@ vnfd-catalog:
vnfd:
- connection-point:
- name: mgmt0
type: VPORT
- name: west
type: VPORT
- name: east
type: VPORT
description: A simple VNF descriptor w/ two VDU
id: Ref_Vnf_12
name: Ref_Vnf_12
......@@ -43,7 +43,7 @@ vnfd-catalog:
internal-connection-point:
- id: iface31
name: iface31
type: VPORT
name: Ref_VM3
vm-flavor:
memory-mb: '2048'
......@@ -71,7 +71,7 @@ vnfd-catalog:
internal-connection-point:
- id: iface41
name: iface41
type: VPORT
name: Ref_VM4
vendor: ETSI
version: '1.0'
descriptor-packages/vnfd/ref21_vnf/src/ref21_vnfd.yaml
+ 2
− 2
View file @ 330ebb0b
......@@ -2,9 +2,9 @@ vnfd-catalog:
vnfd:
- connection-point:
- name: mgmt
type: VPORT
- name: data
type: VPORT
description: A simple VNF descriptor w/ one VDU
id: Ref_Vnf_21
name: Ref_Vnf_21
......
descriptor-packages/vnfd/ref22_vnf/src/ref22_vnfd.yaml
+ 3
− 3
View file @ 330ebb0b
......@@ -2,11 +2,11 @@ vnfd-catalog:
vnfd:
- connection-point:
- name: mgmt
type: VPORT
- name: west
type: VPORT
- name: east
type: VPORT
description: A simple VNF descriptor w/ one VDU
id: Ref_Vnf_22
name: Ref_VNF_22
......
descriptor-packages/vnfd/simple_multi-charm_multi-vdu_vnf/src/simple_multi-charm_multi-vdu_vnfd.yaml
+ 4
− 4
View file @ 330ebb0b
......@@ -10,11 +10,11 @@ vnfd:vnfd-catalog:
- id: vnf-mgmt
name: vnf-mgmt
short-name: vnf-mgmt
type: VPORT
- id: vnf-data
name: vnf-data
short-name: vnf-data
type: VPORT
mgmt-interface:
cp: vnf-mgmt
internal-vld:
......@@ -51,7 +51,7 @@ vnfd:vnfd-catalog:
- id: mgmtVM-internal
name: mgmtVM-internal
short-name: mgmtVM-internal
type: VPORT
cloud-init-file: cloud-config.txt
vdu-configuration:
juju:
......@@ -103,7 +103,7 @@ vnfd:vnfd-catalog:
- id: dataVM-internal
name: dataVM-internal
short-name: dataVM-internal
type: VPORT
vdu-configuration:
juju:
charm: simple
......
descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/ubuntu_1iface_cloudinit_newfile_vnfd.yaml
+ 1
− 1
View file @ 330ebb0b
......@@ -46,4 +46,4 @@ vnfd-catalog:
connection-point:
- name: eth0
type: VPORT
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