Distributing Blueprint to DCAE Dashboard Issue-ID: DCAEGEN2-2385>

[dcaegen2/platform.git] / mod2 / catalog-service / src / main / java / org / onap / dcaegen2 / platform / mod / util / PolicyModelUtils.java

diff --git a/mod2/catalog-service/src/main/java/org/onap/dcaegen2/platform/mod/util/PolicyModelUtils.java b/mod2/catalog-service/src/main/java/org/onap/dcaegen2/platform/mod/util/PolicyModelUtils.java
index 8d7b643..347e66b 100644 (file)
--- a/mod2/catalog-service/src/main/java/org/onap/dcaegen2/platform/mod/util/PolicyModelUtils.java
+++ b/mod2/catalog-service/src/main/java/org/onap/dcaegen2/platform/mod/util/PolicyModelUtils.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  *  org.onap.dcae
  *  ================================================================================
- *  Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
+ *  Copyright (c) 2020-2021 AT&T Intellectual Property. All rights reserved.
  *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@ import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
 import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
 import org.onap.dcaegen2.platform.mod.model.exceptions.policymodel.PolicyModelDistributionEnvNotFoundException;
+import org.onap.dcaegen2.platform.mod.model.policymodel.EnvInfo;
 import org.onap.dcaegen2.platform.mod.model.policymodel.PolicyModelDistributionEnv;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
