From de14cd3aab39bd766241974b982b35ec67114058 Mon Sep 17 00:00:00 2001 From: lizi Date: Wed, 27 Sep 2017 17:13:54 +0800 Subject: 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 --- .../org/onap/aai/esr/bean/MsbRegisterBean.java | 24 ++++++++++++++++++++-- .../org/onap/aai/esr/bean/ServiceNodeBean.java | 4 ++-- .../java/org/onap/aai/esr/system/CommonUtil.java | 4 ++-- .../java/org/onap/aai/esr/system/Constants.java | 4 ++-- .../org/onap/aai/esr/system/RegisterService.java | 5 +++-- .../org/onap/aai/esr/system/SystemListener.java | 4 ++-- .../main/resources/portalConfig/msb_register.xml | 11 +++++----- 7 files changed, 39 insertions(+), 17 deletions(-) (limited to 'integration') 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 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 @@ --> - http://192.168.233.226 + http://127.0.0.1 80 - /onapapi/microservices/v1/services + /api/microservices/v1/services 127.0.0.1 - 9150 - /esrui/esr - esr + 9519 + /esr-gui + /iui/aai-esr-gui + aai-esr-gui UI 1 hash -- cgit 1.2.3-korg