CSIT fixes for frankfurt breakage

CSITs as per the latest policy type validation changes.
Drools and drools apps fixes.
Removed policy-health.

Change-Id: I086bf747059435e12d15e0481b00c97c20eaadc1
Issue-ID: POLICY-1402
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>

29 files changed, 97 insertions, 723 deletions

diff --git a/tests/policy/apex-pdp/data/onap.policies.controlloop.operational.Apex.json b/tests/policy/apex-pdp/data/onap.policies.controlloop.operational.Apex.json
index 810d970d..ed030d1d 100644
--- a/tests/policy/apex-pdp/data/onap.policies.controlloop.operational.Apex.json
+++ b/tests/policy/apex-pdp/data/onap.policies.controlloop.operational.Apex.json
@@ -50,17 +50,17 @@
           "default": "1.0.0"
         },
         "id": {
-          "type": "int",
+          "type": "integer",
           "description": "Specifies the engine id",
           "required": true
         },
         "instance_count": {
-          "type": "int",
+          "type": "integer",
           "description": "Specifies the number of engine threads that should be run",
           "required": true
         },
         "deployment_port": {
-          "type": "int",
+          "type": "integer",
           "description": "Specifies the port to connect to for engine administration",
           "required": false,
           "default": 1
@@ -68,14 +68,12 @@
         "policy_model_file_name": {
           "type": "string",
           "description": "The name of the file from which to read the APEX policy model",
-          "required": false,
-          "default": ""
+          "required": false
         },
         "policy_type_impl": {
           "type": "string",
           "description": "The policy type implementation from which to read the APEX policy model",
-          "required": false,
-          "default": ""
+          "required": false
         },
         "periodic_event_period": {
           "type": "string",
@@ -119,7 +117,7 @@
           "required": false
         },
         "synchronous_mode": {
-          "type": "bool",
+          "type": "boolean",
           "description": "Specifies the event handler is syncronous (receive event and send response)",
           "required": false,
           "default": false
@@ -127,17 +125,15 @@
         "synchronous_peer": {
           "type": "string",
           "description": "The peer event handler (output for input or input for output) of this event handler in synchronous mode, this parameter is mandatory if the event handler is in synchronous mode",
-          "required": false,
-          "default": ""
+          "required": false
         },
         "synchronous_timeout": {
-          "type": "int",
+          "type": "integer",
           "description": "The timeout in milliseconds for responses to be issued by APEX torequests, this parameter is mandatory if the event handler is in synchronous mode",
-          "required": false,
-          "default": ""
+          "required": false
         },
         "requestor_mode": {
-          "type": "bool",
+          "type": "boolean",
           "description": "Specifies the event handler is in requestor mode (send event and wait for response mode)",
           "required": false,
           "default": false
@@ -145,14 +141,12 @@
         "requestor_peer": {
           "type": "string",
           "description": "The peer event handler (output for input or input for output) of this event handler in requestor mode, this parameter is mandatory if the event handler is in requestor mode",
-          "required": false,
-          "default": ""
+          "required": false
         },
         "requestor_timeout": {
-          "type": "int",
+          "type": "integer",
           "description": "The timeout in milliseconds for wait for responses to requests, this parameter is mandatory if the event handler is in requestor mode",
-          "required": false,
-          "default": ""
+          "required": false
         }
       }
     },
@@ -186,7 +180,7 @@
         }
       }
     },
