From: Junaid Zulfiqar Date: Mon, 15 Feb 2016 00:06:18 +0000 (-0800) Subject: Moved calls to "RequestLibrary. Request" in suites/vpnservice/ X-Git-Tag: release/beryllium-sr1~84 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=baff5f3aacb25f559c014763a044cc8dc66ea0dc;hp=ff086b395dc8d40721bd81ce6f34bda7a09ec401;p=integration%2Ftest.git Moved calls to "RequestLibrary. Request" in suites/vpnservice/ + RequestsLibrary.Get Request + RequestsLibrary.Post Request + RequestsLibrary.get Request + RequestsLibrary.Delete Request Change-Id: Ifd0154d3e22bbd507d6fef7577b3ec595a99f2c7 Signed-off-by: Junaid Zulfiqar --- diff --git a/csit/suites/vpnservice/020__configure_vpn.robot b/csit/suites/vpnservice/020__configure_vpn.robot index d0a922b480..fd4ba847e5 100644 --- a/csit/suites/vpnservice/020__configure_vpn.robot +++ b/csit/suites/vpnservice/020__configure_vpn.robot @@ -20,14 +20,14 @@ Create VPN Instance [Documentation] Creates VPN Instance through restconf [Tags] Post ${body} OperatingSystem.Get File ${VPN_CONFIG_DIR}/vpn_instance.json - ${resp} RequestsLibrary.Post session ${REST_CON}l3vpn:vpn-instances/ data=${body} + ${resp} RequestsLibrary.Post Request session ${REST_CON}l3vpn:vpn-instances/ data=${body} Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 204 Verify VPN instance [Documentation] Verifies the vpn instance is created [Tags] Get - ${resp} RequestsLibrary.Get session ${REST_CON}l3vpn:vpn-instances/vpn-instance/${vpn_inst_values[0]}/ headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request session ${REST_CON}l3vpn:vpn-instances/vpn-instance/${vpn_inst_values[0]}/ headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 Log ${resp.content} : FOR ${value} IN @{vpn_inst_values} @@ -37,13 +37,13 @@ Create ietf vm interface [Documentation] Creates ietf interface through the restconf [Tags] Post ${body} OperatingSystem.Get File ${VPN_CONFIG_DIR}/vm_interface.json - ${resp} RequestsLibrary.Post session ${REST_CON}ietf-interfaces:interfaces/ data=${body} + ${resp} RequestsLibrary.Post Request session ${REST_CON}ietf-interfaces:interfaces/ data=${body} Should Be Equal As Strings ${resp.status_code} 204 Verify ietf vm interface [Documentation] Verifies ietf interface created [Tags] Get - ${resp} RequestsLibrary.Get session ${REST_CON}ietf-interfaces:interfaces/interface/${vm_int_values[0]}/ headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request session ${REST_CON}ietf-interfaces:interfaces/interface/${vm_int_values[0]}/ headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 Log ${resp.content} : FOR ${value} IN @{vm_int_values} @@ -53,13 +53,13 @@ Create VPN interface [Documentation] Creates vpn interface for the corresponding ietf interface [Tags] Post ${body} OperatingSystem.Get File ${VPN_CONFIG_DIR}/vm_vpninterface.json - ${resp} RequestsLibrary.Post session ${REST_CON}l3vpn:vpn-interfaces/ data=${body} + ${resp} RequestsLibrary.Post Request session ${REST_CON}l3vpn:vpn-interfaces/ data=${body} Should Be Equal As Strings ${resp.status_code} 204 Verify VPN interface [Documentation] Verifies the vpn interface created [Tags] Get - ${resp} RequestsLibrary.Get session ${REST_CON}l3vpn:vpn-interfaces/ headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request session ${REST_CON}l3vpn:vpn-interfaces/ headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 Log ${resp.content} : FOR ${value} IN @{vm_vpnint_values} @@ -73,37 +73,37 @@ Verify FIB entry after create Delete vm vpn interface [Documentation] Deletes the vpn interface [Tags] Delete - ${resp} RequestsLibrary.Delete session ${REST_CON}l3vpn:vpn-interfaces/ + ${resp} RequestsLibrary.Delete Request session ${REST_CON}l3vpn:vpn-interfaces/ Should Be Equal As Strings ${resp.status_code} 200 Verify after deleteing vm vpn interface [Documentation] Verifies vpn interface after delete [Tags] Verify after delete - ${resp} RequestsLibrary.Get session ${REST_CON}l3vpn:vpn-interfaces/ headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request session ${REST_CON}l3vpn:vpn-interfaces/ headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 404 Delete VPN Instance [Documentation] Deletes the VPN Instance [Tags] Delete - ${resp} RequestsLibrary.Delete session ${REST_CON}l3vpn:vpn-instances/vpn-instance/${vpn_inst_values[0]}/ + ${resp} RequestsLibrary.Delete Request session ${REST_CON}l3vpn:vpn-instances/vpn-instance/${vpn_inst_values[0]}/ Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting the vpn instance [Documentation] Verifies after deleting the vpn instance [Tags] Verfiy after delete - ${resp} RequestsLibrary.Get session ${REST_CON}l3vpn:vpn-instances/vpn-instance/${vpn_inst_values[0]}/ headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request session ${REST_CON}l3vpn:vpn-instances/vpn-instance/${vpn_inst_values[0]}/ headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 404 Delete vm ietf interface [Documentation] Deletes the ietf interface [Tags] Delete - ${resp} RequestsLibrary.Delete session ${REST_CON}ietf-interfaces:interfaces/interface/${vm_int_values[0]} + ${resp} RequestsLibrary.Delete Request session ${REST_CON}ietf-interfaces:interfaces/interface/${vm_int_values[0]} Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting vm ietf interface [Documentation] Verifies ietf interface after delete [Tags] Verify after delete - ${resp} RequestsLibrary.Get session ${REST_CON}ietf-interfaces:interfaces/interface/${vm_int_values[0]} headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request session ${REST_CON}ietf-interfaces:interfaces/interface/${vm_int_values[0]} headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 404 Verify FIB entry after delete @@ -115,7 +115,7 @@ Verify FIB entry after delete Ensure The Fib Entry Is Present [Arguments] ${prefix} [Documentation] Will succeed if the fib entry is present for the vpn - ${resp} RequestsLibrary.Get session /restconf/operational/odl-fib:fibEntries/ headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request session /restconf/operational/odl-fib:fibEntries/ headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 Log ${resp.content} Should Contain ${resp.content} ${prefix} @@ -124,6 +124,6 @@ Ensure The Fib Entry Is Present Ensure the Fib Entry Is Removed [Arguments] ${prefix} [Documentation] Will succeed if the fib entry is removed for the vpn - ${resp} RequestsLibrary.Get session /restconf/operational/odl-fib:fibEntries/ headers=${ACCEPT_XML} + ${resp} RequestsLibrary.Get Request session /restconf/operational/odl-fib:fibEntries/ headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 200 Should Not Contain ${resp.content} ${prefix} diff --git a/csit/suites/vpnservice/030__configure_2_switches.robot b/csit/suites/vpnservice/030__configure_2_switches.robot index 4cc9540495..562591bd6f 100644 --- a/csit/suites/vpnservice/030__configure_2_switches.robot +++ b/csit/suites/vpnservice/030__configure_2_switches.robot @@ -27,7 +27,7 @@ Veirfy The Switches Create VPN Instances [Documentation] Creates VPN Instances through restconf [Tags] Post - ${resp} RequestsLibrary.Post session ${REST_CON}/l3vpn:vpn-instances/ data=${vpn_instances} + ${resp} RequestsLibrary.Post Request session ${REST_CON}/l3vpn:vpn-instances/ data=${vpn_instances} Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 204 @@ -40,7 +40,7 @@ Verify VPN instances Create ietf interfaces [Documentation] Creates ietf interfaces through the restconf [Tags] Post - ${resp} RequestsLibrary.Post session ${REST_CON}/ietf-interfaces:interfaces/ data=${ietf_interfaces} + ${resp} RequestsLibrary.Post Request session ${REST_CON}/ietf-interfaces:interfaces/ data=${ietf_interfaces} Should Be Equal As Strings ${resp.status_code} 204 Verify ietf interfaces @@ -54,7 +54,7 @@ Verify ietf interfaces Create VPN interfaces [Documentation] Creates vpn interface for the corresponding ietf interface [Tags] Post - ${resp} RequestsLibrary.Post session ${REST_CON}/l3vpn:vpn-interfaces/ data=${vpn_interfaces} + ${resp} RequestsLibrary.Post Request session ${REST_CON}/l3vpn:vpn-interfaces/ data=${vpn_interfaces} Should Be Equal As Strings ${resp.status_code} 204 Verify VPN interfaces @@ -98,37 +98,37 @@ Verify ping Delete vpn interfaces [Documentation] Deletes the vpn interfaces [Tags] Delete - ${resp} RequestsLibrary.Delete session ${REST_CON}/l3vpn:vpn-interfaces/ + ${resp} RequestsLibrary.Delete Request session ${REST_CON}/l3vpn:vpn-interfaces/ Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting vpn interfaces [Documentation] Verifies if vpn interfaces are deleted [Tags] Verify after delete - ${resp} RequestsLibrary.get session ${REST_CON}/l3vpn:vpn-interfaces/ headers=${ACCEPT_XML} + ${resp} RequestsLibrary.get Request session ${REST_CON}/l3vpn:vpn-interfaces/ headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 404 Delete ietf interfaces [Documentation] Deletes the ietf interfaces [Tags] Delete - ${resp} RequestsLibrary.Delete session ${REST_CON}/ietf-interfaces:interfaces/ + ${resp} RequestsLibrary.Delete Request session ${REST_CON}/ietf-interfaces:interfaces/ Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting ietf interfaces [Documentation] Verifies if ietf interfaces are deleted [Tags] Verify after delete - ${resp} RequestsLibrary.get session ${REST_CON}/ietf-interfaces:interfaces/ headers=${ACCEPT_XML} + ${resp} RequestsLibrary.get Request session ${REST_CON}/ietf-interfaces:interfaces/ headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 404 Delete VPN Instances [Documentation] Deletes the VPN Instances [Tags] Delete - ${resp} RequestsLibrary.Delete session ${REST_CON}/l3vpn:vpn-instances/ + ${resp} RequestsLibrary.Delete Request session ${REST_CON}/l3vpn:vpn-instances/ Should Be Equal As Strings ${resp.status_code} 200 Verify after deleting the vpn instances [Documentation] Verifies after deleting the vpn instances [Tags] Verfiy after delete - ${resp} RequestsLibrary.get session ${REST_CON}/l3vpn:vpn-instances/ headers=${ACCEPT_XML} + ${resp} RequestsLibrary.get Request session ${REST_CON}/l3vpn:vpn-instances/ headers=${ACCEPT_XML} Should Be Equal As Strings ${resp.status_code} 404 Verify FIB entries after delete