return Mono.just(createOscA1Client(ric));
} else if (version == A1ProtocolType.SDNC_OSC) {
return Mono.just(createSdncOscA1Client(ric));
- } else { // A1ProtocolType.SDNR_ONAP
- return Mono.just(createSdnrOnapA1Client(ric));
+ } else { // A1ProtocolType.SDNC_ONAP
+ return Mono.just(createSdncOnapA1Client(ric));
}
}
private Mono<A1Client.A1ProtocolType> getProtocolVersion(Ric ric) {
if (ric.getProtocolVersion() == A1ProtocolType.UNKNOWN) {
- return fetchVersion(createSdnrOnapA1Client(ric)) //
+ return fetchVersion(createSdncOnapA1Client(ric)) //
.onErrorResume(notUsed -> fetchVersion(createSdncOscA1Client(ric))) //
.onErrorResume(notUsed -> fetchVersion(createOscA1Client(ric))) //
.onErrorResume(notUsed -> fetchVersion(createStdA1ClientImpl(ric))) //
appConfig.getA1ControllerUsername(), appConfig.getA1ControllerPassword());
}
- protected A1Client createSdnrOnapA1Client(Ric ric) {
+ protected A1Client createSdncOnapA1Client(Ric ric) {
return new SdncOnapA1Client(ric.getConfig(), appConfig.getA1ControllerBaseUrl(),
appConfig.getA1ControllerUsername(), appConfig.getA1ControllerPassword());
}
A1Client sdncOscA1ClientMock;
@Mock
- A1Client sdnrOnapA1ClientMock;
+ A1Client sdncOnapA1ClientMock;
private ImmutableRicConfig ricConfig =
ImmutableRicConfig.builder().name(RIC_NAME).baseUrl("baseUrl").managedElementIds(new Vector<>()).build();
@Test
public void createStd_ok() {
- whenGetProtocolVersionSdnrOnapA1ClientThrowException();
+ whenGetProtocolVersionSdncOnapA1ClientThrowException();
whenGetProtocolVersionSdncOscA1ClientThrowException();
whenGetProtocolVersionOscA1ClientThrowException();
whenGetProtocolVersionStdA1ClientReturnCorrectProtocol();
@Test
public void createOsc_ok() {
- whenGetProtocolVersionSdnrOnapA1ClientThrowException();
+ whenGetProtocolVersionSdncOnapA1ClientThrowException();
whenGetProtocolVersionSdncOscA1ClientThrowException();
whenGetProtocolVersionOscA1ClientReturnCorrectProtocol();
@Test
public void createSdncOsc_ok() {
- whenGetProtocolVersionSdnrOnapA1ClientThrowException();
+ whenGetProtocolVersionSdncOnapA1ClientThrowException();
whenGetProtocolVersionSdncOscA1ClientReturnCorrectProtocol();
StepVerifier.create(factoryUnderTest.createA1Client(ric)) //
}
@Test
- public void createSdnrOnap_ok() {
- whenGetProtocolVersionSdnrOnapA1ClientReturnCorrectProtocol();
+ public void createSdncOnap_ok() {
+ whenGetProtocolVersionSdncOnapA1ClientReturnCorrectProtocol();
StepVerifier.create(factoryUnderTest.createA1Client(ric)) //
.expectSubscription() //
- .expectNext(sdnrOnapA1ClientMock) //
+ .expectNext(sdncOnapA1ClientMock) //
.verifyComplete();
assertEquals(A1ProtocolType.SDNC_ONAP, ric.getProtocolVersion(), "Not correct protocol");
@Test
public void createWithNoProtocol_error() {
- whenGetProtocolVersionSdnrOnapA1ClientThrowException();
+ whenGetProtocolVersionSdncOnapA1ClientThrowException();
whenGetProtocolVersionSdncOscA1ClientThrowException();
whenGetProtocolVersionOscA1ClientThrowException();
whenGetProtocolVersionStdA1ClientThrowException();
assertEquals(A1ProtocolType.STD_V1, ric.getProtocolVersion(), "Not correct protocol");
- verifyNoMoreInteractions(sdnrOnapA1ClientMock);
+ verifyNoMoreInteractions(sdncOnapA1ClientMock);
verifyNoMoreInteractions(sdncOscA1ClientMock);
verifyNoMoreInteractions(oscA1ClientMock);
verifyNoMoreInteractions(stdA1ClientMock);
}
- private void whenGetProtocolVersionSdnrOnapA1ClientThrowException() {
- doReturn(sdnrOnapA1ClientMock).when(factoryUnderTest).createSdnrOnapA1Client(ric);
- when(sdnrOnapA1ClientMock.getProtocolVersion()).thenReturn(Mono.error(new Exception(EXCEPTION_MESSAGE)));
+ private void whenGetProtocolVersionSdncOnapA1ClientThrowException() {
+ doReturn(sdncOnapA1ClientMock).when(factoryUnderTest).createSdncOnapA1Client(ric);
+ when(sdncOnapA1ClientMock.getProtocolVersion()).thenReturn(Mono.error(new Exception(EXCEPTION_MESSAGE)));
}
- private void whenGetProtocolVersionSdnrOnapA1ClientReturnCorrectProtocol() {
- doReturn(sdnrOnapA1ClientMock).when(factoryUnderTest).createSdnrOnapA1Client(any(Ric.class));
- when(sdnrOnapA1ClientMock.getProtocolVersion()).thenReturn(Mono.just(A1ProtocolType.SDNC_ONAP));
+ private void whenGetProtocolVersionSdncOnapA1ClientReturnCorrectProtocol() {
+ doReturn(sdncOnapA1ClientMock).when(factoryUnderTest).createSdncOnapA1Client(any(Ric.class));
+ when(sdncOnapA1ClientMock.getProtocolVersion()).thenReturn(Mono.just(A1ProtocolType.SDNC_ONAP));
}
private void whenGetProtocolVersionSdncOscA1ClientThrowException() {