commit 7135e6a8d76aefbd4b1153c2894543eec2bbc687
author Ubuntu <ubuntu@ip-172-31-27-117.us-east-2.compute.internal> Tue Jun 30 01:46:08 2020 +0000
committer David Bainbridge <dbainbri@ciena.com> Mon Jul 06 17:58:09 2020 +0000
tree 920bbb571974f185aa5af1bde94f7d376569bb81
parent baab12f63a4d49097a844673c56bcec8b42f3bc2

VOL-3295 move service name check

do the check after chart is installed

Change-Id: I74491f7432b48898c459e69ecb72686ba5216298

voltha

diff --git a/voltha b/voltha
index 2de2e10..cfd5906 100755
--- a/voltha
+++ b/voltha
@@ -1907,40 +1907,6 @@
 }
 EOJ
 )"
-    elif [ "$CONFIG_SADIS" == "external" ]; then
-        if kubectl get -n "$BBSIM_NS" svc/bbsim-sadis-server-bbsim-sadis-server >/dev/null 2>&1; then
-            BBSIM_SADIS_SVC="bbsim-sadis-server-bbsim-sadis-server"
-        else
-            BBSIM_SADIS_SVC="bbsim-sadis-server"
-        fi
-        push_onos_config "json" \
-            "[optional] Push ONOS configuration for custom SADIS and Bandwidth Profile servers" \
-            "network/configuration/apps/org.opencord.sadis" \
-            "$(cat <<EOJ | tr -d '[:space:]'
-{
-    "sadis": {
-        "integration": {
-            "url": "http://$BBSIM_SADIS_SVC.$BBSIM_NS.svc:58080/subscribers/%s",
-            "cache": {
-                "enabled": true,
-                "maxsize": 50,
-                "ttl": "PT1m"
-            }
-        }
-    },
-    "bandwidthprofile": {
-        "integration": {
-            "url": "http://$BBSIM_SADIS_SVC.$BBSIM_NS.svc:58080/profiles/%s",
-            "cache": {
-                "enabled": true,
-                "maxsize": 50,
-                "ttl": "PT1m"
-            }
-        }
-    }
-}
-EOJ
-)"
     elif [ "$CONFIG_SADIS" == "url" ]; then
         push_onos_config "json" \
             "[optional] Push ONOS configuration for custom SADIS and Bandwidth Profile servers" \
@@ -2278,6 +2244,42 @@
         espin - "$VERIFIED"
     fi
     wait_for_pods - "$BBSIM_NS" 1 "includes" "Waiting for BBSIM SADIS Server to start" "$NO_LABEL" "bbsim-sadis-server-.*"
+
+    if [ "$WITH_ONOS" == "yes" ]; then
+        if kubectl get -n "$BBSIM_NS" svc/bbsim-sadis-server-bbsim-sadis-server >/dev/null 2>&1; then
+            BBSIM_SADIS_SVC="bbsim-sadis-server-bbsim-sadis-server"
+        else
+            BBSIM_SADIS_SVC="bbsim-sadis-server"
+        fi
+        push_onos_config "json" \
+            "[optional] Push ONOS configuration for custom SADIS and Bandwidth Profile servers" \
+            "network/configuration/apps/org.opencord.sadis" \
+            "$(cat <<EOJ | tr -d '[:space:]'
+{
+    "sadis": {
+        "integration": {
+            "url": "http://$BBSIM_SADIS_SVC.$BBSIM_NS.svc:58080/subscribers/%s",
+            "cache": {
+                "enabled": true,
+                "maxsize": 50,
+                "ttl": "PT1m"
+            }
+        }
+    },
+    "bandwidthprofile": {
+        "integration": {
+            "url": "http://$BBSIM_SADIS_SVC.$BBSIM_NS.svc:58080/profiles/%s",
+            "cache": {
+                "enabled": true,
+                "maxsize": 50,
+                "ttl": "PT1m"
+            }
+        }
+    }
+}
+EOJ
+)"
+    fi
     if [ "$WITH_TIMINGS" == "yes" ]; then
         NOW="$(date +%s)"
         printtime $((NOW - STIME))