Add a switch for register MSB with java-sdk.

register MSB with java-sdk is planB. usually, esr will be register to MSB by OOM.

Change-Id: I42fcc260334f0824a462be58bded034212b7a8b0
Issue-ID: AAI-275
Signed-off-by: lizi00164331 <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 43b29ad..ae8797b 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
@@ -49,7 +49,7 @@ public class ExtsysApp extends Application<ExtsysAppConfiguration> {
     environment.jersey().register(new VimManager());
     environment.jersey().register(new VnfmManager());
     
-//    String MSB_IP="127.0.0.1";
+    if (configuration.getRegistByHand().endsWith("true")){
       String MSB_IP=configuration.getMsbIp();
       Integer MSB_Port= Integer.valueOf(configuration.getMsbPort());    
       MSBServiceClient msbClient = new MSBServiceClient(MSB_IP, MSB_Port);
@@ -59,6 +59,7 @@ public class ExtsysApp extends Application<ExtsysAppConfiguration> {
       } catch (Exception e) {
         LOGGER.error("Register esr-server to msb by java-sdk failed", e);
       }
+    }
     LOGGER.info("Initialize extsys finished.");
   }
 

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysAppConfiguration.java b/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysAppConfiguration.java
index 9823ddc..111199b 100644 (file)
--- a/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysAppConfiguration.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysAppConfiguration.java
@@ -38,6 +38,9 @@ public class ExtsysAppConfiguration extends Configuration {
   @NotEmpty
   private String msbPort;
   
+  @NotEmpty
+  private String registByHand;
+  
   @NotEmpty
   private String msbServerAddr;
   
@@ -92,6 +95,17 @@ public class ExtsysAppConfiguration extends Configuration {
   public void setServiceIp(String serviceIp) {
     this.serviceIp = serviceIp;
   }
+
+  @JsonProperty
+  public String getRegistByHand() {
+    return registByHand;
+  }
+
+  @JsonProperty
+  public void setRegistByHand(String registByHand) {
+    this.registByHand = registByHand;
+  }
+
   @JsonProperty
   public void setMsbPort(String msbPort) {
     this.msbPort = msbPort;

diff --git a/standalone/src/main/assembly/conf/extsys.yml b/standalone/src/main/assembly/conf/extsys.yml
index 926bd33..9059e2a 100644 (file)
--- a/standalone/src/main/assembly/conf/extsys.yml
+++ b/standalone/src/main/assembly/conf/extsys.yml
@@ -22,6 +22,7 @@ serviceIp:
 msbIp: 127.0.0.1
 msbPort: 10081
 msbServerAddr: http://127.0.0.1:80
+registByHand: false
 
 # use the simple server factory if you only want to run on a single port
 #server: