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=7b7e0cef93e1fe6b9fab7dd675f986321607a032;hb=b7f8d2ce1b48969eb0ad1048d83a9105f90d0c17;hp=a3d17bc29d7a78a937f94140d1ed7ebb9970a526;hpb=95db19e2820102db0255ca57407faa333cbb4085;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 a3d17bc2..7b7e0cef 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
@@ -39,13 +39,21 @@ public class A1ClientFactory {
     private Mono<A1Client> createA1Client(Ric ric, A1ProtocolType version) {
         if (version == A1ProtocolType.STD_V1) {
             return Mono.just(createStdA1ClientImpl(ric));
+        } else if (version == A1ProtocolType.OSC_V1) {
+            return Mono.just(new OscA1Client(ric.getConfig()));
+        } else if (version == A1ProtocolType.SDNC_OSC) {
+            return Mono.just(createSdncOscA1Client(ric));
+        } else if (version == A1ProtocolType.SDNR_ONAP) {
+            return Mono.just(createSdnrOnapA1Client(ric));
         }
         return Mono.error(new ServiceException("Not supported protocoltype: " + version));
     }
 
     private Mono<A1Client.A1ProtocolType> getProtocolVersion(Ric ric) {
         if (ric.getProtocolVersion() == A1ProtocolType.UNKNOWN) {
-            return fetchVersion(ric, new OscA1Client(ric.getConfig())) //
+            return fetchVersion(ric, createSdnrOnapA1Client(ric)) //
+                .onErrorResume(err -> fetchVersion(ric, createSdncOscA1Client(ric)))
+                .onErrorResume(err -> fetchVersion(ric, new OscA1Client(ric.getConfig())))
                 .onErrorResume(err -> fetchVersion(ric, createStdA1ClientImpl(ric)))
                 .doOnNext(version -> ric.setProtocolVersion(version))
                 .doOnNext(version -> logger.debug("Recover ric: {}, protocol version:{}", ric.name(), version)) //
@@ -59,6 +67,14 @@ public class A1ClientFactory {
         return new StdA1Client(ric.getConfig());
     }
 
+    protected A1Client createSdncOscA1Client(Ric ric) {
+        return new SdncOscA1Client(ric.getConfig());
+    }
+
+    protected A1Client createSdnrOnapA1Client(Ric ric) {
+        return new SdnrOnapA1Client(ric.getConfig());
+    }
+
     private Mono<A1Client.A1ProtocolType> fetchVersion(Ric ric, A1Client a1Client) {
         return Mono.just(a1Client) //
             .flatMap(client -> a1Client.getProtocolVersion());