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 <pdragosh@research.att.com>

11 files changed, 2 insertions, 305 deletions

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
diff --git a/robot/resources/policy_interface.robot b/robot/resources/policy_interface.robot
index 2175f7b7..3e6048b1 100644
--- a/robot/resources/policy_interface.robot
+++ b/robot/resources/policy_interface.robot
@@ -10,18 +10,12 @@ Resource          global_properties.robot
 Resource          ssh/files.robot
 
 *** Variables ***
-${POLICY_HEALTH_CHECK_PATH}        /healthcheck
 ${POLICY_NEW_HEALTHCHECK_PATH}        /policy/pap/v1/components/healthcheck
-${POLICY_ENDPOINT}     ${GLOBAL_POLICY_SERVER_PROTOCOL}://${GLOBAL_INJECTED_POLICY_IP_ADDR}:${GLOBAL_POLICY_SERVER_PORT}
-${POLICY_HEALTHCHECK_ENDPOINT}     ${GLOBAL_POLICY_SERVER_PROTOCOL}://${GLOBAL_INJECTED_POLICY_DROOLS_IP_ADDR}:${GLOBAL_POLICY_HEALTHCHECK_PORT}
 ${POLICY_NEW_HEALTHCHECK_ENDPOINT}     ${GLOBAL_POLICY_SERVER_PROTOCOL}://${GLOBAL_INJECTED_POLICY_PAP_IP_ADDR}:${GLOBAL_POLICY_HEALTHCHECK_PORT}
 ${POLICY_TEMPLATES}        policy
-${DROOLS_ENDPOINT}     ${GLOBAL_POLICY_SERVER_PROTOCOL}://${GLOBAL_INJECTED_POLICY_DROOLS_IP_ADDR}:${GLOBAL_DROOLS_SERVER_PORT}
 ${POLICY_API_IP}    ${GLOBAL_INJECTED_POLICY_API_IP_ADDR}
 ${POLICY_PAP_IP}    ${GLOBAL_INJECTED_POLICY_PAP_IP_ADDR}
-${POLICY_DISTRIBUTION_IP}   ${GLOBAL_INJECTED_POLICY_DISTRIBUTION_IP_ADDR}
 ${POLICY_PDPX_IP}       ${GLOBAL_INJECTED_POLICY_PDPX_IP_ADDR}
-${POLICY_APEX_PDP_IP}       ${GLOBAL_INJECTED_POLICY_APEX_PDP_IP_ADDR}
 ${POLICY_HEALTHCHECK_USERNAME}		${GLOBAL_POLICY_HEALTHCHECK_USERNAME}
 ${POLICY_HEALTHCHECK_PASSWORD}		${GLOBAL_POLICY_HEALTHCHECK_PASSWORD}
 
@@ -29,22 +23,7 @@ ${POLICY_HEALTHCHECK_PASSWORD}		${GLOBAL_POLICY_HEALTHCHECK_PASSWORD}
 *** Keywords ***
 
 Run Policy Health Check
-     [Documentation]    Runs Policy Health check
-     ${auth}=    Create List    ${GLOBAL_POLICY_USERNAME}    ${GLOBAL_POLICY_PASSWORD}
-     Log    Creating session ${POLICY_ENDPOINT}
-     ${session}=    Create Session 	policy 	${POLICY_HEALTHCHECK_ENDPOINT}   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 New Healthcheck
-     [Documentation]    Runs New Policy Health check
+     [Documentation]    Runs Policy Health Check
      ${auth}=    Create List     ${GLOBAL_POLICY_HEALTHCHECK_USERNAME}   ${GLOBAL_POLICY_HEALTHCHECK_PASSWORD}
      Log    Creating session ${POLICY_NEW_HEALTHCHECK_ENDPOINT}
      ${session}=    Create Session  policy  ${POLICY_NEW_HEALTHCHECK_ENDPOINT}   auth=${auth}
