Correcting magma scripts

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
 ```
 

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 "========================================================================"

Hackfest_Demos/OSM-MR13/magma-orc-scripts/1.1-onboard-ns.sh

+#!/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 "========================================================================"

Hackfest_Demos/OSM-MR13/magma-orc-scripts/2-download-admin-operator-cert.sh

 #!/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 "========================================================================"

Hackfest_Demos/OSM-MR13/magma-orc-scripts/3-get-admin-operator-credential.sh

 #!/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

Hackfest_Demos/OSM-MR13/magma-orc-scripts/4-get-magma-orc-gui-credential.sh

 #!/bin/bash
+export MAGMA_NS_NAME=magma_orc_ns
 echo "========================================================================"
 echo "Getting Magma orchestrator GUI credentials"
 echo "========================================================================"

Hackfest_Demos/OSM-MR13/magma-orc-scripts/5-get-loadbalancer-services.sh

 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 "========================================================================"