aboutsummaryrefslogtreecommitdiffstats
path: root/test/csit/tests/policy/suite1/Policy-CSIT.robot
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2017-10-09 02:58:18 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-09 02:58:18 +0000
commitd0709b896d63f1312bfd322b9c0a1be0bf70d39a (patch)
treec4a84d983a84c838115c1f738249a490ddb05001 /test/csit/tests/policy/suite1/Policy-CSIT.robot
parent683198d9f03761ef8402ec707abe28671273b206 (diff)
parent39e27744130df96299152ce81f766d12a0fe7eb3 (diff)
Merge "Policy CSIT Files"
Diffstat (limited to 'test/csit/tests/policy/suite1/Policy-CSIT.robot')
-rw-r--r--test/csit/tests/policy/suite1/Policy-CSIT.robot41
1 files changed, 27 insertions, 14 deletions
diff --git a/test/csit/tests/policy/suite1/Policy-CSIT.robot b/test/csit/tests/policy/suite1/Policy-CSIT.robot
index be52cd2ea..c7cc7256a 100644
--- a/test/csit/tests/policy/suite1/Policy-CSIT.robot
+++ b/test/csit/tests/policy/suite1/Policy-CSIT.robot
@@ -7,16 +7,16 @@ Resource policy_interface.robot
Resource json_templater.robot
*** Variables ***
-${RESOURCE_PATH_CREATE} /pdp/createPolicy
-${RESOURCE_PATH_CREATE_PUSH} /pdp/pushPolicy
-${RESOURCE_PATH_CREATE_DELETE} /pdp/deletePolicy
-${RESOURCE_PATH_GET_CONFIG} /pdp/getConfig
+${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
${CREATE_CONFIG_VFW_TEMPLATE} ${CURDIR}/configpolicy_vFW.template
${CREATE_CONFIG_VDNS_TEMPLATE} ${CURDIR}/configpolicy_vDNS.template
${CREATE_CONFIG_VCPE_TEMPLATE} ${CURDIR}/configpolicy_vCPE.template
-${CREATE_OPS_VFW_TEMPLATE} ${CURDIR}/opspolicy_VFW.template
+${CREATE_OPS_VFW_TEMPLATE} ${CURDIR}/opspolicy_VFW_R1.template
${PUSH_POLICY_TEMPLATE} ${CURDIR}/pushpolicy.template
-${CREATE_OPS_VDNS_TEMPLATE} ${CURDIR}/opspolicy_VDNS.template
+${CREATE_OPS_VDNS_TEMPLATE} ${CURDIR}/opspolicy_VDNS_R1.template
${DEL_POLICY_TEMPLATE} ${CURDIR}/deletepolicy.template
${GETCONFIG_TEMPLATE} ${CURDIR}/getconfigpolicy.template
${CONFIG_POLICY_VFW_NAME} vFirewall
@@ -60,7 +60,21 @@ VCPE Config Policy
Push Config Policy ${CONFIG_POLICY_VCPE_NAME} ${CONFIG_POLICY_VCPE_TYPE}
#VCPE Policy Tests
-#VOLTE Policy
+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
*** Keywords ***
@@ -216,25 +230,24 @@ Create Ops vCPE Policy
[Documentation] Create Opertional Policy
${randompolicyname} = Create Policy Name
${policyname1}= Catenate com.${randompolicyname}
- ${OPS_POLICY_NAME}= Set Test Variable ${policyname1}
- ${dict}= Create Dictionary policy_name=${OPS_POLICY_NAME}
- ${NEWPOLICY1}= Create Dictionary policy_name=com.${OPS_POLICY_NAME}
+ ${OPS_POLICY_VCPE_NAME}= Set Test Variable ${policyname1}
+ ${dict}= Create Dictionary policy_name=${policyname1}
${output} = Fill JSON Template File ${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 Opertional Policy
${randompolicyname} = Create Policy Name
- ${policyname2}= Catenate com.${randompolicyname}
- #${OPS_POLICY_VOLTE_NAME}= Set Test Variable ${policyname2}
- ${dict}= Create Dictionary policy_name=${policyname2}
- #${NEWPOLICY1}= Create Dictionary policy_name=com.${OPS_POLICY_NAME}
+ ${policyname1}= Catenate com.${randompolicyname}
+ ${dict}= Create Dictionary policy_name=${policyname1}
${output} = Fill JSON Template File ${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