diff options
| -rw-r--r-- | openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js | 19 | ||||
| -rw-r--r-- | openo-portal/portal-package/src/main/resources/portalConfig/msb_register.xml | 16 |
2 files changed, 20 insertions, 15 deletions
diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js index 9105d5d6..de016e6e 100644 --- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js +++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js @@ -195,6 +195,7 @@ function fetchGsoNestingTemplateParameters(templateId) { return; } var inputs = serviceTemplate.inputs.map(function(input) { + input.showName = input.name; input.name = nodeTemplate.type + '.' + input.name; return input; }); @@ -207,13 +208,15 @@ function fetchGsoNestingTemplateParameters(templateId) { name: nodeTemplate.type + '.location', type: 'location', description: nodeTemplate.name + ' Location', - required: 'true' + required: 'true', + showName: nodeTemplate.name + ' Location' }); inputs.push({ name: nodeTemplate.type + '.sdncontroller', type: 'sdncontroller', description: nodeTemplate.name + ' SDN Controller', - required: 'true' + required: 'true', + showName: nodeTemplate.name + ' SDN Controller' }); } nodeAggregatation.notify(inputs); @@ -297,13 +300,15 @@ function fetchNfvoTemplateInputParameters(templateId) { name: 'location', type: 'location', description: 'Location', - required: 'true' + required: 'true', + showName: 'Location' }); inputParas.push({ name: 'sdncontroller', type: 'sdncontroller', description: 'SDN Controller', - required: 'true' + required: 'true', + showName: 'SDN Controller' }); templateParameters = translateToTemplateParameters(inputParas, vims, sdnControllers); defer.resolve(templateParameters); @@ -387,7 +392,7 @@ function transformToComponents(templateParas) { function generateComboxComponent(inputPara, items) { var component = '<div class="form-group" style="margin-left:25px;margin-bottom:15px;">' + '<label class="col-sm-3 control-label">' + - '<span>'+ inputPara.name +'</span>' + + '<span>'+ inputPara.showName +'</span>' + '<span class="required">*</span>' + '</label>' + '<div class="col-sm-7">' + @@ -411,11 +416,11 @@ function transformToOptions(items) { function generateComponent(inputPara) { var component = '<div class="mT15 form-group" style="margin-left:25px;">' + '<label class="col-sm-3 control-label">' + - '<span>' + inputPara.name + '</span>' + generateRequiredLabel(inputPara) + + '<span>' + inputPara.showName + '</span>' + generateRequiredLabel(inputPara) + '</label>' + '<div class="col-sm-7">' + '<input type="text" id="' + inputPara.id + '" name="parameter description" class="form-control" placeholder="' + - inputPara.name + '" value="' + inputPara.value + '" />' + + inputPara.showName + '" value="' + inputPara.value + '" />' + '</div></div>'; return component; } diff --git a/openo-portal/portal-package/src/main/resources/portalConfig/msb_register.xml b/openo-portal/portal-package/src/main/resources/portalConfig/msb_register.xml index b0a94acd..ad16c1e6 100644 --- a/openo-portal/portal-package/src/main/resources/portalConfig/msb_register.xml +++ b/openo-portal/portal-package/src/main/resources/portalConfig/msb_register.xml @@ -24,7 +24,7 @@ <registerInfo> <ip>127.0.0.1</ip> <port>8300</port> - <url>/openo-portal/common</url> + <url>/openoui/common</url> <serviceName>common</serviceName> <protocol>UI</protocol> <visualRange>1</visualRange> @@ -34,7 +34,7 @@ <registerInfo> <ip>127.0.0.1</ip> <port>8300</port> - <url>/openo-portal/catalog</url> + <url>/openoui/catalog</url> <serviceName>catalog</serviceName> <protocol>UI</protocol> <visualRange>1</visualRange> @@ -44,7 +44,7 @@ <registerInfo> <ip>127.0.0.1</ip> <port>8300</port> - <url>/openo-portal/extsys</url> + <url>/openoui/extsys</url> <serviceName>extsys</serviceName> <protocol>UI</protocol> <visualRange>1</visualRange> @@ -54,7 +54,7 @@ <registerInfo> <ip>127.0.0.1</ip> <port>8300</port> - <url>/openo-portal/performance</url> + <url>/openoui/performance</url> <serviceName>performance</serviceName> <protocol>UI</protocol> <visualRange>1</visualRange> @@ -64,7 +64,7 @@ <registerInfo> <ip>127.0.0.1</ip> <port>8300</port> - <url>/openo-portal/lifecyclemgr</url> + <url>/openoui/lifecyclemgr</url> <serviceName>lifecyclemgr</serviceName> <protocol>UI</protocol> <visualRange>1</visualRange> @@ -74,7 +74,7 @@ <registerInfo> <ip>127.0.0.1</ip> <port>8300</port> - <url>/openo-portal/resmgr-nfv</url> + <url>/openoui/resmgr-nfv</url> <serviceName>resmgr-nfv</serviceName> <protocol>UI</protocol> <visualRange>1</visualRange> @@ -84,7 +84,7 @@ <registerInfo> <ip>127.0.0.1</ip> <port>8300</port> - <url>/openo-portal/resmgr-sdn</url> + <url>/openoui/resmgr-sdn</url> <serviceName>resmgr-sdn</serviceName> <protocol>UI</protocol> <visualRange>1</visualRange> @@ -94,7 +94,7 @@ <registerInfo> <ip>127.0.0.1</ip> <port>8300</port> - <url>/openo-portal/user</url> + <url>/openoui/user</url> <serviceName>user</serviceName> <protocol>UI</protocol> <visualRange>1</visualRange> |