Register esr-server to MSB with java-sdk

[aai/esr-server.git] / esr-core / esr-mgr / src / main / java / org / onap / aai / esr / ExtsysAppConfiguration.java

diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysAppConfiguration.java b/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysAppConfiguration.java
index 5e3bdf6..862c6a5 100644 (file)
--- a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysAppConfiguration.java
+++ b/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysAppConfiguration.java
@@ -31,27 +31,20 @@ public class ExtsysAppConfiguration extends Configuration {
   private String template;
 
   @NotEmpty
-  private String defaultName = "OPENO-Extsys";
+  private String defaultName = "ONAP-A&AI-ESR";
 
+  @NotEmpty
+  private String msbIp;
+  
+  @NotEmpty
+  private int msbPort;
+  
   @NotEmpty
   private String msbServerAddr;
+  
   @Valid
   private String serviceIp;
-
-  @Valid
-  @NotNull
-  private DataSourceFactory database = new DataSourceFactory();
-
-  @JsonProperty("database")
-  public DataSourceFactory getDataSourceFactory() {
-    return database;
-  }
-
-  @JsonProperty("database")
-  public void setDataSourceFactory(DataSourceFactory dataSourceFactory) {
-    this.database = dataSourceFactory;
-  }
-
+  
   @JsonProperty
   public String getTemplate() {
     return template;
@@ -71,6 +64,26 @@ public class ExtsysAppConfiguration extends Configuration {
   public void setDefaultName(String name) {
     this.defaultName = name;
   }
+  
+  @JsonProperty
+  public String getMsbIp() {
+    return msbIp;
+  }
+  
+  @JsonProperty
+  public String setMsbIp() {
+    return msbIp;
+  }
+  
+  @JsonProperty
+  public int getMsbPort() {
+    return msbPort;
+  }
+  
+  @JsonProperty
+  public int setMsbPort() {
+    return msbPort;
+  }
 
   @JsonProperty
   public String getMsbServerAddr() {