package org.oransc.policyagent.tasks;
+import static ch.qos.logback.classic.Level.ERROR;
+import static ch.qos.logback.classic.Level.WARN;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.awaitility.Awaitility.await;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.read.ListAppender;
import java.io.InputStreamReader;
import java.net.URL;
import java.nio.charset.StandardCharsets;
+import java.time.Duration;
import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.Properties;
import java.util.Vector;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Spy;
-import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoExtension;
import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.CbsClient;
import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.EnvProperties;
import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.ImmutableEnvProperties;
+import org.oransc.policyagent.clients.A1ClientFactory;
import org.oransc.policyagent.configuration.ApplicationConfig;
+import org.oransc.policyagent.configuration.ApplicationConfig.RicConfigUpdate.Type;
import org.oransc.policyagent.configuration.ApplicationConfigParser;
+import org.oransc.policyagent.configuration.ApplicationConfigParser.ConfigParserResult;
+import org.oransc.policyagent.configuration.ImmutableConfigParserResult;
import org.oransc.policyagent.configuration.ImmutableRicConfig;
import org.oransc.policyagent.configuration.RicConfig;
-import org.oransc.policyagent.exceptions.ServiceException;
+import org.oransc.policyagent.repository.ImmutablePolicy;
+import org.oransc.policyagent.repository.ImmutablePolicyType;
+import org.oransc.policyagent.repository.Policies;
+import org.oransc.policyagent.repository.Policy;
+import org.oransc.policyagent.repository.PolicyTypes;
+import org.oransc.policyagent.repository.Ric;
+import org.oransc.policyagent.repository.Rics;
+import org.oransc.policyagent.repository.Services;
import org.oransc.policyagent.utils.LoggingUtils;
import reactor.core.publisher.Flux;
import reactor.test.StepVerifier;
@ExtendWith(MockitoExtension.class)
-@RunWith(MockitoJUnitRunner.class)
-public class RefreshConfigTaskTest {
+class RefreshConfigTaskTest {
+
+ private static final boolean CONFIG_FILE_EXISTS = true;
+ private static final boolean CONFIG_FILE_DOES_NOT_EXIST = false;
private RefreshConfigTask refreshTaskUnderTest;
@Mock
CbsClient cbsClient;
- public static final ImmutableRicConfig CORRECT_RIC_CONIFG = ImmutableRicConfig.builder() //
- .name("ric1") //
+ private static final String RIC_1_NAME = "ric1";
+ private static final ImmutableRicConfig CORRECT_RIC_CONIFG = ImmutableRicConfig.builder() //
+ .name(RIC_1_NAME) //
.baseUrl("http://localhost:8080/") //
.managedElementIds(new Vector<String>(Arrays.asList("kista_1", "kista_2"))) //
+ .controllerName("") //
.build();
private static EnvProperties properties() {
.build();
}
+ private RefreshConfigTask createTestObject(boolean configFileExists) {
+ return createTestObject(configFileExists, new Rics(), new Policies(), true);
+ }
+
+ private RefreshConfigTask createTestObject(boolean configFileExists, Rics rics, Policies policies,
+ boolean stubConfigFileExists) {
+ RefreshConfigTask obj = spy(new RefreshConfigTask(appConfig, rics, policies, new Services(), new PolicyTypes(),
+ new A1ClientFactory(appConfig)));
+ if (stubConfigFileExists) {
+ doReturn(configFileExists).when(obj).fileExists(any());
+ }
+ return obj;
+ }
+
+ @Test
+ void startWithStubbedRefresh_thenTerminationLogged() {
+ refreshTaskUnderTest = this.createTestObject(CONFIG_FILE_DOES_NOT_EXIST, null, null, false);
+ doReturn(Flux.empty()).when(refreshTaskUnderTest).createRefreshTask();
+
+ final ListAppender<ILoggingEvent> logAppender = LoggingUtils.getLogListAppender(RefreshConfigTask.class, ERROR);
+
+ refreshTaskUnderTest.start();
+
+ assertThat(logAppender.list.get(0).getFormattedMessage()).isEqualTo("Configuration refresh terminated");
+ }
+
+ @Test
+ void startWithStubbedRefreshReturnError_thenErrorAndTerminationLogged() {
+ refreshTaskUnderTest = this.createTestObject(CONFIG_FILE_DOES_NOT_EXIST, null, null, false);
+ String errorMessage = "Error";
+ doReturn(Flux.error(new Exception(errorMessage))).when(refreshTaskUnderTest).createRefreshTask();
+
+ final ListAppender<ILoggingEvent> logAppender = LoggingUtils.getLogListAppender(RefreshConfigTask.class, ERROR);
+
+ refreshTaskUnderTest.start();
+
+ ILoggingEvent event = logAppender.list.get(0);
+ assertThat(event.getFormattedMessage())
+ .isEqualTo("Configuration refresh terminated due to exception java.lang.Exception: " + errorMessage);
+ }
+
@Test
- public void whenTheConfigurationFits() throws IOException, ServiceException {
- refreshTaskUnderTest = spy(new RefreshConfigTask(appConfig));
+ void stop_thenTaskIsDisposed() throws Exception {
+ refreshTaskUnderTest = this.createTestObject(CONFIG_FILE_DOES_NOT_EXIST, null, null, false);
+ refreshTaskUnderTest.systemEnvironment = new Properties();
+
+ refreshTaskUnderTest.start();
+ refreshTaskUnderTest.stop();
+
+ assertThat(refreshTaskUnderTest.getRefreshTask().isDisposed()).as("Refresh task is disposed").isTrue();
+ }
+
+ @Test
+ void whenTheConfigurationFits_thenConfiguredRicsArePutInRepository() throws Exception {
+ refreshTaskUnderTest = this.createTestObject(CONFIG_FILE_EXISTS);
refreshTaskUnderTest.systemEnvironment = new Properties();
// When
doReturn(getCorrectJson()).when(refreshTaskUnderTest).createInputStream(any());
doReturn("fileName").when(appConfig).getLocalConfigurationFilePath();
- refreshTaskUnderTest.start();
+
+ StepVerifier //
+ .create(refreshTaskUnderTest.createRefreshTask()) //
+ .expectSubscription() //
+ .expectNext(Type.ADDED) //
+ .expectNext(Type.ADDED) //
+ .thenCancel() //
+ .verify();
// Then
- verify(refreshTaskUnderTest, times(1)).loadConfigurationFromFile();
+ verify(refreshTaskUnderTest).loadConfigurationFromFile();
+
+ verify(refreshTaskUnderTest, times(2)).runRicSynchronization(any(Ric.class));
Iterable<RicConfig> ricConfigs = appConfig.getRicConfigs();
RicConfig ricConfig = ricConfigs.iterator().next();
}
@Test
- public void whenFileIsExistsButJsonIsIncorrect() throws IOException, ServiceException {
- refreshTaskUnderTest = spy(new RefreshConfigTask(appConfig));
+ void whenFileExistsButJsonIsIncorrect_thenNoRicsArePutInRepositoryAndErrorIsLogged() throws Exception {
+ refreshTaskUnderTest = this.createTestObject(CONFIG_FILE_EXISTS);
refreshTaskUnderTest.systemEnvironment = new Properties();
// When
doReturn(getIncorrectJson()).when(refreshTaskUnderTest).createInputStream(any());
doReturn("fileName").when(appConfig).getLocalConfigurationFilePath();
- refreshTaskUnderTest.loadConfigurationFromFile();
+
+ final ListAppender<ILoggingEvent> logAppender = LoggingUtils.getLogListAppender(RefreshConfigTask.class, ERROR);
+
+ StepVerifier //
+ .create(refreshTaskUnderTest.createRefreshTask()) //
+ .expectSubscription() //
+ .expectNoEvent(Duration.ofMillis(100)) //
+ .thenCancel() //
+ .verify();
// Then
- verify(refreshTaskUnderTest, times(1)).loadConfigurationFromFile();
- Assertions.assertEquals(0, appConfig.getRicConfigs().size());
+ verify(refreshTaskUnderTest).loadConfigurationFromFile();
+ assertThat(appConfig.getRicConfigs()).isEmpty();
+
+ await().until(() -> logAppender.list.size() > 0);
+ assertThat(logAppender.list.get(0).getFormattedMessage())
+ .startsWith("Local configuration file not loaded: fileName, ");
}
@Test
- public void whenPeriodicConfigRefreshNoEnvironmentVariables() {
- refreshTaskUnderTest = spy(new RefreshConfigTask(appConfig));
+ void whenPeriodicConfigRefreshNoConsul_thenErrorIsLogged() {
+ refreshTaskUnderTest = this.createTestObject(CONFIG_FILE_DOES_NOT_EXIST);
refreshTaskUnderTest.systemEnvironment = new Properties();
- final ListAppender<ILoggingEvent> logAppender = LoggingUtils.getLogListAppender(RefreshConfigTask.class);
- Flux<ApplicationConfig> task = refreshTaskUnderTest.createRefreshTask();
+ EnvProperties props = properties();
+ doReturn(Mono.just(props)).when(refreshTaskUnderTest).getEnvironment(any());
- StepVerifier.create(task).expectSubscription().verifyComplete();
+ doReturn(Mono.just(cbsClient)).when(refreshTaskUnderTest).createCbsClient(props);
+ when(cbsClient.get(any())).thenReturn(Mono.error(new IOException()));
+
+ final ListAppender<ILoggingEvent> logAppender = LoggingUtils.getLogListAppender(RefreshConfigTask.class, WARN);
- assertTrue(logAppender.list.toString().contains("$CONSUL_HOST environment has not been defined"));
+ StepVerifier //
+ .create(refreshTaskUnderTest.createRefreshTask()) //
+ .expectSubscription() //
+ .expectNoEvent(Duration.ofMillis(1000)) //
+ .thenCancel() //
+ .verify();
+
+ await().until(() -> logAppender.list.size() > 0);
+ assertThat(logAppender.list.get(0).getFormattedMessage())
+ .isEqualTo("Could not refresh application configuration. java.io.IOException");
}
@Test
- public void whenPeriodicConfigRefreshNoConsul() {
- refreshTaskUnderTest = spy(new RefreshConfigTask(appConfig));
+ void whenPeriodicConfigRefreshSuccess_thenNewConfigIsCreatedAndRepositoryUpdated() throws Exception {
+ Rics rics = new Rics();
+ Policies policies = new Policies();
+ refreshTaskUnderTest = this.createTestObject(CONFIG_FILE_DOES_NOT_EXIST, rics, policies, false);
refreshTaskUnderTest.systemEnvironment = new Properties();
+ RicConfig changedRicConfig = getRicConfig(RIC_1_NAME);
+ rics.put(new Ric(changedRicConfig));
+ RicConfig removedRicConfig = getRicConfig("removed");
+ Ric removedRic = new Ric(removedRicConfig);
+ rics.put(removedRic);
+ appConfig.setConfiguration(configParserResult(changedRicConfig, removedRicConfig));
+
+ Policy policy = getPolicy(removedRic);
+ policies.put(policy);
+
EnvProperties props = properties();
doReturn(Mono.just(props)).when(refreshTaskUnderTest).getEnvironment(any());
-
doReturn(Mono.just(cbsClient)).when(refreshTaskUnderTest).createCbsClient(props);
- Flux<JsonObject> err = Flux.error(new IOException());
- doReturn(err).when(cbsClient).updates(any(), any(), any());
- final ListAppender<ILoggingEvent> logAppender = LoggingUtils.getLogListAppender(RefreshConfigTask.class);
- Flux<ApplicationConfig> task = refreshTaskUnderTest.createRefreshTask();
+ JsonObject configAsJson = getJsonRootObject(true);
+ String newBaseUrl = "newBaseUrl";
+ modifyTheRicConfiguration(configAsJson, newBaseUrl);
+ when(cbsClient.get(any())).thenReturn(Mono.just(configAsJson));
+ doNothing().when(refreshTaskUnderTest).runRicSynchronization(any(Ric.class));
StepVerifier //
- .create(task) //
+ .create(refreshTaskUnderTest.createRefreshTask()) //
.expectSubscription() //
- .verifyComplete();
-
- assertTrue(
- logAppender.list.toString().contains("Could not refresh application configuration java.io.IOException"));
+ .expectNext(Type.CHANGED) //
+ .expectNext(Type.ADDED) //
+ .expectNext(Type.REMOVED) //
+ .thenCancel() //
+ .verify();
+
+ assertThat(appConfig.getRicConfigs()).hasSize(2);
+ assertThat(appConfig.getRic(RIC_1_NAME).baseUrl()).isEqualTo(newBaseUrl);
+ String ric2Name = "ric2";
+ assertThat(appConfig.getRic(ric2Name)).isNotNull();
+
+ assertThat(rics.size()).isEqualTo(2);
+ assertThat(rics.get(RIC_1_NAME).getConfig().baseUrl()).isEqualTo(newBaseUrl);
+ assertThat(rics.get(ric2Name)).isNotNull();
+
+ assertThat(policies.size()).isZero();
}
@Test
- public void whenPeriodicConfigRefreshSuccess() throws JsonIOException, JsonSyntaxException, IOException {
- refreshTaskUnderTest = spy(new RefreshConfigTask(appConfig));
+ void whenPeriodicConfigRefreshInvalidJson_thenErrorIsLogged() throws Exception {
+ Rics rics = new Rics();
+ Policies policies = new Policies();
+ refreshTaskUnderTest = this.createTestObject(CONFIG_FILE_DOES_NOT_EXIST, rics, policies, false);
refreshTaskUnderTest.systemEnvironment = new Properties();
+ appConfig.setConfiguration(configParserResult());
+
EnvProperties props = properties();
doReturn(Mono.just(props)).when(refreshTaskUnderTest).getEnvironment(any());
doReturn(Mono.just(cbsClient)).when(refreshTaskUnderTest).createCbsClient(props);
- Flux<JsonObject> json = Flux.just(getJsonRootObject());
- doReturn(json).when(cbsClient).updates(any(), any(), any());
+ JsonObject configAsJson = getJsonRootObject(false);
+ when(cbsClient.get(any())).thenReturn(Mono.just(configAsJson));
- Flux<ApplicationConfig> task = refreshTaskUnderTest.createRefreshTask();
+ final ListAppender<ILoggingEvent> logAppender = LoggingUtils.getLogListAppender(RefreshConfigTask.class, ERROR);
StepVerifier //
- .create(task) //
+ .create(refreshTaskUnderTest.createRefreshTask()) //
.expectSubscription() //
- .expectNext(appConfig) //
- .verifyComplete();
+ .expectNoEvent(Duration.ofMillis(1000)) //
+ .thenCancel() //
+ .verify();
+
+ await().until(() -> logAppender.list.size() > 0);
+ assertThat(logAppender.list.get(0).getFormattedMessage())
+ .startsWith("Could not parse configuration org.oransc.policyagent.exceptions.ServiceException: ");
+ }
+
+ private RicConfig getRicConfig(String name) {
+ RicConfig ricConfig = ImmutableRicConfig.builder() //
+ .name(name) //
+ .baseUrl("url") //
+ .managedElementIds(Collections.emptyList()) //
+ .controllerName("controllerName") //
+ .build();
+ return ricConfig;
+ }
+
+ private Policy getPolicy(Ric ric) {
+ ImmutablePolicyType type = ImmutablePolicyType.builder() //
+ .name("type") //
+ .schema("{}") //
+ .build();
+ Policy policy = ImmutablePolicy.builder() //
+ .id("id") //
+ .type(type) //
+ .lastModified("lastModified") //
+ .ric(ric) //
+ .json("{}") //
+ .ownerServiceName("ownerServiceName") //
+ .isTransient(false) //
+ .build();
+ return policy;
+ }
+
+ ConfigParserResult configParserResult(RicConfig... rics) {
+ return ImmutableConfigParserResult.builder() //
+ .ricConfigs(Arrays.asList(rics)) //
+ .dmaapConsumerTopicUrl("") //
+ .dmaapProducerTopicUrl("") //
+ .controllerConfigs(new HashMap<>()) //
+ .build();
+ }
- Assertions.assertNotNull(appConfig.getRicConfigs());
+ private void modifyTheRicConfiguration(JsonObject configAsJson, String newBaseUrl) {
+ ((JsonObject) configAsJson.getAsJsonObject("config") //
+ .getAsJsonArray("ric").get(0)) //
+ .addProperty("baseUrl", newBaseUrl);
}
- private JsonObject getJsonRootObject() throws JsonIOException, JsonSyntaxException, IOException {
- JsonObject rootObject = (new JsonParser()).parse(new InputStreamReader(getCorrectJson())).getAsJsonObject();
+ private JsonObject getJsonRootObject(boolean valid) throws JsonIOException, JsonSyntaxException, IOException {
+ JsonObject rootObject = JsonParser
+ .parseReader(new InputStreamReader(valid ? getCorrectJson() : getIncorrectJson())).getAsJsonObject();
return rootObject;
}
}
private static InputStream getIncorrectJson() {
- String string = "{" + //
- " \"config\": {" + //
- " \"ric\": {"; //
+ String string = "{}"; //
return new ByteArrayInputStream((string.getBytes(StandardCharsets.UTF_8)));
}
}
Code Review / nonrtric.git / blobdiff