Commit 09e82b92 authored by vicens's avatar vicens
Browse files

Updating packages with strict validation


Signed-off-by: vicens's avatarFelipe Vicens <felipe.vicens@atos.net>
parent 2ddf295d
nsd:nsd-catalog:
nsd-catalog:
nsd:
- constituent-vnfd:
- member-vnf-index: '1'
......@@ -11,7 +11,7 @@ nsd:nsd-catalog:
version: '1.0'
vld:
- id: mgmtnet
mgmt-network: 'true'
mgmt-network: true
name: mgntnet
short-name: mgmtnet
type: ELAN
......
vnfd:vnfd-catalog:
vnfd-catalog:
vnfd:
- id: hackfest_basic_metrics-vnf
name: hackfest_basic_metrics-vnf
short-name: hackfest_basic_metrics-vnf
description: A basic VNF descriptor w/ one VDU and VIM metrics
version: 1.0
version: '1.0'
logo: osm.png
connection-point:
- name: vnf-cp0
......
nsd:nsd-catalog:
nsd-catalog:
nsd:
- id: hackfest_basic-ns
name: hackfest_basic-ns
......@@ -14,7 +14,7 @@ nsd:nsd-catalog:
name: mgmtnet
short-name: mgmtnet
type: ELAN
mgmt-network: 'true'
mgmt-network: true
vnfd-connection-point-ref:
- vnfd-id-ref: hackfest_basic-vnf
member-vnf-index-ref: '1'
......
vnfd:vnfd-catalog:
vnfd-catalog:
vnfd:
- id: hackfest_basic-vnf
name: hackfest_basic-vnf
short-name: hackfest_basic-vnf
version: 1.0
version: '1.0'
description: A basic VNF descriptor w/ one VDU
logo: osm.png
connection-point:
......
nsd:nsd-catalog:
nsd-catalog:
nsd:
- id: hackfest_cloudinit-ns
name: hackfest_cloudinit-ns
......@@ -16,7 +16,7 @@ nsd:nsd-catalog:
name: mgmtnet
short-name: mgmtnet
type: ELAN
mgmt-network: 'true'
mgmt-network: true
vim-network-name: mgmt
vnfd-connection-point-ref:
- vnfd-id-ref: hackfest_cloudinit-vnf
......
vnfd:vnfd-catalog:
vnfd-catalog:
vnfd:
- id: hackfest_cloudinit-vnf
name: hackfest_cloudinit-vnf
short-name: hackfest_cloudinit-vnf
version: 1.0
version: '1.0'
description: A VNF consisting of 2 VDUs connected to an internal VL, and one VDU with cloud-init
logo: osm.png
connection-point:
......
nsd:nsd-catalog:
nsd-catalog:
nsd:
- id: hackfest_epasriov-ns
name: hackfest_epasriov-ns
......@@ -16,7 +16,7 @@ nsd:nsd-catalog:
name: mgmtnet
short-name: mgmtnet
type: ELAN
mgmt-network: 'true'
mgmt-network: true
vim-network-name: mgmt
vnfd-connection-point-ref:
- vnfd-id-ref: hackfest_epasriov-vnf
......
vnfd:vnfd-catalog:
vnfd-catalog:
vnfd:
- id: hackfest_epasriov-vnf
name: hackfest_epasriov-vnf
......
nsd:nsd-catalog:
nsd-catalog:
nsd:
- id: hackfest_multivdu-ns
name: hackfest_multivdu-ns
......@@ -16,7 +16,7 @@ nsd:nsd-catalog:
name: mgmtnet
short-name: mgmtnet
type: ELAN
mgmt-network: 'true'
mgmt-network: true
vnfd-connection-point-ref:
- vnfd-id-ref: hackfest_multivdu-vnf
member-vnf-index-ref: '1'
......
vnfd:vnfd-catalog:
vnfd-catalog:
vnfd:
- id: hackfest_multivdu-vnf
name: hackfest_multivdu-vnf
short-name: hackfest_multivdu-vnf
version: 1.0
version: '1.0'
description: A VNF consisting of 2 VDUs connected to an internal VL
logo: osm.png
connection-point:
......
nsd:nsd-catalog:
nsd-catalog:
nsd:
- id: hackfest_proxycharm-ns
name: hackfest_proxycharm-ns
......@@ -16,7 +16,7 @@ nsd:nsd-catalog:
name: mgmtnet
short-name: mgmtnet
type: ELAN
mgmt-network: 'true'
mgmt-network: true
vim-network-name: PUBLIC
vnfd-connection-point-ref:
- vnfd-id-ref: hackfest_proxycharm-vnf
......
vnfd:vnfd-catalog:
vnfd-catalog:
vnfd:
- id: hackfest_proxycharm-vnf
name: hackfest_proxycharm-vnf
short-name: hackfest_proxycharm-vnf
version: 1.0
version: '1.0'
description: A VNF consisting of 1 VDU connected to two external VL, and one for data and another one for management
logo: osm.png
connection-point:
......
nsd:nsd-catalog:
nsd-catalog:
nsd:
- id: hackfest_vyos-ns
name: hackfest_vyos-ns
......@@ -14,7 +14,7 @@ nsd:nsd-catalog:
name: mgmtnet
short-name: mgmtnet
type: ELAN
mgmt-network: 'true'
mgmt-network: true
vim-network-name: osm-ext
vnfd-connection-point-ref:
- vnfd-id-ref: hackfest_vyos-vnf
......@@ -25,7 +25,7 @@ nsd:nsd-catalog:
name: internal
short-name: internal
type: ELAN
mgmt-network: 'true'
mgmt-network: true
vnfd-connection-point-ref:
- vnfd-id-ref: hackfest_vyos-vnf
member-vnf-index-ref: '1'
......@@ -34,7 +34,7 @@ nsd:nsd-catalog:
name: external
short-name: external
type: ELAN
mgmt-network: 'true'
mgmt-network: true
vnfd-connection-point-ref:
- vnfd-id-ref: hackfest_vyos-vnf
member-vnf-index-ref: '1'
......
vnfd:vnfd-catalog:
vnfd-catalog:
vnfd:
- id: hackfest_vyos-vnf
name: hackfest_vyos-vnf
......@@ -10,20 +10,20 @@ vnfd:vnfd-catalog:
type: VPORT
- name: vnf-internal
type: VPORT
port-security-enabled: 'false'
port-security-enabled: false
- name: vnf-external
type: VPORT
port-security-enabled: 'false'
port-security-enabled: false
vdu:
- id: vyos-VM
name: vyos-VM
cloud-init-file: vyos-userdata
image: vyos-1.1.7
count: '1'
count: 1
vm-flavor:
vcpu-count: '1'
memory-mb: '2048'
storage-gb: '10'
vcpu-count: 1
memory-mb: 2048
storage-gb: 10
interface:
- name: vdu-eth0
type: EXTERNAL
......@@ -44,7 +44,7 @@ vnfd:vnfd-catalog:
type: PARAVIRT
external-connection-point-ref: vnf-external
supplemental-boot-data:
boot-data-drive: true
boot-data-drive: true
mgmt-interface:
cp: vnf-mgmt
vnfd:vnfd-catalog:
vnfd-catalog:
vnfd:
- connection-point:
- name: gateway_public
......@@ -27,7 +27,7 @@ vnfd:vnfd-catalog:
value: osm2020
- name: ssh-hostname
value: <rw_mgmt_ip>
seq: '1'
seq: 1
config-primitive:
- name: configure-remote
parameter:
......
nsd:nsd-catalog:
nsd-catalog:
nsd:
- id: hackfest_magma-agw-enb_nsd
name: hackfest_magma-agw-enb_nsd
......
vnfd:vnfd-catalog:
vnfd-catalog:
vnfd:
- id: hackfest_magma-agw-enb_vnfd
name: hackfest_magma-agw-enb_vnfd
......@@ -25,28 +25,28 @@ vnfd:vnfd-catalog:
interface:
- name: eth0
type: EXTERNAL
position: '0'
position: 0
virtual-interface:
type: PARAVIRT
external-connection-point-ref: agw-mgmt
- name: eth1
type: EXTERNAL
position: '1'
position: 1
virtual-interface:
#type: SR-IOV
type: PARAVIRT
internal-connection-point-ref: agw-s1
- name: eth2
type: EXTERNAL
position: '2'
position: 2
virtual-interface:
type: PARAVIRT
external-connection-point-ref: agw-sgi
external-connection-point-ref: agw-sgi
internal-connection-point:
- id: agw-s1
name: agw-s1
short-name: agw-s1
port-security-enabled: 'false'
port-security-enabled: false
monitoring-param:
- id: agw_cpu_util
nfvi-metric: cpu_utilization
......@@ -63,7 +63,7 @@ vnfd:vnfd-catalog:
alarm-id: cpu-above-threshold
operation: GT
value: 120
vnf-monitoring-param-ref: agw_cpu_util
vnf-monitoring-param-ref: agw_cpu_util
- id: srsLTE-vdu
name: srsLTE-vdu
description: srsLTE-vdu
......@@ -72,7 +72,7 @@ vnfd:vnfd-catalog:
vm-flavor:
vcpu-count: 4
memory-mb: 6144
storage-gb: 100
storage-gb: 100
image: 'srsLTEzmqRF_hf9'
interface:
- name: eth0
......@@ -100,7 +100,7 @@ vnfd:vnfd-catalog:
required: True
default-user: ubuntu
initial-config-primitive:
- seq: '1'
- seq: 1
name: remove-default-gw
config-primitive:
- name: register
......@@ -139,7 +139,7 @@ vnfd:vnfd-catalog:
ip-version: ipv4
subnet-address: 192.168.100.0/24
dhcp-params:
enabled: true
enabled: true
connection-point:
- name: agw-mgmt
- name: agw-sgi
......@@ -149,7 +149,7 @@ vnfd:vnfd-catalog:
ssh-access:
required: true
initial-config-primitive:
- seq: '1'
- seq: 1
name: config
parameter:
- name: ssh-hostname
......@@ -158,16 +158,16 @@ vnfd:vnfd-catalog:
value: magma
- name: ssh-password
value: magma
- seq: '2'
- seq: 2
name: reset-id
- seq: '3'
- seq: 3
name: add-net
parameter:
- name: orch_ip
value: <orch_ip>
value: <orch_ip>
- name: orch_net
value: <orch_net>
- seq: '4'
- seq: 4
name: add-gw
parameter:
- name: agw_id
......@@ -175,22 +175,22 @@ vnfd:vnfd-catalog:
- name: agw_name
value: <agw_name>
- name: orch_ip
value: <orch_ip>
value: <orch_ip>
- name: orch_net
value: <orch_net>
- seq: '5'
- seq: 5
name: add-test-subscriber
parameter:
- name: orch_ip
value: <orch_ip>
- name: orch_net
value: <orch_net>
- seq: '6'
- seq: 6
name: add-hosts
parameter:
- name: orch_ip
value: <orch_ip>
- seq: '7'
- seq: 7
name: restart-magma
config-primitive:
- name: add-gw
......
nsd:nsd-catalog:
nsd-catalog:
nsd:
- id: squid-cnf-ns
name: squid-cnf-ns
......@@ -14,11 +14,9 @@ nsd:nsd-catalog:
name: mgmtnet
short-name: mgmtnet
type: ELAN
mgmt-network: 'true'
mgmt-network: true
vim-network-name: mgmt
vnfd-connection-point-ref:
- member-vnf-index-ref: squid-vnf
vnfd-id-ref: squid-vnf
vnfd-connection-point-ref: mgmtnet
vnfd-connection-point-ref: mgmtnet
\ No newline at end of file
......@@ -7,6 +7,12 @@
- vim_url: http://172.21.7.5:5000/v3
vim_name: whitecloud_lowcost
price: 1
- vim_url: http://172.21.247.1:5000/v3
vim_name: etsi-openstack
price: 5
- vim_url: http://172.21.7.5:5000/v3
vim_name: etsi-openstack-lowcostt
price: 1
admin:
prices:
- vim_url: http://172.21.247.1:5000/v3
......@@ -15,6 +21,12 @@
- vim_url: http://172.21.7.5:5000/v3
vim_name: whitecloud_lowcost
price: 1
- vim_url: http://172.21.247.1:5000/v3
vim_name: etsi-openstack
price: 5
- vim_url: http://172.21.7.5:5000/v3
vim_name: etsi-openstack-lowcostt
price: 1
- vnfd: hackfest_gateway_vnfd
hackfest:
prices:
......@@ -24,6 +36,12 @@
- vim_url: http://172.21.7.5:5000/v3
vim_name: whitecloud_lowcost
price: 1
- vim_url: http://172.21.247.1:5000/v3
vim_name: etsi-openstack
price: 5
- vim_url: http://172.21.7.5:5000/v3
vim_name: etsi-openstack-lowcostt
price: 1
admin:
prices:
- vim_url: http://172.21.247.1:5000/v3
......@@ -31,4 +49,10 @@
price: 5
- vim_url: http://172.21.7.5:5000/v3
vim_name: whitecloud_lowcost
price: 1
\ No newline at end of file
price: 1
- vim_url: http://172.21.247.1:5000/v3
vim_name: etsi-openstack
price: 5
- vim_url: http://172.21.7.5:5000/v3
vim_name: etsi-openstack-lowcostt
Please register or sign in to reply
price: 1
Markdown is supported
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