From 0bdceaa392ae80af78e822d3cb617871703f0d18 Mon Sep 17 00:00:00 2001 From: Gianpietro Lavado Date: Mon, 25 May 2020 18:17:02 +0000 Subject: [PATCH] add sample files for PLA use case --- magma/build_slice.sh | 6 ++++-- .../magma-agw-enb_nsd.yaml | 4 ++-- magma/params.yaml | 6 ++++-- magma/pdu.yaml | 2 +- magma/pdu_lowcostvim.yaml | 13 +++++++++++++ magma/pil_price_list.yaml | 8 ++++++++ magma/vnf_price_list.yaml | 16 ++++++++++++++++ 7 files changed, 48 insertions(+), 7 deletions(-) create mode 100644 magma/pdu_lowcostvim.yaml create mode 100644 magma/pil_price_list.yaml create mode 100644 magma/vnf_price_list.yaml diff --git a/magma/build_slice.sh b/magma/build_slice.sh index 6cb196a0..9cd51c3b 100755 --- a/magma/build_slice.sh +++ b/magma/build_slice.sh @@ -20,7 +20,9 @@ osm nsd-create hackfest_magma-agw-enb_nsd.tar.gz osm netslice-template-create magma_slice.yaml osm nsi-create --nsi_name magma_slice --nst_name magma_slice_hackfest_nst \ ---config_file params.yaml --ssh_keys ~/.ssh/id_rsa.pub --vim_account whitecloud +--config_file params.yaml --ssh_keys ~/.ssh/id_rsa.pub --vim_account whitecloud_highcost sleep 4 -osm ns-list | grep "\" | awk '{print $4}' | xargs -l1 juju switch \ No newline at end of file +osm ns-list | grep "\" | awk '{print $4}' | xargs -l1 juju switch +juju model-config enable-os-refresh-update=false enable-os-upgrade=false +juju model-config apt-mirror=http://fr.archive.ubuntu.com/ubuntu/ \ No newline at end of file diff --git a/magma/hackfest_magma-agw-enb_nsd/magma-agw-enb_nsd.yaml b/magma/hackfest_magma-agw-enb_nsd/magma-agw-enb_nsd.yaml index 8a6b55c9..3c1c00ea 100644 --- a/magma/hackfest_magma-agw-enb_nsd/magma-agw-enb_nsd.yaml +++ b/magma/hackfest_magma-agw-enb_nsd/magma-agw-enb_nsd.yaml @@ -22,7 +22,6 @@ nsd:nsd-catalog: short-name: mgmt type: ELAN mgmt-network: true - vim-network-name: osm-ext vnfd-connection-point-ref: - member-vnf-index-ref: '1' vnfd-id-ref: hackfest_magma-agw-enb_vnfd @@ -37,6 +36,7 @@ nsd:nsd-catalog: name: sgi short-name: sgi type: ELAN + mgmt-network: false vim-network-name: sgi vnfd-connection-point-ref: - member-vnf-index-ref: '1' @@ -44,4 +44,4 @@ nsd:nsd-catalog: vnfd-connection-point-ref: agw-sgi - member-vnf-index-ref: '2' vnfd-id-ref: hackfest_vyos_pnf - vnfd-connection-point-ref: gateway_public \ No newline at end of file + vnfd-connection-point-ref: gateway_public diff --git a/magma/params.yaml b/magma/params.yaml index 7ce6ac9b..193f3da1 100644 --- a/magma/params.yaml +++ b/magma/params.yaml @@ -1,5 +1,6 @@ netslice-subnet: - id: slice_hackfest_nsd_epc + placement-engine: PLA additionalParamsForVnf: - member-vnf-index: '1' additionalParams: @@ -7,6 +8,7 @@ netslice-subnet: agw_name: 'AGW100' orch_ip: '172.21.250.110' ## change this to the MetalLB IP address of your orc8r_proxy service. orch_net: 'osmnet' + - id: slice_hackfest_nsd_epcmgmt additionalParamsForVnf: - member-vnf-index: 'orc8r' @@ -14,8 +16,8 @@ netslice-subnet: - kdu_name: orc8r additionalParams: proxyserviceloadBalancerIP: '172.21.250.110' # MetalLB IP Address + netslice-vld: - name: slice_vld_mgmt - vim-network-name: "osm-ext" - name: slice_vld_data1 - vim-network-name: "sgi" \ No newline at end of file + vim-network-name: "sgi" diff --git a/magma/pdu.yaml b/magma/pdu.yaml index fa01f2d9..36fb0576 100644 --- a/magma/pdu.yaml +++ b/magma/pdu.yaml @@ -1,7 +1,7 @@ name: router01 description: router type: gateway -vim_accounts: [ fb99f5c5-f6b2-4a39-9a30-42012aa3f2c8 ] +vim_accounts: [ 6785ef2d-c3c2-485b-a8e8-3c21d694ce1f ] shared: false interfaces: - name: eth0 diff --git a/magma/pdu_lowcostvim.yaml b/magma/pdu_lowcostvim.yaml new file mode 100644 index 00000000..2758e9c1 --- /dev/null +++ b/magma/pdu_lowcostvim.yaml @@ -0,0 +1,13 @@ +name: router02 +description: router +type: gateway +vim_accounts: [ a2e7f31c-5286-4d54-ac3d-f0e810712ab1 ] +shared: false +interfaces: + - name: eth0 + ip-address: 172.21.7.150 + vim-network-name: osm-ext + mgmt: true + - name: eth1 + ip-address: 192.168.239.7 + mgmt: false diff --git a/magma/pil_price_list.yaml b/magma/pil_price_list.yaml new file mode 100644 index 00000000..71d500bf --- /dev/null +++ b/magma/pil_price_list.yaml @@ -0,0 +1,8 @@ +pil: + - pil_description: Link between OpenStack1 and OpenStack2 + pil_price: 0 + pil_latency: 0 + pil_jitter: 0 + pil_endpoints: + - http://172.21.7.5:5000/v3 + - http://172.21.247.1:5000/v3 diff --git a/magma/vnf_price_list.yaml b/magma/vnf_price_list.yaml new file mode 100644 index 00000000..6fb0cf94 --- /dev/null +++ b/magma/vnf_price_list.yaml @@ -0,0 +1,16 @@ +- vnfd: hackfest_magma-agw-enb_vnfd + prices: + - vim_url: http://172.21.247.1:5000/v3 + vim_name: whitecloud_highcost + price: 5 + - vim_url: http://172.21.7.5:5000/v3 + vim_name: whitecloud_lowcost + price: 1 +- vnfd: hackfest_vyos_pnf + prices: + - vim_url: http://172.21.247.1:5000/v3 + vim_name: whitecloud_highcost + price: 5 + - vim_url: http://172.21.7.5:5000/v3 + vim_name: whitecloud_lowcost + price: 1 \ No newline at end of file -- GitLab