Fix the parameter name shows in portal.

Fix the parameter name shows in portal. Fix the msb register issue.

Change-Id: Idca08dd08fca84a6cec7709da70e167e2291812e
Issue-ID: AAI-392
Signed-off-by: lizi <li.zi30@zte.com.cn>

diff --git a/integration/src/main/java/org/onap/aai/esr/bean/MsbRegisterBean.java b/integration/src/main/java/org/onap/aai/esr/bean/MsbRegisterBean.java
index 3abf078..4d60b02 100644 (file)
--- a/integration/src/main/java/org/onap/aai/esr/bean/MsbRegisterBean.java
+++ b/integration/src/main/java/org/onap/aai/esr/bean/MsbRegisterBean.java
@@ -1,5 +1,5 @@
-/*
- * Copyright 2016-2017, CMCC Technologies Co., Ltd.
+/**
+ * Copyright 2017 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,14 @@ import java.util.List;
 public class MsbRegisterBean {
     private String serviceName = "";
 
+    private String version = "";
+
     private String lb_policy = "";
 
     private String url = "";
 
+    private String path = "";
+
     private String protocol = "";
 
     private String visualRange = "";
@@ -54,6 +58,14 @@ public class MsbRegisterBean {
         this.url = url;
     }
 
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
     public String getProtocol() {
         return protocol;
     }
@@ -77,4 +89,12 @@ public class MsbRegisterBean {
     public void setNodes(List<ServiceNodeBean> nodes) {
         this.nodes = nodes;
     }
+
+    public String getVersion() {
+      return version;
+    }
+
+    public void setVersion(String version) {
+      this.version = version;
+    }
 }

diff --git a/integration/src/main/java/org/onap/aai/esr/bean/ServiceNodeBean.java b/integration/src/main/java/org/onap/aai/esr/bean/ServiceNodeBean.java
index 9656796..ce056ca 100644 (file)
--- a/integration/src/main/java/org/onap/aai/esr/bean/ServiceNodeBean.java
+++ b/integration/src/main/java/org/onap/aai/esr/bean/ServiceNodeBean.java
@@ -1,5 +1,5 @@
-/*
- * Copyright 2016-2017, CMCC Technologies Co., Ltd.
+/**
+ * Copyright 2017 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/integration/src/main/java/org/onap/aai/esr/system/CommonUtil.java b/integration/src/main/java/org/onap/aai/esr/system/CommonUtil.java
index 6f0065b..2dd9315 100644 (file)
--- a/integration/src/main/java/org/onap/aai/esr/system/CommonUtil.java
+++ b/integration/src/main/java/org/onap/aai/esr/system/CommonUtil.java
@@ -1,5 +1,5 @@
-/*
- * Copyright 2016-2017, CMCC Technologies Co., Ltd.
+/**
+ * Copyright 2017 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/integration/src/main/java/org/onap/aai/esr/system/Constants.java b/integration/src/main/java/org/onap/aai/esr/system/Constants.java
index b94bd39..720c1f8 100644 (file)
--- a/integration/src/main/java/org/onap/aai/esr/system/Constants.java
+++ b/integration/src/main/java/org/onap/aai/esr/system/Constants.java
@@ -1,5 +1,5 @@
-/*
- * Copyright 2016-2017, CMCC Technologies Co., Ltd.
+/**
+ * Copyright 2017 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/integration/src/main/java/org/onap/aai/esr/system/RegisterService.java b/integration/src/main/java/org/onap/aai/esr/system/RegisterService.java
index 8042104..94d5c42 100644 (file)
--- a/integration/src/main/java/org/onap/aai/esr/system/RegisterService.java
+++ b/integration/src/main/java/org/onap/aai/esr/system/RegisterService.java
@@ -1,5 +1,5 @@
-/*
- * Copyright 2016-2017, CMCC Technologies Co., Ltd.
+/**
+ * Copyright 2017 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,6 +69,7 @@ public class RegisterService {
                 registerBean.setNodes(nodeList);
                 registerBean.setServiceName(registerInfo.get("serviceName"));
                 registerBean.setUrl(registerInfo.get("url"));
+                registerBean.setPath(registerInfo.get("path"));
                 registerBean.setProtocol(registerInfo.get("protocol"));
                 registerBean.setVisualRange(registerInfo.get("visualRange"));
                 registerBean.setLb_policy(registerInfo.get("lb_policy"));

diff --git a/integration/src/main/java/org/onap/aai/esr/system/SystemListener.java b/integration/src/main/java/org/onap/aai/esr/system/SystemListener.java
index 0161fcc..9bc220c 100644 (file)
--- a/integration/src/main/java/org/onap/aai/esr/system/SystemListener.java
+++ b/integration/src/main/java/org/onap/aai/esr/system/SystemListener.java
@@ -1,5 +1,5 @@
-/*
- * Copyright 2016-2017, CMCC Technologies Co., Ltd.
+/**
+ * Copyright 2017 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/integration/src/main/resources/portalConfig/msb_register.xml b/integration/src/main/resources/portalConfig/msb_register.xml
index bf2b914..3cb059f 100644 (file)
--- a/integration/src/main/resources/portalConfig/msb_register.xml
+++ b/integration/src/main/resources/portalConfig/msb_register.xml
@@ -16,16 +16,17 @@
 -->
 <msbRegister>
     <msbHost>
-        <hostIp>http://192.168.233.226</hostIp>
+        <hostIp>http://127.0.0.1</hostIp>
         <hostPort>80</hostPort>
-        <msbApiRootDomain>/onapapi/microservices/v1/services</msbApiRootDomain>
+        <msbApiRootDomain>/api/microservices/v1/services</msbApiRootDomain>
     </msbHost>
     <registerList>
         <registerInfo>
             <ip>127.0.0.1</ip>
-            <port>9150</port>
-            <url>/esrui/esr</url>
-            <serviceName>esr</serviceName>
+            <port>9519</port>
+            <url>/esr-gui</url>
+            <path>/iui/aai-esr-gui</path>
+            <serviceName>aai-esr-gui</serviceName>
             <protocol>UI</protocol>
             <visualRange>1</visualRange>
             <lb_policy>hash</lb_policy>

diff --git a/portal/src/main/webapp/extsys/ems/emsView.html b/portal/src/main/webapp/extsys/ems/emsView.html
index 7cf0176..368f643 100644 (file)
--- a/portal/src/main/webapp/extsys/ems/emsView.html
+++ b/portal/src/main/webapp/extsys/ems/emsView.html
@@ -78,7 +78,7 @@
                                 </div>
                                 <div class="form-group">
                                     <label class="control-label col-sm-3">
-                                        <span>Ftptype</span>
+                                        <span>Ftp Type</span>
                                         <span class="required" aria-required="true">*</span>
                                     </label>
                                     <div class="col-sm-7">
@@ -130,7 +130,7 @@
                                 </div>
                                 <div class="form-group">
                                     <label class="control-label col-sm-3">
-                                        <span>Remotepath</span>
+                                        <span>Remote Path</span>
                                     </label>
                                     <div class="col-sm-7">
                                     <input class="form-control" rows="3" ms-duplex="currentElement.resourceAddr.remotepath" name="remotepath"/>
@@ -153,7 +153,7 @@
                             <form class="form-horizontal" id="form_performanceAddr" role="form" hidden>
                                 <div class="form-group">
                                     <label class="control-label col-sm-3">
-                                        <span>Ftptype</span>
+                                        <span>Ftp Type</span>
                                         <span class="required" aria-required="true">*</span>
                                     </label>
                                     <div class="col-sm-7">
@@ -205,7 +205,7 @@
                                 </div>
                                 <div class="form-group">
                                     <label class="control-label col-sm-3">
-                                        <span>Remotepath</span>
+                                        <span>Remote Path</span>
                                     </label>
                                     <div class="col-sm-7">
                                     <input class="form-control" rows="3" ms-duplex="currentElement.performanceAddr.remotepath" name="remotepath"/>

diff --git a/portal/src/main/webapp/extsys/sdncontroller/sdncView.html b/portal/src/main/webapp/extsys/sdncontroller/sdncView.html
index f9f909d..05a3e4f 100644 (file)
--- a/portal/src/main/webapp/extsys/sdncontroller/sdncView.html
+++ b/portal/src/main/webapp/extsys/sdncontroller/sdncView.html
@@ -109,7 +109,7 @@
                                 </div>
                                 <div class="form-group">
                                     <label class="control-label col-sm-3">
-                                        <span>ProductName</span>
+                                        <span>Product Name</span>
                                     </label>
                                     <div class="col-sm-7">
                                          <input class="form-control" ms-duplex="currentElement.productName" name="productName"/>
@@ -129,7 +129,7 @@
                                 </div>
                                 <div class="form-group" ms-if="'DC' == currentElement.type" id="sdncLocation">
                                     <label class="control-label col-sm-3">
-                                        <span>location</span>
+                                        <span>Location</span>
                                     </label>
                                     <div class="col-sm-7">
                                         <input class="form-control" ms-duplex="currentElement.location" name="location"/>

diff --git a/portal/src/main/webapp/extsys/vim/vimView.html b/portal/src/main/webapp/extsys/vim/vimView.html
index 923ddf7..b4279a3 100644 (file)
--- a/portal/src/main/webapp/extsys/vim/vimView.html
+++ b/portal/src/main/webapp/extsys/vim/vimView.html
@@ -52,17 +52,17 @@
                         <form class="form-horizontal" id="vim_form" role="form">
                             <div class="form-group">
                                 <label class="control-label col-sm-3">
-                                    <span>cloudOwner</span>
+                                    <span>Cloud Owner</span>
                                     <span class="required" aria-required="true">*</span>
                                 </label>
                                 <div class="col-sm-7">
-                                    <input type="text" ms-duplex="currentElement['cloudOwner']" name="cloudOwner" class="form-control"/>
+                                    <input type="text" ms-duplex="currentElement['cloudOwner']" name="Cloud Owner" class="form-control"/>
                                     <span class="help-block"></span>
                                 </div>
                             </div>
                             <div class="form-group">
                                 <label class="control-label col-sm-3">
-                                    <span>cloudRegionId</span>
+                                    <span>Cloud Region Id</span>
                                     <span class="required" aria-required="true">*</span>
                                 </label>
                                 <div class="col-sm-7">
@@ -72,7 +72,7 @@
                             </div>
                             <div class="form-group">
                                 <label class="control-label col-sm-3">
-                                    <span>cloudType</span>
+                                    <span>Cloud Type</span>
                                     <span class="required" aria-required="true">*</span>
                                 </label>
                                 <div class="col-sm-7">
@@ -85,7 +85,7 @@
                             </div>
                             <div class="form-group">
                                 <label class="control-label col-sm-3">
-                                    <span>cloudRegionVersion</span>
+                                    <span>Cloud Region Version</span>
                                     <span class="required" aria-required="true">*</span>
                                 </label>
                                 <div class="col-sm-7">
@@ -96,7 +96,7 @@
                             </div>
                             <div class="form-group">
                                 <label class="control-label col-sm-3">
-                                    <span>ownerDefinedType</span>
+                                    <span>Owner Defined Type</span>
                                     <span class="required" aria-required="true">*</span>
                                 </label>
                                 <div class="col-sm-7">
@@ -106,7 +106,7 @@
                             </div>
                             <div class="form-group">
                                 <label class="control-label col-sm-3">
-                                    <span>cloudZone</span>
+                                    <span>Cloud Zone</span>
                                     <span class="required" aria-required="true">*</span>
                                 </label>
                                 <div class="col-sm-7">
@@ -116,7 +116,7 @@
                             </div>
                             <div class="form-group">
                                 <label class="control-label col-sm-3">
-                                    <span>complexName</span>
+                                    <span>Complex Name</span>
                                     <span class="required" aria-required="true">*</span>
                                 </label>
                                 <div class="col-sm-7">
@@ -126,7 +126,7 @@
                             </div>
                             <div class="form-group">
                                 <label class="control-label col-sm-3">
-                                    <span>cloudExtraInfo</span>
+                                    <span>Cloud Extra Info</span>
                                     <span class="required" aria-required="true">*</span>
                                 </label>
                                 <div class="col-sm-7">
@@ -155,7 +155,7 @@
                             </div>                           
                             <div class="form-group">
                                 <label class="control-label col-sm-3">
-                                    <span>authUrl</span>
+                                    <span>Auth Url</span>
                                 </label>
                                 <div class="col-sm-7">
                                     <input type="text" ms-duplex="currentElement['vimAuthInfos'][0]['authUrl']" name="authUrl" class="form-control"/>
@@ -173,7 +173,7 @@
                             </div>
                             <div class="form-group">
                                 <label class="control-label col-sm-3">
-                                    <span>sslInsecure</span>
+                                    <span>ssl Insecure</span>
                                 </label>
                                 <div class="col-sm-7">
                                     <select ms-duplex="currentElement['vimAuthInfos'][0]['sslInsecure']" name="sslInsecure" class="form-control">
@@ -184,7 +184,7 @@
                             </div>
                             <div class="form-group">
                                 <label class="control-label col-sm-3">
-                                    <span>cloudDomain</span>
+                                    <span>Cloud Domain</span>
                                 </label>
                                 <div class="col-sm-7">
                                     <input type="text" ms-duplex="currentElement['vimAuthInfos'][0]['cloudDomain']" name="cloudDomain" class="form-control"/>