From a2f6aa23e240c9a70eef3d44b76c42147acbb2ca Mon Sep 17 00:00:00 2001 From: Yaroslav Lastivka Date: Thu, 28 Mar 2024 00:30:56 +0200 Subject: [PATCH] Migrate request invocations (ovsdb) The '* Request' and 'To Json' RequestsLibrary keywords have been deprecated. Replace '* Request' keywords with '* On Session'. 'OVSDB.Log Request' is a duplicate of 'Utils.Log Content' - replace the former with the latter. 'To Json', when pretty_print is false, is replaced with 'Utils.Json Parse from String'. JIRA: INTTEST-141 Change-Id: Ia0b98e5f68de460d363464372b59ef0c209c52af Signed-off-by: Yaroslav Lastivka Signed-off-by: Sangwook Ha --- csit/libraries/OVSDB.robot | 95 ++++++++++--------- .../010__configure_1_ovsdb_node.robot | 71 ++++++++------ .../020__connection_manager.robot | 26 +++-- .../030__configure_exit_ovsdb_node.robot | 24 +++-- .../040__Vxlan_Extension_Test.robot | 1 - .../Southbound_Domain/Bug_Validation.robot | 71 ++++++++------ 6 files changed, 162 insertions(+), 126 deletions(-) diff --git a/csit/libraries/OVSDB.robot b/csit/libraries/OVSDB.robot index 5c24845d77..a50a4aacf3 100644 --- a/csit/libraries/OVSDB.robot +++ b/csit/libraries/OVSDB.robot @@ -21,16 +21,6 @@ ${DEFAULT_PING_COUNT} 3 *** Keywords *** -Log Request - [Arguments] ${resp_content} - IF '''${resp_content}''' != '${EMPTY}' - ${resp_json} = RequestsLibrary.To Json ${resp_content} pretty_print=True - ELSE - ${resp_json} = BuiltIn.Set Variable ${EMPTY} - END - BuiltIn.Log ${resp_json} - RETURN ${resp_json} - Create OVSDB Node [Arguments] ${node_ip} ${port}=${OVSDB_NODE_PORT} ${body} = OperatingSystem.Get File ${OVSDB_CONFIG_DIR}/create_node.json @@ -39,8 +29,8 @@ Create OVSDB Node ${uri} = Builtin.Set Variable ${RFC8040_TOPO_OVSDB1_API} BuiltIn.Log URI is ${uri} BuiltIn.Log data: ${body} - ${resp} = RequestsLibrary.Post Request session ${uri} data=${body} - OVSDB.Log Request ${resp.text} + ${resp} = RequestsLibrary.POST On Session session url=${uri} data=${body} expected_status=anything + Utils.Log Content ${resp.text} BuiltIn.Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code} Connect To Ovsdb Node @@ -52,15 +42,17 @@ Connect To Ovsdb Node ${uri} = BuiltIn.Set Variable ${RFC8040_SOUTHBOUND_NODE_API}${node_ip}%3A${port} BuiltIn.Log URI is ${uri} BuiltIn.Log data: ${body} - ${resp} = RequestsLibrary.Put Request session ${uri} data=${body} - OVSDB.Log Request ${resp.text} + ${resp} = RequestsLibrary.PUT On Session session url=${uri} data=${body} expected_status=anything + Utils.Log Content ${resp.text} BuiltIn.Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code} Disconnect From Ovsdb Node [Documentation] This request will disconnect the OVSDB node from the controller [Arguments] ${node_ip} ${port}=${OVSDB_NODE_PORT} - ${resp} = RequestsLibrary.Delete Request session ${RFC8040_SOUTHBOUND_NODE_API}${node_ip}%3A${port} - BuiltIn.Should Be Equal As Strings ${resp.status_code} 204 + ${resp} = RequestsLibrary.DELETE On Session + ... session + ... url=${RFC8040_SOUTHBOUND_NODE_API}${node_ip}%3A${port} + ... expected_status=204 Add Bridge To Ovsdb Node [Documentation] This will create a bridge and add it to the OVSDB node. @@ -76,17 +68,17 @@ Add Bridge To Ovsdb Node ${uri} = BuiltIn.Set Variable ${RFC8040_SOUTHBOUND_NODE_API}${node_id_}%2Fbridge%2F${bridge} BuiltIn.Log URI is ${uri} BuiltIn.Log data: ${body} - ${resp} = RequestsLibrary.Put Request session ${uri} data=${body} - OVSDB.Log Request ${resp.text} + ${resp} = RequestsLibrary.PUT On Session session url=${uri} data=${body} expected_status=anything + Utils.Log Content ${resp.text} BuiltIn.Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code} Delete Bridge From Ovsdb Node [Documentation] This request will delete the bridge node from the OVSDB [Arguments] ${node_id} ${bridge} - ${resp} = RequestsLibrary.Delete Request + ${resp} = RequestsLibrary.DELETE On Session ... session - ... ${RFC8040_SOUTHBOUND_NODE_API}${node_id}%2Fbridge%2F${bridge} - BuiltIn.Should Be Equal As Strings ${resp.status_code} 204 + ... url=${RFC8040_SOUTHBOUND_NODE_API}${node_id}%2Fbridge%2F${bridge} + ... expected_status=204 Add Termination Point [Documentation] Using the json data body file as a template, a REST config request is made to @@ -98,7 +90,11 @@ Add Termination Point ${body} = String.Replace String ${body} vxlanport ${tp_name} ${node_id_} = BuiltIn.Evaluate """${node_id}""".replace("/","%2F").replace(":","%3A") ${uri} = BuiltIn.Set Variable ${RFC8040_SOUTHBOUND_NODE_API}${node_id_}%2Fbridge%2F${bridge} - ${resp} = RequestsLibrary.Put Request session ${uri}/termination-point=${tp_name} data=${body} + ${resp} = RequestsLibrary.PUT On Session + ... session + ... url=${uri}/termination-point=${tp_name} + ... data=${body} + ... expected_status=anything BuiltIn.Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code} Add Vxlan To Bridge @@ -133,10 +129,12 @@ Get OVSDB UUID ... node-id stripped of "ovsdb://uuid/". If not found, ${EMPTY} will be returned. [Arguments] ${ovs_system_ip}=${TOOLS_SYSTEM_IP} ${controller_http_session}=session ${uuid} = Set Variable ${EMPTY} - ${resp} = RequestsLibrary.Get Request ${controller_http_session} ${RFC8040_OPERATIONAL_TOPO_OVSDB1_API} - OVSDB.Log Request ${resp.text} - BuiltIn.Should Be Equal As Strings ${resp.status_code} 200 - ${resp_json} = RequestsLibrary.To Json ${resp.text} + ${resp} = RequestsLibrary.GET On Session + ... ${controller_http_session} + ... url=${RFC8040_OPERATIONAL_TOPO_OVSDB1_API} + ... expected_status=200 + Utils.Log Content ${resp.text} + ${resp_json} = Utils.Json Parse From String ${resp.text} ${topologies} = Collections.Get From Dictionary ${resp_json} network-topology:topology ${topology} = Collections.Get From List ${topologies} 0 ${node_list} = Collections.Get From Dictionary ${topology} node @@ -281,16 +279,22 @@ Get Port Metadata Log Config And Operational Topology [Documentation] For debugging purposes, this will log both config and operational topo data stores - ${resp} = RequestsLibrary.Get Request session ${RFC8040_CONFIG_TOPO_API} - OVSDB.Log Request ${resp.text} - ${resp} = RequestsLibrary.Get Request session ${RFC8040_OPERATIONAL_TOPO_API} - OVSDB.Log Request ${resp.text} + ${resp} = RequestsLibrary.GET On Session + ... session + ... url=${RFC8040_CONFIG_TOPO_API} + ... expected_status=anything + Utils.Log Content ${resp.text} + ${resp} = RequestsLibrary.GET On Session + ... session + ... url=${RFC8040_OPERATIONAL_TOPO_API} + ... expected_status=anything + Utils.Log Content ${resp.text} Config and Operational Topology Should Be Empty [Documentation] This will check that only the expected output is there for both operational and config ... topology data stores. Empty probably means that only ovsdb:1 is there. - ${config_resp} = RequestsLibrary.Get Request session ${RFC8040_CONFIG_TOPO_API} - ${operational_resp} = RequestsLibrary.Get Request session ${RFC8040_OPERATIONAL_TOPO_API} + ${config_resp} = RequestsLibrary.GET On Session session url=${RFC8040_CONFIG_TOPO_API} + ${operational_resp} = RequestsLibrary.GET On Session session url=${RFC8040_OPERATIONAL_TOPO_API} BuiltIn.Should Contain ${config_resp.text} {"topology-id":"ovsdb:1"} BuiltIn.Should Contain ${operational_resp.text} {"topology-id":"ovsdb:1"} @@ -311,8 +315,8 @@ Modify Multi Port Body ${uri} = Builtin.Set Variable ${RFC8040_TOPO_API} BuiltIn.Log URI is ${uri} BuiltIn.Log data: ${body} - ${resp} = RequestsLibrary.Put Request session ${uri} data=${body} - OVSDB.Log Request ${resp.text} + ${resp} = RequestsLibrary.PUT On Session session url=${uri} data=${body} expected_status=anything + Utils.Log Content ${resp.text} BuiltIn.Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code} RETURN ${body} @@ -323,8 +327,8 @@ Create Qos ${body} = Replace String ${body} QOS-1 ${qos} BuiltIn.Log URI is ${uri} BuiltIn.Log data: ${body} - ${resp} = RequestsLibrary.Put Request session ${uri} data=${body} - OVSDB.Log Request ${resp.text} + ${resp} = RequestsLibrary.PUT On Session session url=${uri} data=${body} expected_status=anything + Utils.Log Content ${resp.text} BuiltIn.Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code} Create Queue @@ -334,8 +338,8 @@ Create Queue ${uri} = BuiltIn.Set Variable ${RFC8040_SOUTHBOUND_NODE_HOST1_API}/ovsdb:queues=${queue} BuiltIn.Log URI is ${uri} BuiltIn.Log data: ${body} - ${resp} = RequestsLibrary.Put Request session ${uri} data=${body} - OVSDB.Log Request ${resp.text} + ${resp} = RequestsLibrary.PUT On Session session url=${uri} data=${body} expected_status=anything + Utils.Log Content ${resp.text} BuiltIn.Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code} Update Qos @@ -344,14 +348,18 @@ Update Qos ${uri} = BuiltIn.Set Variable ${RFC8040_SOUTHBOUND_NODE_HOST1_API}/ovsdb:qos-entries=${QOS} BuiltIn.Log URL is ${uri} BuiltIn.Log data: ${body} - ${resp} = RequestsLibrary.Put Request session ${uri} data=${body} - OVSDB.Log Request ${resp.text} + ${resp} = RequestsLibrary.PUT On Session session url=${uri} data=${body} expected_status=anything + Utils.Log Content ${resp.text} BuiltIn.Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code} Create Qos Linked Queue ${body} = OperatingSystem.Get File ${OVSDB_CONFIG_DIR}/bug_7160/create_qoslinkedqueue.json - ${resp} = RequestsLibrary.Put Request session ${RFC8040_SOUTHBOUND_NODE_HOST1_API} data=${body} - OVSDB.Log Request ${resp.text} + ${resp} = RequestsLibrary.PUT On Session + ... session + ... url=${RFC8040_SOUTHBOUND_NODE_HOST1_API} + ... data=${body} + ... expected_status=anything + Utils.Log Content ${resp.text} BuiltIn.Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code} Add OVS Logging @@ -401,9 +409,8 @@ Suite Teardown [Arguments] ${uris}=@{EMPTY} OVSDB.Clean OVSDB Test Environment ${TOOLS_SYSTEM_IP} FOR ${uri} IN @{uris} - RequestsLibrary.Delete Request session ${uri} + RequestsLibrary.DELETE On Session session url=${uri} expected_status=anything END - ${resp} = RequestsLibrary.Get Request session ${RFC8040_CONFIG_TOPO_API} OVSDB.Log Config And Operational Topology RequestsLibrary.Delete All Sessions diff --git a/csit/suites/ovsdb/Southbound_Domain/010__configure_1_ovsdb_node.robot b/csit/suites/ovsdb/Southbound_Domain/010__configure_1_ovsdb_node.robot index 4067abaa91..1f3be3d216 100644 --- a/csit/suites/ovsdb/Southbound_Domain/010__configure_1_ovsdb_node.robot +++ b/csit/suites/ovsdb/Southbound_Domain/010__configure_1_ovsdb_node.robot @@ -54,9 +54,8 @@ Create a Bridge Get Config Topology with Bridge [Documentation] This will fetch the configuration topology from configuration data store to verify the bridge is added to the data store - ${resp} = RequestsLibrary.Get Request session ${RFC8040_CONFIG_TOPO_API} - OVSDB.Log Request ${resp.text} - BuiltIn.Should Be Equal As Strings ${resp.status_code} 200 + ${resp} = RequestsLibrary.GET On Session session url=${RFC8040_CONFIG_TOPO_API} expected_status=200 + Utils.Log Content ${resp.text} BuiltIn.Should Contain ${resp.text} ${BRIDGE} Get Operational Topology with Bridge @@ -87,10 +86,10 @@ Get Operational Topology with Port Delete the Port [Documentation] This request will delete the port node from the bridge node and data store. - ${resp} = RequestsLibrary.Delete Request + RequestsLibrary.DELETE On Session ... session - ... ${RFC8040_SOUTHBOUND_NODE_TOOLS_API}%2Fbridge%2F${BRIDGE}/termination-point=${PORT} - BuiltIn.Should Be Equal As Strings ${resp.status_code} 204 + ... url=${RFC8040_SOUTHBOUND_NODE_TOOLS_API}%2Fbridge%2F${BRIDGE}/termination-point=${PORT} + ... expected_status=204 Get Operational Topology after Deletion of Port [Documentation] This request will fetch the operational topology after the Port is deleted @@ -105,8 +104,10 @@ Get Operational Topology after Deletion of Port Delete the Bridge [Documentation] This request will delete the bridge node from the config data store. - ${resp} = RequestsLibrary.Delete Request session ${RFC8040_SOUTHBOUND_NODE_TOOLS_API}%2Fbridge%2F${BRIDGE} - BuiltIn.Should Be Equal As Strings ${resp.status_code} 204 + RequestsLibrary.DELETE On Session + ... session + ... url=${RFC8040_SOUTHBOUND_NODE_TOOLS_API}%2Fbridge%2F${BRIDGE} + ... expected_status=204 Get Operational Topology after Deletion of Bridge [Documentation] This request will fetch the operational topology after the Bridge is deleted @@ -121,9 +122,8 @@ Get Operational Topology after Deletion of Bridge Verify Config Still Has OVS Info [Documentation] This will fetch the configuration topology from configuration data store to verify the node is still in the data store - ${resp} = RequestsLibrary.Get Request session ${RFC8040_CONFIG_TOPO_API} - OVSDB.Log Request ${resp.text} - BuiltIn.Should Be Equal As Strings ${resp.status_code} 200 + ${resp} = RequestsLibrary.GET On Session session url=${RFC8040_CONFIG_TOPO_API} expected_status=200 + Utils.Log Content ${resp.text} BuiltIn.Wait Until Keyword Succeeds ... 8s ... 2s @@ -134,8 +134,7 @@ Verify Config Still Has OVS Info Delete the OVSDB Node [Documentation] This request will delete the OVSDB node - ${resp} = RequestsLibrary.Delete Request session ${RFC8040_SOUTHBOUND_NODE_TOOLS_API} - BuiltIn.Should Be Equal As Strings ${resp.status_code} 204 + RequestsLibrary.DELETE On Session session url=${RFC8040_SOUTHBOUND_NODE_TOOLS_API} expected_status=204 Get Operational Topology to make sure the connection has been deleted [Documentation] This request will fetch the operational topology from the connected OVSDB nodes @@ -175,9 +174,8 @@ Get Operational Topology After Node Reconnect Get Config Topology After Reconnect [Documentation] This will fetch the configuration topology from configuration data store after reconnect - ${resp} = RequestsLibrary.Get Request session ${RFC8040_CONFIG_TOPO_API} - OVSDB.Log Request ${resp.text} - BuiltIn.Should Be Equal As Strings ${resp.status_code} 200 + ${resp} = RequestsLibrary.GET On Session session url=${RFC8040_CONFIG_TOPO_API} expected_status=200 + Utils.Log Content ${resp.text} BuiltIn.Wait Until Keyword Succeeds ... 8s ... 2s @@ -208,8 +206,11 @@ Update QOS with a Linked queue entry to a OVSDB Node Get QOS Config Topology with port [Documentation] This will fetch the configuration topology from configuration data store to verify the QOS is added to the data store - ${resp} = RequestsLibrary.Get Request session ${RFC8040_CONFIG_TOPO_API} - OVSDB.Log Request ${resp.text} + ${resp} = RequestsLibrary.GET On Session + ... session + ... url=${RFC8040_CONFIG_TOPO_API} + ... expected_status=anything + Utils.Log Content ${resp.text} BuiltIn.Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code} BuiltIn.Should Contain ${resp.text} ${QOS} @@ -226,8 +227,11 @@ Get QOS Operational Topology with port Get Queue Config Topology with port [Documentation] This request will fetch the configuration topology from configuration data store to verify the Queue is added to the data store - ${resp} = RequestsLibrary.Get Request session ${RFC8040_CONFIG_TOPO_API} - OVSDB.Log Request ${resp.text} + ${resp} = RequestsLibrary.GET On Session + ... session + ... url=${RFC8040_CONFIG_TOPO_API} + ... expected_status=anything + Utils.Log Content ${resp.text} BuiltIn.Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code} BuiltIn.Should Contain ${resp.text} ${QUEUE} @@ -244,34 +248,43 @@ Get Queue Operational Topology with port Delete a Queue entry from a Qos entry [Documentation] This request will Delete a Queue entry from a Qos entry - ${resp} = RequestsLibrary.Delete Request + ${resp} = RequestsLibrary.DELETE On Session ... session - ... ${RFC8040_SOUTHBOUND_NODE_HOST1_API}/ovsdb:qos-entries=${QOS}/queue-list=0 + ... url=${RFC8040_SOUTHBOUND_NODE_HOST1_API}/ovsdb:qos-entries=${QOS}/queue-list=0 + ... expected_status=anything BuiltIn.Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code} Delete a QoS entry from a node [Documentation] This request will Delete a QoS entry from a node. - ${resp} = RequestsLibrary.Delete Request + ${resp} = RequestsLibrary.DELETE On Session ... session - ... ${RFC8040_SOUTHBOUND_NODE_HOST1_API}/ovsdb:qos-entries=${QOS} + ... url=${RFC8040_SOUTHBOUND_NODE_HOST1_API}/ovsdb:qos-entries=${QOS} + ... expected_status=anything BuiltIn.Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code} Delete a Queue entry from an ovsdb node [Documentation] This request will Delete a Queue entry from an ovsdb node - ${resp} = RequestsLibrary.Delete Request + ${resp} = RequestsLibrary.DELETE On Session ... session - ... ${RFC8040_SOUTHBOUND_NODE_HOST1_API}/ovsdb:queues=${QUEUE} + ... url=${RFC8040_SOUTHBOUND_NODE_HOST1_API}/ovsdb:queues=${QUEUE} + ... expected_status=anything BuiltIn.Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code} Delete the OVSDB Node HOST1 [Documentation] This request will delete the OVSDB node - ${resp} = RequestsLibrary.Delete Request session ${RFC8040_SOUTHBOUND_NODE_HOST1_API} + ${resp} = RequestsLibrary.DELETE On Session + ... session + ... url=${RFC8040_SOUTHBOUND_NODE_HOST1_API} + ... expected_status=anything BuiltIn.Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code} Get Config Topology to verify that deleted configurations are cleaned from config datastore [Documentation] This request will fetch the configuration topology from configuration data store to verify OVSDB NODE is deleted frrom the configuration data store - ${resp} = RequestsLibrary.Get Request session ${RFC8040_CONFIG_TOPO_API} - OVSDB.Log Request ${resp.text} + ${resp} = RequestsLibrary.GET On Session + ... session + ... url=${RFC8040_CONFIG_TOPO_API} + ... expected_status=anything + Utils.Log Content ${resp.text} BuiltIn.Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code} BuiltIn.Should Not Contain ${resp.text} ovsdb:HOST1 diff --git a/csit/suites/ovsdb/Southbound_Domain/020__connection_manager.robot b/csit/suites/ovsdb/Southbound_Domain/020__connection_manager.robot index 04de1db840..dd737adae1 100644 --- a/csit/suites/ovsdb/Southbound_Domain/020__connection_manager.robot +++ b/csit/suites/ovsdb/Southbound_Domain/020__connection_manager.robot @@ -61,9 +61,8 @@ Get Operational Topology to verify the bridge has been added Get Config Topology to verify the manually added bridge is not added to the config datastore [Documentation] This request will fetch the configuration topology from configuration data store - ${resp} = RequestsLibrary.Get Request session ${RFC8040_CONFIG_TOPO_API} - OVSDB.Log Request ${resp.text} - BuiltIn.Should Be Equal As Strings ${resp.status_code} 200 + ${resp} = RequestsLibrary.GET On Session session url=${RFC8040_CONFIG_TOPO_API} expected_status=200 + Utils.Log Content ${resp.text} BuiltIn.Should Not Contain ${resp.text} ovsdb://${TOOLS_SYSTEM_IP}:${OVSDB_NODE_PORT}/bridge/${BRIDGE1} Create a Bridge through controller @@ -83,9 +82,8 @@ Get Operational Topology to verify the bridge has been added through rest call Get Config Topology to verify the entry added to the config datastore [Documentation] This request will fetch the configuration topology from configuration data store - ${resp} = RequestsLibrary.Get Request session ${RFC8040_CONFIG_TOPO_API} - OVSDB.Log Request ${resp.text} - BuiltIn.Should Be Equal As Strings ${resp.status_code} 200 + ${resp} = RequestsLibrary.GET On Session session url=${RFC8040_CONFIG_TOPO_API} expected_status=200 + Utils.Log Content ${resp.text} BuiltIn.Should Contain ${resp.text} ovsdb://uuid/${OVSDB_UUID}/bridge/${BRIDGE2} Create bridge of already added bridge @@ -94,9 +92,8 @@ Create bridge of already added bridge Get Config Topology to verify the entry of existing bridge added to the config datastore [Documentation] This request will fetch the configuration topology from configuration data store - ${resp} = RequestsLibrary.Get Request session ${RFC8040_CONFIG_TOPO_API} - OVSDB.Log Request ${resp.text} - BuiltIn.Should Be Equal As Strings ${resp.status_code} 200 + ${resp} = RequestsLibrary.GET On Session session url=${RFC8040_CONFIG_TOPO_API} expected_status=200 + Utils.Log Content ${resp.text} BuiltIn.Should Contain ${resp.text} ovsdb://uuid/${OVSDB_UUID}/bridge/${BRIDGE1} Delete bridge manually @@ -115,17 +112,16 @@ Get Operational Topology to verify the bridge has been deleted manually Config Topology Still Contains Bridge [Documentation] This request will fetch the configuration topology from configuration data store - ${resp} = RequestsLibrary.Get Request session ${RFC8040_CONFIG_TOPO_API} - OVSDB.Log Request ${resp.text} - BuiltIn.Should Be Equal As Strings ${resp.status_code} 200 + ${resp} = RequestsLibrary.GET On Session session url=${RFC8040_CONFIG_TOPO_API} expected_status=200 + Utils.Log Content ${resp.text} BuiltIn.Should Contain ${resp.text} ovsdb://uuid/${OVSDB_UUID}/bridge/${BRIDGE2} Delete the Bridge through rest call [Documentation] This request will delete the bridge node from the config data store. - ${resp} = RequestsLibrary.Delete Request + RequestsLibrary.DELETE On Session ... session - ... ${RFC8040_SOUTHBOUND_NODE_API}uuid%2F${OVSDB_UUID}%2Fbridge%2F${BRIDGE2} - BuiltIn.Should Be Equal As Strings ${resp.status_code} 204 + ... url=${RFC8040_SOUTHBOUND_NODE_API}uuid%2F${OVSDB_UUID}%2Fbridge%2F${BRIDGE2} + ... expected_status=204 Get Operational Topology after Deletion of Bridge [Documentation] This request will fetch the operational topology after the Bridge is deleted diff --git a/csit/suites/ovsdb/Southbound_Domain/030__configure_exit_ovsdb_node.robot b/csit/suites/ovsdb/Southbound_Domain/030__configure_exit_ovsdb_node.robot index ea60bd2b44..36f889ad33 100644 --- a/csit/suites/ovsdb/Southbound_Domain/030__configure_exit_ovsdb_node.robot +++ b/csit/suites/ovsdb/Southbound_Domain/030__configure_exit_ovsdb_node.robot @@ -125,10 +125,10 @@ Get Operational Topology with Port Delete the Port1 [Documentation] This request will delete the port node from the bridge node and data store. - ${resp} = RequestsLibrary.Delete Request + RequestsLibrary.DELETE On Session ... session - ... ${RFC8040_SOUTHBOUND_NODE_TOOLS_API}%2Fbridge%2F${BRIDGE}/termination-point=${PORT1} - BuiltIn.Should Be Equal As Strings ${resp.status_code} 204 + ... url=${RFC8040_SOUTHBOUND_NODE_TOOLS_API}%2Fbridge%2F${BRIDGE}/termination-point=${PORT1} + ... expected_status=204 Get Operational Topology after deletion of Port1 [Documentation] This request will fetch the operational topology after the Port is added to the bridge @@ -143,10 +143,10 @@ Get Operational Topology after deletion of Port1 Delete the Port2 [Documentation] This request will delete the port node from the bridge node and data store. - ${resp} = RequestsLibrary.Delete Request + RequestsLibrary.DELETE On Session ... session - ... ${RFC8040_SOUTHBOUND_NODE_TOOLS_API}%2Fbridge%2F${BRIDGE}/termination-point=${PORT2} - BuiltIn.Should Be Equal As Strings ${resp.status_code} 204 + ... url=${RFC8040_SOUTHBOUND_NODE_TOOLS_API}%2Fbridge%2F${BRIDGE}/termination-point=${PORT2} + ... expected_status=204 Get Operational Topology after Deletion of Port2 [Documentation] This request will fetch the operational topology after the Port is deleted @@ -161,8 +161,10 @@ Get Operational Topology after Deletion of Port2 Delete the Bridge [Documentation] This request will delete the bridge node from the config data store. - ${resp} = RequestsLibrary.Delete Request session ${RFC8040_SOUTHBOUND_NODE_TOOLS_API}%2Fbridge%2F${BRIDGE} - BuiltIn.Should Be Equal As Strings ${resp.status_code} 204 + RequestsLibrary.DELETE On Session + ... session + ... url=${RFC8040_SOUTHBOUND_NODE_TOOLS_API}%2Fbridge%2F${BRIDGE} + ... expected_status=204 Get Operational Topology after Deletion of Bridge [Documentation] This request will fetch the operational topology after the Bridge is deleted @@ -177,8 +179,10 @@ Get Operational Topology after Deletion of Bridge Delete the OVSDB Node [Documentation] This request will delete the OVSDB node - ${resp} = RequestsLibrary.Delete Request session ${RFC8040_SOUTHBOUND_NODE_TOOLS_API} - BuiltIn.Should Be Equal As Strings ${resp.status_code} 204 + RequestsLibrary.DELETE On Session + ... session + ... url=${RFC8040_SOUTHBOUND_NODE_TOOLS_API} + ... expected_status=204 Get Operational Topology after Deletion of OVSDB Node [Documentation] This request will fetch the operational topology after the OVSDB node is deleted diff --git a/csit/suites/ovsdb/Southbound_Domain/040__Vxlan_Extension_Test.robot b/csit/suites/ovsdb/Southbound_Domain/040__Vxlan_Extension_Test.robot index cb085c2568..3941296db5 100644 --- a/csit/suites/ovsdb/Southbound_Domain/040__Vxlan_Extension_Test.robot +++ b/csit/suites/ovsdb/Southbound_Domain/040__Vxlan_Extension_Test.robot @@ -169,6 +169,5 @@ Suite Teardown [Documentation] Cleans up test environment, close existing sessions. OVSDB.Clean OVSDB Test Environment ${TOOLS_SYSTEM_IP} OVSDB.Clean OVSDB Test Environment ${TOOLS_SYSTEM_2_IP} - ${resp} = RequestsLibrary.Get Request session ${RFC8040_CONFIG_TOPO_API} OVSDB.Log Config And Operational Topology RequestsLibrary.Delete All Sessions diff --git a/csit/suites/ovsdb/Southbound_Domain/Bug_Validation.robot b/csit/suites/ovsdb/Southbound_Domain/Bug_Validation.robot index f7e5d07681..7b9fe519b0 100644 --- a/csit/suites/ovsdb/Southbound_Domain/Bug_Validation.robot +++ b/csit/suites/ovsdb/Southbound_Domain/Bug_Validation.robot @@ -66,7 +66,7 @@ Bug 7414 Same Endpoint Name ... ${TOOLS_SYSTEM_2_IP} ... ${TOOLS_SYSTEM_IP} [Teardown] BuiltIn.Run Keywords Test Teardown - ... AND RequestsLibrary.Delete Request session ${RFC8040_TOPO_API} data=${body} + ... AND RequestsLibrary.DELETE On Session session url=${RFC8040_TOPO_API} data=${body} expected_status=anything Bug 7414 Different Endpoint Name [Documentation] This test case is supplemental to the other test case for bug 7414. Even when the other @@ -104,7 +104,7 @@ Bug 7414 Different Endpoint Name ... ${TOOLS_SYSTEM_2_IP} ... ${TOOLS_SYSTEM_IP} [Teardown] BuiltIn.Run Keywords Test Teardown - ... AND RequestsLibrary.Delete Request session ${RFC8040_TOPO_API} data=${body} + ... AND RequestsLibrary.DELETE On Session session url=${RFC8040_TOPO_API} data=${body} expected_status=anything Bug 5221 [Documentation] In the case that an ovs node is rebooted, or the ovs service is @@ -154,8 +154,8 @@ Bug 5221 ... ${list} ... pretty_print_json=True [Teardown] BuiltIn.Run Keywords Test Teardown - ... AND RequestsLibrary.Delete Request session ${RFC8040_SOUTHBOUND_NODE_TOOLS_API}%2Fbridge%2F${bridge} - ... AND RequestsLibrary.Delete Request session ${RFC8040_SOUTHBOUND_NODE_TOOLS_API} + ... AND RequestsLibrary.DELETE On Session session url=${RFC8040_SOUTHBOUND_NODE_TOOLS_API}%2Fbridge%2F${bridge} expected_status=anything + ... AND RequestsLibrary.DELETE On Session session url=${RFC8040_SOUTHBOUND_NODE_TOOLS_API} expected_status=anything Bug 5177 [Documentation] This test case will recreate the bug using the same basic steps as @@ -172,9 +172,8 @@ Bug 5177 BuiltIn.Set Suite Variable ${OVSDB_UUID} ${node} = BuiltIn.Set Variable uuid/${OVSDB_UUID} OVSDB.Add Bridge To Ovsdb Node ${node} ${TOOLS_SYSTEM_IP} ${BRIDGE} 0000000000005177 - ${resp} = RequestsLibrary.Get Request session ${RFC8040_CONFIG_TOPO_API} - OVSDB.Log Request ${resp.text} - BuiltIn.Should Be Equal As Strings ${resp.status_code} 200 + ${resp} = RequestsLibrary.GET On Session session url=${RFC8040_CONFIG_TOPO_API} expected_status=200 + Utils.Log Content ${resp.text} BuiltIn.Should Contain ${resp.text} ${node}/bridge/${BRIDGE} Utils.Run Command On Mininet ${TOOLS_SYSTEM_IP} sudo ovs-vsctl set-manager tcp:${ODL_SYSTEM_IP}:${OVSDBPORT} @{list} = BuiltIn.Create List ${BRIDGE} @@ -208,8 +207,8 @@ Bug 4794 ... Shard.*shard-topology-operational An exception occurred while preCommitting transaction # TODO: Bug 5178 [Teardown] BuiltIn.Run Keywords Test Teardown - ... AND RequestsLibrary.Delete Request session ${RFC8040_SOUTHBOUND_NODE_API}${node_id}%2Fbridge%2F${BRIDGE} - ... AND RequestsLibrary.Delete Request session ${RFC8040_SOUTHBOUND_NODE_API}${node_id} + ... AND RequestsLibrary.DELETE On Session session url=${RFC8040_SOUTHBOUND_NODE_API}${node_id}%2Fbridge%2F${BRIDGE} expected_status=anything + ... AND RequestsLibrary.DELETE On Session session url=${RFC8040_SOUTHBOUND_NODE_API}${node_id} expected_status=anything Bug 8280 [Documentation] Any config created for a bridge (e.g. added ports) should be reconciled when a bridge is @@ -237,8 +236,8 @@ Bug 8280 Utils.Check For Elements At URI ${RFC8040_CONFIG_TOPO_API} ${config_store_elements} pretty_print_json=True BuiltIn.Wait Until Keyword Succeeds 5s 1s Verify Ovs-vsctl Output show Port "port2" [Teardown] BuiltIn.Run Keywords Test Teardown - ... AND RequestsLibrary.Delete Request session ${RFC8040_SOUTHBOUND_NODE_API}uuid%2F${OVSDB_UUID2}%2Fbridge%2F${BRIDGE} - ... AND RequestsLibrary.Delete Request session ${RFC8040_SOUTHBOUND_NODE_API}uuid%2F${OVSDB_UUID2} + ... AND RequestsLibrary.DELETE On Session session url=${RFC8040_SOUTHBOUND_NODE_API}uuid%2F${OVSDB_UUID2}%2Fbridge%2F${BRIDGE} expected_status=anything + ... AND RequestsLibrary.DELETE On Session session url=${RFC8040_SOUTHBOUND_NODE_API}uuid%2F${OVSDB_UUID2} expected_status=anything Bug 7160 [Documentation] If this bug is reproduced, it's possible that the operational store will be @@ -257,22 +256,26 @@ Bug 7160 OVSDB.Log Config And Operational Topology OVSDB.Create Qos Linked Queue OVSDB.Log Config And Operational Topology - ${resp} = RequestsLibrary.Delete Request + RequestsLibrary.DELETE On Session ... session - ... ${RFC8040_SOUTHBOUND_NODE_HOST1_API}/ovsdb:qos-entries=${qos}/queue-list=0 + ... url=${RFC8040_SOUTHBOUND_NODE_HOST1_API}/ovsdb:qos-entries=${qos}/queue-list=0 OVSDB.Log Config And Operational Topology - ${resp} = RequestsLibrary.Delete Request + RequestsLibrary.DELETE On Session ... session - ... ${RFC8040_SOUTHBOUND_NODE_HOST1_API}/ovsdb:qos-entries=${qos} + ... url=${RFC8040_SOUTHBOUND_NODE_HOST1_API}/ovsdb:qos-entries=${qos} OVSDB.Log Config And Operational Topology - ${resp} = RequestsLibrary.Delete Request + RequestsLibrary.DELETE On Session ... session - ... ${RFC8040_SOUTHBOUND_NODE_HOST1_API}/ovsdb:queues=${queue} + ... url=${RFC8040_SOUTHBOUND_NODE_HOST1_API}/ovsdb:queues=${queue} OVSDB.Log Config And Operational Topology - ${resp} = RequestsLibrary.Delete Request session ${RFC8040_SOUTHBOUND_NODE_HOST1_API} + RequestsLibrary.DELETE On Session + ... session + ... url=${RFC8040_SOUTHBOUND_NODE_HOST1_API} OVSDB.Log Config And Operational Topology Utils.Run Command On Mininet ${TOOLS_SYSTEM_IP} sudo ovs-vsctl del-manager - RequestsLibrary.Delete Request session ${RFC8040_SOUTHBOUND_NODE_TOOLS_API} + RequestsLibrary.DELETE On Session + ... session + ... url=${RFC8040_SOUTHBOUND_NODE_TOOLS_API} OVSDB.Log Config And Operational Topology BuiltIn.Wait Until Keyword Succeeds 5s 1s OVSDB.Config and Operational Topology Should Be Empty @@ -296,16 +299,30 @@ Suite Teardown [Documentation] Cleans up test environment, close existing sessions. Clean All Ovs Nodes # Best effort to clean config store, by deleting all the types of nodes that are used in this suite - RequestsLibrary.Delete Request + RequestsLibrary.DELETE On Session + ... session + ... url=${RFC8040_SOUTHBOUND_NODE_API}uuid%2F${OVSDB_UUID}%2Fbridge%2F${BRIDGE} + ... expected_status=anything + RequestsLibrary.DELETE On Session + ... session + ... url=${RFC8040_SOUTHBOUND_NODE_API}uuid%2F${OVSDB_UUID} + ... expected_status=anything + RequestsLibrary.DELETE On Session + ... session + ... url=${RFC8040_SOUTHBOUND_NODE_API}uuid%2F${OVSDB_UUID2}%2Fbridge%2F${BRIDGE} + ... expected_status=anything + RequestsLibrary.DELETE On Session + ... session + ... url=${RFC8040_SOUTHBOUND_NODE_API}uuid%2F${OVSDB_UUID2} + ... expected_status=anything + RequestsLibrary.DELETE On Session ... session - ... ${RFC8040_SOUTHBOUND_NODE_API}uuid%2F${OVSDB_UUID}%2Fbridge%2F${BRIDGE} - RequestsLibrary.Delete Request session ${RFC8040_SOUTHBOUND_NODE_API}uuid%2F${OVSDB_UUID} - RequestsLibrary.Delete Request + ... url=${RFC8040_SOUTHBOUND_NODE_TOOLS_API}%2Fbridge%2F${BRIDGE} + ... expected_status=anything + RequestsLibrary.DELETE On Session ... session - ... ${RFC8040_SOUTHBOUND_NODE_API}uuid%2F${OVSDB_UUID2}%2Fbridge%2F${BRIDGE} - RequestsLibrary.Delete Request session ${RFC8040_SOUTHBOUND_NODE_API}uuid%2F${OVSDB_UUID2} - RequestsLibrary.Delete Request session ${RFC8040_SOUTHBOUND_NODE_TOOLS_API}%2Fbridge%2F${BRIDGE} - RequestsLibrary.Delete Request session ${RFC8040_SOUTHBOUND_NODE_TOOLS_API} + ... url=${RFC8040_SOUTHBOUND_NODE_TOOLS_API} + ... expected_status=anything OVSDB.Log Config And Operational Topology Delete All Sessions -- 2.36.6