summaryrefslogtreecommitdiffstats
path: root/robot/resources
diff options
context:
space:
mode:
authorBrian Freeman <bf1936@att.com>2020-05-06 15:10:06 -0500
committerMarco Platania <platania@research.att.com>2020-05-07 12:42:14 +0000
commitdf0ca461be8369a1c3ab9ac66ecb8fb834532fe5 (patch)
tree6d81fba60f06e9ecf92a92290df94675478a7d49 /robot/resources
parentad59044d59a02dc26f7a0a58c24a3316c79d16ff (diff)
remove url_encoded operational policy
add Payload back into template fix tabs and remove commented out lines Issue-ID: INT-1350 Change-Id: Ieeaa6c9f6b2e18c4ee5cf433504654897f6157bb Signed-off-by: Brian Freeman <bf1936@att.com>
Diffstat (limited to 'robot/resources')
-rw-r--r--robot/resources/policy_interface.robot11
1 files changed, 3 insertions, 8 deletions
diff --git a/robot/resources/policy_interface.robot b/robot/resources/policy_interface.robot
index 71311a81..2175f7b7 100644
--- a/robot/resources/policy_interface.robot
+++ b/robot/resources/policy_interface.robot
@@ -221,16 +221,11 @@ Create vFirewall Operational Policy
[Arguments] ${resource_id}
${dict}= Create Dictionary RESOURCE_ID=${resource_id}
Templating.Create Environment policy ${GLOBAL_TEMPLATE_FOLDER}
- #${content_data} OperatingSystem.Get File ${GLOBAL_TEMPLATE_FOLDER}/${POLICY_TEMPLATES}/vFirewall_policy_operational_content.yaml
- ${content_data} OperatingSystem.Get File ${GLOBAL_ASSETS_FOLDER}/policy/vFirewall_policy_operational_content.yaml
- ${content_data}= Replace String Using Regexp ${content_data} __RESOURCE_ID__ ${resource_id}
- ${encoded_content_data}= Evaluate urllib.quote_plus('''${content_data}''') urllib
- ${content_dictionary}= Create Dictionary URL_ENCODED_CONTENT ${encoded_content_data}
- ${data_2}= Templating.Apply Template policy ${POLICY_TEMPLATES}/vFirewall_policy_operational_url_enc_content_input.jinja ${content_dictionary}
+ ${data_2}= Templating.Apply Template policy ${POLICY_TEMPLATES}/vFirewall_policy_operational_content_input.jinja ${dict}
Log ${data_2}
- ${resp}= Run Policy Api Post Request /policy/api/v1/policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies ${data_2}
+ ${resp}= Run Policy Api Post Request /policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/policies ${data_2}
Should Be Equal As Strings ${resp.status_code} 200
- [Return] ${resp.json()['policy-version']}
+ [Return] ${resp.json()['version']}
Push vFirewall Policies To PDP Group
[Arguments] ${op_policy_version}