TW-882: Updated run.sh by removing the Backend_Server variable and

instead introduced variables relevant to All-in-one-cloud and Distributed
environments. These variables are called:
PROV_SERVER
SSC_SERVER
INTEGRATED_SERVER

Expectation is that for All-in-one-cloud env, we would define Integrated_server
variable, whereas for Distributed we will have Prov_server and SSC_server defined..
This commit is contained in:
Rahul Sharma
2020-07-16 16:51:03 -04:00
parent a5c1f5929a
commit a833ef18e8

View File

@@ -14,7 +14,9 @@ CLIENT_MQTT_SSL_PROPS+=" -Dtip.wlan.mqttBroker.password=admin"
OVSDB_MANAGER_HOST=${OVSDB_MANAGER}
MQTT_BROKER_HOST="${MQTT_SERVER}"
BACKEND_SERVER="${BACKEND_SERVER}"
PROV_SERVER_HOST="${PROV_SERVER}"
SSC_SERVER_HOST="${SSC_SERVER}"
ALL_IN_ONE_HOST="${INTEGRATED_SERVER}"
OVSDB_PROPS=" "
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.managerAddr=$OVSDB_MANAGER_HOST"
@@ -50,23 +52,33 @@ then
HOST_PROPS+=" -Dtip.wlan.internalHostName=${OVSDB_MANAGER_IP}"
fi
if [[ -n $BACKEND_SERVER ]]
if [[ -n $PROV_SERVER_HOST && -n $SSC_SERVER_HOST ]]
then
echo Use specifed local host
HOST_URL=https://${BACKEND_SERVER}:9092
HOST_PROPS+=" -Dtip.wlan.cloudEventDispatcherBaseUrl=$HOST_URL"
HOST_PROPS+=" -Dtip.wlan.statusServiceBaseUrl=$HOST_URL"
HOST_PROPS+=" -Dtip.wlan.routingServiceBaseUrl=$HOST_URL"
HOST_PROPS+=" -Dtip.wlan.alarmServiceBaseUrl=$HOST_URL"
HOST_PROPS+=" -Dtip.wlan.customerServiceBaseUrl=$HOST_URL"
HOST_PROPS+=" -Dtip.wlan.locationServiceBaseUrl=$HOST_URL"
HOST_PROPS+=" -Dtip.wlan.equipmentServiceBaseUrl=$HOST_URL"
HOST_PROPS+=" -Dtip.wlan.profileServiceBaseUrl=$HOST_URL"
HOST_PROPS+=" -Dtip.wlan.clientServiceBaseUrl=$HOST_URL"
HOST_PROPS+=" -Dtip.wlan.firmwareServiceBaseUrl=$HOST_URL"
HOST_PROPS+=" -Dtip.wlan.manufacturerServiceBaseUrl=$HOST_URL"
SSC_URL=https://${SSC_SERVER_HOST}:9031
PROV_URL=https://${PROV_SERVER_HOST}:9091
else
echo Its an Integrated server environment
SSC_URL=https://${ALL_IN_ONE_HOST}:9092
PROV_URL=https://${ALL_IN_ONE_HOST}:9092
fi
// SSC URLs
HOST_PROPS+=" -Dtip.wlan.cloudEventDispatcherBaseUrl=$SSC_URL"
HOST_PROPS+=" -Dtip.wlan.statusServiceBaseUrl=$SSC_URL"
HOST_PROPS+=" -Dtip.wlan.routingServiceBaseUrl=$SSC_URL"
HOST_PROPS+=" -Dtip.wlan.alarmServiceBaseUrl=$SSC_URL"
HOST_PROPS+=" -Dtip.wlan.systemEventServiceBaseUrl=$SSC_URL"
HOST_PROPS+=" -Dtip.wlan.profileServiceBaseUrl=$SSC_URL"
HOST_PROPS+=" -Dtip.wlan.clientServiceBaseUrl=$SSC_URL"
// PROV URLs
HOST_PROPS+=" -Dtip.wlan.customerServiceBaseUrl=$PROV_URL"
HOST_PROPS+=" -Dtip.wlan.portalUserServiceBaseUrl=$PROV_URL"
HOST_PROPS+=" -Dtip.wlan.firmwareServiceBaseUrl=$PROV_URL"
HOST_PROPS+=" -Dtip.wlan.serviceMetricServiceBaseUrl=$PROV_URL"
HOST_PROPS+=" -Dtip.wlan.locationServiceBaseUrl=$PROV_URL"
HOST_PROPS+=" -Dtip.wlan.manufacturerServiceBaseUrl=$PROV_URL"
HOST_PROPS+=" -Dtip.wlan.equipmentServiceBaseUrl=$PROV_URL"
DEFAULT_BRIDGE="${DEFAULT_BRIDGE:=br-lan}"
DEFAULT_WAN_TYPE="${DEFAULT_WAN_TYPE:=eth}"