summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePip.java8
-rw-r--r--applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePipTest.java15
-rw-r--r--applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/CoordinationGuardTranslator.java18
-rw-r--r--applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/CoordinationTest.java4
-rw-r--r--applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/SonCoordinationTest.java2
-rw-r--r--applications/guard/src/test/resources/requests/coordination.cl.vPci.node.1.json2
-rw-r--r--applications/guard/src/test/resources/requests/coordination.cl.vSonh.node.1.json2
7 files changed, 21 insertions, 30 deletions
diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePip.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePip.java
index b269e25a..fb018b02 100644
--- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePip.java
+++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePip.java
@@ -90,7 +90,7 @@ public class GetOperationOutcomePip extends StdOnapPip {
target = getAttribute(pipFinder, PIP_REQUEST_TARGET);
logger.debug("Going to query DB about: clname={}, target={}", clname, target);
- String outcome = doDatabaseQuery(clname, target);
+ String outcome = doDatabaseQuery(clname);
logger.debug("Query result is: {}", outcome);
StdMutablePIPResponse pipResponse = new StdMutablePIPResponse();
@@ -102,8 +102,8 @@ public class GetOperationOutcomePip extends StdOnapPip {
return new StdPIPResponse(pipResponse);
}
- private String doDatabaseQuery(String clname, String target) {
- logger.info("Querying operations history for {} {}", clname, target);
+ private String doDatabaseQuery(String clname) {
+ logger.info("Querying operations history for {}", clname);
//
// Only can query if we have an EntityManager
//
@@ -120,11 +120,9 @@ public class GetOperationOutcomePip extends StdOnapPip {
//
return em.createQuery("select e.outcome from Dbao e"
+ " where e.closedLoopName= ?1"
- + " and e.target= ?2"
+ " order by e.endtime desc",
String.class)
.setParameter(1, clname)
- .setParameter(2, target)
.setMaxResults(1)
.getSingleResult();
} catch (NoResultException e) {
diff --git a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePipTest.java b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePipTest.java
index e0dc7cd4..dcb172e6 100644
--- a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePipTest.java
+++ b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/operationshistory/GetOperationOutcomePipTest.java
@@ -189,13 +189,12 @@ public class GetOperationOutcomePipTest {
// Use reflection to run getCountFromDB
//
Method method = GetOperationOutcomePip.class.getDeclaredMethod("doDatabaseQuery",
- String.class,
String.class);
method.setAccessible(true);
//
// Test pipEngine
//
- String outcome = (String) method.invoke(pipEngine, "testcl1", "testtarget1");
+ String outcome = (String) method.invoke(pipEngine, "testcl1");
assertThat(outcome).isNull();
//
// Insert entry
@@ -204,7 +203,7 @@ public class GetOperationOutcomePipTest {
//
// Test pipEngine
//
- outcome = (String) method.invoke(pipEngine, "testcl1", "testtarget1");
+ outcome = (String) method.invoke(pipEngine, "testcl1");
//
// outcome should be "1"
//
@@ -214,25 +213,21 @@ public class GetOperationOutcomePipTest {
//
insertEntry("testcl1", "testtarget1", "2");
insertEntry("testcl2", "testtarget2", "3");
- insertEntry("testcl1", "testtarget2", "4");
//
// Test pipEngine
//
- outcome = (String) method.invoke(pipEngine, "testcl1", "testtarget1");
+ outcome = (String) method.invoke(pipEngine, "testcl1");
assertEquals("2", outcome);
- outcome = (String) method.invoke(pipEngine, "testcl2", "testtarget2");
+ outcome = (String) method.invoke(pipEngine, "testcl2");
assertEquals("3", outcome);
- outcome = (String) method.invoke(pipEngine, "testcl1", "testtarget2");
- assertEquals("4", outcome);
-
//
// Shut it down
//
pipEngine.shutdown();
- assertThat(method.invoke(pipEngine, "testcl1", "testtarget2")).isNull();
+ assertThat(method.invoke(pipEngine, "testcl1")).isNull();
}
private void insertEntry(String cl, String target, String outcome) {
diff --git a/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/CoordinationGuardTranslator.java b/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/CoordinationGuardTranslator.java
index 2c7ad587..b20c8cce 100644
--- a/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/CoordinationGuardTranslator.java
+++ b/applications/guard/src/main/java/org/onap/policy/xacml/pdp/application/guard/CoordinationGuardTranslator.java
@@ -42,6 +42,7 @@ import java.util.stream.Stream;
import org.apache.commons.io.IOUtils;
import org.onap.policy.common.utils.coder.CoderException;
import org.onap.policy.common.utils.coder.StandardYamlCoder;
+import org.onap.policy.common.utils.resources.ResourceUtils;
import org.onap.policy.models.decisions.concepts.DecisionRequest;
import org.onap.policy.models.decisions.concepts.DecisionResponse;
import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
@@ -157,15 +158,16 @@ public class CoordinationGuardTranslator implements ToscaPolicyTranslator {
/*
* Replace function placeholders with appropriate values
*/
- try (Stream<String> stream = Files.lines(Paths.get(xacmlProtoFilename))) {
- return stream.map(s -> s.replace("UNIQUE_ID", uniqueId))
- .map(s -> s.replace("CONTROL_LOOP_ONE", cLOne))
- .map(s -> s.replace("CONTROL_LOOP_TWO", cLTwo))
- .collect(Collectors.joining(XacmlPolicyUtils.LINE_SEPARATOR));
- } catch (IOException e) {
- throw new ToscaPolicyConversionException(
- "Error while generating XACML policy for coordination directive", e);
+ String policyXml = ResourceUtils.getResourceAsString(xacmlProtoFilename);
+ if (policyXml == null) {
+ throw new ToscaPolicyConversionException("Error while generating XACML policy for coordination directive");
}
+ policyXml = policyXml.replace("UNIQUE_ID", uniqueId);
+ policyXml = policyXml.replace("CONTROL_LOOP_ONE", cLOne);
+ policyXml = policyXml.replace("CONTROL_LOOP_TWO", cLTwo);
+
+ return policyXml;
+
}
}
diff --git a/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/CoordinationTest.java b/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/CoordinationTest.java
index 5b62f364..31aced6d 100644
--- a/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/CoordinationTest.java
+++ b/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/CoordinationTest.java
@@ -251,10 +251,6 @@ public class CoordinationTest {
//
insertOperationEvent(requestCl1Node1, OPEN);
//
- // Try cl2 on node2, cl1 only open on node1: should get permit
- //
- requestAndCheckDecision(requestCl2Node2, PERMIT);
- //
// Open cl2 on node2
//
insertOperationEvent(requestCl2Node2, OPEN);
diff --git a/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/SonCoordinationTest.java b/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/SonCoordinationTest.java
index e840bb7b..fc4c5e68 100644
--- a/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/SonCoordinationTest.java
+++ b/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/SonCoordinationTest.java
@@ -275,7 +275,7 @@ public class SonCoordinationTest {
//
Dbao newEntry = new Dbao();
newEntry.setActor(properties.get("actor").toString());
- newEntry.setOperation(properties.get("recipe").toString());
+ newEntry.setOperation(properties.get("operation").toString());
newEntry.setClosedLoopName(properties.get("clname").toString());
newEntry.setOutcome(outcome);
newEntry.setStarttime(Date.from(Instant.now().minusMillis(20000)));
diff --git a/applications/guard/src/test/resources/requests/coordination.cl.vPci.node.1.json b/applications/guard/src/test/resources/requests/coordination.cl.vPci.node.1.json
index 22e710bd..d6a48c7c 100644
--- a/applications/guard/src/test/resources/requests/coordination.cl.vPci.node.1.json
+++ b/applications/guard/src/test/resources/requests/coordination.cl.vPci.node.1.json
@@ -7,7 +7,7 @@
"resource": {
"guard": {
"actor": "SDNR",
- "recipe": "ModifyConfig",
+ "operation": "ModifyConfig",
"clname": "ControlLoop-vPCI-fb41f388-a5f2-11e8-98d0-529269fb1459",
"target": "node1"
}
diff --git a/applications/guard/src/test/resources/requests/coordination.cl.vSonh.node.1.json b/applications/guard/src/test/resources/requests/coordination.cl.vSonh.node.1.json
index 5846da37..10f2bc1e 100644
--- a/applications/guard/src/test/resources/requests/coordination.cl.vSonh.node.1.json
+++ b/applications/guard/src/test/resources/requests/coordination.cl.vSonh.node.1.json
@@ -7,7 +7,7 @@
"resource": {
"guard": {
"actor": "SDNR",
- "recipe": "ModifyConfigANR",
+ "operation": "ModifyConfigANR",
"clname": "ControlLoop-vSONH-7d4baf04-8875-4d1f-946d-06b874048b61",
"target": "node1"
}