From d2daf7ef5d003b5c5ae6a7083ccf676cc87a1d7b Mon Sep 17 00:00:00 2001
From: Pamela Dragosh <pdragosh@research.att.com>
Date: Wed, 27 Mar 2019 06:40:18 -0400
Subject: Adding guard PIP

Adding the PIP support into the translator to setup the count
attribute as an attribute generated by PIP and not sent by
calling application.

Added JUnit for OperationsHistoryPipEngine.

Issue-ID: POLICY-1471
Change-Id: I71773ee8ea0e6c02873506d973a604899383d4b5
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---
 .../decisions/decision.guard.shoulddeny.input.json       |  3 ++-
 .../decisions/decision.guard.shoulddeny.input2.json      | 15 ---------------
 .../decisions/decision.guard.shouldpermit.input.json     |  2 +-
 .../decisions/decision.guard.vfCount.1.input.json        | 16 ++++++++++++++++
 .../decisions/decision.guard.vfCount.3.input.json        | 16 ++++++++++++++++
 .../decisions/decision.guard.vfCount.6.input.json        | 16 ++++++++++++++++
 6 files changed, 51 insertions(+), 17 deletions(-)
 delete mode 100644 main/src/test/resources/decisions/decision.guard.shoulddeny.input2.json
 create mode 100644 main/src/test/resources/decisions/decision.guard.vfCount.1.input.json
 create mode 100644 main/src/test/resources/decisions/decision.guard.vfCount.3.input.json
 create mode 100644 main/src/test/resources/decisions/decision.guard.vfCount.6.input.json

(limited to 'main')

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 5906382c..336d9270 100644
--- a/main/src/test/resources/decisions/decision.guard.shoulddeny.input.json
+++ b/main/src/test/resources/decisions/decision.guard.shoulddeny.input.json
@@ -9,7 +9,8 @@
           "actor": "SO",
           "recipe": "VF Module Create",
           "clname": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
-          "operationCount" : "1"
+          "target": "vLoadBalancer-00",
+          "vfCount" : "6"
       }
   }
 }
\ 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
deleted file mode 100644
index a97fc16e..00000000
--- a/main/src/test/resources/decisions/decision.guard.shoulddeny.input2.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "ONAPName": "Policy",
-  "ONAPComponent": "drools-pdp",
-  "ONAPInstance": "usecase-template",
-  "requestId": "unique-request-id-2",
-  "action": "guard",
-  "resource": {
-      "guard": {
-          "actor": "SO",
-          "recipe": "VF Module Create",
-          "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.shouldpermit.input.json b/main/src/test/resources/decisions/decision.guard.shouldpermit.input.json
index a80a4cfa..75fa00fc 100644
--- a/main/src/test/resources/decisions/decision.guard.shouldpermit.input.json
+++ b/main/src/test/resources/decisions/decision.guard.shouldpermit.input.json
@@ -9,7 +9,7 @@
           "actor": "SO",
           "recipe": "VF Module Create",
           "clname": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
-          "operationCount": "0",
+          "target": "vLoadBalancer-00",
           "vfCount": "1"
       }
   }
diff --git a/main/src/test/resources/decisions/decision.guard.vfCount.1.input.json b/main/src/test/resources/decisions/decision.guard.vfCount.1.input.json
new file mode 100644
index 00000000..ef1b5f65
--- /dev/null
+++ b/main/src/test/resources/decisions/decision.guard.vfCount.1.input.json
@@ -0,0 +1,16 @@
+{
+  "ONAPName": "Policy",
+  "ONAPComponent": "drools-pdp",
+  "ONAPInstance": "usecase-template",
+  "requestId": "unique-request-id-1",
+  "action": "guard",
+  "resource": {
+      "guard": {
+          "actor": "SO",
+          "recipe": "VF Module Create",
+          "clname": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
+          "target": "vLoadBalancer-00",
+          "vfCount": "1"
+      }
+  }
+}
diff --git a/main/src/test/resources/decisions/decision.guard.vfCount.3.input.json b/main/src/test/resources/decisions/decision.guard.vfCount.3.input.json
new file mode 100644
index 00000000..9faa55d6
--- /dev/null
+++ b/main/src/test/resources/decisions/decision.guard.vfCount.3.input.json
@@ -0,0 +1,16 @@
+{
+  "ONAPName": "Policy",
+  "ONAPComponent": "drools-pdp",
+  "ONAPInstance": "usecase-template",
+  "requestId": "unique-request-id-3",
+  "action": "guard",
+  "resource": {
+      "guard": {
+          "actor": "SO",
+          "recipe": "VF Module Create",
+          "clname": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
+          "target": "vLoadBalancer-00",
+          "vfCount": "3"
+      }
+  }
+}
diff --git a/main/src/test/resources/decisions/decision.guard.vfCount.6.input.json b/main/src/test/resources/decisions/decision.guard.vfCount.6.input.json
new file mode 100644
index 00000000..e00d67ae
--- /dev/null
+++ b/main/src/test/resources/decisions/decision.guard.vfCount.6.input.json
@@ -0,0 +1,16 @@
+{
+  "ONAPName": "Policy",
+  "ONAPComponent": "drools-pdp",
+  "ONAPInstance": "usecase-template",
+  "requestId": "unique-request-id-2",
+  "action": "guard",
+  "resource": {
+      "guard": {
+          "actor": "SO",
+          "recipe": "VF Module Create",
+          "clname": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
+          "target": "vLoadBalancer-00",
+          "vfCount" : "6"
+      }
+  }
+}
-- 
cgit 1.2.3-korg