aboutsummaryrefslogtreecommitdiffstats
path: root/main/src
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2019-03-22 14:12:52 -0400
committerPamela Dragosh <pdragosh@research.att.com>2019-03-25 13:54:56 -0400
commit2c847e0855b316c162c9fd31456fdf8e338a5dba (patch)
treeceb330604ec28a2cde721ebc0774508a533a1e56 /main/src
parentd5c3b36247605392b4f75b2e44296922559baac6 (diff)
Adding optimization application finish guard
Created Optimization application and created a translator for it. The translator makes an assumption that OOF wants to query on policyScope and policyType properties. Rearranged some of the test code for re-usability. Guard policies are now creating for frequency limiter and min max. Probably could use some clean up. Upgraded to xacml 2.0.1 to include a fix for handling null attribute values. Added some code to test missing values. Issue-ID: POLICY-1273 Change-Id: Ia3dbfa992bbe0cbb5aa294c38aa2aff430a3230a Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Diffstat (limited to 'main/src')
-rw-r--r--main/src/test/resources/decisions/decision.guard.shoulddeny.input.json7
-rw-r--r--main/src/test/resources/decisions/decision.guard.shoulddeny.input2.json15
-rw-r--r--main/src/test/resources/decisions/decision.guard.shoulddeny.output.json3
-rw-r--r--main/src/test/resources/decisions/decision.guard.shouldpermit.input.json8
-rw-r--r--main/src/test/resources/decisions/decision.guard.shouldpermit.output.json3
-rw-r--r--main/src/test/resources/decisions/decision.optimization.affinity.input.json10
6 files changed, 34 insertions, 12 deletions
diff --git a/main/src/test/resources/decisions/decision.guard.shoulddeny.input.json b/main/src/test/resources/decisions/decision.guard.shoulddeny.input.json
index ba9b5543..65d40c0a 100644
--- a/main/src/test/resources/decisions/decision.guard.shoulddeny.input.json
+++ b/main/src/test/resources/decisions/decision.guard.shoulddeny.input.json
@@ -1,14 +1,15 @@
{
"ONAPName": "Policy",
- "ONAPComponent": "DCAE",
- "ONAPInstance": "optional-tbd",
+ "ONAPComponent": "drools-pdp",
+ "ONAPInstance": "usecase-template",
+ "requestId": "unique-request-id-2",
"action": "guard",
"resource": {
"guard": {
"actor": "SO",
"recipe": "scaleOut",
"clname": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
- "vfcount" : "5"
+ "operationCount" : "1"
}
}
} \ No newline at end of file
diff --git a/main/src/test/resources/decisions/decision.guard.shoulddeny.input2.json b/main/src/test/resources/decisions/decision.guard.shoulddeny.input2.json
new file mode 100644
index 00000000..29dfc3dc
--- /dev/null
+++ b/main/src/test/resources/decisions/decision.guard.shoulddeny.input2.json
@@ -0,0 +1,15 @@
+{
+ "ONAPName": "Policy",
+ "ONAPComponent": "drools-pdp",
+ "ONAPInstance": "usecase-template",
+ "requestId": "unique-request-id-2",
+ "action": "guard",
+ "resource": {
+ "guard": {
+ "actor": "SO",
+ "recipe": "scaleOut",
+ "clname": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
+ "vfCount" : "6"
+ }
+ }
+} \ No newline at end of file
diff --git a/main/src/test/resources/decisions/decision.guard.shoulddeny.output.json b/main/src/test/resources/decisions/decision.guard.shoulddeny.output.json
deleted file mode 100644
index 3752fe47..00000000
--- a/main/src/test/resources/decisions/decision.guard.shoulddeny.output.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "status": "deny"
-} \ No newline at end of file
diff --git a/main/src/test/resources/decisions/decision.guard.shouldpermit.input.json b/main/src/test/resources/decisions/decision.guard.shouldpermit.input.json
index 324d495a..92e933f7 100644
--- a/main/src/test/resources/decisions/decision.guard.shouldpermit.input.json
+++ b/main/src/test/resources/decisions/decision.guard.shouldpermit.input.json
@@ -1,14 +1,16 @@
{
"ONAPName": "Policy",
- "ONAPComponent": "DCAE",
- "ONAPInstance": "optional-tbd",
+ "ONAPComponent": "drools-pdp",
+ "ONAPInstance": "usecase-template",
+ "requestId": "unique-request-id-1",
"action": "guard",
"resource": {
"guard": {
"actor": "SO",
"recipe": "scaleOut",
"clname": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
- "vfcount" : "1"
+ "operationCount": "0",
+ "vfCount": "1"
}
}
} \ No newline at end of file
diff --git a/main/src/test/resources/decisions/decision.guard.shouldpermit.output.json b/main/src/test/resources/decisions/decision.guard.shouldpermit.output.json
deleted file mode 100644
index a1939262..00000000
--- a/main/src/test/resources/decisions/decision.guard.shouldpermit.output.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "status": "permit"
-} \ No newline at end of file
diff --git a/main/src/test/resources/decisions/decision.optimization.affinity.input.json b/main/src/test/resources/decisions/decision.optimization.affinity.input.json
new file mode 100644
index 00000000..1794acea
--- /dev/null
+++ b/main/src/test/resources/decisions/decision.optimization.affinity.input.json
@@ -0,0 +1,10 @@
+{
+ "ONAPName": "OOF",
+ "ONAPComponent": "OOF-component",
+ "ONAPInstance": "OOF-component-instance",
+ "action": "optimize",
+ "resource": {
+ "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra", "vG"],
+ "policyType": "zone"
+ }
+} \ No newline at end of file