Code Review
/
sdnc
/
oam.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
fix sdnr ws port configs
[sdnc/oam.git]
/
installation
/
sdnc-web
/
src
/
main
/
scripts
/
core.py
diff --git
a/installation/sdnc-web/src/main/scripts/core.py
b/installation/sdnc-web/src/main/scripts/core.py
index
feb5734
..
6bdd4b5
100644
(file)
--- a/
installation/sdnc-web/src/main/scripts/core.py
+++ b/
installation/sdnc-web/src/main/scripts/core.py
@@
-76,14
+76,22
@@
def add_application(name, index, file=None):
def initial_load():
files = os.listdir(INIT_FOLDER)
regex = r"([0-9]+)([a-zA-Z]+)\.(jar|zip)"
def initial_load():
files = os.listdir(INIT_FOLDER)
regex = r"([0-9]+)([a-zA-Z]+)\.(jar|zip)"
+ regexUrl = r"([0-9]+)([a-zA-Z]+)\.(url)"
for file in files:
matches = re.finditer(regex,file)
match = next(matches, None)
for file in files:
matches = re.finditer(regex,file)
match = next(matches, None)
+ matchesUrl = re.finditer(regexUrl,file)
+ matchUrl = next(matchesUrl, None)
if match is not None:
print("installing {}".format(file))
index = int(match.group(1))
name = match.group(2)
add_application(name,index,INIT_FOLDER+'/'+file)
if match is not None:
print("installing {}".format(file))
index = int(match.group(1))
name = match.group(2)
add_application(name,index,INIT_FOLDER+'/'+file)
+ elif matchUrl is not None:
+ print("installing {}".format(file))
+ index = int(match.group(1))
+ name = match.group(2)
+ add_application(name,index,INIT_FOLDER+'/'+file)
else:
print("no index naming format found. try to autodetect")
infos = autoDetectInfosFromJar(file)
else:
print("no index naming format found. try to autodetect")
infos = autoDetectInfosFromJar(file)
@@
-269,8
+277,14
@@
def update_nginx_site_conf():
WEBPROTOCOL=getEnv('WEBPROTOCOL')
WEBPORT=getEnv('WEBPORT')
SDNRPROTOCOL=getEnv('SDNRPROTOCOL')
WEBPROTOCOL=getEnv('WEBPROTOCOL')
WEBPORT=getEnv('WEBPORT')
SDNRPROTOCOL=getEnv('SDNRPROTOCOL')
+ SDNCWEBHOST=getEnv('HOSTNAME')
SDNRHOST=getEnv('SDNRHOST')
SDNRHOST=getEnv('SDNRHOST')
+ if SDNRHOST == "sdnc.onap":
+ # Request is from K8s
+ SDNCWEBHOSTINDEX=SDNCWEBHOST[SDNCWEBHOST.rindex("-")+1:]
+ SDNRHOST = "sdnc-" + SDNCWEBHOSTINDEX + ".onap"
SDNRPORT=getEnv('SDNRPORT')
SDNRPORT=getEnv('SDNRPORT')
+ SDNRWEBSOCKETPORT=getEnv('SDNRWEBSOCKETPORT',SDNRPORT)
DNS_RESOLVER=getEnv('DNS_RESOLVER')
DNS_INTERNAL_RESOLVER=getEnv('DNS_INTERNAL_RESOLVER')
if FN is None:
DNS_RESOLVER=getEnv('DNS_RESOLVER')
DNS_INTERNAL_RESOLVER=getEnv('DNS_INTERNAL_RESOLVER')
if FN is None:
@@
-286,6
+300,7
@@
def update_nginx_site_conf():
sedInFile('SDNRPROTOCOL',SDNRPROTOCOL,FN)
sedInFile('SDNRHOST',SDNRHOST ,FN)
sedInFile('SDNRPORT',SDNRPORT,FN)
sedInFile('SDNRPROTOCOL',SDNRPROTOCOL,FN)
sedInFile('SDNRHOST',SDNRHOST ,FN)
sedInFile('SDNRPORT',SDNRPORT,FN)
+ sedInFile('SDNRWEBSOCKETPORT',SDNRWEBSOCKETPORT, FN)
sedInFile('DNS_RESOLVER',DNS_RESOLVER ,FN)
sedInFile('DNS_INTERNAL_RESOLVER',DNS_INTERNAL_RESOLVER ,FN)
sedInFile('DNS_RESOLVER',DNS_RESOLVER ,FN)
sedInFile('DNS_INTERNAL_RESOLVER',DNS_INTERNAL_RESOLVER ,FN)