[master] AppAgent fix - linking WebApplications without service
Signed-off-by: Tamas Levente Kiss <tamas.levente.kiss@ericsson.com>
diff --git a/src/AppAgent.py b/src/AppAgent.py
index fc37ea9..4a06a4b 100644
--- a/src/AppAgent.py
+++ b/src/AppAgent.py
@@ -258,10 +258,6 @@
if os.path.isdir(appPath):
appName = 'Microservices.' + app
try:
- module = importlib.import_module(appName)
- # create the handler
- handler = module.createHandler(appPath)
- server.requestHandlers[module.EXTENSION] = handler
appWebAppDir = os.path.join(appPath, 'WebApplication')
appGuiDir = os.path.join(appPath, 'GUI')
# link webapp
@@ -282,6 +278,11 @@
logger.info('Linked GUI: ' + os.path.relpath(appGuiDir, customizationDirectory) + ' -> ' + linkFile)
else:
logger.warning('Linked GUI: ' + app + ' already exists')
+ # load service module
+ module = importlib.import_module(appName)
+ # create the handler
+ handler = module.createHandler(appPath)
+ server.requestHandlers[module.EXTENSION] = handler
# add DataSource handlers if they exist
if hasattr(handler, 'getDataSourceHandlers'):
dsRestApiHandlers.update(handler.getDataSourceHandlers())
diff --git a/src/Microservices/Authentication/userGroups.json b/src/Microservices/Authentication/userGroups.json
index f12670e..da8225d 100644
--- a/src/Microservices/Authentication/userGroups.json
+++ b/src/Microservices/Authentication/userGroups.json
@@ -1,16 +1,19 @@
{
"users": {
"admin": [
- "admin"
+ "admin",
+ "tsaas-user"
],
"ekistam": [
- "users"
+ "users",
+ "tsaas-user"
],
"ethjgi": [
"users"
],
"eistnav": [
- "users"
+ "users",
+ "tsaas-user"
],
"ednigbo": [
"users"
@@ -18,6 +21,7 @@
},
"groups": [
"admin",
- "users"
+ "users",
+ "tsaas-user"
]
}
\ No newline at end of file
