From: Jozef Behran Date: Mon, 9 Nov 2015 16:58:22 +0000 (+0100) Subject: Tidied new and modified tests X-Git-Tag: release/lithium-sr3~43 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F53%2F29453%2F2;p=integration%2Ftest.git Tidied new and modified tests Change-Id: I9bc6a6aa136bc97827d840304bf3ed08726e3e8d Signed-off-by: Jozef Behran --- diff --git a/csit/libraries/GBP/RestconfUtils.robot b/csit/libraries/GBP/RestconfUtils.robot index d9f70435d7..8b194ae47e 100644 --- a/csit/libraries/GBP/RestconfUtils.robot +++ b/csit/libraries/GBP/RestconfUtils.robot @@ -7,9 +7,8 @@ Variables ../../variables/Variables.py Resource ../Utils.robot *** Keywords *** - Unregister Endpoints - [Arguments] ${OPER_ENDPOINTS_PATH} + [Arguments] ${OPER_ENDPOINTS_PATH} [Documentation] Unregister Endpoints Endpoints from ODL ${result} = RequestsLibrary.Get session ${OPER_ENDPOINTS_PATH} ${json_result} = json.loads ${result.text} @@ -25,14 +24,14 @@ Unregister Endpoints Should Be Empty ${json_result['endpoints']} Unregister L2Endpoints - [Arguments] ${l2_eps} + [Arguments] ${l2_eps} [Documentation] Unregister Endpoints L2Endpoints from ODL : FOR ${endpoint} IN @{l2_eps} \ ${l2_data} = Create L2 Endpoint JSON Data ${endpoint} \ Post Elements To URI ${UNREG_ENDPOINTS_PATH} ${l2_data} Unregister L3Endpoints - [Arguments] ${l3_eps} + [Arguments] ${l3_eps} [Documentation] Unregister Endpoints L3Endpoints from ODL : FOR ${endpoint} IN @{l3_eps} \ ${l3_data} = Create L3 Endpoint JSON Data ${endpoint} @@ -41,14 +40,11 @@ Unregister L3Endpoints Create L2 Endpoint JSON Data [Arguments] ${endpoint} [Documentation] Generate the JSON data required for unregistering L2 Endpoints - ${data} Set Variable - ... {"input": {"l2": [{"mac-address": "${endpoint['mac-address']}", "l2-context": "${endpoint['l2-context']}"}]}} + ${data} Set Variable {"input": {"l2": [{"mac-address": "${endpoint['mac-address']}", "l2-context": "${endpoint['l2-context']}"}]}} [Return] ${data} Create L3 Endpoint JSON Data [Arguments] ${endpoint} [Documentation] Generate the JSON data required for unregistering L3 Endpoints - ${data} Set Variable - ... {"input": {"l3": [{"l3-context": "${endpoint['l3-context']}", "ip-address": "${endpoint['ip-address']}"}]}} + ${data} Set Variable {"input": {"l3": [{"l3-context": "${endpoint['l3-context']}", "ip-address": "${endpoint['ip-address']}"}]}} [Return] ${data} - diff --git a/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-asymmetric-chain/998_clean_odl.robot b/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-asymmetric-chain/998_clean_odl.robot index 7cc1f17e1d..9d3591fc8c 100644 --- a/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-asymmetric-chain/998_clean_odl.robot +++ b/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-asymmetric-chain/998_clean_odl.robot @@ -11,29 +11,23 @@ Resource ../../../../../libraries/Utils.robot Resource ../../../../../libraries/GBP/RestconfUtils.robot *** Variables *** - -${GBP_TENENT_ID} f5c7d344-d1c7-4208-8531-2c2693657e12 -${TENANT_PATH} /restconf/config/policy:tenants/tenant/${GBP_TENENT_ID} -${TUNNELS_PATH} /restconf/config/opendaylight-inventory:nodes - -${OPER_ENDPOINTS_PATH} /restconf/operational/endpoint:endpoints +${GBP_TENENT_ID} f5c7d344-d1c7-4208-8531-2c2693657e12 +${TENANT_PATH} /restconf/config/policy:tenants/tenant/${GBP_TENENT_ID} +${TUNNELS_PATH} /restconf/config/opendaylight-inventory:nodes +${OPER_ENDPOINTS_PATH} /restconf/operational/endpoint:endpoints ${UNREG_ENDPOINTS_PATH} /restconf/operations/endpoint:unregister-endpoint - -${SF_PATH} /restconf/config/service-function:service-functions -${SFF_PATH} /restconf/config/service-function-forwarder:service-function-forwarders -${SFC_PATH} /restconf/config/service-function-chain:service-function-chains -${SFP_PATH} /restconf/config/service-function-path:service-function-paths - -${OPER_NODES} /restconf/operational/opendaylight-inventory:nodes/ +${SF_PATH} /restconf/config/service-function:service-functions +${SFF_PATH} /restconf/config/service-function-forwarder:service-function-forwarders +${SFC_PATH} /restconf/config/service-function-chain:service-function-chains +${SFP_PATH} /restconf/config/service-function-path:service-function-paths +${OPER_NODES} /restconf/operational/opendaylight-inventory:nodes/ *** Test Cases *** - Delete Service Function Paths [Documentation] Delete Service Function Paths from ODL [Tags] GBPSFCTEAR Remove All Elements At URI And Verify ${SFP_PATH} - Delete Service Function Chains [Documentation] Delete Service Function Chains from ODL [Tags] GBPSFCTEAR @@ -63,4 +57,3 @@ Unregister Endpoints [Documentation] Unregister Endpoints Endpoints from ODL [Tags] GBPSFCTEAR Unregister Endpoints ${OPER_ENDPOINTS_PATH} - diff --git a/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/998_clean_odl.robot b/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/998_clean_odl.robot index dc95ff9eb8..d5f41aed34 100644 --- a/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/998_clean_odl.robot +++ b/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/998_clean_odl.robot @@ -11,24 +11,18 @@ Resource ../../../../../libraries/Utils.robot Resource ../../../../../libraries/GBP/RestconfUtils.robot *** Variables *** - -${GBP_TENENT_ID} f5c7d344-d1c7-4208-8531-2c2693657e12 -${TENANT_PATH} /restconf/config/policy:tenants/tenant/${GBP_TENENT_ID} -${TUNNELS_PATH} /restconf/config/opendaylight-inventory:nodes - -${OPER_ENDPOINTS_PATH} /restconf/operational/endpoint:endpoints +${GBP_TENENT_ID} f5c7d344-d1c7-4208-8531-2c2693657e12 +${TENANT_PATH} /restconf/config/policy:tenants/tenant/${GBP_TENENT_ID} +${TUNNELS_PATH} /restconf/config/opendaylight-inventory:nodes +${OPER_ENDPOINTS_PATH} /restconf/operational/endpoint:endpoints ${UNREG_ENDPOINTS_PATH} /restconf/operations/endpoint:unregister-endpoint - -${SF_PATH} /restconf/config/service-function:service-functions -${SFF_PATH} /restconf/config/service-function-forwarder:service-function-forwarders -${SFC_PATH} /restconf/config/service-function-chain:service-function-chains -${SFP_PATH} /restconf/config/service-function-path:service-function-paths - -${OPER_NODES} /restconf/operational/opendaylight-inventory:nodes/ - +${SF_PATH} /restconf/config/service-function:service-functions +${SFF_PATH} /restconf/config/service-function-forwarder:service-function-forwarders +${SFC_PATH} /restconf/config/service-function-chain:service-function-chains +${SFP_PATH} /restconf/config/service-function-path:service-function-paths +${OPER_NODES} /restconf/operational/opendaylight-inventory:nodes/ *** Test Cases *** - Delete Service Function Paths [Documentation] Delete Service Function Paths from ODL [Tags] GBPSFCTEAR