X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fclients%2FA1ClientFactory.java;h=dba6c91232da7a4da3d3c0b27d502d5231519f0b;hb=refs%2Fchanges%2F95%2F4495%2F1;hp=8f9169dd419b605499a6d5f1bbaeb9d3e2e7fe97;hpb=be2000ec2d21151b42cb559ef881695eb32e35e9;p=nonrtric.git

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/clients/A1ClientFactory.java b/policy-agent/src/main/java/org/oransc/policyagent/clients/A1ClientFactory.java
index 8f9169dd..dba6c912 100644
--- a/policy-agent/src/main/java/org/oransc/policyagent/clients/A1ClientFactory.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/clients/A1ClientFactory.java
@@ -22,13 +22,14 @@ package org.oransc.policyagent.clients;
 
 import org.oransc.policyagent.clients.A1Client.A1ProtocolType;
 import org.oransc.policyagent.configuration.ApplicationConfig;
+import org.oransc.policyagent.configuration.ControllerConfig;
 import org.oransc.policyagent.exceptions.ServiceException;
 import org.oransc.policyagent.repository.Ric;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
-
+import lombok.Getter;
 /**
  * Factory for A1 clients that supports four different protocol versions of the
  * A1 api.
@@ -37,6 +38,7 @@ public class A1ClientFactory {
 
     private static final Logger logger = LoggerFactory.getLogger(A1ClientFactory.class);
 
+    @Getter
     private final ApplicationConfig appConfig;
 
     @Autowired
@@ -65,47 +67,71 @@ public class A1ClientFactory {
             .flatMap(version -> createA1ClientMono(ric, version));
     }
 
-    A1Client createClient(Ric ric, A1ProtocolType version) {
-        if (version == A1ProtocolType.STD_V1) {
-            return new StdA1ClientVersion1(ric.getConfig());
-        } else if (version == A1ProtocolType.STD_V1_1) {
-            return new StdA1ClientVersion2(ric.getConfig());
+    A1Client createClient(Ric ric, A1ProtocolType version) throws ServiceException {
+        if (version == A1ProtocolType.STD_V1_1) {
+            assertNoControllerConfig(ric, version);
+            return new StdA1ClientVersion1(ric.getConfig(), this.appConfig.getWebClientConfig());
         } else if (version == A1ProtocolType.OSC_V1) {
-            return new OscA1Client(ric.getConfig());
-        } else if (version == A1ProtocolType.SDNC_OSC) {
-            return new SdncOscA1Client(ric.getConfig(), appConfig.getA1ControllerBaseUrl(),
-                appConfig.getA1ControllerUsername(), appConfig.getA1ControllerPassword());
+            assertNoControllerConfig(ric, version);
+            return new OscA1Client(ric.getConfig(), this.appConfig.getWebClientConfig());
+        } else if (version == A1ProtocolType.SDNC_OSC_STD_V1_1 || version == A1ProtocolType.SDNC_OSC_OSC_V1) {
+            return new SdncOscA1Client(version, ric.getConfig(), getControllerConfig(ric));
         } else if (version == A1ProtocolType.SDNC_ONAP) {
-            return new SdncOnapA1Client(ric.getConfig(), appConfig.getA1ControllerBaseUrl(),
-                appConfig.getA1ControllerUsername(), appConfig.getA1ControllerPassword());
+            return new SdncOnapA1Client(ric.getConfig(), getControllerConfig(ric));
         } else {
             logger.error("Unhandled protocol: {}", version);
-            return null;
+            throw new ServiceException("Unhandled protocol");
+        }
+    }
+
+    private ControllerConfig getControllerConfig(Ric ric) throws ServiceException {
+        String controllerName = ric.getConfig().controllerName();
+        if (controllerName.isEmpty()) {
+            ric.setProtocolVersion(A1ProtocolType.UNKNOWN);
+            throw new ServiceException("No controller configured for RIC: " + ric.name());
+        }
+        try {
+            return this.appConfig.getControllerConfig(controllerName);
+        } catch (ServiceException e) {
+            ric.setProtocolVersion(A1ProtocolType.UNKNOWN);
+            throw e;
+        }
+    }
+
+    private void assertNoControllerConfig(Ric ric, A1ProtocolType version) throws ServiceException {
+        if (!ric.getConfig().controllerName().isEmpty()) {
+            ric.setProtocolVersion(A1ProtocolType.UNKNOWN);
+            throw new ServiceException(
+                "Controller config should be empty, ric: " + ric.name() + " when using protocol version: " + version);
         }
     }
 
     private Mono<A1Client> createA1ClientMono(Ric ric, A1ProtocolType version) {
-        A1Client c = createClient(ric, version);
-        return c != null ? Mono.just(c) : Mono.error(new ServiceException("Unhandled protocol: " + version));
+        try {
+            return Mono.just(createClient(ric, version));
+        } catch (ServiceException e) {
+            return Mono.error(e);
+        }
     }
 
     private Mono<A1Client.A1ProtocolType> getProtocolVersion(Ric ric) {
         if (ric.getProtocolVersion() == A1ProtocolType.UNKNOWN) {
-            return fetchVersion(createClient(ric, A1ProtocolType.STD_V1)) //
-                .onErrorResume(notUsed -> fetchVersion(createClient(ric, A1ProtocolType.STD_V1_1))) //
-                .onErrorResume(notUsed -> fetchVersion(createClient(ric, A1ProtocolType.OSC_V1))) //
-                .onErrorResume(notUsed -> fetchVersion(createClient(ric, A1ProtocolType.SDNC_OSC))) //
-                .onErrorResume(notUsed -> fetchVersion(createClient(ric, A1ProtocolType.SDNC_ONAP))) //
+            return fetchVersion(ric, A1ProtocolType.STD_V1_1) //
+                .onErrorResume(notUsed -> fetchVersion(ric, A1ProtocolType.OSC_V1)) //
+                .onErrorResume(notUsed -> fetchVersion(ric, A1ProtocolType.SDNC_OSC_STD_V1_1)) //
+                .onErrorResume(notUsed -> fetchVersion(ric, A1ProtocolType.SDNC_ONAP)) //
                 .doOnNext(ric::setProtocolVersion)
-                .doOnNext(version -> logger.debug("Recover ric: {}, protocol version:{}", ric.name(), version)) //
-                .doOnError(notUsed -> logger.warn("Could not get protocol version from RIC: {}", ric.name())); //
+                .doOnNext(version -> logger.debug("Established protocol version:{} for Ric: {}", version, ric.name())) //
+                .doOnError(notUsed -> logger.warn("Could not get protocol version from RIC: {}", ric.name())) //
+                .onErrorResume(
+                    notUsed -> Mono.error(new ServiceException("Protocol negotiation failed for " + ric.name())));
         } else {
             return Mono.just(ric.getProtocolVersion());
         }
     }
 
-    private Mono<A1ProtocolType> fetchVersion(A1Client a1Client) {
-        return Mono.just(a1Client) //
-            .flatMap(client -> a1Client.getProtocolVersion());
+    private Mono<A1ProtocolType> fetchVersion(Ric ric, A1ProtocolType protocolType) {
+        return createA1ClientMono(ric, protocolType) //
+            .flatMap(A1Client::getProtocolVersion);
     }
 }