summaryrefslogtreecommitdiffstats
path: root/integration
diff options
context:
space:
mode:
authorlizi <li.zi30@zte.com.cn>2017-09-27 17:13:54 +0800
committerlizi <li.zi30@zte.com.cn>2017-09-27 17:13:54 +0800
commitde14cd3aab39bd766241974b982b35ec67114058 (patch)
tree95ec27558b5d26d145997b9d7741a0b2de8ab550 /integration
parent53b32f46b94c7ff938159d6d18369d3f4f3a8f1f (diff)
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>
Diffstat (limited to 'integration')
-rw-r--r--integration/src/main/java/org/onap/aai/esr/bean/MsbRegisterBean.java24
-rw-r--r--integration/src/main/java/org/onap/aai/esr/bean/ServiceNodeBean.java4
-rw-r--r--integration/src/main/java/org/onap/aai/esr/system/CommonUtil.java4
-rw-r--r--integration/src/main/java/org/onap/aai/esr/system/Constants.java4
-rw-r--r--integration/src/main/java/org/onap/aai/esr/system/RegisterService.java5
-rw-r--r--integration/src/main/java/org/onap/aai/esr/system/SystemListener.java4
-rw-r--r--integration/src/main/resources/portalConfig/msb_register.xml11
7 files changed, 39 insertions, 17 deletions
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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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>