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=c150c08933279254fdd569581de447e72ef335b3;hb=10811110a23cf9fcf464575bba609b8c65d19aec;hp=7b7e0cef93e1fe6b9fab7dd675f986321607a032;hpb=3482ea81c8189d5cfacf4005e1c92673304e11b3;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 7b7e0cef..c150c089 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 @@ -21,16 +21,25 @@ package org.oransc.policyagent.clients; import org.oransc.policyagent.clients.A1Client.A1ProtocolType; +import org.oransc.policyagent.configuration.ApplicationConfig; 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; public class A1ClientFactory { private static final Logger logger = LoggerFactory.getLogger(A1ClientFactory.class); + private final ApplicationConfig appConfig; + + @Autowired + public A1ClientFactory(ApplicationConfig appConfig) { + this.appConfig = appConfig; + } + public Mono createA1Client(Ric ric) { return getProtocolVersion(ric) // .flatMap(version -> createA1Client(ric, version)); @@ -68,11 +77,13 @@ public class A1ClientFactory { } protected A1Client createSdncOscA1Client(Ric ric) { - return new SdncOscA1Client(ric.getConfig()); + return new SdncOscA1Client(ric.getConfig(), appConfig.getA1ControllerBaseUrl(), + appConfig.getA1ControllerUsername(), appConfig.getA1ControllerPassword()); } protected A1Client createSdnrOnapA1Client(Ric ric) { - return new SdnrOnapA1Client(ric.getConfig()); + return new SdnrOnapA1Client(ric.getConfig(), appConfig.getA1ControllerBaseUrl(), + appConfig.getA1ControllerUsername(), appConfig.getA1ControllerPassword()); } private Mono fetchVersion(Ric ric, A1Client a1Client) {