OFC25 tests:

- Updated deploy script

src/tests/ofc25/deploy.sh

@@ -14,28 +14,26 @@
 # limitations under the License.
 
 # ===== Check Microk8s is ready ==============================
-microk8s status --wait-ready
-kubectl get pods --all-namespaces
+#microk8s status --wait-ready
+#kubectl get pods --all-namespaces
 
 # ===== Cleanup old deployments ==============================
-helm3 uninstall --namespace nats-e2e nats-e2e 2>/dev/null || true
-helm3 uninstall --namespace nats-ip  nats-ip  2>/dev/null || true
-helm3 uninstall --namespace nats-opt nats-opt 2>/dev/null || true
-helm3 uninstall --namespace nats     nats     2>/dev/null || true
-kubectl delete namespaces tfs tfs-ip tfs-opt tfs-e2e --ignore-not-found
-kubectl delete namespaces qdb qdb-e2e qdb-opt qdb-ip --ignore-not-found
-kubectl delete namespaces kafka kafka-ip kafka-opt kafka-e2e --ignore-not-found
-kubectl delete namespaces nats nats-ip nats-opt nats-e2e --ignore-not-found
-
-kubectl delete -f src/tests/ofc25/nginx-ingress-controller-opt.yaml --ignore-not-found
-kubectl delete -f src/tests/ofc25/nginx-ingress-controller-ip.yaml  --ignore-not-found
-kubectl delete -f src/tests/ofc25/nginx-ingress-controller-e2e.yaml --ignore-not-found
-
-sleep 5
+#helm3 uninstall --namespace nats-e2e nats-e2e 2>/dev/null || true
+#helm3 uninstall --namespace nats-ip  nats-ip  2>/dev/null || true
+#helm3 uninstall --namespace nats-opt nats-opt 2>/dev/null || true
+#helm3 uninstall --namespace nats     nats     2>/dev/null || true
+#kubectl delete namespaces tfs tfs-ip tfs-opt tfs-e2e --ignore-not-found
+#kubectl delete namespaces qdb qdb-e2e qdb-opt qdb-ip --ignore-not-found
+#kubectl delete namespaces kafka kafka-ip kafka-opt kafka-e2e --ignore-not-found
+#kubectl delete namespaces nats nats-ip nats-opt nats-e2e --ignore-not-found
+#kubectl delete -f src/tests/ofc25/nginx-ingress-controller-opt.yaml --ignore-not-found
+#kubectl delete -f src/tests/ofc25/nginx-ingress-controller-ip.yaml  --ignore-not-found
+#kubectl delete -f src/tests/ofc25/nginx-ingress-controller-e2e.yaml --ignore-not-found
+#sleep 5
 
 # ===== Check Microk8s is ready ==============================
-microk8s status --wait-ready
-kubectl get pods --all-namespaces
+#microk8s status --wait-ready
+#kubectl get pods --all-namespaces
 
 # Configure TeraFlowSDN deployment
 # Uncomment if DEBUG log level is needed for the components
@@ -49,9 +47,9 @@ kubectl get pods --all-namespaces
 #yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/vntmservice.yaml
 
 # Create secondary ingress controllers
-kubectl apply -f src/tests/ofc25/nginx-ingress-controller-opt.yaml
-kubectl apply -f src/tests/ofc25/nginx-ingress-controller-ip.yaml
-kubectl apply -f src/tests/ofc25/nginx-ingress-controller-e2e.yaml
+#kubectl apply -f src/tests/ofc25/nginx-ingress-controller-opt.yaml
+#kubectl apply -f src/tests/ofc25/nginx-ingress-controller-ip.yaml
+#kubectl apply -f src/tests/ofc25/nginx-ingress-controller-e2e.yaml
 
 cp manifests/contextservice.yaml manifests/contextservice.yaml.bak
 
@@ -71,36 +69,36 @@ sed -i '/name: CRDB_DATABASE/{n;s/value: .*/value: "tfs_opt_context"/}' manifest
 mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_opt.sh
 
 
-## ===== Deploy IP TeraFlowSDN ==============================
-#source src/tests/ofc25/deploy_specs_ip.sh
-#cp manifests/contextservice.yaml.bak manifests/contextservice.yaml
-#sed -i '/name: CRDB_DATABASE/{n;s/value: .*/value: "tfs_ip_context"/}' manifests/contextservice.yaml
-#
-#./deploy/crdb.sh
-#./deploy/nats.sh
-#./deploy/kafka.sh
-##./deploy/qdb.sh
-##./deploy/expose_dashboard.sh
-#./deploy/tfs.sh
-#./deploy/show.sh
-#
-#mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_ip.sh
+# ===== Deploy IP TeraFlowSDN ==============================
+source src/tests/ofc25/deploy_specs_ip.sh
+cp manifests/contextservice.yaml.bak manifests/contextservice.yaml
+sed -i '/name: CRDB_DATABASE/{n;s/value: .*/value: "tfs_ip_context"/}' manifests/contextservice.yaml
 
+./deploy/crdb.sh
+./deploy/nats.sh
+./deploy/kafka.sh
+#./deploy/qdb.sh
+#./deploy/expose_dashboard.sh
+./deploy/tfs.sh
+./deploy/show.sh
 
-## ===== Deploy End-to-End TeraFlowSDN ====================
-#source src/tests/ofc25/deploy_specs_e2e.sh
-#cp manifests/contextservice.yaml.bak manifests/contextservice.yaml
-#sed -i '/name: CRDB_DATABASE/{n;s/value: .*/value: "tfs_e2e_context"/}' manifests/contextservice.yaml
-#
-#./deploy/crdb.sh
-#./deploy/nats.sh
-#./deploy/kafka.sh
-##./deploy/qdb.sh
-##./deploy/expose_dashboard.sh
-#./deploy/tfs.sh
-#./deploy/show.sh
-#
-#mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_e2e.sh
+mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_ip.sh
+
+
+# ===== Deploy End-to-End TeraFlowSDN ====================
+source src/tests/ofc25/deploy_specs_e2e.sh
+cp manifests/contextservice.yaml.bak manifests/contextservice.yaml
+sed -i '/name: CRDB_DATABASE/{n;s/value: .*/value: "tfs_e2e_context"/}' manifests/contextservice.yaml
+
+./deploy/crdb.sh
+./deploy/nats.sh
+./deploy/kafka.sh
+#./deploy/qdb.sh
+#./deploy/expose_dashboard.sh
+./deploy/tfs.sh
+./deploy/show.sh
+
+mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_e2e.sh
 
 
 # ===== Recovering files =========================