diff options
| -rw-r--r-- | esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java | 3 | ||||
| -rw-r--r-- | esr-mgr/src/main/java/org/onap/aai/esr/ExtsysAppConfiguration.java | 14 | ||||
| -rw-r--r-- | standalone/src/main/assembly/conf/extsys.yml | 1 |
3 files changed, 17 insertions, 1 deletions
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 --- 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 --- a/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysAppConfiguration.java +++ b/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysAppConfiguration.java @@ -39,6 +39,9 @@ public class ExtsysAppConfiguration extends Configuration { private String msbPort; @NotEmpty + private String registByHand; + + @NotEmpty private String msbServerAddr; @Valid @@ -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 --- 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: |