From 158aee82f338921df1cc01fa5ad0eb827bde77f2 Mon Sep 17 00:00:00 2001
From: Gianpietro Lavado <glavado@whitestack.com>
Date: Wed, 27 May 2020 19:23:15 +0000
Subject: [PATCH] updating srslte flavor & PLA/Slice params
---
.../magma-agw-enb_vnfd.yaml | 4 +--
magma/magma_slice.yaml | 6 ----
magma/params.yaml | 11 ++-----
magma/pdu.yaml | 2 +-
magma/pdu_lowcostvim.yaml | 2 +-
magma/vnf_price_list.yaml | 30 ++++++++++---------
6 files changed, 23 insertions(+), 32 deletions(-)
diff --git a/magma/hackfest_magma-agw-enb_vnfd/magma-agw-enb_vnfd.yaml b/magma/hackfest_magma-agw-enb_vnfd/magma-agw-enb_vnfd.yaml
index 82925ff3..00927933 100644
--- a/magma/hackfest_magma-agw-enb_vnfd/magma-agw-enb_vnfd.yaml
+++ b/magma/hackfest_magma-agw-enb_vnfd/magma-agw-enb_vnfd.yaml
@@ -62,8 +62,8 @@ vnfd:vnfd-catalog:
count: 1
cloud-init-file: srslte_init
vm-flavor:
- vcpu-count: 1
- memory-mb: 4096
+ vcpu-count: 4
+ memory-mb: 6144
storage-gb: 100
image: 'srsLTEfauxRF_hf9'
interface:
diff --git a/magma/magma_slice.yaml b/magma/magma_slice.yaml
index 2d6236b8..5efa1b47 100644
--- a/magma/magma_slice.yaml
+++ b/magma/magma_slice.yaml
@@ -41,9 +41,3 @@ nst:
nsd-connection-point-ref: nsd_cp_mgmt
- nss-ref: slice_hackfest_nsd_epcmgmt
nsd-connection-point-ref: nsd_cp_mgmt
- - id: slice_vld_data1
- name: slice_vld_data1
- type: ELAN
- nss-connection-point-ref:
- - nss-ref: slice_hackfest_nsd_epc
- nsd-connection-point-ref: nsd_cp_sgi
\ No newline at end of file
diff --git a/magma/params.yaml b/magma/params.yaml
index bb7457f9..b534f88a 100644
--- a/magma/params.yaml
+++ b/magma/params.yaml
@@ -1,7 +1,7 @@
netslice-subnet:
- id: slice_hackfest_nsd_epc
- # placement-engine: PLA
- # wimAccountId: False
+ #placement-engine: PLA
+ #wimAccountId: False
additionalParamsForVnf:
- member-vnf-index: '1'
additionalParams:
@@ -11,15 +11,10 @@ netslice-subnet:
orch_net: 'osmnet'
- id: slice_hackfest_nsd_epcmgmt
- # wimAccountId: False
+ #wimAccountId: False
additionalParamsForVnf:
- member-vnf-index: 'orc8r'
additionalParamsForKdu:
- kdu_name: orc8r
additionalParams:
proxyserviceloadBalancerIP: '172.21.250.199' # MetalLB IP Address
-
-netslice-vld:
-- name: slice_vld_mgmt
-- name: slice_vld_data1
- vim-network-name: "sgi"
diff --git a/magma/pdu.yaml b/magma/pdu.yaml
index 36fb0576..46849af8 100644
--- a/magma/pdu.yaml
+++ b/magma/pdu.yaml
@@ -1,7 +1,7 @@
name: router01
description: router
type: gateway
-vim_accounts: [ 6785ef2d-c3c2-485b-a8e8-3c21d694ce1f ]
+vim_accounts: [ 6e51e2e2-ac78-4620-b378-100b8ddbfb55 ]
shared: false
interfaces:
- name: eth0
diff --git a/magma/pdu_lowcostvim.yaml b/magma/pdu_lowcostvim.yaml
index 2758e9c1..b97d590c 100644
--- a/magma/pdu_lowcostvim.yaml
+++ b/magma/pdu_lowcostvim.yaml
@@ -1,7 +1,7 @@
name: router02
description: router
type: gateway
-vim_accounts: [ a2e7f31c-5286-4d54-ac3d-f0e810712ab1 ]
+vim_accounts: [ f675113a-e274-4801-a1c6-0c25e52d3748 ]
shared: false
interfaces:
- name: eth0
diff --git a/magma/vnf_price_list.yaml b/magma/vnf_price_list.yaml
index 389c1b20..715eb70f 100644
--- a/magma/vnf_price_list.yaml
+++ b/magma/vnf_price_list.yaml
@@ -1,16 +1,18 @@
- 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
+ hackfest:
+ 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_gateway_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
+ hackfest:
+ 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
--
GitLab