Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix bug in SDNC, read controller info from yaml
[nonrtric.git]
/
policy-agent
/
src
/
main
/
java
/
org
/
oransc
/
policyagent
/
clients
/
A1ClientFactory.java
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
7b7e0ce
..
c150c08
100644
(file)
--- 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;
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.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);
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<A1Client> createA1Client(Ric ric) {
return getProtocolVersion(ric) //
.flatMap(version -> createA1Client(ric, version));
public Mono<A1Client> createA1Client(Ric ric) {
return getProtocolVersion(ric) //
.flatMap(version -> createA1Client(ric, version));
@@
-68,11
+77,13
@@
public class A1ClientFactory {
}
protected A1Client createSdncOscA1Client(Ric ric) {
}
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) {
}
protected A1Client createSdnrOnapA1Client(Ric ric) {
- return new SdnrOnapA1Client(ric.getConfig());
+ return new SdnrOnapA1Client(ric.getConfig(), appConfig.getA1ControllerBaseUrl(),
+ appConfig.getA1ControllerUsername(), appConfig.getA1ControllerPassword());
}
private Mono<A1Client.A1ProtocolType> fetchVersion(Ric ric, A1Client a1Client) {
}
private Mono<A1Client.A1ProtocolType> fetchVersion(Ric ric, A1Client a1Client) {