From c967dd69ee01fe702ffd25ba3f04c15f7af19b2a Mon Sep 17 00:00:00 2001
From: Brian Freeman <bf1936@att.com>
Date: Tue, 30 Apr 2019 09:47:44 -0500
Subject: Updates for new policy

Fix for APPC mount of multiple VM VNFs

Issue-ID: POLICY-1685
Change-Id: If8de8ecaa2052044af0512206fe8b326b21f50c4
Signed-off-by: Brian Freeman <bf1936@att.com>
---
 robot/resources/policy_interface.robot | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

(limited to 'robot/resources/policy_interface.robot')

diff --git a/robot/resources/policy_interface.robot b/robot/resources/policy_interface.robot
index 8bbbb62a..91d0d98b 100644
--- a/robot/resources/policy_interface.robot
+++ b/robot/resources/policy_interface.robot
@@ -53,6 +53,15 @@ Run Policy Put Request
      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 Post Request
      [Documentation]    Runs Policy Post request
      [Arguments]    ${data_path}  ${data}
@@ -62,7 +71,7 @@ Run Policy Post Request
      ${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}
@@ -85,7 +94,7 @@ Run Policy Get Configs Request
 
 
 
-Update vVFWCL Policy
+Update vVFWCL Policy Old
     [Arguments]   ${resource_id}
     Run Keyword and Ignore Error    Delete vFWCL Policy
     Sleep    20s
@@ -99,8 +108,23 @@ Update vVFWCL Policy
     Reboot Drools
     Sleep    20s
     Log To Console   Validate vFWCL Policy
+    Validate the vFWCL Policy Old
+
+Update vVFWCL Policy
+    [Arguments] ${resource_id}
+    Log To Console Create vFWCL Monitoring Policy
+    Create vFirewall Monitoring Policy
+    Sleep   5s
+    Log To Console Create vFWCL Operational Policy
+    Create vFirewall Operational Policy ${resource_id}
+    Sleep   5s
+    Log To Console Push vFWCL To PDP Group
+    Push vFirewall Policies To PDP Group
+    Sleep    20s
+    Log To Console   Validate vFWCL Policy
     Validate the vFWCL Policy
 
+
 Delete vFWCL Policy
      ${data}=   OperatingSystem.Get File    ${POLICY_TEMPLATES}/FirewallPolicy_delete.template
      ${resp}=   Run Policy Delete Request    /pdp/api/deletePolicy    ${data}
@@ -134,12 +158,16 @@ Reboot Drools
     Log   stdout=${stdout}
     Should Contain     ${stdout}    is running
 
-Validate the vFWCL Policy
+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 Get Request   /policy/pap/v1/pdps
+    Log    Received response from policy ${resp.text}
+    Should Be Equal As Strings         ${resp.status_code}     200
 
 Create vFirewall Monitoring Policy
      ${dict}=   Create Dictionary
-- 
cgit 1.2.3-korg