@@ -45,82 +46,69 @@ import java.util.Map;
 @Component
 public class PolicyModelUtils {
 
-    @Value("${url.path}")
+    @Value("${policymodel.url.path}")
     private String urlpath;
 
-    @Value("${dev.server}")
+    @Value("${policymodel.dev.server}")
     private String devServer;
 
-    @Value("${dev.port}")
+    @Value("${policymodel.dev.port}")
     private String devServerPort;
 
-    @Value("${dev.user}")
+    @Value("${policymodel.dev.user}")
     private String devServerUser;
 
-    @Value("${dev.password}")
+    @Value("${policymodel.dev.password}")
     private String devServerUserPassword;
 
-    @Value("${pst.server}")
+    @Value("${policymodel.pst.server}")
     private String pstServer;
 
-    @Value("${pst.port}")
+    @Value("${policymodel.pst.port}")
     private String pstServerPort;
 
-    @Value("${pst.user}")
+    @Value("${policymodel.pst.user}")
     private String pstServerUser;
 
-    @Value("${pst.password}")
+    @Value("${policymodel.pst.password}")
     private String pstServerUserPassword;
 
-    @Value("${ete.server}")
+    @Value("${policymodel.ete.server}")
     private String eteServer;
 
-    @Value("${ete.port}")
+    @Value("${policymodel.ete.port}")
     private String eteServerPort;
 
-    @Value("${ete.user}")
+    @Value("${policymodel.ete.user}")
     private String eteServerUser;
 
-    @Value("${ete.password}")
+    @Value("${policymodel.ete.password}")
     private String eteServerUserPassword;
 
-    @Value("${prod.server}")
+    @Value("${policymodel.prod.server}")
     private String prodServer;
 
-    @Value("${prod.port}")
+    @Value("${policymodel.prod.port}")
     private String prodServerPort;
 
-    @Value("${prod.user}")
+    @Value("${policymodel.prod.user}")
     private String prodServerUser;
 
-    @Value("${prod.password}")
+    @Value("${policymodel.prod.password}")
     private String prodServerUserPassword;
 
-    Map<String, String> envToUrlMap,envToUserNameMap,envToPasswordMap;
+    Map<String, EnvInfo> envMap;
 
     /**
      * Creates a Policy Model Distribution Engine URL for the Environment requested
      */
     @PostConstruct
     public void init() {
-        envToUrlMap = new HashMap<>();
-        envToUserNameMap = new HashMap();
-        envToPasswordMap = new HashMap();
-
-        envToUrlMap.put(PolicyModelDistributionEnv.DEV.name(), "https://"+ devServer + ":" + devServerPort + urlpath);
-        envToUrlMap.put(PolicyModelDistributionEnv.PST.name(), "https://"+ pstServer + ":" + pstServerPort + urlpath);
-        envToUrlMap.put(PolicyModelDistributionEnv.ETE.name(), "https://"+ eteServer + ":" + eteServerPort + urlpath);
-        envToUrlMap.put(PolicyModelDistributionEnv.PROD.name(), "https://"+ prodServer + ":" + prodServerPort + urlpath);
-
-        envToUserNameMap.put(PolicyModelDistributionEnv.DEV.name(), devServerUser);
-        envToUserNameMap.put(PolicyModelDistributionEnv.PST.name(), pstServerUser);
-        envToUserNameMap.put(PolicyModelDistributionEnv.ETE.name(), eteServerUser);
-        envToUserNameMap.put(PolicyModelDistributionEnv.PROD.name(), prodServerUser);
-
-        envToPasswordMap.put(PolicyModelDistributionEnv.DEV.name(), devServerUserPassword);
-        envToPasswordMap.put(PolicyModelDistributionEnv.PST.name(), pstServerUserPassword);
-        envToPasswordMap.put(PolicyModelDistributionEnv.ETE.name(), eteServerUserPassword);
-        envToPasswordMap.put(PolicyModelDistributionEnv.PROD.name(), prodServerUserPassword);
+        envMap = new HashMap<>();
+        envMap.put(PolicyModelDistributionEnv.DEV.name(), EnvInfo.builder().url("https://"+ devServer + ":" + devServerPort + urlpath).username(devServerUser).password(devServerUserPassword).build());
+        envMap.put(PolicyModelDistributionEnv.PST.name(), EnvInfo.builder().url("https://"+ pstServer + ":" + pstServerPort + urlpath).username(pstServerUser).password(pstServerUserPassword).build());
+        envMap.put(PolicyModelDistributionEnv.ETE.name(), EnvInfo.builder().url("https://"+ eteServer + ":" + eteServerPort + urlpath).username(eteServerUser).password(eteServerUserPassword).build());
+        envMap.put(PolicyModelDistributionEnv.PROD.name(), EnvInfo.builder().url("https://"+ prodServer + ":" + prodServerPort + urlpath).username(prodServerUser).password(prodServerUserPassword).build());
     }
 
     /**
@@ -130,8 +118,8 @@ public class PolicyModelUtils {
      * @return
      */
     public String getPolicyEngineURL(String env) {
-        if(!envToUrlMap.containsKey(env)) throw new PolicyModelDistributionEnvNotFoundException(String.format("Policy Model Environment with env %s invalid", env));
-        return envToUrlMap.get(env);
+        if(!envMap.containsKey(env)) throw new PolicyModelDistributionEnvNotFoundException(String.format("Policy Model Environment with env %s invalid", env));
+        return envMap.get(env).getUrl();
     }
 
 
@@ -144,8 +132,8 @@ public class PolicyModelUtils {
      */
 
     public String getUserName(String env) {
-        if(!envToUserNameMap.containsKey(env)) throw new PolicyModelDistributionEnvNotFoundException(String.format("Policy Model Environment with env %s invalid", env));
-        return envToUserNameMap.get(env);
+        if(!envMap.containsKey(env)) throw new PolicyModelDistributionEnvNotFoundException(String.format("Policy Model Environment with env %s invalid", env));
+        return envMap.get(env).getUsername();
     }
 
 
@@ -157,8 +145,8 @@ public class PolicyModelUtils {
      */
 
     public String getPassword(String env) {
-        if(!envToPasswordMap.containsKey(env)) throw new PolicyModelDistributionEnvNotFoundException(String.format("Policy Model Environment with env %s invalid", env));
-        return envToPasswordMap.get(env);
+        if(!envMap.containsKey(env)) throw new PolicyModelDistributionEnvNotFoundException(String.format("Policy Model Environment with env %s invalid", env));
+        return envMap.get(env).getPassword();
     }
 
     /**