aboutsummaryrefslogtreecommitdiffstats
path: root/robot
diff options
context:
space:
mode:
Diffstat (limited to 'robot')
-rw-r--r--robot/resources/demo_preload.robot2
-rw-r--r--robot/resources/policy_interface.robot12
-rw-r--r--robot/resources/test_templates/vnf_orchestration_test_template.robot4
-rw-r--r--robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot1
-rw-r--r--robot/resources/vid/teardown_vid.robot1
-rw-r--r--robot/testsuites/closed-loop.robot4
6 files changed, 14 insertions, 10 deletions
diff --git a/robot/resources/demo_preload.robot b/robot/resources/demo_preload.robot
index 3083cc44..3f5100b6 100644
--- a/robot/resources/demo_preload.robot
+++ b/robot/resources/demo_preload.robot
@@ -212,7 +212,7 @@ Instantiate VNF
\ ${generic_vnf}= Get From Dictionary ${generic_vnfs} ${vf_module}
\ ${model_invariant_id}= Set Variable If '${vf_module_label}' in '${vf_module}' ${generic_vnf['model-invariant-id']} ${model_invariant_id}
Log Update old vFWCL Policy for ModelInvariantID=${model_invariant_id}
- ${status} ${value}= Run Keyword And Ignore Error Update vVFWCL Policy ${model_invariant_id}
+ ${status} ${value}= Run Keyword And Ignore Error Update vFWCL Operational and Monitoring Policies ${model_invariant_id}
:FOR ${vf_module_name} IN @{vf_module_name_list}
\ Log APPC Mount Point for VNF Module Name=${vf_module_name}
\ ${status} ${value}= Run Keyword And Ignore Error APPC Mount Point ${vf_module_name}
diff --git a/robot/resources/policy_interface.robot b/robot/resources/policy_interface.robot
index b8ecf45f..9ff95f07 100644
--- a/robot/resources/policy_interface.robot
+++ b/robot/resources/policy_interface.robot
@@ -188,7 +188,7 @@ Run Deploy Policy Pap Post Request
[Return] ${resp}
Should Be Equal As Strings ${resp.status_code} 200
-Run Undeploy Policy
+Run Undeploy vFW Operational Policy
[Documentation] Runs Policy PAP Undeploy a Policy from PDP Groups
#[Arguments] ${policy_name}
${auth}= Create List ${POLICY_HEALTHCHECK_USERNAME} ${POLICY_HEALTHCHECK_PASSWORD}
@@ -222,6 +222,16 @@ Run Delete vFW Monitoring Policy
Log Received response from policy ${resp.text}
Should Be Equal As Strings ${resp.status_code} 200
+Run Delete vFW Operational Policy
+ [Documentation] Runs Policy API Delete Operational Policy
+ #[Arguments] ${policy_name}
+ ${auth}= Create List ${POLICY_HEALTHCHECK_USERNAME} ${POLICY_HEALTHCHECK_PASSWORD}
+ ${session}= Create Session policy ${GLOBAL_POLICY_SERVER_PROTOCOL}://${POLICY_API_IP}:${GLOBAL_POLICY_HEALTHCHECK_PORT} auth=${auth}
+ Log Creating session ${GLOBAL_POLICY_SERVER_PROTOCOL}://${POLICY_API_IP}:${GLOBAL_POLICY_HEALTHCHECK_PORT}
+ ${headers}= Create Dictionary Accept=application/json Content-Type=application/json
+ ${resp}= Delete Request policy /policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/policies/operational.modifyconfig/versions/1.0.0 headers=${headers}
+ Log Received response from policy ${resp.text}
+ Should Be Equal As Strings ${resp.status_code} 200
Run Delete Policy Request
[Documentation] Runs Policy Delete request
diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot
index e4b44270..9d33f7ab 100644
--- a/robot/resources/test_templates/vnf_orchestration_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot
@@ -15,7 +15,6 @@ Resource ../aai/create_complex.robot
Resource ../aai/create_tenant.robot
Resource ../aai/create_service.robot
Resource ../openstack/neutron_interface.robot
-Resource ../heatbridge.robot
Library ONAPLibrary.Openstack
@@ -76,9 +75,6 @@ Orchestrate VNF
\ ${generic_vnf}= Validate Generic VNF ${vnf_name} ${vnf_type} ${service_instance_id}
\ Set To Dictionary ${generic_vnfs} ${vf_module_type} ${generic_vnf}
# TODO: Need to look at a better way to default ipv4_oam_interface search for Heatbridge
- ## Part of removale of heatbridge
- ## \ ${uris_to_delete}= Execute Heatbridge ${vf_module_name} ${vnf} ${service} ipv4_oam_interface
- ## set a fake urils_to_delete until we confirm heatbridge can be fully removed
\ ${uris_to_delete}= Set Variable 'http://devnull'
\ Validate VF Module ${vf_module_name} ${vnf}
\ Append To List ${vf_module_name_list} ${vf_module_name}
diff --git a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
index 63266aa5..1ab5852c 100644
--- a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
@@ -15,7 +15,6 @@ Resource ../aai/create_complex.robot
Resource ../aai/create_tenant.robot
Resource ../aai/create_service.robot
Resource ../openstack/neutron_interface.robot
-Resource ../heatbridge.robot
Resource ../global_properties.robot
diff --git a/robot/resources/vid/teardown_vid.robot b/robot/resources/vid/teardown_vid.robot
index a2ffc83c..23217704 100644
--- a/robot/resources/vid/teardown_vid.robot
+++ b/robot/resources/vid/teardown_vid.robot
@@ -7,7 +7,6 @@ Library ONAPLibrary.SO WITH NAME SO
Resource vid_interface.robot
Resource create_vid_vnf.robot
Resource create_service_instance.robot
-Resource ../heatbridge.robot
*** Variables ***
${VID_ENV} /vid
diff --git a/robot/testsuites/closed-loop.robot b/robot/testsuites/closed-loop.robot
index 3c8e7083..6f1a9db3 100644
--- a/robot/testsuites/closed-loop.robot
+++ b/robot/testsuites/closed-loop.robot
@@ -28,10 +28,10 @@ VFWCL Repush Monitoring And Operational Policies
Validate the vFWCL Policy
Run Keyword And Ignore Error Run Undeploy vFW Monitoring Policy
Validate the vFWCL Policy
- Run Keyword and Ignore Error Run Delete vFW Monitoring Policy
- Validate the vFWCL Policy
Run Keyword And Ignore Error Run Undeploy vFW Operational Policy
Validate the vFWCL Policy
+ Run Keyword and Ignore Error Run Delete vFW Monitoring Policy
+ Validate the vFWCL Policy
Run Keyword And Ignore Error Run Delete vFW Operational Policy
Validate the vFWCL Policy
Update vVFWCL Policy ${MODEL_INVARIANT_ID}