fixed sdnc-web dist

adapt nginx rules to latest env vars

Issue-ID: CCSDK-4087
Change-Id: I59483bbee48e986b15986fc14629565bcfa3da33
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>

diff --git a/installation/sdnc-web/src/main/resources/location.rules b/installation/sdnc-web/src/main/resources/location.rules
index 8f1f527..4eecadf 100644 (file)
--- a/installation/sdnc-web/src/main/resources/location.rules
+++ b/installation/sdnc-web/src/main/resources/location.rules
@@ -10,12 +10,36 @@ location ~ ^/transportpce  {
         proxy_pass TRPCEURL/$1;
     }
 }
+location ~ ^/topology/  {
+    resolver DNS_INTERNAL_RESOLVER;
+    proxy_pass TOPOURL;
+}
+location ~ ^/sitedoc/  {
+  resolver DNS_INTERNAL_RESOLVER;
+  if ($request_uri ~* "/sitedoc/(.*)") {
+    proxy_pass SITEDOCURL/topology/stadok/$1;
+  }
+}
 location ~ ^/tiles/  {
     resolver DNS_RESOLVER;
     if ($request_uri ~* "/tiles/(.*)") { 
         proxy_pass TILEURL/$1;
     }
 }
+location ~ ^/terrain/  {
+  resolver DNS_INTERNAL_RESOLVER;
+  if ($request_uri ~* "/terrain/(.*)") {
+    proxy_pass TERRAINURL/$1;
+  }
+}
+location ~ ^/electromagnetic-field/  {
+  resolver DNS_RESOLVER;
+  proxy_set_header Authorization "Basic ELECTROMAGNETICFIELDBAUTHTOKEN";
+  proxy_pass_header Authorization;
+  if ($request_uri ~* "/electromagnetic-field/(.*)") {
+    proxy_pass ELECTROMAGNETICFIELDURL/$1;
+  }
+}
 location /  {
     try_files $uri $uri/ @backend;
 }

diff --git a/installation/sdnc-web/src/main/scripts/core.py b/installation/sdnc-web/src/main/scripts/core.py
index 2852379..43b58c0 100644 (file)
--- a/installation/sdnc-web/src/main/scripts/core.py
+++ b/installation/sdnc-web/src/main/scripts/core.py
@@ -237,7 +237,6 @@ def update_index_html(apps=None):
         ODLUX_CONFIG['transportpceUrl']=TRPCEGUIURL
         print("trpce gui url is: {}".format(TRPCEGUIURL))
 
-#    sed -z 's/<script>[^<]*<\/script>/<script>\n    \/\/ run the application \n  require\(\[\"connectApp\",\"faultApp\",\"maintenanceApp\",\"configurationApp\",\"performanceHistoryApp\",\"inventoryApp\",\"eventLogApp\",\"mediatorApp\",\"networkMapApp\",\"linkCalculationApp\",\"helpApp\",\"run\"\], function \(connectApp,faultApp,maintenanceApp,configurationApp,performanceHistoryApp,inventoryApp,eventLogApp,mediatorApp,networkMapApp,linkCalculationApp,helpApp,run\) \{ \n run.configure('$ODLUX_CONFIG'); \n    connectApp.register\(\); \n  faultApp.register\(\);\n    maintenanceApp.register\(\); \n     configurationApp.register\(\);\n    performanceHistoryApp.register\(\); \n    inventoryApp.register\(\);\n    eventLogApp.register\(\);\n   mediatorApp.register\(\);\n   networkMapApp.register\(\);\n   linkCalculationApp.register\(\);\n     helpApp.register\(\);\n      run.runApplication();\n    \}\);\n  <\/script>/' -i /opt/bitnami/nginx/html/odlux/index.html 
     requireArg=""
     fnArgs=""
     appCalls=""
@@ -305,6 +304,8 @@ def update_nginx_site_conf():
     TILEURL=getEnv('TILEURL')
     DATAPROVIDERURL=getEnv('DATAPROVIDERURL')
     TERRAINURL=getEnv('TERRAINURL')
+    ELECTROMAGNETICFIELDURL=getEnv('ELECTROMAGNETICFIELDURL')
+    ELECTROMAGNETICFIELDBAUTHTOKEN=getEnv('ELECTROMAGNETICFIELDBAUTHTOKEN')
     # handle optional parameters
     if TRPCEURL is None:
         print("transportPCE forwarding disabled")
@@ -341,3 +342,10 @@ def update_nginx_site_conf():
         sedInFile('proxy_pass TERRAINURL/$1;','return 404;',FN)
     else:
         sedInFile('TERRAINURL',TERRAINURL ,FN)
+        
+    if ELECTROMAGNETICFIELDURL is None:
+        print("electromagnetic-field server forwarding disabled")
+        sedInFile('proxy_pass ELECTROMAGNETICFIELDURL/$1;','return 404;',FN)
+    else:
+        sedInFile('ELECTROMAGNETICFIELDURL',ELECTROMAGNETICFIELDURL ,FN)
+        sedInFile('ELECTROMAGNETICFIELDBAUTHTOKEN',ELECTROMAGNETICFIELDBAUTHTOKEN ,FN)       

diff --git a/installation/sdnc-web/src/main/scripts/run.sh b/installation/sdnc-web/src/main/scripts/run.sh
index 630a3e3..e8e492b 100644 (file)
--- a/installation/sdnc-web/src/main/scripts/run.sh
+++ b/installation/sdnc-web/src/main/scripts/run.sh
@@ -30,7 +30,7 @@ echo " WEBPORT                          : $WEBPORT"
 echo " SDNRPROTOCOL                     : $SDNRPROTOCOL"
 echo " SDNRHOST                         : $SDNRHOST"
 echo " SDNRPORT                         : $SDNRPORT"
-echo " SDNRWSPORT                       : $SDNRWEBSOCKETPORT"
+echo " SDNRWEBSOCKETPORT                : $SDNRWEBSOCKETPORT"
 echo " DNS_RESOLVER                     : $DNS_RESOLVER"
 echo " DNS_INTERNAL_RESOLVER            : $DNS_INTERNAL_RESOLVER"
 echo " TRPCEURL                         : $TRPCEURL"
@@ -38,6 +38,8 @@ echo " TRPCEGUIURL                      : $TRPCEGUIURL"
 echo " TOPOURL                          : $TOPOURL"
 echo " TILEURL                          : $TILEURL"
 echo " SITEDOCURL                       : $SITEDOCURL"
+echo " ELECTROMAGNETICFIELDURL          : $ELECTROMAGNETICFIELDURL"
+echo " ELECTROMAGNETICFIELDBAUTHTOKEN   : ${ELECTROMAGNETICFIELDBAUTHTOKEN:0:5}...${ELECTROMAGNETICFIELDBAUTHTOKEN: -5}"
 echo "======================="
 if [ "$WEBPROTOCOL" == "HTTPS" ]; then
   echo " SSL_CERT_DIR : $SSL_CERT_DIR"