X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2FExtsysApp.java;h=e1db10825ce144d066c548e91e99cd1b79c1e67d;hb=769718b3e8b4e659299602701b575cf1b4b182c5;hp=ae8797bfe5d4a48c1794b19e2d155b2034beaa00;hpb=f73f885c344834bef7ea2bb77ce40659eb0dd45c;p=aai%2Fesr-server.git

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 ae8797b..e1db108 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java
@@ -16,9 +16,11 @@
 package org.onap.aai.esr;
 
 
+import org.onap.aai.esr.common.MsbConfig;
 import org.onap.aai.esr.externalservice.msb.MsbHelper;
 import org.onap.aai.esr.resource.EmsManager;
-import org.onap.aai.esr.resource.ThirdpatySdncManager;
+import org.onap.aai.esr.resource.ServiceTest;
+import org.onap.aai.esr.resource.ThirdpartySdncManager;
 import org.onap.aai.esr.resource.VimManager;
 import org.onap.aai.esr.resource.VnfmManager;
 import org.onap.msb.sdk.httpclient.msb.MSBServiceClient;
@@ -44,18 +46,22 @@ public class ExtsysApp extends Application<ExtsysAppConfiguration> {
   @Override
   public void run(ExtsysAppConfiguration configuration, Environment environment) {
     LOGGER.info("Start to initialize esr.");
+    MsbConfig.setMsbServerAddr(configuration.getMsbServerAddr());
+    MsbConfig.setMsbDiscoveryIp(configuration.getMsbDiscoveryIp());
+    MsbConfig.setMsbDiscoveryPort(configuration.getMsbDiscoveryPort());
     environment.jersey().register(new EmsManager());
-    environment.jersey().register(new ThirdpatySdncManager());
+    environment.jersey().register(new ThirdpartySdncManager());
     environment.jersey().register(new VimManager());
     environment.jersey().register(new VnfmManager());
-    
-    if (configuration.getRegistByHand().endsWith("true")){
-      String MSB_IP=configuration.getMsbIp();
-      Integer MSB_Port= Integer.valueOf(configuration.getMsbPort());    
+    environment.jersey().register(new ServiceTest());
+    if (configuration.getRegistByHand().equals("true")){
+      String MSB_IP=configuration.getMsbDiscoveryIp();
+      Integer MSB_Port= Integer.valueOf(configuration.getMsbDiscoveryPort());
       MSBServiceClient msbClient = new MSBServiceClient(MSB_IP, MSB_Port);
       MsbHelper helper = new MsbHelper(msbClient);
       try {
         helper.registerMsb();
+        LOGGER.info("Register esr-server to msb by java-sdk finished");
       } catch (Exception e) {
         LOGGER.error("Register esr-server to msb by java-sdk failed", e);
       }