From e4b4b4740d2ff8669ddae73a462c8c147f38de21 Mon Sep 17 00:00:00 2001
From: Ubuntu <ubuntu@nbi.osm>
Date: Fri, 14 Oct 2022 15:35:18 +0000
Subject: [PATCH] Correcting magma scripts
---
.../OSM-13/magma_orc_onboarding/README.md | 2 +-
.../magma-orc-scripts/1-onboard-packages.sh | 2 +-
.../OSM-MR13/magma-orc-scripts/1.1-onboard-ns.sh | 14 ++++++++++++++
.../2-download-admin-operator-cert.sh | 5 +++--
.../3-get-admin-operator-credential.sh | 6 ++++--
.../4-get-magma-orc-gui-credential.sh | 1 +
.../5-get-loadbalancer-services.sh | 5 +++--
.../magma-orc-scripts/6-access-magma-orch-gui.sh | 0
8 files changed, 27 insertions(+), 8 deletions(-)
mode change 100644 => 100755 Hackfest_Demos/OSM-MR13/magma-orc-scripts/1-onboard-packages.sh
create mode 100755 Hackfest_Demos/OSM-MR13/magma-orc-scripts/1.1-onboard-ns.sh
mode change 100644 => 100755 Hackfest_Demos/OSM-MR13/magma-orc-scripts/2-download-admin-operator-cert.sh
mode change 100644 => 100755 Hackfest_Demos/OSM-MR13/magma-orc-scripts/3-get-admin-operator-credential.sh
mode change 100644 => 100755 Hackfest_Demos/OSM-MR13/magma-orc-scripts/4-get-magma-orc-gui-credential.sh
mode change 100644 => 100755 Hackfest_Demos/OSM-MR13/magma-orc-scripts/5-get-loadbalancer-services.sh
mode change 100644 => 100755 Hackfest_Demos/OSM-MR13/magma-orc-scripts/6-access-magma-orch-gui.sh
diff --git a/Hackfest_Demos/OSM-13/magma_orc_onboarding/README.md b/Hackfest_Demos/OSM-13/magma_orc_onboarding/README.md
index 75d484e0..42a0c231 100644
--- a/Hackfest_Demos/OSM-13/magma_orc_onboarding/README.md
+++ b/Hackfest_Demos/OSM-13/magma_orc_onboarding/README.md
@@ -73,7 +73,7 @@ juju scp --container="magma-orc8r-certifier" orc8r-certifier/0:/var/opt/magma/ce
### Get the Admin Operator Https Certificate credentials
```bash
-osm ns-action $MAGMA_NS_NAME --vnf_name magma_orc_cnf --kdu_name magma-orc-kdu --action_name get-master-admin-credentials --wait
+osm ns-action $MAGMA_NS_NAME --vnf_name magma_orc_cnf --kdu_name magma-orc-kdu --action_name get-pfx-package-password --wait
# pfx_package pass appears in the operation output, please save it
```
diff --git a/Hackfest_Demos/OSM-MR13/magma-orc-scripts/1-onboard-packages.sh b/Hackfest_Demos/OSM-MR13/magma-orc-scripts/1-onboard-packages.sh
old mode 100644
new mode 100755
index 13fea286..1c6a88a9
--- a/Hackfest_Demos/OSM-MR13/magma-orc-scripts/1-onboard-packages.sh
+++ b/Hackfest_Demos/OSM-MR13/magma-orc-scripts/1-onboard-packages.sh
@@ -3,7 +3,7 @@
echo "========================================================================"
echo "Upload VNFD"
echo "========================================================================"
-pushd osm-packages/Hackfest_Demos/OSM-13/
+pushd ../../OSM-13/
osm nfpkg-create magma_orc_cnf
echo "========================================================================"
diff --git a/Hackfest_Demos/OSM-MR13/magma-orc-scripts/1.1-onboard-ns.sh b/Hackfest_Demos/OSM-MR13/magma-orc-scripts/1.1-onboard-ns.sh
new file mode 100755
index 00000000..cac1af83
--- /dev/null
+++ b/Hackfest_Demos/OSM-MR13/magma-orc-scripts/1.1-onboard-ns.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+export MAGMA_NS_NAME=magma_orc_ns
+export VIM_ACCOUNT=openstack
+export K8S_NET=osm-ext
+echo "========================================================================"
+echo "Creating MAGMA_NS: $MAGMA_NS_NAME"
+echo "========================================================================"
+osm ns-create --ns_name $MAGMA_NS_NAME --nsd_name magma_orc_cnf_ns --vim_account $VIM_ACCOUNT --config "{vld: [ {name: mgmtnet, vim-network-name: $K8S_NET}]}"
+# Check NS status
+osm ns-list
+
+echo "========================================================================"
+echo "Check NS status using osm ns-list, osm ns-show $MAGMA_NS_NAME"
+echo "========================================================================"
diff --git a/Hackfest_Demos/OSM-MR13/magma-orc-scripts/2-download-admin-operator-cert.sh b/Hackfest_Demos/OSM-MR13/magma-orc-scripts/2-download-admin-operator-cert.sh
old mode 100644
new mode 100755
index d94acee2..1eb13913
--- a/Hackfest_Demos/OSM-MR13/magma-orc-scripts/2-download-admin-operator-cert.sh
+++ b/Hackfest_Demos/OSM-MR13/magma-orc-scripts/2-download-admin-operator-cert.sh
@@ -1,7 +1,8 @@
#!/bin/bash
-export orc_model=juju models | grep -i magma-orc | awk -F " " '{print $1}' | tr -d \*
-juju switch $orch_model
+export orc_model=`juju models | grep -i magma-orc | awk -F " " '{print $1}' | tr -d \*`
+juju switch $orc_model
+echo $orch_model
echo "========================================================================"
echo "Dowloading admin_operator.pfx file to your current working directory"
echo "========================================================================"
diff --git a/Hackfest_Demos/OSM-MR13/magma-orc-scripts/3-get-admin-operator-credential.sh b/Hackfest_Demos/OSM-MR13/magma-orc-scripts/3-get-admin-operator-credential.sh
old mode 100644
new mode 100755
index 87e48aa4..0df8b3b7
--- a/Hackfest_Demos/OSM-MR13/magma-orc-scripts/3-get-admin-operator-credential.sh
+++ b/Hackfest_Demos/OSM-MR13/magma-orc-scripts/3-get-admin-operator-credential.sh
@@ -1,8 +1,10 @@
#!/bin/bash
+export MAGMA_NS_NAME=magma_orc_ns
echo "========================================================================"
echo "Getting admin operator credentials"
echo "========================================================================"
-osm ns-action $MAGMA_NS_NAME --vnf_name magma_orc_cnf --kdu_name magma-orc-kdu --action_name get-master-admin-credentials --wait
+output=`osm ns-action $MAGMA_NS_NAME --vnf_name magma_orc_cnf --kdu_name magma-orc-kdu --action_name get-pfx-package-password --wait`
echo "========================================================================"
echo "pfx_package pass appears in the operation output, please save it"
-echo "========================================================================"
\ No newline at end of file
+echo "========================================================================"
+echo $output
diff --git a/Hackfest_Demos/OSM-MR13/magma-orc-scripts/4-get-magma-orc-gui-credential.sh b/Hackfest_Demos/OSM-MR13/magma-orc-scripts/4-get-magma-orc-gui-credential.sh
old mode 100644
new mode 100755
index 3b324318..fa7f199d
--- a/Hackfest_Demos/OSM-MR13/magma-orc-scripts/4-get-magma-orc-gui-credential.sh
+++ b/Hackfest_Demos/OSM-MR13/magma-orc-scripts/4-get-magma-orc-gui-credential.sh
@@ -1,4 +1,5 @@
#!/bin/bash
+export MAGMA_NS_NAME=magma_orc_ns
echo "========================================================================"
echo "Getting Magma orchestrator GUI credentials"
echo "========================================================================"
diff --git a/Hackfest_Demos/OSM-MR13/magma-orc-scripts/5-get-loadbalancer-services.sh b/Hackfest_Demos/OSM-MR13/magma-orc-scripts/5-get-loadbalancer-services.sh
old mode 100644
new mode 100755
index 05de4c6e..cc65ba8a
--- a/Hackfest_Demos/OSM-MR13/magma-orc-scripts/5-get-loadbalancer-services.sh
+++ b/Hackfest_Demos/OSM-MR13/magma-orc-scripts/5-get-loadbalancer-services.sh
@@ -1,7 +1,8 @@
echo "========================================================================"
echo "Getting Loadbalancer services"
echo "========================================================================"
-osm ns-action $NS_NAME --vnf_name magma_orc_cnf --kdu_name magma-orc-kdu --action_name get-load-balancer-services --wait
+export MAGMA_NS_NAME=magma_orc_ns
+osm ns-action $MAGMA_NS_NAME --vnf_name magma_orc_cnf --kdu_name magma-orc-kdu --action_name get-load-balancer-services --wait
echo "========================================================================"
echo "Load Balancer service names and External IP's are visible in the action output."
@@ -16,4 +17,4 @@ echo "ZONE=osm.magma.com."
echo "# Sample registration for api.osm.magma.com"
echo "DOMAIN=api."
echo "IP=<orc8r-nginx-proxy External IP> "
-echo "========================================================================"
\ No newline at end of file
+echo "========================================================================"
diff --git a/Hackfest_Demos/OSM-MR13/magma-orc-scripts/6-access-magma-orch-gui.sh b/Hackfest_Demos/OSM-MR13/magma-orc-scripts/6-access-magma-orch-gui.sh
old mode 100644
new mode 100755
--
GitLab