X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=esr-core%2Fesr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2FExtsysAppConfiguration.java;h=862c6a58739b3e681403733e99296992b97340ea;hb=efaaa2f9abb12a7154b139ef7c160c7c5d0852a8;hp=5e3bdf6a065dd80a7a870e9402ebd11079a55f8a;hpb=1d3d273283587b17768437ece873617254e52d51;p=aai%2Fesr-server.git

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
--- 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() {