From 0adce51b4e79e3be3b92ab99e671dc4479f80486 Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Tue, 25 Aug 2020 13:18:02 -0400 Subject: Remove deprecated Policy Component Tests These tests I don't think are being called anymore. They refer to the old policy/engine code which is being deprecated. In addition, removing the drools-pdp Health check as the new PAP component consolidates all the policy components into one Healthcheck now. Minor fix for dcagen2 Policy Type that was missed in my last review. Renamed the Policy Healthcheck to remove the "new" Issue-ID: POLICY-2003 Change-Id: I8e90a1a70ca71ec57c665a4de6a02c223f3ccbe5 Signed-off-by: Pamela Dragosh --- .../templates/policy/FirewallPolicy_delete.jinja | 6 ---- .../templates/policy/FirewallPolicy_push.jinja | 5 --- .../templates/policy/FirewallPolicy_update.jinja | 16 ---------- .../templates/policy/closedloop_configpolicy.jinja | 36 ---------------------- .../templates/policy/closedloop_createpolicy.jinja | 21 ------------- .../templates/policy/closedloop_deletepolicy.jinja | 5 --- .../policy/closedloop_getconfigpolicy.jinja | 8 ----- .../templates/policy/closedloop_opspolicy.jinja | 24 --------------- .../templates/policy/closedloop_pushpolicy.jinja | 5 --- 9 files changed, 126 deletions(-) delete mode 100644 robot/assets/templates/policy/FirewallPolicy_delete.jinja delete mode 100644 robot/assets/templates/policy/FirewallPolicy_push.jinja delete mode 100644 robot/assets/templates/policy/FirewallPolicy_update.jinja delete mode 100644 robot/assets/templates/policy/closedloop_configpolicy.jinja delete mode 100644 robot/assets/templates/policy/closedloop_createpolicy.jinja delete mode 100644 robot/assets/templates/policy/closedloop_deletepolicy.jinja delete mode 100644 robot/assets/templates/policy/closedloop_getconfigpolicy.jinja delete mode 100644 robot/assets/templates/policy/closedloop_opspolicy.jinja delete mode 100644 robot/assets/templates/policy/closedloop_pushpolicy.jinja (limited to 'robot/assets') diff --git a/robot/assets/templates/policy/FirewallPolicy_delete.jinja b/robot/assets/templates/policy/FirewallPolicy_delete.jinja deleted file mode 100644 index ba891aff..00000000 --- a/robot/assets/templates/policy/FirewallPolicy_delete.jinja +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pdpGroup": "default", - "policyComponent" : "PDP", - "policyName": "{{policyName}}", - "policyType": "BRMS_Param" -} \ No newline at end of file diff --git a/robot/assets/templates/policy/FirewallPolicy_push.jinja b/robot/assets/templates/policy/FirewallPolicy_push.jinja deleted file mode 100644 index ddf95f0b..00000000 --- a/robot/assets/templates/policy/FirewallPolicy_push.jinja +++ /dev/null @@ -1,5 +0,0 @@ -{ - "pdpGroup": "default", - "policyName": "com.BRMSParamvFirewall", - "policyType": "BRMS_Param" -} \ No newline at end of file diff --git a/robot/assets/templates/policy/FirewallPolicy_update.jinja b/robot/assets/templates/policy/FirewallPolicy_update.jinja deleted file mode 100644 index 2a71c1d6..00000000 --- a/robot/assets/templates/policy/FirewallPolicy_update.jinja +++ /dev/null @@ -1,16 +0,0 @@ -{ - "policyConfigType": "BRMS_PARAM", - "policyName": "com.BRMSParamvFirewall", - "policyDescription": "BRMS Param vFirewall policy", - "policyScope": "com", - "attributes": { - "MATCHING": { - "controller": "amsterdam" - }, - "RULE": { - "templateName": "ClosedLoopControlName", - "closedLoopControlName": "ControlLoop-vFirewall-{{RESOURCE_ID}}", - "controlLoopYaml": "controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-vFirewall-{{RESOURCE_ID}}%0D%0A++trigger_policy%3A+unique-policy-id-1-modifyConfig%0D%0A++timeout%3A+1200%0D%0A++abatement%3A+false%0D%0A+%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-1-modifyConfig%0D%0A++++name%3A+modify+packet+gen+config%0D%0A++++description%3A%0D%0A++++actor%3A+APPC%0D%0A++++recipe%3A+ModifyConfig%0D%0A++++target%3A%0D%0A++++++%23+TBD+-+Cannot+be+known+until+instantiation+is+done%0D%0A++++++resourceID%3A+{{RESOURCE_ID}}%0D%0A++++++type%3A+VNF%0D%0A++++retry%3A+0%0D%0A++++timeout%3A+300%0D%0A++++success%3A+final_success%0D%0A++++failure%3A+final_failure%0D%0A++++failure_timeout%3A+final_failure_timeout%0D%0A++++failure_retries%3A+final_failure_retries%0D%0A++++failure_exception%3A+final_failure_exception%0D%0A++++failure_guard%3A+final_failure_guard" - } - } -} diff --git a/robot/assets/templates/policy/closedloop_configpolicy.jinja b/robot/assets/templates/policy/closedloop_configpolicy.jinja deleted file mode 100644 index b7bd35b2..00000000 --- a/robot/assets/templates/policy/closedloop_configpolicy.jinja +++ /dev/null @@ -1,36 +0,0 @@ -{ - "service": "tca_policy", - "location": "SampleServiceLocation", - "uuid": "test", - "policyName": "MicroServicevDNS", - "description": "MicroService vDNS Policy", - "configName": "SampleConfigName", - "templateVersion": "OpenSource.version.1", - "version": "1.1.0", - "priority": "1", - "policyScope": "resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3", - "riskType": "SampleRiskType", - "riskLevel": "1", - "guard": "False", - "content": { - "tca_policy": { - "domain": "measurementsForVfScaling", - "metricsPerEventName": [{ - "eventName": "vLoadBalancer", - "controlLoopSchemaType": "VM", - "policyScope": "DCAE", - "policyName": "DCAE.Config_tca-hi-lo", - "policyVersion": "v0.0.1", - "thresholds": [{ - "closedLoopControlName": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3", - "version": "1.0.2", - "fieldPath": "$$.event.measurementsForVfScalingFields.vNicUsageArray[*].receivedTotalPacketsDelta", - "thresholdValue": 300, - "direction": "GREATER_OR_EQUAL", - "severity": "CRITICAL", - "closedLoopEventStatus": "ONSET" - }] - }] - } - } -} \ No newline at end of file diff --git a/robot/assets/templates/policy/closedloop_createpolicy.jinja b/robot/assets/templates/policy/closedloop_createpolicy.jinja deleted file mode 100644 index 0ee2e711..00000000 --- a/robot/assets/templates/policy/closedloop_createpolicy.jinja +++ /dev/null @@ -1,21 +0,0 @@ -{ - "policyConfigType": "BRMS_PARAM", - "policyName": "{{policy_name}}", - "policyDescription": "Create BRMS Param policy", - "attributes": { - "RULE": { - "templateName": "ClosedLoopDemo_closedLoopControlName", - "aaiNamedQueryUUID": "2", - "aaiPassword": "2", - "aaiPatternMatch": "2", - "aaiURL": "2", - "actor": "2", - "appcTopic": "2", - "closedLoopControlName": "2", - "msoPassword": "2", - "msoURL": "2", - "msoUsername": "2", - "aaiUsername": "3" - } - } -} \ No newline at end of file diff --git a/robot/assets/templates/policy/closedloop_deletepolicy.jinja b/robot/assets/templates/policy/closedloop_deletepolicy.jinja deleted file mode 100644 index 45ca2bea..00000000 --- a/robot/assets/templates/policy/closedloop_deletepolicy.jinja +++ /dev/null @@ -1,5 +0,0 @@ -{ - "pdpGroup": "default", - "policyComponent": "PDP", - "policyName": "{{policy_name}}" -} \ No newline at end of file diff --git a/robot/assets/templates/policy/closedloop_getconfigpolicy.jinja b/robot/assets/templates/policy/closedloop_getconfigpolicy.jinja deleted file mode 100644 index f1142b57..00000000 --- a/robot/assets/templates/policy/closedloop_getconfigpolicy.jinja +++ /dev/null @@ -1,8 +0,0 @@ -{ - "configAttributes" : { - }, - "configName" : ".*", - "ecompName" : "DCAE", - "policyName" : "{{config_policy_name}}", - "unique" : true -} \ No newline at end of file diff --git a/robot/assets/templates/policy/closedloop_opspolicy.jinja b/robot/assets/templates/policy/closedloop_opspolicy.jinja deleted file mode 100644 index d6d62028..00000000 --- a/robot/assets/templates/policy/closedloop_opspolicy.jinja +++ /dev/null @@ -1,24 +0,0 @@ - -{ - "policyConfigType": "BRMS_PARAM", - "policyName": "{{policy_name}}", - "policyDescription": "Create BRMS Param policy for vFW", - "attributes": { - "RULE": { - "templateName": "ControlLoopDemo__closedLoopControlName", - "closedLoopControlName": "CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8", - "policyVersion": "v1.0", - "aaiNamedQueryUUID": "null", - "aaiPassword": "null", - "aaiURL": "null", - "actor": "APPC", - "appcTopic": "APPC-CL", - "msoPassword": "null", - "msoURL": "null", - "msoUsername": "null", - "aaiUsername": "null", - "notificationTopic": "POLICY-CL-MGT", - "aaiPatternMatch": 1 - } - } -} \ No newline at end of file diff --git a/robot/assets/templates/policy/closedloop_pushpolicy.jinja b/robot/assets/templates/policy/closedloop_pushpolicy.jinja deleted file mode 100644 index 7be4c9a9..00000000 --- a/robot/assets/templates/policy/closedloop_pushpolicy.jinja +++ /dev/null @@ -1,5 +0,0 @@ -{ - "policyName" : "{{policy_name}}", - "policyType" : "{{policy_type}}", - "pdpGroup" : "default" -} \ No newline at end of file -- cgit 1.2.3-korg