summaryrefslogtreecommitdiffstats
path: root/a1-policy-management
diff options
context:
space:
mode:
authorPatrikBuhr <patrik.buhr@est.tech>2020-11-09 13:42:09 +0100
committerPatrikBuhr <patrik.buhr@est.tech>2020-11-10 10:31:52 +0100
commit2a5028d0d6b1d4b809ab72beafd95c65ea26c662 (patch)
treeb7a8ca2f199fcfd2b7eb1ec45e2e64eeb1058516 /a1-policy-management
parentcef5a0b50f07e4e658ff9d2e058d6aa6eb8cb780 (diff)
Bugfix, GET policy V2
Did not return transient flag. Improved somew unittests Skipped unwanted service callback when RIC is removed Change-Id: I3ca3be5d4592c2a1b31d3b1a23fe601d1d3f85a2 Issue-ID: CCSDK-2502 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Diffstat (limited to 'a1-policy-management')
-rw-r--r--a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/PolicyController.java7
-rw-r--r--a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/PolicyInfo.java8
-rw-r--r--a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RefreshConfigTask.java11
-rw-r--r--a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSupervision.java2
-rw-r--r--a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSynchronizationTask.java9
-rw-r--r--a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/configuration/ApplicationConfigTest.java89
-rw-r--r--a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSynchronizationTaskTest.java10
7 files changed, 79 insertions, 57 deletions
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/PolicyController.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/PolicyController.java
index ec776042..ea047cb5 100644
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/PolicyController.java
+++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/PolicyController.java
@@ -262,12 +262,6 @@ public class PolicyController {
return Mono.just("{}");
}
- private void assertRicStateIdleSync(Ric ric) throws ServiceException {
- if (ric.getState() != Ric.RicState.AVAILABLE) {
- throw new ServiceException("Near-RT RIC: " + ric.id() + " is " + ric.getState());
- }
- }
-
private Mono<Object> assertRicStateIdle(Ric ric) {
if (ric.getState() == Ric.RicState.AVAILABLE) {
return Mono.just("{}");
@@ -408,6 +402,7 @@ public class PolicyController {
policyInfo.ricId = p.ric().id();
policyInfo.policyTypeId = p.type().id();
policyInfo.serviceId = p.ownerServiceId();
+ policyInfo.isTransient = p.isTransient();
if (!p.statusNotificationUri().isEmpty()) {
policyInfo.statusNotificationUri = p.statusNotificationUri();
}
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/PolicyInfo.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/PolicyInfo.java
index c032e3ad..43684a33 100644
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/PolicyInfo.java
+++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/PolicyInfo.java
@@ -57,10 +57,12 @@ public class PolicyInfo {
@SerializedName("service_id")
public String serviceId;
- @ApiModelProperty(value = "the name of the service owning the policy", required = false)
- @JsonProperty(value = "transient", required = false)
+ @ApiModelProperty(
+ value = "if true, the policy is deleted at RIC restart. If false, its value is maintained by this service until explicitly deleted. Default false.",
+ required = false)
+ @JsonProperty(value = "transient", required = false, defaultValue = "false")
@SerializedName("transient")
- public boolean isTransient;
+ public boolean isTransient = false;
@ApiModelProperty(value = "Callback URI for policy status updates", required = false)
@JsonProperty(value = "status_notification_uri", required = false)
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RefreshConfigTask.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RefreshConfigTask.java
index e4d7d8d7..dc364faf 100644
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RefreshConfigTask.java
+++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RefreshConfigTask.java
@@ -201,8 +201,8 @@ public class RefreshConfigTask {
private void removePoliciciesInRic(@Nullable Ric ric) {
if (ric != null) {
- RicSynchronizationTask synch =
- new RicSynchronizationTask(a1ClientFactory, policyTypes, policies, services, restClientFactory);
+ RicSynchronizationTask synch = new RicSynchronizationTask(a1ClientFactory, policyTypes, policies, services,
+ restClientFactory, rics);
synch.run(ric);
}
}
@@ -212,15 +212,18 @@ public class RefreshConfigTask {
String ricId = updatedInfo.getRicConfig().ricId();
RicConfigUpdate.Type event = updatedInfo.getType();
if (event == RicConfigUpdate.Type.ADDED) {
+ logger.debug("RIC added {}", ricId);
addRic(updatedInfo.getRicConfig());
} else if (event == RicConfigUpdate.Type.REMOVED) {
+ logger.debug("RIC removed {}", ricId);
Ric ric = rics.remove(ricId);
this.policies.removePoliciesForRic(ricId);
removePoliciciesInRic(ric);
} else if (event == RicConfigUpdate.Type.CHANGED) {
+ logger.debug("RIC config updated {}", ricId);
Ric ric = this.rics.get(ricId);
if (ric == null) {
- // Should not happen,just for robustness
+ logger.error("An non existing RIC config is changed, should not happen (just for robustness)");
addRic(updatedInfo.getRicConfig());
} else {
ric.setRicConfig(updatedInfo.getRicConfig());
@@ -237,7 +240,7 @@ public class RefreshConfigTask {
void runRicSynchronization(Ric ric) {
RicSynchronizationTask synchronizationTask =
- new RicSynchronizationTask(a1ClientFactory, policyTypes, policies, services, restClientFactory);
+ new RicSynchronizationTask(a1ClientFactory, policyTypes, policies, services, restClientFactory, rics);
synchronizationTask.run(ric);
}
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSupervision.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSupervision.java
index cae257cd..c13df8c3 100644
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSupervision.java
+++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSupervision.java
@@ -211,6 +211,6 @@ public class RicSupervision {
}
RicSynchronizationTask createSynchronizationTask() {
- return new RicSynchronizationTask(a1ClientFactory, policyTypes, policies, services, restClientFactory);
+ return new RicSynchronizationTask(a1ClientFactory, policyTypes, policies, services, restClientFactory, rics);
}
}
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSynchronizationTask.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSynchronizationTask.java
index 825418b5..b38a36b2 100644
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSynchronizationTask.java
+++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSynchronizationTask.java
@@ -33,6 +33,7 @@ import org.onap.ccsdk.oran.a1policymanagementservice.repository.Policy;
import org.onap.ccsdk.oran.a1policymanagementservice.repository.PolicyType;
import org.onap.ccsdk.oran.a1policymanagementservice.repository.PolicyTypes;
import org.onap.ccsdk.oran.a1policymanagementservice.repository.Ric;
+import org.onap.ccsdk.oran.a1policymanagementservice.repository.Rics;
import org.onap.ccsdk.oran.a1policymanagementservice.repository.Services;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -64,15 +65,17 @@ public class RicSynchronizationTask {
private final PolicyTypes policyTypes;
private final Policies policies;
private final Services services;
+ private final Rics rics;
private final AsyncRestClientFactory restClientFactory;
public RicSynchronizationTask(A1ClientFactory a1ClientFactory, PolicyTypes policyTypes, Policies policies,
- Services services, AsyncRestClientFactory restClientFactory) {
+ Services services, AsyncRestClientFactory restClientFactory, Rics rics) {
this.a1ClientFactory = a1ClientFactory;
this.policyTypes = policyTypes;
this.policies = policies;
this.services = services;
this.restClientFactory = restClientFactory;
+ this.rics = rics;
}
public void run(Ric ric) {
@@ -129,6 +132,10 @@ public class RicSynchronizationTask {
}
private void onSynchronizationComplete(Ric ric) {
+ if (this.rics.get(ric.id()) == null) {
+ logger.debug("Policies removed in removed ric: {}", ric.id());
+ return;
+ }
logger.debug("Synchronization completed for: {}", ric.id());
ric.setState(RicState.AVAILABLE);
notifyServices(ric);
diff --git a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/configuration/ApplicationConfigTest.java b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/configuration/ApplicationConfigTest.java
index cf4739c8..7a075428 100644
--- a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/configuration/ApplicationConfigTest.java
+++ b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/configuration/ApplicationConfigTest.java
@@ -21,12 +21,11 @@
package org.onap.ccsdk.oran.a1policymanagementservice.configuration;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Arrays;
import java.util.HashMap;
+import java.util.List;
import java.util.Vector;
import org.junit.jupiter.api.Test;
@@ -34,7 +33,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
import org.onap.ccsdk.oran.a1policymanagementservice.configuration.ApplicationConfig.RicConfigUpdate;
import org.onap.ccsdk.oran.a1policymanagementservice.configuration.ApplicationConfigParser.ConfigParserResult;
-import org.onap.ccsdk.oran.a1policymanagementservice.exceptions.ServiceException;
@ExtendWith(MockitoExtension.class)
class ApplicationConfigTest {
@@ -46,6 +44,20 @@ class ApplicationConfigTest {
.controllerName("") //
.build();
+ private static final ImmutableRicConfig RIC_CONFIG_2 = ImmutableRicConfig.builder() //
+ .ricId("ric2") //
+ .baseUrl("ric1_url") //
+ .managedElementIds(new Vector<>()) //
+ .controllerName("") //
+ .build();
+
+ private static final ImmutableRicConfig RIC_CONFIG_3 = ImmutableRicConfig.builder() //
+ .ricId("ric3") //
+ .baseUrl("ric1_url") //
+ .managedElementIds(new Vector<>()) //
+ .controllerName("") //
+ .build();
+
ConfigParserResult configParserResult(RicConfig... rics) {
return ImmutableConfigParserResult.builder() //
.ricConfigs(Arrays.asList(rics)) //
@@ -56,72 +68,67 @@ class ApplicationConfigTest {
}
@Test
- void gettingNotAddedRicShouldThrowException() {
- ApplicationConfig appConfigUnderTest = new ApplicationConfig();
-
- appConfigUnderTest.setConfiguration(configParserResult(RIC_CONFIG_1));
-
- Exception exception = assertThrows(ServiceException.class, () -> {
- appConfigUnderTest.getRic("name");
- });
-
- assertEquals("Could not find ric configuration: name", exception.getMessage());
- }
-
- @Test
- void addRicShouldNotifyAllObserversOfRicAdded() throws Exception {
+ void addRics() throws Exception {
ApplicationConfig appConfigUnderTest = new ApplicationConfig();
- RicConfigUpdate update = appConfigUnderTest.setConfiguration(configParserResult(RIC_CONFIG_1)).blockFirst();
- assertEquals(RicConfigUpdate.Type.ADDED, update.getType());
+ List<RicConfigUpdate> update = appConfigUnderTest.setConfiguration(configParserResult(RIC_CONFIG_1)) //
+ .collectList().block();
+ assertEquals(1, update.size());
+ assertEquals(RicConfigUpdate.Type.ADDED, update.get(0).getType());
assertTrue(appConfigUnderTest.getRicConfigs().contains(RIC_CONFIG_1), "Ric not added to configurations.");
assertEquals(RIC_CONFIG_1, appConfigUnderTest.getRic(RIC_CONFIG_1.ricId()),
"Not correct Ric retrieved from configurations.");
- update = appConfigUnderTest.setConfiguration(configParserResult(RIC_CONFIG_1)).blockFirst();
- assertNull(update, "Nothing should be updated");
- assertTrue(appConfigUnderTest.getRicConfigs().contains(RIC_CONFIG_1), "Ric should remain.");
+ update = appConfigUnderTest.setConfiguration(configParserResult(RIC_CONFIG_1)).collectList().block();
+ assertEquals(0, update.size());
+
+ update = appConfigUnderTest.setConfiguration(configParserResult(RIC_CONFIG_1, RIC_CONFIG_2)).collectList()
+ .block();
+ assertEquals(1, update.size());
+ assertEquals(RicConfigUpdate.Type.ADDED, update.get(0).getType());
}
@Test
- void changedRicShouldNotifyAllObserversOfRicChanged() throws Exception {
+ void changedRic() throws Exception {
ApplicationConfig appConfigUnderTest = new ApplicationConfig();
- appConfigUnderTest.setConfiguration(configParserResult(RIC_CONFIG_1));
+ List<RicConfigUpdate> update = appConfigUnderTest
+ .setConfiguration(configParserResult(RIC_CONFIG_1, RIC_CONFIG_2, RIC_CONFIG_3)).collectList().block();
+ assertEquals(3, update.size());
ImmutableRicConfig changedRicConfig = ImmutableRicConfig.builder() //
- .ricId("ric1") //
+ .ricId(RIC_CONFIG_1.ricId()) //
.baseUrl("changed_ric1_url") //
.managedElementIds(new Vector<>()) //
.controllerName("") //
.build();
- RicConfigUpdate update = appConfigUnderTest.setConfiguration(configParserResult(changedRicConfig)).blockFirst();
+ update = appConfigUnderTest.setConfiguration(configParserResult(changedRicConfig, RIC_CONFIG_2, RIC_CONFIG_3))
+ .collectList().block();
+ assertEquals(1, update.size());
- assertEquals(RicConfigUpdate.Type.CHANGED, update.getType());
+ assertEquals(RicConfigUpdate.Type.CHANGED, update.get(0).getType());
assertEquals(changedRicConfig, appConfigUnderTest.getRic(RIC_CONFIG_1.ricId()),
"Changed Ric not retrieved from configurations.");
}
@Test
- void removedRicShouldNotifyAllObserversOfRicRemoved() {
+ void removedRic() {
ApplicationConfig appConfigUnderTest = new ApplicationConfig();
- ImmutableRicConfig ricConfig2 = ImmutableRicConfig.builder() //
- .ricId("ric2") //
- .baseUrl("ric2_url") //
- .managedElementIds(new Vector<>()) //
- .controllerName("") //
- .build();
-
- appConfigUnderTest.setConfiguration(configParserResult(RIC_CONFIG_1, ricConfig2));
-
- RicConfigUpdate update = appConfigUnderTest.setConfiguration(configParserResult(ricConfig2)).blockFirst();
-
- assertEquals(RicConfigUpdate.Type.REMOVED, update.getType());
- assertEquals(1, appConfigUnderTest.getRicConfigs().size(), "Ric not deleted from configurations.");
+ List<RicConfigUpdate> update = appConfigUnderTest
+ .setConfiguration(configParserResult(RIC_CONFIG_1, RIC_CONFIG_2, RIC_CONFIG_3)).collectList().block();
+ assertEquals(3, update.size());
+
+ update = appConfigUnderTest.setConfiguration(configParserResult(RIC_CONFIG_2, RIC_CONFIG_3)) //
+ .collectList() //
+ .block();
+ assertEquals(1, update.size());
+ assertEquals(RicConfigUpdate.Type.REMOVED, update.get(0).getType());
+ assertEquals(RIC_CONFIG_1, update.get(0).getRicConfig());
+ assertEquals(2, appConfigUnderTest.getRicConfigs().size(), "Ric not deleted from configurations.");
}
}
diff --git a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSynchronizationTaskTest.java b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSynchronizationTaskTest.java
index 8029741e..ea4ca97b 100644
--- a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSynchronizationTaskTest.java
+++ b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSynchronizationTaskTest.java
@@ -57,6 +57,7 @@ import org.onap.ccsdk.oran.a1policymanagementservice.repository.PolicyType;
import org.onap.ccsdk.oran.a1policymanagementservice.repository.PolicyTypes;
import org.onap.ccsdk.oran.a1policymanagementservice.repository.Ric;
import org.onap.ccsdk.oran.a1policymanagementservice.repository.Ric.RicState;
+import org.onap.ccsdk.oran.a1policymanagementservice.repository.Rics;
import org.onap.ccsdk.oran.a1policymanagementservice.repository.Service;
import org.onap.ccsdk.oran.a1policymanagementservice.repository.Services;
import org.onap.ccsdk.oran.a1policymanagementservice.utils.LoggingUtils;
@@ -108,12 +109,14 @@ class RicSynchronizationTaskTest {
private PolicyTypes policyTypes;
private Policies policies;
private Services services;
+ private Rics rics;
@BeforeEach
void init() {
policyTypes = new PolicyTypes();
policies = new Policies();
services = new Services();
+ rics = new Rics();
RIC_1.setState(RicState.UNAVAILABLE);
RIC_1.clearSupportedPolicyTypes();
}
@@ -121,7 +124,8 @@ class RicSynchronizationTaskTest {
private RicSynchronizationTask createTask() {
ApplicationConfig config = new ApplicationConfig();
AsyncRestClientFactory restClientFactory = new AsyncRestClientFactory(config.getWebClientConfig());
- return new RicSynchronizationTask(a1ClientFactoryMock, policyTypes, policies, services, restClientFactory);
+ return new RicSynchronizationTask(a1ClientFactoryMock, policyTypes, policies, services, restClientFactory,
+ rics);
};
@Test
@@ -146,6 +150,7 @@ class RicSynchronizationTaskTest {
@Test
void ricIdlePolicyTypeInRepo_thenSynchronizationWithReuseOfTypeFromRepoAndCorrectServiceNotified() {
+ rics.put(RIC_1);
RIC_1.setState(RicState.AVAILABLE);
policyTypes.put(POLICY_TYPE_1);
@@ -176,6 +181,7 @@ class RicSynchronizationTaskTest {
@Test
void ricIdlePolicyTypeNotInRepo_thenSynchronizationWithTypeFromRic() throws Exception {
RIC_1.setState(RicState.AVAILABLE);
+ rics.put(RIC_1);
setUpCreationOfA1Client();
simulateRicWithOnePolicyType();
@@ -198,6 +204,7 @@ class RicSynchronizationTaskTest {
@Test
void ricIdleAndHavePolicies_thenSynchronizationWithRecreationOfPolicies() {
RIC_1.setState(RicState.AVAILABLE);
+ rics.put(RIC_1);
Policy transientPolicy = createPolicy("transientPolicyId", true);
@@ -226,6 +233,7 @@ class RicSynchronizationTaskTest {
@Test
void ricIdleAndErrorDeletingPoliciesFirstTime_thenSynchronizationWithDeletionOfPolicies() {
RIC_1.setState(RicState.AVAILABLE);
+ rics.put(RIC_1);
policies.put(POLICY_1);