X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fesr-server.git;a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2FExtsysApp.java;h=5b1f6cd4ec6d1dbab0dc4ef8c010e5e25b8a65ec;hp=43b29ad846167bd466d3d0c1d73cac1f09273b3f;hb=ed26992f976741031237ead3a5dc0565d4318b05;hpb=c3966c0f911b119e9493c4faa7b8eba2ecbc7457

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..5b1f6cd 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,50 +16,56 @@
 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;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import io.dropwizard.Application;
 import io.dropwizard.setup.Environment;
 
 public class ExtsysApp extends Application<ExtsysAppConfiguration> {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ExtsysApp.class);
-  
-  public static void main(String[] args) throws Exception {
-    new ExtsysApp().run(args);
-  }
+    private static final Logger LOGGER = LoggerFactory.getLogger(ExtsysApp.class);
+
+    public static void main(String[] args) throws Exception {
+        new ExtsysApp().run(args);
+    }
 
-  @Override
-  public String getName() {
-    return "ONAP-ESR";
-  }
+    @Override
+    public String getName() {
+        return "ONAP-ESR";
+    }
 
-  @Override
-  public void run(ExtsysAppConfiguration configuration, Environment environment) {
-    LOGGER.info("Start to initialize esr.");
-    environment.jersey().register(new EmsManager());
-    environment.jersey().register(new ThirdpatySdncManager());
-    environment.jersey().register(new VimManager());
-    environment.jersey().register(new VnfmManager());
-    
-//    String MSB_IP="127.0.0.1";
-      String MSB_IP=configuration.getMsbIp();
-      Integer MSB_Port= Integer.valueOf(configuration.getMsbPort());    
-      MSBServiceClient msbClient = new MSBServiceClient(MSB_IP, MSB_Port);
-      MsbHelper helper = new MsbHelper(msbClient);
-      try {
-        helper.registerMsb();
-      } catch (Exception e) {
-        LOGGER.error("Register esr-server to msb by java-sdk failed", e);
-      }
-    LOGGER.info("Initialize extsys finished.");
-  }
+    @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 ThirdpartySdncManager());
+        environment.jersey().register(new VimManager());
+        environment.jersey().register(new VnfmManager());
+        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);
+            }
+        }
+        LOGGER.info("Initialize extsys finished.");
+    }
 
 }