@@ -54,36 +33,6 @@ Run Policy New Healthcheck
      Should Be Equal As Strings   ${resp.status_code}   200
      Should Be True   ${resp.json()['healthy']}
 
-Run Drools Get Request
-     [Documentation]    Runs Drools Get Request
-     [Arguments]    ${data_path}
-     Log    Creating session ${DROOLS_ENDPOINT}
-     ${session}=    Create Session      policy  ${DROOLS_ENDPOINT}   auth=${GLOBAL_DROOLS_AUTHENTICATION}
-     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
-     ${resp}=   Get Request     policy  ${data_path}     headers=${headers}
-     Log    Received response from policy ${resp.text}
-     Should Be Equal As Strings         ${resp.status_code}     200
-     [Return]   ${resp}
-
-Run Policy Put Request
-     [Documentation]    Runs Policy Put request
-     [Arguments]    ${data_path}  ${data}
-     Log    Creating session ${POLICY_ENDPOINT}
-     ${session}=    Create Session 	policy 	${POLICY_ENDPOINT}
-     ${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 Get Request
-     [Documentation]    Runs Policy Get request
-     [Arguments]    ${data_path}
-     Log    Creating session ${POLICY_ENDPOINT}
-     ${session}=    Create Session 	policy 	${POLICY_ENDPOINT}
-     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json    Authorization=Basic ${GLOBAL_POLICY_AUTH}   ClientAuth=${GLOBAL_POLICY_CLIENTAUTH}    Environment=TEST
-     ${resp}= 	Get Request 	policy   ${data_path}     headers=${headers}
-     Log    Received response from policy ${resp.text}
-
 Run Policy Pap Get Request
      [Documentation]    Runs Policy Pap Get request
      [Arguments]    ${data_path}
@@ -95,17 +44,6 @@ Run Policy Pap Get Request
      Log    Received response from Policy Pap ${resp.text}
      [Return]   ${resp}
 
-
-Run Policy Post Request
-     [Documentation]    Runs Policy Post request
-     [Arguments]    ${data_path}  ${data}
-     Log    Creating session ${POLICY_ENDPOINT}
-     ${session}=    Create Session 	policy 	${POLICY_ENDPOINT}
-     ${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 Api Post Request
      [Documentation]    Runs Policy Api Post request
      [Arguments]    ${data_path}  ${data}
@@ -117,7 +55,6 @@ Run Policy Api Post Request
      Log    Received response from policy ${resp.text}
      [Return]    ${resp}
 
-
 Run Policy Pap Post Request
      [Documentation]    Runs Policy Pap Post request
      [Arguments]    ${data_path}  ${data}
@@ -140,27 +77,6 @@ Undeploy Policy
      Log    Received response from policy ${resp.text}
      Should Be Equal As Strings    ${resp.status_code}     200
 
-
-Run Policy Delete Request
-     [Documentation]    Runs Policy Delete request
-     [Arguments]    ${data_path}  ${data}
-     Log    Creating session ${POLICY_ENDPOINT}
-     ${session}=    Create Session 	policy 	${POLICY_ENDPOINT}
-     ${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 ${POLICY_ENDPOINT}
-    ${session}=    Create Session 	policy 	${POLICY_ENDPOINT}
-    ${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}
-
 Update vVFWCL Policy
     [Arguments]   ${resource_id}
     Log   Create vFWCL Monitoring Policy
@@ -175,35 +91,6 @@ Update vVFWCL Policy
     Log   Validate vFWCL Policy
     Validate the vFWCL Policy
 
-
-Delete vFWCL Policy
-    Templating.Create Environment    policy    ${GLOBAL_TEMPLATE_FOLDER}
-    ${dict}=   Create Dictionary   policyName=com.BRMSParamvFirewall
-  	${data}=   Templating.Apply Template    policy    ${POLICY_TEMPLATES}/FirewallPolicy_delete.jinja    ${dict}
-    ${resp}=   Run Policy Delete Request    /pdp/api/deletePolicy    ${data}
-    Should Be Equal As Strings 	${resp.status_code} 	200
-
-Create vFWCL Policy
-    [Arguments]   ${resource_id}
-    ${dict}=   Create Dictionary   RESOURCE_ID=${resource_id}
-    Templating.Create Environment    policy    ${GLOBAL_TEMPLATE_FOLDER}
-    ${data}=   Templating.Apply Template    policy    ${POLICY_TEMPLATES}/FirewallPolicy_update.jinja   ${dict}
-    ${resp}=   Run Policy Put Request    /pdp/api/updatePolicy    ${data}
-    Should Be Equal As Strings 	${resp.status_code} 	200
-
-Push vFWCL Policy
-    Templating.Create Environment    policy    ${GLOBAL_TEMPLATE_FOLDER}
-    ${dict}=   Create Dictionary
-    ${data}=   Templating.Apply Template    policy    ${POLICY_TEMPLATES}/FirewallPolicy_push.jinja   ${dict}
-    ${resp}=   Run Policy Put Request    /pdp/api/pushPolicy    ${data}
-    Should Be Equal As Strings 	${resp.status_code} 	200
-
-Validate the vFWCL Policy Old
-    ${resp}=   Run Drools Get Request   /policy/pdp/engine/controllers/amsterdam/drools
-    Should Be Equal As Strings 	${resp.status_code} 	200
-    ${resp}=   Run Drools Get Request   /policy/pdp/engine/controllers/amsterdam/drools/facts/closedloop-amsterdam/org.onap.policy.controlloop.Params
-    Should Be Equal As Strings 	${resp.status_code} 	200
-
 Validate the vFWCL Policy
     ${resp}=   Run Policy Pap Get Request   /policy/pap/v1/pdps
     Log    Received response from policy ${resp.text}
@@ -214,7 +101,7 @@ Create vFirewall Monitoring Policy
      ${dict}=   Create Dictionary   RESOURCE_ID=${resource_id}
     Templating.Create Environment    policy    ${GLOBAL_TEMPLATE_FOLDER}
      ${data}=   Templating.Apply Template    policy    ${POLICY_TEMPLATES}/vFirewall_policy_monitoring_input_tosca.jinja    ${dict}
-     ${resp}=   Run Policy Api Post Request    /policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies     ${data}
+     ${resp}=   Run Policy Api Post Request    /policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/policies     ${data}
      Should Be Equal As Strings 	${resp.status_code} 	200
 
 Create vFirewall Operational Policy
@@ -234,58 +121,3 @@ Push vFirewall Policies To PDP Group
     ${data}=   Templating.Apply Template    policy    ${POLICY_TEMPLATES}/vFirewall_push.jinja    ${dict}
     ${resp}=   Run Policy Pap Post Request    /policy/pap/v1/pdps/policies   ${data}
     Should Be Equal As Strings    ${resp.status_code}     200
-
-Run Policy API Healthcheck
-     [Documentation]    Runs Policy Api Health check
-     ${auth}=    Create List    ${POLICY_HEALTHCHECK_USERNAME}    ${POLICY_HEALTHCHECK_PASSWORD}
-     Log    Creating session ${GLOBAL_POLICY_SERVER_PROTOCOL}://${POLICY_API_IP}:${GLOBAL_POLICY_HEALTHCHECK_PORT}
-     ${session}=    Create Session      policy  ${GLOBAL_POLICY_SERVER_PROTOCOL}://${POLICY_API_IP}:${GLOBAL_POLICY_HEALTHCHECK_PORT}   auth=${auth}
-     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
-     ${resp}=   Get Request     policy  /policy/api/v1/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()['code']}  200
-
-Run Policy PAP Healthcheck
-     [Documentation]    Runs Policy PAP Health check
-     ${auth}=    Create List   ${POLICY_HEALTHCHECK_USERNAME}    ${POLICY_HEALTHCHECK_PASSWORD}
-     Log    Creating session ${GLOBAL_POLICY_SERVER_PROTOCOL}://${POLICY_PAP_IP}:${GLOBAL_POLICY_HEALTHCHECK_PORT}
-     ${session}=    Create Session      policy  ${GLOBAL_POLICY_SERVER_PROTOCOL}://${POLICY_PAP_IP}:${GLOBAL_POLICY_HEALTHCHECK_PORT}   auth=${auth}
-     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
-     ${resp}=   Get Request     policy  /policy/pap/v1/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()['code']}  200
-
-Run Policy Distribution Healthcheck
-     [Documentation]    Runs Policy Distribution Health check
-     ${auth}=    Create List    ${POLICY_HEALTHCHECK_USERNAME}    ${POLICY_HEALTHCHECK_PASSWORD}
-     Log    Creating session ${GLOBAL_POLICY_SERVER_PROTOCOL}://${POLICY_DISTRIBUTION_IP}:${GLOBAL_POLICY_HEALTHCHECK_PORT}
-     ${session}=    Create Session      policy  ${GLOBAL_POLICY_SERVER_PROTOCOL}://${POLICY_DISTRIBUTION_IP}:${GLOBAL_POLICY_HEALTHCHECK_PORT}   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()['code']}  200
-
-Run Policy XACML PDP Healthcheck
-     [Documentation]    Runs Policy Xacml PDP Health check
-     ${auth}=    Create List    ${POLICY_HEALTHCHECK_USERNAME}    ${POLICY_HEALTHCHECK_PASSWORD}
-     Log    Creating session ${GLOBAL_POLICY_SERVER_PROTOCOL}://${POLICY_PDPX_IP}:${GLOBAL_POLICY_HEALTHCHECK_PORT}
-     ${session}=    Create Session      policy  ${GLOBAL_POLICY_SERVER_PROTOCOL}://${POLICY_PDPX_IP}:${GLOBAL_POLICY_HEALTHCHECK_PORT}   auth=${auth}
-     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
-     ${resp}=   Get Request     policy  /policy/pdpx/v1/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()['code']}  200
-
-Run Policy APEX PDP Healthcheck
-     [Documentation]    Runs Policy Apex PDP Health check
-     ${auth}=    Create List    ${POLICY_HEALTHCHECK_USERNAME}    ${POLICY_HEALTHCHECK_PASSWORD}
-     Log    Creating session ${GLOBAL_POLICY_SERVER_PROTOCOL}://${POLICY_APEX_PDP_IP}:${GLOBAL_POLICY_HEALTHCHECK_PORT}
-     ${session}=    Create Session      policy  ${GLOBAL_POLICY_SERVER_PROTOCOL}://${POLICY_APEX_PDP_IP}:${GLOBAL_POLICY_HEALTHCHECK_PORT}   auth=${auth}
-     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json
-     ${resp}=   Get Request     policy  /policy/apex-pdp/v1/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()['code']}  200
diff --git a/robot/testsuites/health-check.robot b/robot/testsuites/health-check.robot
index 55e52eee..7e07b5c6 100644
--- a/robot/testsuites/health-check.robot
+++ b/robot/testsuites/health-check.robot
@@ -135,15 +135,6 @@ Basic OOF-CMSO Health Check
 Basic Policy Health Check
     [Tags]    health    medium   health-policy
     Run Policy Health Check
-    Run Policy API Healthcheck
-    Run Policy PAP Healthcheck
-    Run Policy Distribution Healthcheck
-    Run Policy XACML PDP Healthcheck
-    Run Policy APEX PDP Healthcheck
-
-Basic Policy New Healthcheck
-    [Tags]    health    medium   health-policy
-    Run Policy New Healthcheck
 
 Basic Pomba AAI-context-builder Health Check
     [Tags]    oom   health-pomba