Fix the bug about register MSB.

When register service to MSB, esr-server still will register to MSB automaticly

Change-Id: I69769906e87e6b8c9658b05de60af45ed2b47e82
Issue-ID: AAI-738
Signed-off-by: Lizi <li.zi30@zte.com.cn>

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java b/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java
index db44504..10d8a9f 100644 (file)
--- a/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java
@@ -59,7 +59,7 @@ public class ExtsysApp extends Application<ExtsysAppConfiguration> {
         environment.jersey().register(new VnfmManager());
         environment.jersey().register(new ServiceTest());
         initSwaggerConfig(environment, configuration);
         environment.jersey().register(new VnfmManager());
         environment.jersey().register(new ServiceTest());
         initSwaggerConfig(environment, configuration);

-        if ("true".equals(configuration.getRegistByHand())) {
+        if ("false".equals(configuration.getRegistByHand())) {

             String MSB_IP = configuration.getMsbDiscoveryIp();
             Integer MSB_Port = Integer.valueOf(configuration.getMsbDiscoveryPort());
             MSBServiceClient msbClient = new MSBServiceClient(MSB_IP, MSB_Port);
             String MSB_IP = configuration.getMsbDiscoveryIp();
             Integer MSB_Port = Integer.valueOf(configuration.getMsbDiscoveryPort());
             MSBServiceClient msbClient = new MSBServiceClient(MSB_IP, MSB_Port);

diff --git a/standalone/src/main/assembly/conf/extsys.yml b/standalone/src/main/assembly/conf/extsys.yml
index af28302..41faea9 100644 (file)
--- a/standalone/src/main/assembly/conf/extsys.yml
+++ b/standalone/src/main/assembly/conf/extsys.yml
@@ -19,9 +19,9 @@ template: Hello, %s!
 #defaultName: ${DW_DEFAULT_NAME:-Stranger}
 # the micro service ip
 serviceIp: 127.0.0.1
 #defaultName: ${DW_DEFAULT_NAME:-Stranger}
 # the micro service ip
 serviceIp: 127.0.0.1

-msbDiscoveryIp: 10.74.148.80
+msbDiscoveryIp: 127.0.0.1

 msbDiscoveryPort: 10081
 msbDiscoveryPort: 10081

-msbServerAddr: http://10.74.148.80:80
+msbServerAddr: http://127.0.0.1:80

 registByHand: true
 
 # use the simple server factory if you only want to run on a single port
 registByHand: true
 
 # use the simple server factory if you only want to run on a single port