summaryrefslogtreecommitdiffstats
path: root/adapter/acumos/aoconversion
diff options
context:
space:
mode:
authorVijay Venkatesh Kumar <vv770d@att.com>2020-03-20 17:30:51 +0000
committerGerrit Code Review <gerrit@onap.org>2020-03-20 17:30:51 +0000
commitbcccdb62fe0dd1f7d9fb356363ef8889ebfdf5e8 (patch)
tree83cff89b2cebcbcd52a53901a2a4816ec5dfcf3a /adapter/acumos/aoconversion
parent27507bb81f6bcfc66fd88d23b7b44ec2deffb027 (diff)
parent2d1528b34c45a650e2407bbc90737cc4ca6ec042 (diff)
Merge "Link DCAE MOD design tool to Acumos Adapter"
Diffstat (limited to 'adapter/acumos/aoconversion')
-rw-r--r--adapter/acumos/aoconversion/index.html8
-rw-r--r--adapter/acumos/aoconversion/scanner.py10
2 files changed, 9 insertions, 9 deletions
diff --git a/adapter/acumos/aoconversion/index.html b/adapter/acumos/aoconversion/index.html
index c94621a..31f2372 100644
--- a/adapter/acumos/aoconversion/index.html
+++ b/adapter/acumos/aoconversion/index.html
@@ -156,7 +156,7 @@ function esc(s) {
function onBoard() {
fcomp("onboardingInProgress").style.display = "block";
- var url = "/onboard.js?acumos=" + uecvalue("furl");
+ var url = "/acumos-adapter/onboard.js?acumos=" + uecvalue("furl");
if (cvalue("catMenu") != "*") {
url += "&catalogId=" + uecvalue("catMenu");
if (cvalue("solMenu") != "*") {
@@ -178,19 +178,19 @@ function chooseSolution() {
if (cvalue("solMenu") == "*") {
updatevis();
} else {
- lookupItem("acRevs", "revMenu", "/listRevisions.js?acumos=" + uecvalue("furl") + "&solutionId=" + uecvalue("solMenu"));
+ lookupItem("acRevs", "revMenu", "/acumos-adapter/listRevisions.js?acumos=" + uecvalue("furl") + "&solutionId=" + uecvalue("solMenu"));
}
}
function chooseCatalog() {
if (cvalue("catMenu") == "*") {
updatevis();
} else {
- lookupItem("acSols", "solMenu", "/listSolutions.js?acumos=" + uecvalue("furl") + "&catalogId=" + uecvalue("catMenu"));
+ lookupItem("acSols", "solMenu", "/acumos-adapter/listSolutions.js?acumos=" + uecvalue("furl") + "&catalogId=" + uecvalue("catMenu"));
}
}
function lookupCatalogs() {
fcomp("onboard").style.display = "block";
- lookupItem("cAcumos", "catMenu", "/listCatalogs.js?acumos=" + uecvalue("furl"));
+ lookupItem("cAcumos", "catMenu", "/acumos-adapter/listCatalogs.js?acumos=" + uecvalue("furl"));
}
function lookupItem(dblock, smenu, url) {
fcomp(dblock).style.display = "block";
diff --git a/adapter/acumos/aoconversion/scanner.py b/adapter/acumos/aoconversion/scanner.py
index 22a5922..41f18de 100644
--- a/adapter/acumos/aoconversion/scanner.py
+++ b/adapter/acumos/aoconversion/scanner.py
@@ -251,23 +251,23 @@ class Apihandler(BaseHTTPRequestHandler):
def do_GET(self):
self.doqp()
- if self.path == '/' or self.path == '/index.html':
+ if self.path == '/' or self.path == '/index.html' or self.path == '/acumos-adapter/' or self.path == '/acumos-adapter/index.html':
self.replyraw(self.server.index, 'text/html')
return
if 'acumos' not in self.qparams:
self.send_error(400)
return
aa = _AcumosAccess(self.server.config, self.qparams['acumos'])
- if self.path == '/listCatalogs.js':
+ if self.path == '/acumos-adapter/listCatalogs.js':
self.replyjson([{'name': x['name'], 'id': x['catalogId']} for x in aa.jsonget('/catalogs')])
return
- if self.path == '/listSolutions.js':
+ if self.path == '/acumos-adapter/listSolutions.js':
if 'catalogId' not in self.qparams:
self.send_error(400)
return
self.replyjson([{'name': x['name'], 'id': x['solutionId']} for x in aa.jsonget('/solutions?catalogId={}', self.qparams['catalogId'])])
return
- if self.path == '/listRevisions.js':
+ if self.path == '/acumos-adapter/listRevisions.js':
if 'solutionId' not in self.qparams:
self.send_error(400)
return
@@ -277,7 +277,7 @@ class Apihandler(BaseHTTPRequestHandler):
def do_POST(self):
self.doqp()
- if self.path == '/onboard.js':
+ if self.path == '/acumos-adapter/onboard.js':
if 'acumos' not in self.qparams:
self.send_error(400)
return