aboutsummaryrefslogtreecommitdiffstats
path: root/controlloop/common/controller-usecases
diff options
context:
space:
mode:
authorjhh <jorge.hernandez-herrero@att.com>2020-02-24 18:14:04 -0600
committerjhh <jorge.hernandez-herrero@att.com>2020-02-24 18:22:33 -0600
commit6d284bc693b5103ad27ff533957ec2a51fa61f42 (patch)
treef0397737c3205f7869c8e1cd75ec344b66b099a5 /controlloop/common/controller-usecases
parent43c1e8c7c820bc8004725355a4a5eb0ad519e680 (diff)
vDNS tosca compliant policies support
Issue-ID: POLICY-2383 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I5d5d864b2853f6e7e0c7e1096cb17746500f2495 Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Diffstat (limited to 'controlloop/common/controller-usecases')
-rw-r--r--controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/UsecasesBase.java67
-rw-r--r--controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/VcpeTest.java6
-rw-r--r--controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/VfwTest.java6
-rw-r--r--controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/VlbTest.java44
-rw-r--r--controlloop/common/controller-usecases/src/test/resources/vlb/tosca-compliant-vlb.json48
5 files changed, 132 insertions, 39 deletions
diff --git a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/UsecasesBase.java b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/UsecasesBase.java
index 618963a70..66ad32462 100644
--- a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/UsecasesBase.java
+++ b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/UsecasesBase.java
@@ -36,6 +36,7 @@ import java.util.Queue;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import lombok.Getter;
+import org.apache.commons.lang3.StringUtils;
import org.kie.api.event.rule.AfterMatchFiredEvent;
import org.kie.api.event.rule.BeforeMatchFiredEvent;
import org.kie.api.event.rule.DefaultAgendaEventListener;
@@ -54,6 +55,7 @@ import org.onap.policy.common.endpoints.event.comm.TopicListener;
import org.onap.policy.common.endpoints.http.server.HttpServletServerFactoryInstance;
import org.onap.policy.common.utils.coder.CoderException;
import org.onap.policy.common.utils.coder.StandardCoder;
+import org.onap.policy.common.utils.resources.ResourceUtils;
import org.onap.policy.controlloop.drl.legacy.ControlLoopParams;
import org.onap.policy.drools.persistence.SystemPersistence;
import org.onap.policy.drools.persistence.SystemPersistenceConstants;
@@ -66,6 +68,7 @@ import org.onap.policy.drools.util.KieUtils;
import org.onap.policy.drools.utils.PropertyUtil;
import org.onap.policy.drools.utils.logging.LoggerUtil;
import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
+import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
import org.onap.policy.simulators.Util;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -76,6 +79,7 @@ import org.slf4j.LoggerFactory;
public abstract class UsecasesBase {
private static final Logger logger = LoggerFactory.getLogger(UsecasesBase.class);
+ private static final StandardCoder coder = new StandardCoder();
/**
* PDP-D Engine.
@@ -151,14 +155,33 @@ public abstract class UsecasesBase {
.get();
}
+ protected ToscaPolicy getPolicyFromResource(String resourcePath, String policyName) throws CoderException {
+ String policyJson = ResourceUtils.getResourceAsString(resourcePath);
+ ToscaServiceTemplate serviceTemplate = coder.decode(policyJson, ToscaServiceTemplate.class);
+ ToscaPolicy policy = serviceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyName);
+ assertNotNull(policy);
+
+ /*
+ * name and version are used within a drl. api component and drools core will ensure that these
+ * are populated.
+ */
+ if (StringUtils.isBlank(policy.getName())) {
+ policy.setName(policyName);
+ }
- /**
- * Installs a given policy.
- */
- protected ToscaPolicy setupPolicy(String policyPath) throws IOException, CoderException, InterruptedException {
+ if (StringUtils.isBlank(policy.getVersion())) {
+ policy.setVersion(policy.getTypeVersion());
+ }
+
+ return serviceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyName);
+ }
+
+ protected ToscaPolicy getPolicyFromFile(String policyPath) throws IOException, CoderException {
String rawPolicy = new String(Files.readAllBytes(Paths.get(policyPath)));
- ToscaPolicy policy = new StandardCoder().decode(rawPolicy, ToscaPolicy.class);
+ return coder.decode(rawPolicy, ToscaPolicy.class);
+ }
+ private ToscaPolicy setupPolicy(ToscaPolicy policy) throws InterruptedException {
final KieObjectExpectedCallback policyTracker = new KieObjectInsertedExpectedCallback<>(policy);
final KieObjectExpectedCallback paramsTracker = new KieClassInsertedExpectedCallback<>(ControlLoopParams.class);
@@ -167,24 +190,32 @@ public abstract class UsecasesBase {
assertTrue(policyTracker.isNotified());
assertTrue(paramsTracker.isNotified());
- assertEquals(1,
- usecases
- .getDrools()
- .facts(USECASES, ToscaPolicy.class).stream()
- .filter((anotherPolicy) -> anotherPolicy == policy)
- .count());
-
- assertEquals(1,
- usecases
- .getDrools()
- .facts(USECASES, ControlLoopParams.class).stream()
- .filter((params) -> params.getToscaPolicy() == policy)
- .count());
+ assertEquals(1, usecases.getDrools().facts(USECASES, ToscaPolicy.class).stream()
+ .filter((anotherPolicy) -> anotherPolicy == policy).count());
+ assertEquals(1, usecases.getDrools().facts(USECASES, ControlLoopParams.class).stream()
+ .filter((params) -> params.getToscaPolicy() == policy).count());
return policy;
}
/**
+ * Installs a policy from policy/models (examples) repo.
+ */
+ protected ToscaPolicy setupPolicyFromResource(String resourcePath, String policyName)
+ throws CoderException, InterruptedException {
+ return setupPolicy(getPolicyFromResource(resourcePath, policyName));
+ }
+
+
+ /**
+ * Installs a given policy.
+ */
+ protected ToscaPolicy setupPolicyFromFile(String policyPath)
+ throws IOException, CoderException, InterruptedException {
+ return setupPolicy(getPolicyFromFile(policyPath));
+ }
+
+ /**
* Deletes a policy.
*/
protected void deletePolicy(ToscaPolicy policy) throws InterruptedException {
diff --git a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/VcpeTest.java b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/VcpeTest.java
index 1d9d0dd26..ec3b50213 100644
--- a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/VcpeTest.java
+++ b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/VcpeTest.java
@@ -127,7 +127,7 @@ public class VcpeTest extends UsecasesBase {
@Test
public void sunnyDayLegacy() throws InterruptedException, CoderException, IOException {
assertEquals(0, usecases.getDrools().factCount(USECASES));
- policy = setupPolicy(TOSCA_LEGACY_POLICY_VCPE);
+ policy = setupPolicyFromFile(TOSCA_LEGACY_POLICY_VCPE);
assertEquals(2, usecases.getDrools().factCount(USECASES));
sunnyDay();
@@ -139,7 +139,7 @@ public class VcpeTest extends UsecasesBase {
@Test
public void sunnyDayCompliant() throws InterruptedException, CoderException, IOException {
assertEquals(0, usecases.getDrools().factCount(USECASES));
- policy = setupPolicy(TOSCA_COMPLIANT_POLICY_VCPE);
+ policy = setupPolicyFromFile(TOSCA_COMPLIANT_POLICY_VCPE);
assertEquals(2, usecases.getDrools().factCount(USECASES));
sunnyDay();
@@ -153,7 +153,7 @@ public class VcpeTest extends UsecasesBase {
@Test
public void onsetFloodPrevention() throws IOException, InterruptedException, CoderException {
assertEquals(0, usecases.getDrools().factCount(USECASES));
- policy = setupPolicy(TOSCA_LEGACY_POLICY_VCPE);
+ policy = setupPolicyFromFile(TOSCA_LEGACY_POLICY_VCPE);
assertEquals(2, usecases.getDrools().factCount(USECASES));
injectOnTopic(DCAE_TOPIC, Paths.get(ONSET_1));
diff --git a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/VfwTest.java b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/VfwTest.java
index 3796f0bfb..8386b3028 100644
--- a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/VfwTest.java
+++ b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/VfwTest.java
@@ -68,7 +68,7 @@ public class VfwTest extends UsecasesBase {
* Prepare PDP-D Framework for testing.
*/
@BeforeClass
- public static void prepareResouces() throws InterruptedException, CoderException, IOException {
+ public static void prepareResouces() throws InterruptedException, IOException {
setupLogging();
preparePdpD();
setupSimulators();
@@ -124,7 +124,7 @@ public class VfwTest extends UsecasesBase {
@Test
public void sunnyDayLegacy() throws InterruptedException, CoderException, IOException {
assertEquals(0, usecases.getDrools().factCount(USECASES));
- policy = setupPolicy(TOSCA_LEGACY_POLICY_VFW);
+ policy = setupPolicyFromFile(TOSCA_LEGACY_POLICY_VFW);
assertEquals(2, usecases.getDrools().factCount(USECASES));
sunnyDay();
@@ -136,7 +136,7 @@ public class VfwTest extends UsecasesBase {
@Test
public void sunnyDayCompliant() throws InterruptedException, CoderException, IOException {
assertEquals(0, usecases.getDrools().factCount(USECASES));
- policy = setupPolicy(TOSCA_COMPLIANT_POLICY_VFW);
+ policy = setupPolicyFromFile(TOSCA_COMPLIANT_POLICY_VFW);
assertEquals(2, usecases.getDrools().factCount(USECASES));
sunnyDay();
diff --git a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/VlbTest.java b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/VlbTest.java
index e577fab9b..73eeae882 100644
--- a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/VlbTest.java
+++ b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/VlbTest.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP
* ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2020 AT&T Intellectual Property. 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.
@@ -41,7 +41,8 @@ public class VlbTest extends UsecasesBase {
/**
* VLB Tosca Policy File.
*/
- private static final String TOSCA_POLICY_VLB = "src/test/resources/vlb/tosca-vlb.json";
+ private static final String TOSCA_LEGACY_POLICY_VLB = "src/test/resources/vlb/tosca-vlb.json";
+ private static final String TOSCA_COMPLIANT_POLICY_VLB = "src/test/resources/vlb/tosca-compliant-vlb.json";
/*
* VLB Use case Messages.
@@ -62,7 +63,7 @@ public class VlbTest extends UsecasesBase {
* Prepare PDP-D Framework for testing.
*/
@BeforeClass
- public static void prepareResouces() throws InterruptedException, CoderException, IOException {
+ public static void prepareResouces() throws InterruptedException, IOException {
setupLogging();
preparePdpD();
setupSimulators();
@@ -80,8 +81,7 @@ public class VlbTest extends UsecasesBase {
/**
* Sunny day scenario for the VCPE use case.
*/
- @Test
- public void sunnyDay() throws IOException {
+ private void sunnyDay() throws IOException {
/* Inject an ONSET event over the DCAE topic */
injectOnTopic(DCAE_TOPIC, Paths.get(ONSET));
@@ -101,6 +101,30 @@ public class VlbTest extends UsecasesBase {
}
/**
+ * Sunny Day with Legacy Tosca Policy.
+ */
+ @Test
+ public void sunnyDayLegacy() throws InterruptedException, CoderException, IOException {
+ assertEquals(0, usecases.getDrools().factCount(USECASES));
+ policy = setupPolicyFromFile(TOSCA_LEGACY_POLICY_VLB);
+ assertEquals(2, usecases.getDrools().factCount(USECASES));
+
+ sunnyDay();
+ }
+
+ /**
+ * Sunny Day with Tosca Compliant Policy.
+ */
+ @Test
+ public void sunnyDayCompliant() throws InterruptedException, CoderException, IOException {
+ assertEquals(0, usecases.getDrools().factCount(USECASES));
+ policy = setupPolicyFromFile(TOSCA_COMPLIANT_POLICY_VLB);
+ assertEquals(2, usecases.getDrools().factCount(USECASES));
+
+ sunnyDay();
+ }
+
+ /**
* Observe Topics.
*/
@Before
@@ -119,16 +143,6 @@ public class VlbTest extends UsecasesBase {
}
/**
- * Install Policy.
- */
- @Before
- public void installPolicy() throws IOException, CoderException, InterruptedException {
- assertEquals(0, usecases.getDrools().factCount(USECASES));
- policy = setupPolicy(TOSCA_POLICY_VLB);
- assertEquals(2, usecases.getDrools().factCount(USECASES));
- }
-
- /**
* Uninstall Policy.
*/
@After
diff --git a/controlloop/common/controller-usecases/src/test/resources/vlb/tosca-compliant-vlb.json b/controlloop/common/controller-usecases/src/test/resources/vlb/tosca-compliant-vlb.json
new file mode 100644
index 000000000..0ddd63006
--- /dev/null
+++ b/controlloop/common/controller-usecases/src/test/resources/vlb/tosca-compliant-vlb.json
@@ -0,0 +1,48 @@
+{
+ "type": "onap.policies.controlloop.operational.common.Drools",
+ "type_version": "1.0.0",
+ "name": "operational.scaleout",
+ "version": "1.0.0",
+ "metadata": {
+ "policy-id": "operational.scaleout"
+ },
+ "properties": {
+ "id": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
+ "timeout": 1200,
+ "abatement": false,
+ "trigger": "unique-policy-id-1-scale-up",
+ "operations": [
+ {
+ "id": "unique-policy-id-1-scale-up",
+ "description": "Create a new VF Module",
+ "operation": {
+ "actor": "SO",
+ "operation": "VF Module Create",
+ "target": {
+ "targetType": "VFMODULE",
+ "entityIds": {
+ "modelInvariantId": "e6130d03-56f1-4b0a-9a1d-e1b2ebc30e0e",
+ "modelVersionId": "94b18b1d-cc91-4f43-911a-e6348665f292",
+ "modelName": "VfwclVfwsnkBbefb8ce2bde..base_vfw..module-0",
+ "modelVersion": 1,
+ "modelCustomizationId": "47958575-138f-452a-8c8d-d89b595f8164"
+ }
+ },
+ "payload": {
+ "requestParameters": "{\"usePreload\":true,\"userParams\":[]}",
+ "configurationParameters": "[{\"ip-addr\":\"$.vf-module-topology.vf-module-parameters.param[9]\",\"oam-ip-addr\":\"$.vf-module-topology.vf-module-parameters.param[16]\",\"enabled\":\"$.vf-module-topology.vf-module-parameters.param[23]\"}]"
+ }
+ },
+ "timeout": 1200,
+ "retries": 0,
+ "success": "final_success",
+ "failure": "final_failure",
+ "failure_timeout": "final_failure_timeout",
+ "failure_retries": "final_failure_retries",
+ "failure_exception": "final_failure_exception",
+ "failure_guard": "final_failure_guard"
+ }
+ ],
+ "controllerName": "usecases"
+ }
+}