1 files changed, 28 insertions, 1 deletions
diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdnc/SdncConfiguration.java b/src/main/java/org/onap/pomba/contextbuilder/sdnc/SdncConfiguration.java
index bc2ca64..7317143 100644
--- a/src/main/java/org/onap/pomba/contextbuilder/sdnc/SdncConfiguration.java
+++ b/src/main/java/org/onap/pomba/contextbuilder/sdnc/SdncConfiguration.java
@@ -22,8 +22,10 @@ import java.util.Base64;
 import javax.ws.rs.ApplicationPath;
 import org.eclipse.jetty.util.security.Password;
 import org.onap.aai.restclient.client.RestClient;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -72,6 +74,18 @@ public class SdncConfiguration {
     @Value("${aai.httpProtocol}")
     private String aaiHttpProtocol;
 
+    @Value("${aai.authentication}")
+    private String authenticationMode;
+
+    @Value("${aai.trustStorePath}")
+    private String trustStorePath;
+
+    @Value("${aai.keyStorePath}")
+    private String keyStorePath;
+
+    @Value("${aai.keyStorePassword}")
+    private String keyStorePassword;
+
     @Value("${aai.connectionTimeout}")
     private Integer aaiConnectionTimeout;
 
@@ -131,8 +145,9 @@ public class SdncConfiguration {
         return (BASIC + encodedAuth);
     }
 
+    @Conditional(AAIBasicAuthCondition.class)
     @Bean(name="aaiClient")
-    public RestClient restClient() {
+    public RestClient restClientWithBasicAuth() {
         RestClient restClient = new RestClient();
         restClient.validateServerHostname(false).validateServerCertChain(false).connectTimeoutMs(aaiConnectionTimeout).readTimeoutMs(aaiReadTimeout);
         restClient.basicAuthUsername(aaiUsername);
@@ -140,6 +155,18 @@ public class SdncConfiguration {
         return restClient;
     }
 
+    @Conditional(AAIClientCertCondition.class)
+    @Bean(name="aaiClient")
+    public RestClient restClientWithClientCert() {
+        RestClient restClient = new RestClient();
+        System.out.println("in client cert");
+        if (httpProtocol.equals("https"))
+            restClient.validateServerHostname(false).validateServerCertChain(false).trustStore(trustStorePath).clientCertFile(keyStorePath).clientCertPassword(keyStorePassword).connectTimeoutMs(connectionTimeout).readTimeoutMs(readTimeout);
+        else
+            restClient.validateServerHostname(false).validateServerCertChain(false).connectTimeoutMs(connectionTimeout).readTimeoutMs(readTimeout);
+        return restClient;
+    }
+
     @Bean(name="aaiBaseUrl")
     public String getAaiURL() {
         return httpProtocol + "://" + aaiHost + ":" + aaiPort;