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.CONTROLLER) {
+ return Mono.just(createControllerA1Client(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, createControllerA1Client(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)) //
return new StdA1Client(ric.getConfig());
}
+ protected A1Client createControllerA1Client(Ric ric) {
+ return new ControllerA1Client(ric.getConfig());
+ }
+
private Mono<A1Client.A1ProtocolType> fetchVersion(Ric ric, A1Client a1Client) {
return Mono.just(a1Client) //
.flatMap(client -> a1Client.getProtocolVersion());