* ============LICENSE_START=======================================================
* Copyright (C) 2019-2021 Nordix Foundation.
* Modifications Copyright (C) 2020-2021 AT&T Intellectual Property.
- * Modifications Copyright (C) 2021-2022 Bell Canada. All rights reserved.
+ * Modifications Copyright (C) 2021-2023 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
-import java.text.ParseException;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.Map;
import java.util.stream.Collectors;
import org.junit.Test;
import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure;
import org.onap.policy.common.utils.coder.CoderException;
import org.onap.policy.models.base.PfModelException;
import org.onap.policy.models.pdp.concepts.PdpGroup;
-import org.onap.policy.models.pdp.concepts.PdpStatistics;
import org.onap.policy.models.pdp.concepts.PdpStatus;
import org.onap.policy.models.pdp.concepts.PdpSubGroup;
import org.onap.policy.models.pdp.concepts.PdpUpdate;
addGroups("PdpGroups.json");
PapParameterGroup parameterGroup = new PapParameterGroup();
parameterGroup.setPdpParameters(new PdpParameters());
- parameterGroup.setSavePdpStatisticsInDb(true);
// Testing pdp registration success case
final PdpStatus status1 = new PdpStatus();
policies.add(polA);
policies.add(polB);
final PapParameterGroup testGroup = new CommonTestData().getPapParameterGroup(1);
- testGroup.setSavePdpStatisticsInDb(true);
List<ToscaConceptIdentifier> polsUndep =
policies.stream().map(ToscaPolicy::getIdentifier).collect(Collectors.toList());
- PdpStatusMessageHandler handler = new PdpStatusMessageHandler(testGroup, pdpGroupService,
- pdpStatisticsService);
+ PdpStatusMessageHandler handler = new PdpStatusMessageHandler(testGroup, pdpGroupService);
PdpUpdate update10 =
handler.createPdpUpdateMessage(status3.getPdpGroup(), new PdpSubGroup(), "pdp_2", policies, polsUndep);
assertSame(update10.getPoliciesToBeDeployed(), policies);
assertSame(update10.getPoliciesToBeUndeployed(), polsUndep);
assertThat(update10.getPoliciesToBeDeployed()).isInstanceOf(List.class);
}
-
- @Test
- public void testPdpStatistics() throws CoderException, PfModelException, ParseException {
- addGroups("PdpGroups.json");
- PapParameterGroup parameterGroup = new PapParameterGroup();
- parameterGroup.setPdpParameters(new PdpParameters());
- parameterGroup.setSavePdpStatisticsInDb(true);
- timeStamp = Instant.parse("2021-02-12T17:48:01.029211400Z");
-
- // init default pdp group
- final PdpStatus status1 = new PdpStatus();
- status1.setName(PDP_NAME);
- status1.setState(PdpState.ACTIVE);
- status1.setPdpGroup(DEFAULT_GROUP);
- status1.setPdpType(APEX_TYPE);
- status1.setHealthy(PdpHealthStatus.HEALTHY);
- final List<ToscaConceptIdentifier> idents1 =
- Arrays.asList(new ToscaConceptIdentifier(POLICY_NAME, POLICY_VERSION));
- status1.setPolicies(idents1);
- pdpHeartbeatListener.onTopicEvent(INFRA, TOPIC, status1);
- verifyPdpGroup(DEFAULT_GROUP, 1);
-
- // init pdp instance
- final PdpStatus status2 = new PdpStatus();
- status2.setName(PDP_NAME);
- status2.setState(PdpState.ACTIVE);
- status2.setPdpGroup(DEFAULT_GROUP);
- status2.setPdpType(APEX_TYPE);
- status2.setHealthy(PdpHealthStatus.HEALTHY);
- status2.setPdpSubgroup(APEX_TYPE);
- final List<ToscaConceptIdentifier> idents2 =
- Arrays.asList(new ToscaConceptIdentifier(POLICY_NAME, POLICY_VERSION));
- status2.setPolicies(idents2);
- pdpHeartbeatListener.onTopicEvent(INFRA, TOPIC, status2);
-
- // Testing passing pdp statistics success case
- final PdpStatus status3 = new PdpStatus();
- status3.setName(PDP_NAME);
- status3.setState(PdpState.ACTIVE);
- status3.setPdpGroup(DEFAULT_GROUP);
- status3.setPdpType(APEX_TYPE);
- status3.setHealthy(PdpHealthStatus.HEALTHY);
- status3.setPdpSubgroup(APEX_TYPE);
- final List<ToscaConceptIdentifier> idents3 =
- Arrays.asList(new ToscaConceptIdentifier(POLICY_NAME, POLICY_VERSION));
- status3.setPolicies(idents3);
-
- PdpStatistics pdpStatistics03 = new PdpStatistics();
- pdpStatistics03.setPdpInstanceId(PDP_NAME);
- pdpStatistics03.setPdpGroupName(DEFAULT_GROUP);
- pdpStatistics03.setPdpSubGroupName(APEX_TYPE);
- pdpStatistics03.setTimeStamp(timeStamp);
- status3.setStatistics(pdpStatistics03);
- pdpHeartbeatListener.onTopicEvent(INFRA, TOPIC, status3);
- verifyPdpStatistics(PDP_NAME, DEFAULT_GROUP, APEX_TYPE, 1);
-
- // Testing pdp statistics failure having the pdpStatistics null in the heartbeat for already registered pdp
- final PdpStatus status4 = new PdpStatus();
- status4.setName(PDP_NAME);
- status4.setState(PdpState.ACTIVE);
- status4.setPdpGroup(DEFAULT_GROUP);
- status4.setPdpType(APEX_TYPE);
- status4.setHealthy(PdpHealthStatus.HEALTHY);
- status4.setPdpSubgroup(APEX_TYPE);
- final List<ToscaConceptIdentifier> idents4 =
- Arrays.asList(new ToscaConceptIdentifier(POLICY_NAME, POLICY_VERSION));
- status4.setPolicies(idents4);
- status4.setStatistics(null);
- pdpHeartbeatListener.onTopicEvent(INFRA, TOPIC, status4);
- verifyPdpStatistics(PDP_NAME, DEFAULT_GROUP, APEX_TYPE, 1);
-
- // Testing pdp statistics failure passing different pdpGroup, PdpSubGroup & pdpInstanceId
- final PdpStatus status5 = new PdpStatus();
- status5.setName(PDP_NAME);
- status5.setState(PdpState.ACTIVE);
- status5.setPdpGroup(DEFAULT_GROUP);
- status5.setPdpType(APEX_TYPE);
- status5.setHealthy(PdpHealthStatus.HEALTHY);
- status5.setPdpSubgroup(APEX_TYPE);
- final List<ToscaConceptIdentifier> idents5 =
- Arrays.asList(new ToscaConceptIdentifier(POLICY_NAME, POLICY_VERSION));
- status5.setPolicies(idents5);
-
- PdpStatistics pdpStatistics05 = new PdpStatistics();
- pdpStatistics05.setPdpInstanceId("pdp_2");
- pdpStatistics05.setPdpGroupName("defaultGroup_1");
- pdpStatistics05.setPdpSubGroupName("apex_1");
- pdpStatistics03.setTimeStamp(timeStamp);
- status5.setStatistics(pdpStatistics05);
-
- pdpHeartbeatListener.onTopicEvent(INFRA, TOPIC, status5);
- verifyPdpStatistics(PDP_NAME, DEFAULT_GROUP, APEX_TYPE, 1);
-
- // Test pdp statistics failure passing negative values
- final PdpStatus status6 = new PdpStatus();
- status6.setName(PDP_NAME);
- status6.setState(PdpState.ACTIVE);
- status6.setPdpGroup(DEFAULT_GROUP);
- status6.setPdpType(APEX_TYPE);
- status6.setHealthy(PdpHealthStatus.HEALTHY);
- status6.setPdpSubgroup(APEX_TYPE);
- final List<ToscaConceptIdentifier> idents6 =
- Arrays.asList(new ToscaConceptIdentifier(POLICY_NAME, POLICY_VERSION));
- status5.setPolicies(idents6);
-
- PdpStatistics pdpStatistics06 = new PdpStatistics();
- pdpStatistics06.setPdpInstanceId(PDP_NAME);
- pdpStatistics06.setPdpGroupName(DEFAULT_GROUP);
- pdpStatistics06.setPdpSubGroupName(APEX_TYPE);
- pdpStatistics03.setTimeStamp(timeStamp);
-
- pdpStatistics06.setPolicyDeployCount(-1);
- pdpStatistics06.setPolicyDeployFailCount(-1);
- pdpStatistics06.setPolicyUndeployCount(-1);
- pdpStatistics06.setPolicyUndeployFailCount(-1);
- status5.setStatistics(pdpStatistics06);
-
- pdpHeartbeatListener.onTopicEvent(INFRA, TOPIC, status5);
- verifyPdpStatistics(PDP_NAME, DEFAULT_GROUP, APEX_TYPE, 1);
-
- // Test pdp statistics save disabled case, sending valid pdp status but count should still remain 1
- parameterGroup = new PapParameterGroup();
- parameterGroup.setPdpParameters(new PdpParameters());
- parameterGroup.setSavePdpStatisticsInDb(false);
- timeStamp = Instant.parse("2021-02-12T17:48:05.029211400Z");
- final PdpStatus status7 = new PdpStatus();
- status7.setName(PDP_NAME);
- status7.setState(PdpState.ACTIVE);
- status7.setPdpGroup(DEFAULT_GROUP);
- status7.setPdpType(APEX_TYPE);
- status7.setHealthy(PdpHealthStatus.HEALTHY);
- status7.setPdpSubgroup(APEX_TYPE);
- final List<ToscaConceptIdentifier> idents7 =
- Arrays.asList(new ToscaConceptIdentifier(POLICY_NAME, POLICY_VERSION));
- status7.setPolicies(idents7);
-
- PdpStatistics pdpStatistics07 = new PdpStatistics();
- pdpStatistics07.setPdpInstanceId(PDP_NAME);
- pdpStatistics07.setPdpGroupName(DEFAULT_GROUP);
- pdpStatistics07.setPdpSubGroupName(APEX_TYPE);
- pdpStatistics07.setTimeStamp(timeStamp);
- status7.setStatistics(pdpStatistics07);
- pdpHeartbeatListener.onTopicEvent(INFRA, TOPIC, status7);
- verifyPdpStatistics(PDP_NAME, DEFAULT_GROUP, APEX_TYPE, 1);
-
- }
-
+
private void verifyPdpGroup(final String name, final int count) throws PfModelException {
final List<PdpGroup> fetchedGroups = fetchGroups(name);
for (final PdpSubGroup subGroup : fetchedGroups.get(0).getPdpSubgroups()) {
}
}
}
-
- private void verifyPdpStatistics(final String pdpInstanceId, final String pdpGroupName,
- final String pdpSubGroupName, final int count) throws PfModelException {
- final Map<String, Map<String, List<PdpStatistics>>> fetchedPdpStatistics =
- fetchPdpStatistics(pdpInstanceId, pdpGroupName, pdpSubGroupName);
- assertEquals(count, fetchedPdpStatistics.size());
- }
}
Code Review / policy / pap.git / blobdiff