-    "onap.datatypes.policies.controlloop.operational.apex.Environmental": {
+    "onap.datatypes.policies.controlloop.operational.apex.Environment": {
       "derived_from": "tosca.datatypes.Root",
       "properties": {
         "name": {
@@ -237,7 +231,7 @@
           }
         },
         "locking": {
-          "type": "onap.datatypes.policies.controlloop.operational.apex.plugin",
+          "type": "onap.datatypes.policies.controlloop.operational.apex.Plugin",
           "description": "The plugin to be used for locking context in and between APEX PDPs at runtime",
           "required": false
         },
diff --git a/tests/policy/apex-pdp/data/onap.policies.controlloop.operational.Apex.tosca.json b/tests/policy/apex-pdp/data/onap.policies.controlloop.operational.Apex.tosca.json
index b58e5b5b..d03d8fae 100644
--- a/tests/policy/apex-pdp/data/onap.policies.controlloop.operational.Apex.tosca.json
+++ b/tests/policy/apex-pdp/data/onap.policies.controlloop.operational.Apex.tosca.json
@@ -6,7 +6,6 @@
         "operational.sampledomain": {
           "type": "onap.policies.controlloop.operational.Apex",
           "type_version": "1.0.0",
-          "derived_from": "tosca.policies.Root",
           "name": "onap.policies.controlloop.Operational.apex.sampledomain",
           "version": "1.0.0",
           "properties": {
diff --git a/tests/policy/api/api-test.robot b/tests/policy/api/api-test.robot
index 19aa18ab..76c1bdc6 100644
--- a/tests/policy/api/api-test.robot
+++ b/tests/policy/api/api-test.robot
@@ -39,7 +39,7 @@ RetrievePolicyTypes
      Should Be Equal As Strings    ${resp.json()['version']}  1.0.0
 
 CreateTCAPolicyTypeV1
-     [Documentation]    Create TCA Policy Type Version 1
+     [Documentation]    Create TCA Policy Type Version 1. Trying to create an existing policy type with any change and same version should cause error.
      ${auth}=    Create List    healthcheck    zb!XztG34
      ${postjson}=  Get file  ${CURDIR}/data/onap.policy.monitoring.cdap.tca.hi.lo.app.v1.json
      Log    Creating session https://${POLICY_API_IP}:6969
@@ -90,9 +90,9 @@ CreateNewMonitoringPolicyV1
      Dictionary Should Contain Key	${postjsonobject['topology_template']['policies'][0]}  onap.restart.tca
 
 SimpleCreateNewMonitoringPolicyV1
-     [Documentation]    Create a new Monitoring TCA policiy version 1 using simple endpoint
+     [Documentation]    Create a new Monitoring TCA policiy version 1 using simple endpoint. Trying to create an existing policy with any change and same version should cause error.
      ${auth}=    Create List    healthcheck    zb!XztG34
-     ${postjson}=  Get file  ${CURDIR}/data/vCPE.policy.monitoring.input.tosca.v1.json
+     ${postjson}=  Get file  ${CURDIR}/data/vCPE.policy.monitoring.input.tosca.v1_2.json
      Log    Creating session https://${POLICY_API_IP}:6969
      ${session}=    Create Session      policy  https://${POLICY_API_IP}:6969   auth=${auth}
      ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
diff --git a/tests/policy/api/data/onap.policy.monitoring.cdap.tca.hi.lo.app.v1.json b/tests/policy/api/data/onap.policy.monitoring.cdap.tca.hi.lo.app.v1.json
index f06247d7..1db64f83 100644
--- a/tests/policy/api/data/onap.policy.monitoring.cdap.tca.hi.lo.app.v1.json
+++ b/tests/policy/api/data/onap.policy.monitoring.cdap.tca.hi.lo.app.v1.json
@@ -3,6 +3,7 @@
   "policy_types": {
     "onap.policies.Monitoring": {
       "derived_from": "tosca.policies.Root",
+      "version": "1.0.0",
       "description": "a base policy type for all policies that governs monitoring provisioning"
     },
     "onap.policies.monitoring.cdap.tca.hi.lo.app": {
@@ -210,4 +211,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/tests/policy/api/data/vCPE.policy.monitoring.input.tosca.v1_2.json b/tests/policy/api/data/vCPE.policy.monitoring.input.tosca.v1_2.json
new file mode 100644
index 00000000..a3faae4d
--- /dev/null
+++ b/tests/policy/api/data/vCPE.policy.monitoring.input.tosca.v1_2.json
@@ -0,0 +1,52 @@
+{
+    "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
+    "topology_template": {
+        "policies": [
+            {
+                "onap.restart.tca": {
+                    "type": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+                    "version": "1.0.0",
+                    "type_version": "1.0.0",
+                    "description": "monitoring policy",
+                    "metadata": {
+                        "policy-id": "onap.restart.tca"
+                    },
+                    "properties": {
+                        "tca_policy" : {
+                            "domain": "measurementsForVfScaling",
+                            "metricsPerEventName": [
+                                {
+                                    "eventName": "Measurement_vGMUX",
+                                    "controlLoopSchemaType": "VNF",
+                                    "policyScope": "DCAE",
+                                    "policyName": "DCAE.Config_tca-hi-lo",
+                                    "policyVersion": "v0.0.1",
+                                    "thresholds": [
+                                        {
+                                            "closedLoopControlName": "ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e",
+                                            "version": "1.0.2",
+                                            "fieldPath": "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value",
+                                            "thresholdValue": 0,
+                                            "direction": "EQUAL",
+                                            "severity": "MAJOR",
+                                            "closedLoopEventStatus": "ABATED"
+                                        },
+                                        {
+                                            "closedLoopControlName": "ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e",
+                                            "version": "1.0.2",
+                                            "fieldPath": "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value",
+                                            "thresholdValue": 0,
+                                            "direction": "GREATER",
+                                            "severity": "CRITICAL",
+                                            "closedLoopEventStatus": "ONSET"
+                                        }
+                                    ]
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        ]
+    }
+}
diff --git a/tests/policy/drools-applications/drools-applications-test.robot b/tests/policy/drools-applications/drools-applications-test.robot
index cf4d3cea..1c9ea1d8 100644
--- a/tests/policy/drools-applications/drools-applications-test.robot
+++ b/tests/policy/drools-applications/drools-applications-test.robot
@@ -15,3 +15,26 @@ Alive
      Log    Received response from policy ${resp.text}
      Should Be Equal As Strings    ${resp.status_code}     200
      Should Be Equal As Strings    ${resp.json()['alive']}  True
+
+Healthcheck
+     [Documentation]    Runs Policy PDP-D Health check
+     ${auth}=    Create List    demo@people.osaaf.org    demo123456!
+     Log    Creating session https://${POLICY_DROOLS_IP}:6969/healthcheck
+     ${session}=    Create Session      policy  https://${POLICY_DROOLS_IP}:6969   auth=${auth}
+     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
+     ${resp}=   Get Request     policy  /healthcheck     headers=${headers}
+     Log    Received response from policy ${resp.text}
+     Should Be Equal As Strings    ${resp.status_code}     200
+     Should Be Equal As Strings    ${resp.json()['healthy']}  True
+
+Usecases
+     [Documentation]    Checks usecases controller is up
+     ${auth}=    Create List    demo@people.osaaf.org    demo123456!
+     Log    Creating session https://${POLICY_DROOLS_IP}:9696
+     ${session}=    Create Session      policy  https://${POLICY_DROOLS_IP}:9696   auth=${auth}
+     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
+     ${resp}=   Get Request     policy  /policy/pdp/engine/controllers/usecases/drools/facts     headers=${headers}
+     Log    Received response from policy ${resp.text}
+     Should Be Equal As Strings    ${resp.status_code}     200
+     Should Be Equal As Strings    ${resp.json()['usecases']}  0
+
diff --git a/tests/policy/drools-pdp/drools-pdp-test.robot b/tests/policy/drools-pdp/drools-pdp-test.robot
index fdb46a92..cf4d3cea 100644
--- a/tests/policy/drools-pdp/drools-pdp-test.robot
+++ b/tests/policy/drools-pdp/drools-pdp-test.robot
@@ -8,8 +8,8 @@ Library     json
 Alive
      [Documentation]    Runs Policy PDP Alive Check
      ${auth}=    Create List    demo@people.osaaf.org    demo123456!
-     Log    Creating session https://${POLICY_IP}:9696
-     ${session}=    Create Session      policy  https://${POLICY_IP}:9696   auth=${auth}
+     Log    Creating session https://${POLICY_DROOLS_IP}:9696
+     ${session}=    Create Session      policy  https://${POLICY_DROOLS_IP}:9696   auth=${auth}
      ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
      ${resp}=   Get Request     policy  /policy/pdp/engine     headers=${headers}
      Log    Received response from policy ${resp.text}
diff --git a/tests/policy/engine/Policy-CSIT.robot b/tests/policy/engine/Policy-CSIT.robot
deleted file mode 100644
index e55ccac8..00000000
--- a/tests/policy/engine/Policy-CSIT.robot
+++ /dev/null
@@ -1,425 +0,0 @@
-*** Settings ***
-Documentation	  Policy ONAP CSIT Test cases
-Library    String
-Library    HttpLibrary.HTTP
-LIbrary    Process
-Library    BuiltIn
-Library    ONAPLibrary.Templating
-Resource    policy_interface.robot
-
-*** Variables ***
-${RESOURCE_PATH_CREATE}        /pdp/api/createPolicy
-${RESOURCE_PATH_CREATE_PUSH}        /pdp/api/pushPolicy
-${RESOURCE_PATH_CREATE_DELETE}        /pdp/api/deletePolicy
-${RESOURCE_PATH_GET_CONFIG}    /pdp/api/getConfig
-${RESOURCE_PATH_LISTPOLICY}        /pdp/api/listPolicy
-${CREATE_CONFIG_VFW_TEMPLATE}    configpolicy_vFW_R1.jinja
-${CREATE_CONFIG_VDNS_TEMPLATE}    configpolicy_vDNS_R1.jinja
-${CREATE_CONFIG_VCPE_TEMPLATE}    configpolicy_vCPE_R1.jinja
-${CREATE_OPS_VFW_TEMPLATE}    opspolicy_VFW_R1.jinja
-${CREATE_OOF_HPA_TEMPLATE}    oofpolicy_HPA_R1.jinja
-${CREATE_SDNC_VFW_TEMPLATE}     sdncnamingpolicy_vFW.jinja
-${CREATE_SDNC_VPG_TEMPLATE}     sdncnamingpolicy_vPG.jinja
-${PUSH_POLICY_TEMPLATE}   pushpolicy.jinja
-${MULTIPLE_PUSH_POLICY_TEMPLATE}   multiple_pushpolicy.jinja
-${MULTIPLE_UNPUSH_POLICY_TEMPLATE}   multiple_unpushpolicy.jinja
-${CREATE_OPS_VDNS_TEMPLATE}    opspolicy_VDNS_R1.jinja
-${DEL_POLICY_TEMPLATE}   deletepolicy.jinja
-${GETCONFIG_TEMPLATE}    getconfigpolicy.jinja
-${GETOOF_TEMPLATE}       getoofpolicy.jinja
-${LISTPOLICY_TEMPLATE}    listpolicy.jinja
-${CONFIG_POLICY_VFW_NAME}    vFirewall
-${CONFIG_POLICY_VFW_TYPE}    MicroService
-${CONFIG_POLICY_VDNS_NAME}    vLoadBalancer
-${CONFIG_POLICY_VDNS_TYPE}    MicroService
-${OPS_POLICY_VFW_NAME}    vFirewall
-${OPS_POLICY_VFW_TYPE}    BRMS_PARAM
-${OPS_POLICY_VDNS_NAME}    vLoadBalancer
-${OPS_POLICY_VDNS_TYPE}    BRMS_PARAM
-${CONFIG_POLICY_VCPE_NAME}    vCPE
-${CONFIG_POLICY_VCPE_TYPE}    MicroService
-${OPS_POLICY_VCPE_NAME}    vCPE
-${OPS_POLICY_VCPE_TYPE}    BRMS_PARAM
-${OPS_POLICY_VOLTE_NAME}    VoLTE
-${OPS_POLICY_VOLTE_TYPE}    BRMS_PARAM
-${OOF_POLICY_HPA_NAME}    HPA
-${OOF_POLICY_HPA_TYPE}    Optimization 
-${SDNC_POLICY_VFW_NAME}   ONAP_vFW_Naming
-${SDNC_POLICY_VPG_NAME}   ONAP_vPG_Naming
-${MULTIPLE_PUSH_POLICY_NAME1}   com.testBase1
-${MULTIPLE_PUSH_POLICY_NAME2}   com.testBase2
-${MULTIPLE_PUSH_POLICY_NAME3}   com.testBase3
-${file_path}        ../testsuite/robot/assets/templates/ControlLoopDemo__closedLoopControlName.drl
-${RESOURCE_PATH_UPLOAD}  /pdp/api/policyEngineImport?importParametersJson=%7B%22serviceName%22%3A%22Manyu456%22%2C%20%22serviceType%22%3A%22BRMSPARAM%22%7D
-${CREATE_OPS_VCPE_TEMPLATE}      opspolicy_vCPE_R1.jinja 
-${CREATE_OPS_VOLTE_TEMPLATE}    opspolicy_vOLTE_R1.jinja
-
-
-*** Test Cases ***
-Policy Health check
-    Run Policy Health Check
-
-VFW Config Policy
-    ${CONFIG_POLICY_VFW_NAME}=    Create Config VFW Policy
-    Push Config Policy    ${CONFIG_POLICY_VFW_NAME}    ${CONFIG_POLICY_VFW_TYPE}  
-    #VFW Policy Tests
-    
-VDNS Config Policy
-    ${CONFIG_POLICY_VDNS_NAME}=    Create Config VDNS Policy
-    Push Config Policy    ${CONFIG_POLICY_VDNS_NAME}    ${CONFIG_POLICY_VDNS_TYPE}
-    #VDNS Policy Tests 
-    
-VCPE Config Policy
-    ${CONFIG_POLICY_VCPE_NAME}=    Create Config VCPE Policy
-    Push Config Policy    ${CONFIG_POLICY_VCPE_NAME}    ${CONFIG_POLICY_VCPE_TYPE}
-    #VCPE Policy Tests
-
-VFW Ops Policy
-     ${OPS_POLICY_VFW_NAME}=    Create Ops VFW Policy
-     Push Ops Policy    ${OPS_POLICY_VFW_NAME}    ${OPS_POLICY_VFW_TYPE}
-     
-VDNS Ops Policy
-     ${OPS_POLICY_VDNS_NAME}=    Create Ops VDNS Policy
-     Push Ops Policy    ${OPS_POLICY_VDNS_NAME}    ${OPS_POLICY_VDNS_TYPE}    
-     
-VCPE Ops Policy
-     ${OPS_POLICY_VCPE_NAME}=    Create Ops VCPE Policy
-     Push Ops Policy    ${OPS_POLICY_VCPE_NAME}    ${OPS_POLICY_VCPE_TYPE}    
-
-VOLTE Ops Policy
-     ${OPS_POLICY_VOLTE_NAME}=    Create Ops VOLTE Policy
-     Push Ops Policy    ${OPS_POLICY_VOLTE_NAME}    ${OPS_POLICY_VOLTE_TYPE}    
-    #VOLTE Policy Tests
-
-VFW SDNC Naming Policy
-     ${SDNC_POLICY_VFW_NAME}=    Create VFW SDNC Naming Policy
-     Push Config Policy    ${SDNC_POLICY_VFW_NAME}    ${CONFIG_POLICY_VFW_TYPE}
-    #VFW Policy Tests
-    
-VPG SDNC Naming Policy
-     ${SDNC_POLICY_VPG_NAME}=    Create VPG SDNC Naming Policy
-     Push Config Policy    ${SDNC_POLICY_VPG_NAME}    ${CONFIG_POLICY_VFW_TYPE}
-    #VPG Policy Tests
-
-HPA OOF Policy
-     ${OOF_POLICY_HPA_NAME}=     Create OOF HPA Policy
-     Push Config Policy    ${OOF_POLICY_HPA_NAME}      ${OOF_POLICY_HPA_TYPE}
-    #HPA Policy Tests
- 
-VFW Get Configs Policy
-    Sleep    5s
-    Get Configs VFW Policy 
-    
-VDNS Get Configs Policy
-    Sleep    5s
-    Get Configs VDNS Policy 
-    
-VCPE Get Configs Policy
-    Sleep    5s
-    Get Configs VCPE Policy 
-    
-HPA Get OOF Policy
-    Sleep    5s
-    Get OOF HPA Policy
-
-ListPolicy
-    ListPolicy test    com.Config_Sample.1.xml
-
-Multiple Push Policy
-    ${MULTIPLE_PUSH_POLICY_NAME1}=    Create Ops VDNS Policy
-    ${MULTIPLE_PUSH_POLICY_NAME2}=    Create Ops VDNS Policy
-    ${MULTIPLE_PUSH_POLICY_NAME3}=    Create Ops VDNS Policy
-    Push Multiple Policy test    ${MULTIPLE_PUSH_POLICY_NAME1}	${MULTIPLE_PUSH_POLICY_NAME2}	${MULTIPLE_PUSH_POLICY_NAME3}      ${OPS_POLICY_VDNS_TYPE}
-    Sleep    5s
-    Delete Multiple Policy test    ${MULTIPLE_PUSH_POLICY_NAME1}	${MULTIPLE_PUSH_POLICY_NAME2}	${MULTIPLE_PUSH_POLICY_NAME3}      ${OPS_POLICY_VDNS_TYPE}
-
-*** Keywords ***
-
-VFW Policy Tests
-     ${CONFIG_POLICY_VFW_NAME}=    Create Config VFW Policy
-     Push Config Policy    ${CONFIG_POLICY_VFW_NAME}    ${CONFIG_POLICY_VFW_TYPE}
-     Get Configs VFW Policy    
-     ${OPS_POLICY_VFW_NAME}=    Create Ops VFW Policy
-     Push Ops Policy    ${OPS_POLICY_VFW_NAME}    ${OPS_POLICY_VFW_TYPE}
-     ${SDNC_POLICY_VFW_NAME}=   Create VFW SDNC Naming Policy
-     Push Config Policy     ${CONFIG_POLICY_VFW_NAME}    ${CONFIG_POLICY_VFW_TYPE}
-    
-VDNS Policy Tests
-     ${CONFIG_POLICY_VDNS_NAME}=    Create Config VDNS Policy
-     Push Config Policy    ${CONFIG_POLICY_VDNS_NAME}    ${CONFIG_POLICY_VDNS_TYPE}
-     Get Configs VDNS Policy
-     ${OPS_POLICY_VDNS_NAME}=    Create Ops VDNS Policy
-     Push Ops Policy    ${OPS_POLICY_VDNS_NAME}    ${OPS_POLICY_VDNS_TYPE}
-
-VCPE Policy Tests
-     ${CONFIG_POLICY_VCPE_NAME}=    Create Config VCPE Policy
-     Push Config Policy    ${CONFIG_POLICY_VCPE_NAME}    ${CONFIG_POLICY_VCPE_TYPE}
-     Get Configs VCPE Policy    
-     ${OPS_POLICY_VCPE_NAME}=    Create Ops VCPE Policy
-     Push Ops Policy    ${OPS_POLICY_VCPE_NAME}    ${OPS_POLICY_VCPE_TYPE}
-
-VPG Policy Tests
-     ${SDNC_POLICY_VPG_NAME}=    Create VPG SDNC Naming Policy
-     Push Config Policy    ${SDNC_POLICY_VPG_NAME}    ${CONFIG_POLICY_VFW_TYPE}
-     
-VOLTE Policy Tests  
-     ${OPS_POLICY_VOLTE_NAME}=    Create Ops VOLTE Policy
-     Push Ops Policy    ${OPS_POLICY_VOLTE_NAME}    ${OPS_POLICY_VOLTE_TYPE}
-     
-HPA Policy Tests
-     ${OOF_POLICY_HPA_NAME}=    Create OOF HPA Policy
-     Push Config Policy    ${OOF_POLICY_HPA_NAME}    ${OOF_POLICY_HPA_TYPE}
-     Get OOF HPA Policy
-
-Get Configs VFW Policy
-    [Documentation]    Get Config Policy for VFW
-    Create Environment    policy    ${CURDIR}
-    ${getconfigpolicy}=    Catenate    .*${CONFIG_POLICY_VFW_NAME}*
-    ${configpolicy_name}=    Create Dictionary    config_policy_name=${getconfigpolicy}
-    ${output} =     Apply Template    policy    ${GETCONFIG_TEMPLATE}    ${configpolicy_name}
-    ${get_resp} =    Run Policy Get Configs Request    ${RESOURCE_PATH_GET_CONFIG}   ${output}
-	Should Be Equal As Strings 	${get_resp.status_code} 	200
-	
-Create OOF HPA Policy
-    [Documentation]    Create OOF Policy
-    Create Environment    policy    ${CURDIR}
-    ${randompolicyname} =     Create Policy Name
-    ${policyname1}=    Catenate   com.${randompolicyname}_HPA
-    ${OOF_POLICY_HPA_NAME}=    Set Test Variable    ${policyname1}
-    ${hpapolicy}=   Create Dictionary   policy_name=${policyname1}
-    ${output} =   Apply Template    policy    ${CREATE_OOF_HPA_TEMPLATE}   ${hpapolicy}
-    ${put_resp} =   Run Policy Put Request    ${RESOURCE_PATH_CREATE}   ${output}
-    Log    ${put_resp}    
-        Should Be Equal As Strings     ${put_resp.status_code}          200
-        [Return]    ${policyname1}
-
-Get OOF HPA Policy
-    [Documentation]    Get OOF Policy for HPA 
-    Create Environment    policy    ${CURDIR}
-    ${gethpapolicy}=   Catenate    .*${OOF_POLICY_HPA_NAME}*
-    ${hpapolicy_name}=   Create Dictionary    oof_policy_name=${gethpapolicy}
-    ${output} =    Apply Template    policy    ${GETOOF_TEMPLATE}    ${hpapolicy_name}
-    ${get_resp} =   Run Policy Get Configs Request   ${RESOURCE_PATH_GET_CONFIG}   ${output}
-        Should Be Equal As Strings     ${get_resp.status_code}        200
- 
-Create Config VFW Policy
-    [Documentation]    Create Config Policy
-    Create Environment    policy    ${CURDIR}
-    ${randompolicyname} =     Create Policy Name
-    ${policyname1}=    Catenate   com.${randompolicyname}_vFirewall
-    ${CONFIG_POLICY_VFW_NAME}=    Set Test Variable    ${policyname1}
-    ${configpolicy}=    Create Dictionary    policy_name=${policyname1}
-    ${output} =     Apply Template    policy     ${CREATE_CONFIG_VFW_TEMPLATE}    ${configpolicy}
-    ${put_resp} =    Run Policy Put Request    ${RESOURCE_PATH_CREATE}  ${output}
-	Should Be Equal As Strings 	${put_resp.status_code} 	200
-	[Return]    ${policyname1}
-
-Create VPG SDNC Naming Policy
-    [Documentation]    Create VPG SDNC Naming Policy
-    Create Environment    policy    ${CURDIR}
-    ${randompolicyname} =    Create Policy Name
-    ${policyname1}=    Catenate    com.${randompolicyname}_ONAP_vPG_Naming
-    ${SDNC_POLICY_VPG_NAME}=    Set Test Variable     ${policyname1}
-    ${sdncpolicy}=    Create Dictionary    policy_name=${policyname1}
-    ${output} =   Apply Template    policy    ${CREATE_SDNC_VPG_TEMPLATE}    ${sdncpolicy}
-    ${put_resp} =    Run Policy Put Request    ${RESOURCE_PATH_CREATE}  ${output}
-    Should Be Equal As Strings  ${put_resp.status_code}    200
-    [Return]    ${policyname1}
-    
-Create VFW SDNC Naming Policy
-    [Documentation]    Create VFW SDNC Naming Policy
-    Create Environment    policy    ${CURDIR}
-    ${randompolicyname} =    Create Policy Name
-    ${policyname1}=    Catenate    com.${randompolicyname}_ONAP_vFW_Naming
-    ${SDNC_POLICY_VFW_NAME}=    Set Test Variable     ${policyname1}
-    ${sdncpolicy}=    Create Dictionary    policy_name=${policyname1}
-    ${output} =   Apply Template    policy    ${CREATE_SDNC_VFW_TEMPLATE}    ${sdncpolicy}
-    ${put_resp} =    Run Policy Put Request    ${RESOURCE_PATH_CREATE}  ${output}
-    Should Be Equal As Strings  ${put_resp.status_code}    200
-    [Return]    ${policyname1}
-    
-Create Policy Name
-     [Documentation]    Generate Policy Name
-     [Arguments]    ${prefix}=CSIT_
-     ${random}=    Generate Random String    15    [LOWER][NUMBERS]
-     ${policyname}=    Catenate    ${prefix}${random}
-     [Return]    ${policyname}
-
-Create Ops VFW Policy
-	[Documentation]    Create Operational Policy
-    Create Environment    policy    ${CURDIR}
-   	${randompolicyname} =     Create Policy Name
-	${policyname1}=    Catenate   com.${randompolicyname}_vFirewall
-	${OPS_POLICY_VFW_NAME}=    Set Test Variable    ${policyname1}
- 	${dict}=     Create Dictionary    policy_name=${policyname1}
-	${output} =     Apply Template    policy     ${CREATE_OPS_VFW_TEMPLATE}    ${dict}
-    ${put_resp} =    Run Policy Put Request    ${RESOURCE_PATH_CREATE}  ${output}
-    Log    ${put_resp}
-    Should Be Equal As Strings 	${put_resp.status_code} 	200
-    [Return]    ${policyname1}
-
-Push Ops Policy
-    [Documentation]    Push Ops Policy
-    [Arguments]    ${policyname}    ${policytype}
-    Create Environment    policy    ${CURDIR}
-    ${dict}=     Create Dictionary     policy_name=${policyname}    policy_type=${policytype}
-	${output} =     Apply Template    policy    ${PUSH_POLICY_TEMPLATE}     ${dict}
-    ${put_resp} =    Run Policy Put Request    ${RESOURCE_PATH_CREATE_PUSH}  ${output}
-    Should Be Equal As Strings 	${put_resp.status_code} 	200
-
-Push Config Policy
-    [Documentation]    Push Config Policy
-    [Arguments]    ${policyname}    ${policytype}
-    Create Environment    policy    ${CURDIR}
-    ${dict}=     Create Dictionary     policy_name=${policyname}    policy_type=${policytype}
-	${output} =     Apply Template    policy    ${PUSH_POLICY_TEMPLATE}     ${dict}
-    ${put_resp} =    Run Policy Put Request    ${RESOURCE_PATH_CREATE_PUSH}  ${output}
-    Should Be Equal As Strings 	${put_resp.status_code} 	200
-
-Delete Ops Policy
-    [Documentation]    Delete Config Policy
-    [Arguments]    ${policy_name}
-    Create Environment    policy    ${CURDIR}
-    ${policyname3}=    Catenate   com.Config_BRMS_Param_${policyname}.1.xml
-    ${dict}=     Create Dictionary     policy_name=${policyname3}
-	${output} =     Apply Template    policy    ${DEL_POLICY_TEMPLATE}     ${dict}
-    ${put_resp} =    Run Policy Delete Request    ${RESOURCE_PATH_CREATE_DELETE}  ${output}
-    Should Be Equal As Strings 	${put_resp.status_code} 	200
-
-Delete Config Policy
-    [Documentation]    Delete Ops Policy
-    [Arguments]    ${policy_name}
-    Create Environment    policy    ${CURDIR}
-    ${policyname3}=    Catenate   com.Config_MS_com.${policy_name}.1.xml
-    ${dict}=     Create Dictionary     policy_name=${policyname3}
-	${output} =     Apply Template    policy    ${DEL_POLICY_TEMPLATE}     ${dict}
-    ${put_resp} =    Run Policy Delete Request    ${RESOURCE_PATH_CREATE_DELETE}  ${output}
-    Should Be Equal As Strings 	${put_resp.status_code} 	200
-
-Delete OOF Policy
-    [Documentation]    Delete OOF Policy
-    [Arguments]    ${policy_name}
-    Create Environment    policy    ${CURDIR}
-    ${policyname3}=    Catenate   com.Config_OOF_${policy_name}.1.xml
-    ${dict}=    Create Dictionary     policy_name=${policyname3}
-    ${output} =    Apply Template    policy    ${DEL_POLICY_TEMPLATE}     ${dict}
-    ${put_resp} =   Run Policy Delete Request    ${RESOURCE_PATH_CREATE_DELETE}   ${output}
-    Should Be Equal As Strings  ${put_resp.status_code}        200 
-
-Get Configs VDNS Policy
-    [Documentation]    Get Config Policy for VDNS
-    Create Environment    policy    ${CURDIR}
-    ${getconfigpolicy}=    Catenate    .*${CONFIG_POLICY_VDNS_NAME}*
-    ${configpolicy_name}=    Create Dictionary    config_policy_name=${getconfigpolicy}
-    ${output} =     Apply Template    policy     ${GETCONFIG_TEMPLATE}    ${configpolicy_name}
-    ${get_resp} =    Run Policy Get Configs Request    ${RESOURCE_PATH_GET_CONFIG}   ${output}
-	Should Be Equal As Strings 	${get_resp.status_code} 	200
-	
-Create Config VDNS Policy
-    [Documentation]    Create Config Policy
-    Create Environment    policy    ${CURDIR}
-    ${randompolicyname} =     Create Policy Name
-    ${policyname1}=    Catenate   com.${randompolicyname}_vLoadBalancer
-    ${CONFIG_POLICY_VDNS_NAME}=    Set Test Variable    ${policyname1}
-    ${configpolicy}=    Create Dictionary    policy_name=${policyname1}
-    ${output} =     Apply Template    policy     ${CREATE_CONFIG_VDNS_TEMPLATE}    ${configpolicy}
-    ${put_resp} =    Run Policy Put Request    ${RESOURCE_PATH_CREATE}  ${output}
-	Should Be Equal As Strings 	${put_resp.status_code} 	200
-	[Return]    ${policyname1}
-
-Create Ops VDNS Policy
-	[Documentation]    Create Operational Policy
-    Create Environment    policy    ${CURDIR}
-   	${randompolicyname} =     Create Policy Name
-	${policyname1}=    Catenate   com.${randompolicyname}_vLoadBalancer
-	${OPS_POLICY_VDNS_NAME}=    Set Test Variable    ${policyname1}
- 	${dict}=     Create Dictionary    policy_name=${policyname1}
-	${output} =     Apply Template    policy     ${CREATE_OPS_VDNS_TEMPLATE}    ${dict}
-    ${put_resp} =    Run Policy Put Request    ${RESOURCE_PATH_CREATE}  ${output}
-    Log    ${put_resp}
-    Should Be Equal As Strings 	${put_resp.status_code} 	200
-    [Return]    ${policyname1}
-    
-Create Config VCPE Policy
-    [Documentation]    Create Config Policy
-    Create Environment    policy    ${CURDIR}
-    ${randompolicyname} =     Create Policy Name
-    ${policyname1}=    Catenate   com.${randompolicyname}_vCPE
-    ${CONFIG_POLICY_VCPE_NAME}=    Set Test Variable    ${policyname1}
-    ${configpolicy}=    Create Dictionary    policy_name=${policyname1}
-    ${output} =     Apply Template    policy     ${CREATE_CONFIG_VCPE_TEMPLATE}    ${configpolicy}
-    ${put_resp} =    Run Policy Put Request    ${RESOURCE_PATH_CREATE}  ${output}
-	Should Be Equal As Strings 	${put_resp.status_code} 	200
-	[Return]    ${policyname1}
-	
-Get Configs VCPE Policy
-    [Documentation]    Get Config Policy for VCPE
-    Create Environment    policy    ${CURDIR}
-    ${getconfigpolicy}=    Catenate    .*${CONFIG_POLICY_VCPE_NAME}*
-    ${configpolicy_name}=    Create Dictionary    config_policy_name=${getconfigpolicy}
-    ${output} =     Apply Template    policy     ${GETCONFIG_TEMPLATE}    ${configpolicy_name}
-    ${get_resp} =    Run Policy Get Configs Request    ${RESOURCE_PATH_GET_CONFIG}   ${output}
-	Should Be Equal As Strings 	${get_resp.status_code} 	200
-
-Create Ops vCPE Policy
-	[Documentation]    Create Operational Policy
-    Create Environment    policy    ${CURDIR}
-   	${randompolicyname} =     Create Policy Name
-	${policyname1}=    Catenate   com.${randompolicyname}_vCPE
-	${OPS_POLICY_VCPE_NAME}=    Set Test Variable    ${policyname1}
- 	${dict}=     Create Dictionary    policy_name=${policyname1}
-	${output} =     Apply Template    policy     ${CREATE_OPS_VCPE_TEMPLATE}    ${dict}
-    ${put_resp} =    Run Policy Put Request    ${RESOURCE_PATH_CREATE}  ${output}
-    Log    ${put_resp}
-    Should Be Equal As Strings 	${put_resp.status_code} 	200
-    [Return]    ${policyname1}
-    
-Create Ops VolTE Policy
-	[Documentation]    Create Operational Policy
-    Create Environment    policy    ${CURDIR}
-   	${randompolicyname} =     Create Policy Name
-	${policyname1}=    Catenate   com.${randompolicyname}_VoLTE
- 	${dict}=     Create Dictionary    policy_name=${policyname1}
-	${output} =     Apply Template    policy     ${CREATE_OPS_VOLTE_TEMPLATE}    ${dict}
-    ${put_resp} =    Run Policy Put Request    ${RESOURCE_PATH_CREATE}  ${output}
-    Log    ${put_resp}
-    Should Be Equal As Strings 	${put_resp.status_code} 	200
-    [Return]    ${policyname1}
-    
-Upload DRL file
-    [Documentation]    Upload DRL file1
-    ${file_data}=     Get Binary File  ${file_path}
-    ${files}=    Create Dictionary    file=${file_data}
-   #${CONFIG_POLICY_VDNS_NAME}=    Set Test Variable    ${policyname1}
-   # ${files2} = {'file': open('../testsuite/robot/assets/templates/ControlLoopDemo__closedLoopControlName.drl', 'rb')}
-   # ${files}=  Create Dictionary  file  ${file_data}
-    ${put_resp} =    Run Policy Post form Request    ${RESOURCE_PATH_UPLOAD}    ${files}      
-	Should Be Equal As Strings 	${put_resp.status_code} 	200
-
-ListPolicy test
-	[Documentation]    Listing Config Policies
-	[Arguments]    ${policy_name}
-    Create Environment    policy    ${CURDIR}
-	${dict}=     Create Dictionary    policy_name=${policy_name}
-	${output} =     Apply Template    policy     ${LISTPOLICY_TEMPLATE}    ${dict}
-	${put_resp} =        policy_interface.Run Policy Post Request    ${RESOURCE_PATH_LISTPOLICY}    ${output}
-	Should Be Equal As Strings 	${put_resp.status_code} 	200
-
-Push Multiple Policy test
-    [Documentation]    Push Multiple Policy
-    [Arguments]    ${policyname1}	${policyname2}		${policyname3}    ${policytype}
-    Create Environment    policy    ${CURDIR}
-    ${dict}=     Create Dictionary     policy_name1=${policyname1}  policy_name2=${policyname2}  policy_name3=${policyname3}    policy_type=${policytype}
-	${output} =     Apply Template    policy    ${MULTIPLE_PUSH_POLICY_TEMPLATE}     ${dict}
-    ${put_resp} =    Run Policy Put Request    ${RESOURCE_PATH_CREATE_PUSH}  ${output}
-    Should Be Equal As Strings 	${put_resp.status_code} 	200
-
-Delete Multiple Policy test
-    [Documentation]    Delete Multiple Policy
-    [Arguments]    ${policyname1}	${policyname2}		${policyname3}    ${policytype}
-    Create Environment    policy    ${CURDIR}
-    ${dict}=     Create Dictionary     policy_name1=${policyname1}  policy_name2=${policyname2}  policy_name3=${policyname3}    policy_type=${policytype}
-	${output} =     Apply Template    policy    ${MULTIPLE_UNPUSH_POLICY_TEMPLATE}     ${dict}
-    ${put_resp} =    Run Policy Delete Request    ${RESOURCE_PATH_CREATE_DELETE}  ${output}
-    Should Be Equal As Strings 	${put_resp.status_code} 	200
-
diff --git a/tests/policy/engine/__init__.robot b/tests/policy/engine/__init__.robot
deleted file mode 100644
index c7970e6a..00000000
--- a/tests/policy/engine/__init__.robot
+++ /dev/null
@@ -1,2 +0,0 @@
-*** Settings ***
-Documentation    Policy - Suite 1
diff --git a/tests/policy/engine/configpolicy_vCPE_R1.jinja b/tests/policy/engine/configpolicy_vCPE_R1.jinja
deleted file mode 100644
index 6bcd74fe..00000000
--- a/tests/policy/engine/configpolicy_vCPE_R1.jinja
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"configBody": "{ \"service\": \"tca_policy\", \"location\": \"SampleServiceLocation\", \"uuid\": \"test\", \"policyName\": \"MicroServicevCPE\", \"description\": \"MicroService vCPE Policy\", \"configName\": \"SampleConfigName\", \"templateVersion\": \"OpenSource.version.1\", \"version\": \"1.1.0\", \"priority\": \"1\", \"policyScope\": \"resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\", \"riskType\": \"SampleRiskType\", \"riskLevel\": \"1\", \"guard\": \"False\", \"content\": { \"policyVersion\": \"v0.0.1\", \"threshholds\": [{ \"severity\": \"MAJOR\", \"fieldPath\": \"$$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\", \"thresholdValue\": \"0\", \"closedLoopEventStatus\": \"ABATED\", \"closedLoopControlName\": \"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\", \"version\": \"1.0.2\", \"direction\": \"EQUAL\" }, { \"severity\": \"CRITICAL\", \"fieldPath\": \"$$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\", \"thresholdValue\": \"0\", \"closedLoopEventStatus\": \"ONSET\", \"closedLoopControlName\": \"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\", \"version\": \"1.0.2\", \"direction\": \"GREATER\" }], \"policyName\": \"DCAE.Config_tca-hi-lo\", \"controlLoopSchemaType\": \"VNF\", \"policyScope\": \"DCAE\", \"eventName\": \"Measurement_vGMUX\" } }",
-	"policyConfigType": "MicroService",
-	"policyName": "{{policy_name}}",
-	"onapName": "DCAE",
-        "priority": "5"
-}
diff --git a/tests/policy/engine/configpolicy_vDNS_R1.jinja b/tests/policy/engine/configpolicy_vDNS_R1.jinja
deleted file mode 100644
index a2c3eeb9..00000000
--- a/tests/policy/engine/configpolicy_vDNS_R1.jinja
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"configBody": "{ \"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\": { \"policyVersion\": \"v0.0.1\", \"threshholds\": [{ \"severity\": \"CRITICAL\", \"fieldPath\": \"$$.event.measurementsForVfScalingFields.vNicUsageArray[*].receivedTotalPacketsDelta\", \"thresholdValue\": \"300\", \"closedLoopEventStatus\": \"ONSET\", \"closedLoopControlName\": \"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\", \"version\": \"1.0.2\", \"direction\": \"GREATER_OR_EQUAL\" }], \"policyName\": \"DCAE.Config_tca-hi-lo\", \"controlLoopSchemaType\": \"VM\", \"policyScope\": \"DCAE\", \"eventName\": \"vLoadBalancer\" } }",
-	"policyConfigType": "MicroService",
-	"policyName": "{{policy_name}}",
-	"onapName": "DCAE",
-        "priority": "5"
-}
diff --git a/tests/policy/engine/configpolicy_vFW_R1.jinja b/tests/policy/engine/configpolicy_vFW_R1.jinja
deleted file mode 100644
index b843a0b0..00000000
--- a/tests/policy/engine/configpolicy_vFW_R1.jinja
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"configBody": "{\"service\": \"tca_policy\",\"location\": \"SampleServiceLocation\",\"uuid\": \"test\",\"policyName\": \"MicroServicevFirewall\",\"description\": \"MicroService vFirewall Policy\",\"configName\": \"SampleConfigName\",\"templateVersion\": \"OpenSource.version.1\",\"version\": \"1.1.0\",\"priority\": \"1\",\"policyScope\": \"resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"riskType\": \"SampleRiskType\",\"riskLevel\": \"1\",\"guard\": \"False\",\"content\": {\"policyVersion\": \"v0.0.1\",\"threshholds\": [{\"severity\": \"MAJOR\",\"fieldPath\": \"$$.event.measurementsForVfScalingFields.vNicUsageArray[*].receivedTotalPacketsDelta\",\"thresholdValue\": \"300\",\"closedLoopEventStatus\": \"ONSET\",\"closedLoopControlName\": \"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\": \"1.0.2\",\"direction\": \"LESS_OR_EQUAL\"}, {\"severity\": \"CRITICAL\",\"fieldPath\": \"$$.event.measurementsForVfScalingFields.vNicUsageArray[*].receivedTotalPacketsDelta\",\"thresholdValue\": \"700\",\"closedLoopEventStatus\": \"ONSET\",\"closedLoopControlName\": \"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\": \"1.0.2\",\"direction\": \"GREATER_OR_EQUAL\"}],\"policyName\": \"DCAE.Config_tca-hi-lo\",\"controlLoopSchemaType\": \"VNF\",\"policyScope\": \"DCAE\",\"eventName\": \"vFirewallBroadcastPackets\"}}",
-	"policyConfigType": "MicroService",
-	"policyName": "{{policy_name}}",
-	"onapName": "DCAE",
-        "priority": "5"
-}
diff --git a/tests/policy/engine/createpolicy.jinja b/tests/policy/engine/createpolicy.jinja
deleted file mode 100644
index bbb1f1ad..00000000
--- a/tests/policy/engine/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"
-		}
-	}
-}
diff --git a/tests/policy/engine/deletepolicy.jinja b/tests/policy/engine/deletepolicy.jinja
deleted file mode 100644
index 73c5badf..00000000
--- a/tests/policy/engine/deletepolicy.jinja
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "pdpGroup": "default",
-    "policyComponent": "PDP",
-    "policyName": "{{policy_name}}"
-}
diff --git a/tests/policy/engine/getconfigpolicy.jinja b/tests/policy/engine/getconfigpolicy.jinja
deleted file mode 100644
index 11e8cae6..00000000
--- a/tests/policy/engine/getconfigpolicy.jinja
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "configAttributes" : {
-    },
-    "configName" : ".*",
-    "ecompName" : "DCAE",
-    "policyName" : "{{config_policy_name}}",
-    "unique" : false
-}
\ No newline at end of file
diff --git a/tests/policy/engine/getoofpolicy.jinja b/tests/policy/engine/getoofpolicy.jinja
deleted file mode 100644
index 3c7dd755..00000000
--- a/tests/policy/engine/getoofpolicy.jinja
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "configAttributes" : {
-    },
-    "policyName" : "{{oof_policy_name}}",
-    "unique" : false
-}
diff --git a/tests/policy/engine/global_properties.robot b/tests/policy/engine/global_properties.robot
deleted file mode 100644
index e0c816ea..00000000
--- a/tests/policy/engine/global_properties.robot
+++ /dev/null
@@ -1,30 +0,0 @@
-*** Settings ***
-Documentation        store all properties that can change or are used in multiple places here
-...                    format is all caps with underscores between words and prepended with GLOBAL
-...                   make sure you prepend them with GLOBAL so that other files can easily see it is from this file.
-
-
-*** Variables ***
-${GLOBAL_APPLICATION_ID}          robot-ete
-${GLOBAL_MSO_STATUS_PATH}    /ecomp/mso/infra/orchestrationRequests/v2/
-${GLOBAL_SELENIUM_BROWSER}        chrome
-${GLOBAL_SELENIUM_BROWSER_CAPABILITIES}        Create Dictionary
-${GLOBAL_SELENIUM_DELAY}          0
-${GLOBAL_SELENIUM_BROWSER_IMPLICIT_WAIT}        5
-${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT}        15
-${GLOBAL_OPENSTACK_HEAT_SERVICE_TYPE}    orchestration
-${GLOBAL_OPENSTACK_CINDER_SERVICE_TYPE}    volume
-${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE}    compute
-${GLOBAL_OPENSTACK_NEUTRON_SERVICE_TYPE}    network
-${GLOBAL_OPENSTACK_GLANCE_SERVICE_TYPE}    image
-${GLOBAL_OPENSTACK_KEYSTONE_SERVICE_TYPE}    identity
-${GLOBAL_AAI_CLOUD_OWNER}    Rackspace
-${GLOBAL_BUILD_NUMBER}    31
-${GLOBAL_VM_PRIVATE_KEY}   ${EXECDIR}/robot/assets/keys/robot_ssh_private_key.pvt
-# policy info - everything is from the private oam network (also called ecomp private network)
-${GLOBAL_POLICY_SERVER_URL}	https://%{PDP_IP}:8081
-${GLOBAL_POLICY_AUTH}	dGVzdHBkcDphbHBoYTEyMw==
-${GLOBAL_POLICY_CLIENTAUTH}	 cHl0aG9uOnRlc3Q=
-${GLOBAL_POLICY_HEALTHCHECK_URL}	https://%{POLICY_IP}:6969
-${GLOBAL_POLICY_USERNAME}	demo@people.osaaf.org
-${GLOBAL_POLICY_PASSWORD}	demo123456!
diff --git a/tests/policy/engine/listpolicy.jinja b/tests/policy/engine/listpolicy.jinja
deleted file mode 100644
index ce2d3df0..00000000
--- a/tests/policy/engine/listpolicy.jinja
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "policyName": "{{policy_name}}"
-}
diff --git a/tests/policy/engine/multiple_pushpolicy.jinja b/tests/policy/engine/multiple_pushpolicy.jinja
deleted file mode 100644
index bda0da08..00000000
--- a/tests/policy/engine/multiple_pushpolicy.jinja
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "policyName":"{{policy_name1}},{{policy_name2}},{{policy_name3}}",
-    "policyType":"{{policy_type}}",
-    "pdpGroup":"default"
-}
diff --git a/tests/policy/engine/multiple_unpushpolicy.jinja b/tests/policy/engine/multiple_unpushpolicy.jinja
deleted file mode 100644
index 55fb8810..00000000
--- a/tests/policy/engine/multiple_unpushpolicy.jinja
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "policyName": "{{policy_name1}},{{policy_name2}},{{policy_name3}}",
-    "policyType": "{{policy_type}}",
-    "policyComponent": "PDP",
-    "pdpGroup": "default"
-}
diff --git a/tests/policy/engine/oofpolicy_HPA_R1.jinja b/tests/policy/engine/oofpolicy_HPA_R1.jinja
deleted file mode 100644
index 6834ceb6..00000000
--- a/tests/policy/engine/oofpolicy_HPA_R1.jinja
+++ /dev/null
@@ -1,6 +0,0 @@
-{    
-	"configBody": "{\"service\":\"hpaPolicy\",\"policyName\":\"testWorkingTOSCA\",\"description\":\"testing\",\"templateVersion\":\"OpenSource.version.1\",\"version\":\"CSIT\",\"priority\":\"5\",\"riskType\":\"SampleRiskType\",\"riskLevel\":\"3\",\"guard\":\"False\",\"content\":{\"identity\":\"testIdentity\",\"policyScope\":[\"test1\",\"test2\",\"test3\"],\"policyType\":\"hpaPolicy\",\"resources\":\"testResources1\",\"flavorFeatures\":[{\"flavorLabel\":\"testFlavor\",\"flavorProperties\":[{\"score\":\"testScore\",\"featureAttributes\":[{\"unit\":\"testUnit\",\"attribute\":\"teatFeatureAttribute\",\"value\":\"testValue\",\"operator\":\"any\"}],\"mandatory\":\"testMandatory\",\"hpaFeature\":\"testHAPFeature\",\"architecture\":\"testArch\"}]}]}}",
-	"policyConfigType": "Optimization",
-	"policyName": "{{policy_name}}",
-	"onapName": "OOF"
-}
diff --git a/tests/policy/engine/opspolicy_VDNS_R1.jinja b/tests/policy/engine/opspolicy_VDNS_R1.jinja
deleted file mode 100644
index 8b1e6d2d..00000000
--- a/tests/policy/engine/opspolicy_VDNS_R1.jinja
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"policyConfigType": "BRMS_PARAM",
-	"policyName": "{{policy_name}}",
-	"policyDescription": "BRMS Param vDNS policy",
-	"policyScope": "com",
-	"attributes": {
-		"MATCHING": {
-	    	"controller" : "amsterdam"
-	    },
-		"RULE": {
-			"templateName": "ClosedLoopControlName",
-			"closedLoopControlName": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3",
-			"controlLoopYaml": "controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3%0D%0A++trigger_policy%3A+unique-policy-id-1-scale-up%0D%0A++timeout%3A+1200%0D%0A++abatement%3A+false%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-1-scale-up%0D%0A++++name%3A+Create+a+new+VF+Module%0D%0A++++description%3A%0D%0A++++actor%3A+SO%0D%0A++++recipe%3A+VF+Module+Create%0D%0A++++target%3A%0D%0A++++++type%3A+VNF%0D%0A++++retry%3A+0%0D%0A++++timeout%3A+1200%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"
-			}
-	}
-}
\ No newline at end of file
diff --git a/tests/policy/engine/opspolicy_VFW_R1.jinja b/tests/policy/engine/opspolicy_VFW_R1.jinja
deleted file mode 100644
index 0a6977df..00000000
--- a/tests/policy/engine/opspolicy_VFW_R1.jinja
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"policyConfigType": "BRMS_PARAM",
-	"policyName": "{{policy_name}}",
-	"policyDescription": "BRMS Param vFirewall policy",
-	"policyScope": "com",
-	"attributes": {
-		"MATCHING": {
-	    	"controller" : "amsterdam"
-	    },
-		"RULE": {
-			"templateName": "ClosedLoopControlName",
-			"closedLoopControlName": "ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a",
-			"controlLoopYaml": "controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a%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+Eace933104d443b496b8.nodes.heat.vpg%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/tests/policy/engine/opspolicy_vCPE_R1.jinja b/tests/policy/engine/opspolicy_vCPE_R1.jinja
deleted file mode 100644
index a04a0c1e..00000000
--- a/tests/policy/engine/opspolicy_vCPE_R1.jinja
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"policyConfigType": "BRMS_PARAM",
-	"policyName": "{{policy_name}}",
-	"policyDescription": "BRMS Param vCPE policy",
-	"policyScope": "com",
-	"attributes": {
-	    "MATCHING": {
-	    	"controller" : "amsterdam"
-	    },
-		"RULE": {
-			"templateName": "ClosedLoopControlName",
-			"closedLoopControlName": "ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e",
-			"controlLoopYaml": "controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e%0D%0A++trigger_policy%3A+unique-policy-id-1-restart%0D%0A++timeout%3A+3600%0D%0A++abatement%3A+true%0D%0A+%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-1-restart%0D%0A++++name%3A+Restart+the+VM%0D%0A++++description%3A%0D%0A++++actor%3A+APPC%0D%0A++++recipe%3A+Restart%0D%0A++++target%3A%0D%0A++++++type%3A+VM%0D%0A++++retry%3A+3%0D%0A++++timeout%3A+1200%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"
-			}
-	}
-}
\ No newline at end of file
diff --git a/tests/policy/engine/opspolicy_vOLTE_R1.jinja b/tests/policy/engine/opspolicy_vOLTE_R1.jinja
deleted file mode 100644
index 67119659..00000000
--- a/tests/policy/engine/opspolicy_vOLTE_R1.jinja
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"policyConfigType": "BRMS_PARAM",
-	"policyName": "{{policy_name}}",
-	"policyDescription": "BRMS Param VOLTE policy",
-	"policyScope": "com",
-	"attributes": {
-		"MATCHING": {
-	    	"controller" : "amsterdam"
-	    },
-		"RULE": {
-			"templateName": "ClosedLoopControlName",
-			"closedLoopControlName": "ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b",
-			"controlLoopYaml": "controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b%0D%0A++trigger_policy%3A+unique-policy-id-1-restart%0D%0A++timeout%3A+3600%0D%0A++abatement%3A+false%0D%0A+%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-1-restart%0D%0A++++name%3A+Restart+the+VM%0D%0A++++description%3A%0D%0A++++actor%3A+VFC%0D%0A++++recipe%3A+Restart%0D%0A++++target%3A%0D%0A++++++type%3A+VM%0D%0A++++retry%3A+3%0D%0A++++timeout%3A+1200%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"
-			}
-	}
-}
\ No newline at end of file
diff --git a/tests/policy/engine/policy_interface.robot b/tests/policy/engine/policy_interface.robot
deleted file mode 100644
index da7fdd87..00000000
--- a/tests/policy/engine/policy_interface.robot
+++ /dev/null
@@ -1,66 +0,0 @@
-*** Settings ***
-Documentation	  The main interface for interacting with Policy. It handles low level stuff like managing the http request library and Policy required fields
-Library    RequestsLibrary
-Library    String
-Library    Collections      
-Resource   global_properties.robot
-
-*** Variables ***
-${POLICY_HEALTH_CHECK_PATH}        /healthcheck
-
-*** Keywords ***
-
-Run Policy Health Check
-     [Documentation]    Runs Policy Health check
-     ${auth}=    Create List    ${GLOBAL_POLICY_USERNAME}    ${GLOBAL_POLICY_PASSWORD}    
-     Log    Creating session ${GLOBAL_POLICY_SERVER_URL}
-     ${session}=    Create Session 	policy 	${GLOBAL_POLICY_HEALTHCHECK_URL}   auth=${auth}
-     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
-     ${resp}= 	Get Request 	policy 	${POLICY_HEALTH_CHECK_PATH}     headers=${headers}
-     Log    Received response from policy ${resp.text}
-     Should Be Equal As Strings 	${resp.status_code} 	200
-     Should Be True 	${resp.json()['healthy']}
-     @{ITEMS}=    Copy List    ${resp.json()['details']}
-     :FOR    ${ELEMENT}    IN    @{ITEMS}
-     \    Should Be Equal As Strings 	${ELEMENT['code']} 	200
-     \    Should Be True    ${ELEMENT['healthy']}
-    
-Run Policy Put Request
-     [Documentation]    Runs Policy Put request
-     [Arguments]    ${data_path}  ${data}
-     Log    Creating session ${GLOBAL_POLICY_SERVER_URL}
-     ${session}=    Create Session 	policy 	${GLOBAL_POLICY_SERVER_URL}
-     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json    Authorization=Basic ${GLOBAL_POLICY_AUTH}   ClientAuth=${GLOBAL_POLICY_CLIENTAUTH}    Environment=TEST
-     ${resp}= 	Put Request 	policy 	${data_path}     data=${data}    headers=${headers}
-     Log    Received response from policy ${resp.text}
-     [Return]    ${resp}
-
-Run Policy Post Request
-     [Documentation]    Runs Policy Post request
-     [Arguments]    ${data_path}  ${data}
-     Log    Creating session ${GLOBAL_POLICY_SERVER_URL}
-     ${session}=    Create Session 	policy 	${GLOBAL_POLICY_SERVER_URL}
-     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json    Authorization=Basic ${GLOBAL_POLICY_AUTH}   ClientAuth=${GLOBAL_POLICY_CLIENTAUTH}    Environment=TEST
-     ${resp}= 	Post Request 	policy 	${data_path}     data=${data}    headers=${headers}
-     Log    Received response from policy ${resp.text}
-     [Return]    ${resp}
-
-Run Policy Delete Request
-     [Documentation]    Runs Policy Delete request
-     [Arguments]    ${data_path}  ${data}
-     Log    Creating session ${GLOBAL_POLICY_SERVER_URL}
-     ${session}=    Create Session 	policy 	${GLOBAL_POLICY_SERVER_URL}
-     ${headers}=    Create Dictionary     Accept=application/json    Content-Type=application/json    Authorization=Basic ${GLOBAL_POLICY_AUTH}   ClientAuth=${GLOBAL_POLICY_CLIENTAUTH}    Environment=TEST
-     ${resp}= 	Delete Request 	policy 	${data_path}    data=${data}    headers=${headers}
-     Log    Received response from policy ${resp.text}
-     [Return]    ${resp}
-     
-Run Policy Get Configs Request
-    [Documentation]    Runs Policy Get Configs request
-    [Arguments]    ${data_path}  ${data}
-    Log    Creating session ${GLOBAL_POLICY_SERVER_URL}
-    ${session}=    Create Session 	policy 	${GLOBAL_POLICY_SERVER_URL}
-    ${headers}=    Create Dictionary     Accept=application/json    Content-Type=application/json    Authorization=Basic ${GLOBAL_POLICY_AUTH}   ClientAuth=${GLOBAL_POLICY_CLIENTAUTH}    
-    ${resp}= 	Post Request 	policy 	${data_path}    data=${data}    headers=${headers}
-    Log    Received response from policy ${resp.text}
-    [Return]    ${resp}
diff --git a/tests/policy/engine/pushpolicy.jinja b/tests/policy/engine/pushpolicy.jinja
deleted file mode 100644
index a1faaede..00000000
--- a/tests/policy/engine/pushpolicy.jinja
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "policyName":"{{policy_name}}",
-    "policyType":"{{policy_type}}",
-    "pdpGroup":"default"
-}
\ No newline at end of file
diff --git a/tests/policy/engine/sdncnamingpolicy_vFW.jinja b/tests/policy/engine/sdncnamingpolicy_vFW.jinja
deleted file mode 100644
index a012d59c..00000000
--- a/tests/policy/engine/sdncnamingpolicy_vFW.jinja
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "configBody": "{\"service\":\"SDNC-GenerateName\",\"version\":\"CSIT\",\"content\":{\"policy-instance-name\":\"ONAP_VFW_NAMING_TIMESTAMP\",\"naming-models\":[{\"naming-properties\":[{\"property-name\":\"AIC_CLOUD_REGION\"},{\"property-name\":\"nfRole\"},{\"property-name\":\"TIMESTAMP\"},{\"property-value\":\"_\",\"property-name\":\"DELIMITER\"}],\"naming-type\":\"VNF\",\"nfRole\":\"vFW\",\"naming-recipe\":\"AIC_CLOUD_REGION|DELIMITER|nfRole|DELIMITER|TIMESTAMP\"},{\"naming-properties\":[{\"property-name\":\"VNF_NAME\"},{\"property-name\":\"SEQUENCE\",\"increment-sequence\":{\"max\":\"zzz\",\"scope\":\"ENTIRETY\",\"start-value\":\"001\",\"length\":\"3\",\"increment\":\"1\",\"sequence-type\":\"alpha-numeric\"}},{\"property-name\":\"NFC_NAMING_CODE\"},{\"property-value\":\"_\",\"property-name\":\"DELIMITER\"}],\"naming-type\":\"VNFC\",\"nfRole\":\"vFW\",\"naming-recipe\":\"VNF_NAME|DELIMITER|NFC_NAMING_CODE|DELIMITER|SEQUENCE\"},{\"naming-properties\":[{\"property-name\":\"VNF_NAME\"},{\"property-value\":\"_\",\"property-name\":\"DELIMITER\"},{\"property-name\":\"VF_MODULE_LABEL\"},{\"property-name\":\"VF_MODULE_TYPE\"},{\"property-name\":\"SEQUENCE\",\"increment-sequence\":{\"max\":\"zzz\",\"scope\":\"PRECEEDING\",\"start-value\":\"01\",\"length\":\"3\",\"increment\":\"1\",\"sequence-type\":\"alpha-numeric\"}}],\"naming-type\":\"VF-MODULE\",\"nfRole\":\"vFW\",\"naming-recipe\":\"VNF_NAME|DELIMITER|VF_MODULE_LABEL|DELIMITER|VF_MODULE_TYPE|DELIMITER|SEQUENCE\"},{\"naming-properties\":[{\"property-name\":\"VNF_NAME\"}],\"naming-type\":\"KEY\",\"nfRole\":\"vFW\",\"naming-recipe\":\"VNF_NAME\"},{\"naming-properties\":[{\"property-name\":\"VNF_NAME\"},{\"property-value\":\"protected\",\"property-name\":\"CONSTANT\"},{\"property-value\":\"_\",\"property-name\":\"DELIMITER\"}],\"naming-type\":\"protected_private_net_id\",\"nfRole\":\"vFW\",\"naming-recipe\":\"VNF_NAME|DELIMITER|CONSTANT\"},{\"naming-properties\":[{\"property-name\":\"VNF_NAME\"},{\"property-value\":\"unprotected\",\"property-name\":\"CONSTANT\"},{\"property-value\":\"_\",\"property-name\":\"DELIMITER\"}],\"naming-type\":\"unprotected_private_net_id\",\"nfRole\":\"vFW\",\"naming-recipe\":\"VNF_NAME|DELIMITER|CONSTANT\"}]}}",
-    "policyName": "{{policy_name}}",
-    "policyConfigType": "MicroService",
-    "onapName": "SDNC",
-    "riskLevel": "4",
-    "riskType": "test",
-    "guard": "false",
-    "priority": "4",
-    "description": "ONAP_VFW_NAMING_TIMESTAMP"
-}
\ No newline at end of file
diff --git a/tests/policy/engine/sdncnamingpolicy_vPG.jinja b/tests/policy/engine/sdncnamingpolicy_vPG.jinja
deleted file mode 100644
index 9aa4f505..00000000
--- a/tests/policy/engine/sdncnamingpolicy_vPG.jinja
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "configBody": "{\"service\":\"SDNC-GenerateName\",\"version\":\"CSIT\",\"content\":{\"policy-instance-name\":\"ONAP_VPG_NAMING_TIMESTAMP\",\"naming-models\":[{\"naming-properties\":[{\"property-name\":\"AIC_CLOUD_REGION\"},{\"property-name\":\"nfRole\"},{\"property-name\":\"TIMESTAMP\"},{\"property-value\":\"_\",\"property-name\":\"DELIMITER\"}],\"naming-type\":\"VNF\",\"nfRole\":\"vPG\",\"naming-recipe\":\"AIC_CLOUD_REGION|DELIMITER|nfRole|DELIMITER|TIMESTAMP\"},{\"naming-properties\":[{\"property-name\":\"VNF_NAME\"},{\"property-name\":\"SEQUENCE\",\"increment-sequence\":{\"max\":\"zzz\",\"scope\":\"ENTIRETY\",\"start-value\":\"001\",\"length\":\"3\",\"increment\":\"1\",\"sequence-type\":\"alpha-numeric\"}},{\"property-name\":\"NFC_NAMING_CODE\"},{\"property-value\":\"_\",\"property-name\":\"DELIMITER\"}],\"naming-type\":\"VNFC\",\"nfRole\":\"vPG\",\"naming-recipe\":\"VNF_NAME|DELIMITER|NFC_NAMING_CODE|DELIMITER|SEQUENCE\"},{\"naming-properties\":[{\"property-name\":\"VNF_NAME\"},{\"property-value\":\"_\",\"property-name\":\"DELIMITER\"},{\"property-name\":\"VF_MODULE_LABEL\"},{\"property-name\":\"VF_MODULE_TYPE\"},{\"property-name\":\"SEQUENCE\",\"increment-sequence\":{\"max\":\"zzz\",\"scope\":\"PRECEEDING\",\"start-value\":\"01\",\"length\":\"3\",\"increment\":\"1\",\"sequence-type\":\"alpha-numeric\"}}],\"naming-type\":\"VF-MODULE\",\"nfRole\":\"vPG\",\"naming-recipe\":\"VNF_NAME|DELIMITER|VF_MODULE_LABEL|DELIMITER|VF_MODULE_TYPE|DELIMITER|SEQUENCE\"},{\"naming-properties\":[{\"property-name\":\"VNF_NAME\"}],\"naming-type\":\"KEY\",\"nfRole\":\"vPG\",\"naming-recipe\":\"VNF_NAME\"},{\"naming-properties\":[{\"property-name\":\"VNF_NAME\"},{\"property-value\":\"protected\",\"property-name\":\"CONSTANT\"},{\"property-value\":\"_\",\"property-name\":\"DELIMITER\"}],\"naming-type\":\"protected_private_net_id\",\"nfRole\":\"vPG\",\"naming-recipe\":\"VNF_NAME|DELIMITER|CONSTANT\"},{\"naming-properties\":[{\"property-name\":\"VNF_NAME\"},{\"property-value\":\"unprotected\",\"property-name\":\"CONSTANT\"},{\"property-value\":\"_\",\"property-name\":\"DELIMITER\"}],\"naming-type\":\"unprotected_private_net_id\",\"nfRole\":\"vPG\",\"naming-recipe\":\"VNF_NAME|DELIMITER|CONSTANT\"}]}}",    "policyName": "{{policy_name}}",
-	"policyName": "{{policy_name}}",
-    "policyConfigType": "MicroService",
-	"onapName": "SDNC",
-	"riskLevel": "4",
-	"riskType": "test",
-	"guard": "false",
-	"priority": "4",
-	"description": "ONAP_VPG_NAMING_TIMESTAMP"
-}
\ No newline at end of file