From 2f620254d70e87e55d20089ce19c6422c46b092a Mon Sep 17 00:00:00 2001
From: Gianpietro Lavado <glavado@whitestack.com>
Date: Tue, 26 May 2020 18:16:20 +0000
Subject: [PATCH] adding helper script and sriov settings at VNFD
---
magma/delete_slice.sh | 6 ++++++
magma/hackfest_magma-agw-enb_vnfd/magma-agw-enb_vnfd.yaml | 8 +++++---
magma/params.yaml | 2 ++
3 files changed, 13 insertions(+), 3 deletions(-)
create mode 100755 magma/delete_slice.sh
diff --git a/magma/delete_slice.sh b/magma/delete_slice.sh
new file mode 100755
index 00000000..17e60b22
--- /dev/null
+++ b/magma/delete_slice.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+osm nsi-delete magma_slice
+osm ns-delete magma_slice.slice_hackfest_nsd_epc
+osm ns-delete magma_slice.slice_hackfest_nsd_epcmgmt
+PROJECT=$(osm project-list | grep $OSM_PROJECT | awk '{print $4}')
+echo "To ensure complete deletion, run this in your K8s cluster: kubectl delete namespace $PROJECT"
\ No newline at end of file
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 e4c32263..82925ff3 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
@@ -15,7 +15,7 @@ vnfd:vnfd-catalog:
count: 1
cloud-init-file: magmaagw_init
vm-flavor:
- vcpu-count: 2
+ vcpu-count: 1
memory-mb: 4096
storage-gb: 50
guest-epa:
@@ -33,6 +33,7 @@ vnfd:vnfd-catalog:
type: EXTERNAL
position: '1'
virtual-interface:
+ # type: SR-IOV
type: PARAVIRT
internal-connection-point-ref: agw-s1
- name: eth2
@@ -61,8 +62,8 @@ vnfd:vnfd-catalog:
count: 1
cloud-init-file: srslte_init
vm-flavor:
- vcpu-count: 2
- memory-mb: 8192
+ vcpu-count: 1
+ memory-mb: 4096
storage-gb: 100
image: 'srsLTEfauxRF_hf9'
interface:
@@ -75,6 +76,7 @@ vnfd:vnfd-catalog:
- name: eth1
type: EXTERNAL
virtual-interface:
+ # type: SR-IOV
type: PARAVIRT
internal-connection-point-ref: srsLTE-s1
internal-connection-point:
diff --git a/magma/params.yaml b/magma/params.yaml
index 30b0ec87..bb7457f9 100644
--- a/magma/params.yaml
+++ b/magma/params.yaml
@@ -1,6 +1,7 @@
netslice-subnet:
- id: slice_hackfest_nsd_epc
# placement-engine: PLA
+ # wimAccountId: False
additionalParamsForVnf:
- member-vnf-index: '1'
additionalParams:
@@ -10,6 +11,7 @@ netslice-subnet:
orch_net: 'osmnet'
- id: slice_hackfest_nsd_epcmgmt
+ # wimAccountId: False
additionalParamsForVnf:
- member-vnf-index: 'orc8r'
additionalParamsForKdu:
--
GitLab