From 0d4874becdf588ab44f8666ad6078926f3e3f1ee Mon Sep 17 00:00:00 2001 From: Marcus G K Williams Date: Wed, 2 Sep 2015 12:54:51 -0700 Subject: [PATCH 1/1] Move 'Create Dictionary' calls from tab format to '=' format Create Dictionary tab format is deprecated and fixing will remove a lot of cumbersome log warnings Change-Id: I9fea967b42c4a75e2d08f7a3b0d2b450d3772545 Signed-off-by: Marcus G K Williams --- csit/libraries/AAAKeywords.robot | 8 ++++---- csit/libraries/FlowLib.robot | 6 +++--- .../authn/010_Credential_Authentication.robot | 2 +- .../010__SM_add_upd_del_flows.robot | 4 ++-- .../Sanity3Node/010__Flows_OF13_Cluster.robot | 2 +- .../suites/tsdr/HBase/010_InterfaceMetrics.robot | 6 +++--- tools/Robot_Tool/suites/base/arp_handler.txt | 8 ++++---- .../Robot_Tool/suites/base/container_manager.txt | 12 ++++++------ .../suites/base/forwarding_manager.txt | 10 ++++------ .../suites/base/forwarding_rule_manager.txt | 16 +++++++--------- tools/Robot_Tool/suites/base/host_tracker.txt | 16 ++++++++-------- tools/Robot_Tool/suites/base/switch_manager.txt | 14 +++++++------- .../Robot_Tool/suites/base/topology_manager.txt | 14 ++++++++------ tools/Robot_Tool/suites/cluster/015__FRM.txt | 7 +++---- .../suites/ha/005__two_controller_running.txt | 4 ++-- tools/Robot_Tool/suites/ha/010__c1_fails.txt | 2 +- tools/Robot_Tool/suites/ha/015__c2_fails.txt | 2 +- tools/Robot_Tool/suites/ha/020__c1_recovers.txt | 4 ++-- .../suites/ha/030__two_controller_see_flow.txt | 13 ++++++------- .../suites/ha/035__installed_flow_remains.txt | 9 ++++----- 20 files changed, 77 insertions(+), 82 deletions(-) diff --git a/csit/libraries/AAAKeywords.robot b/csit/libraries/AAAKeywords.robot index 04ad225b42..bb2899b56f 100644 --- a/csit/libraries/AAAKeywords.robot +++ b/csit/libraries/AAAKeywords.robot @@ -13,7 +13,7 @@ AAA Login [Arguments] ${controller_ip} ${auth_data} [Documentation] Makes a POST REST call to the AUTH_TOKEN_API with the given auth_data and returns the response Create Session ODL_SESSION http://${controller_ip}:8181 - ${headers}= Create Dictionary Content-Type application/x-www-form-urlencoded + ${headers}= Create Dictionary Content-Type=application/x-www-form-urlencoded ${resp}= RequestsLibrary.POST ODL_SESSION ${AUTH_TOKEN_API} data=${auth_data} headers=${headers} Delete All Sessions [Return] ${resp} @@ -59,7 +59,7 @@ Get Auth Token Revoke Auth Token [Arguments] ${token} [Documentation] Requests the given token be revoked via POST to ${REVOKE_TOKEN_API} - ${headers}= Create Dictionary Content-Type application/x-www-form-urlencoded + ${headers}= Create Dictionary Content-Type=application/x-www-form-urlencoded ${resp}= RequestsLibrary.POST ODL_SESSION ${REVOKE_TOKEN_API} data=${token} headers=${headers} Should Be Equal As Strings ${resp.status_code} 204 @@ -72,7 +72,7 @@ Get User From IDM DB [Documentation] Will return user information. If no user id is passed, it will retrieve all users in DB [Arguments] ${user_id}=${EMPTY} Create Session httpbin http://${CONTROLLER}:${RESTPORT} - ${headers}= Create Dictionary Content-Type application/x-www-form-urlencoded + ${headers}= Create Dictionary Content-Type=application/x-www-form-urlencoded ${resp}= RequestsLibrary.GET httpbin ${idmurl}/users/${user_id} headers=${headers} Should Be Equal As Strings ${resp.status_code} 200 Log ${resp.content} @@ -82,7 +82,7 @@ Create User [Documentation] Will return user information. If no user id is passed, it will retrieve all users in DB [Arguments] ${user_data} Create Session httpbin http://${CONTROLLER}:${RESTPORT} - ${headers}= Create Dictionary Content-Type application/json + ${headers}= Create Dictionary Content-Type=application/json ${resp}= RequestsLibrary.POST httpbin ${idmurl}/users headers=${headers} data=${user_data} Should Be Equal As Strings ${resp.status_code} 201 Log ${resp.content} diff --git a/csit/libraries/FlowLib.robot b/csit/libraries/FlowLib.robot index ffccd72aee..c52481f0f7 100644 --- a/csit/libraries/FlowLib.robot +++ b/csit/libraries/FlowLib.robot @@ -191,7 +191,7 @@ Remove Default Flows Log Flow XML is ${flow.xml} write dpctl dump-flows -O OpenFlow13 ${switchoutput} Read Until > - ${headers}= Create Dictionary Content-Type application/yang.data+xml + ${headers}= Create Dictionary Content-Type=application/yang.data+xml ${resp} RequestsLibrary.Post session restconf/operations/sal-flow:remove-flow data=${flow.xml} headers=${headers} Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 @@ -231,7 +231,7 @@ Flow Presence In Config Store [Arguments] ${expvalue} [Documentation] Checks the config store for given flow. Returns True if present, otherwise returns False ... This keyword assumes that the global/suite variables are available (${table_id}, ${flow_id} and ${switch_idx} - ${headers}= Create Dictionary Accept application/xml + ${headers}= Create Dictionary Accept=application/xml ${resp}= RequestsLibrary.Get session ${CONFIG_NODES_API}/node/openflow:${switch_idx}/table/${table_id}/flow/${flow_id} headers=${headers} Log ${resp} Log ${resp.content} @@ -244,7 +244,7 @@ Flow Presence In Operational Store [Arguments] ${expvalue} [Documentation] Checks the operational store for given flow. Returns True if present, otherwise returns False ... This keyword assumes that the global/suite variables are available (${table_id}, ${flow_id} and ${switch_idx} - ${headers}= Create Dictionary Accept application/xml + ${headers}= Create Dictionary Accept=application/xml ${resp}= RequestsLibrary.Get session ${OPERATIONAL_NODES_API}/node/openflow:${switch_idx}/table/${table_id} headers=${headers} Log ${resp} Log ${resp.content} diff --git a/csit/suites/aaa/authn/010_Credential_Authentication.robot b/csit/suites/aaa/authn/010_Credential_Authentication.robot index ce7518adb2..631125201b 100644 --- a/csit/suites/aaa/authn/010_Credential_Authentication.robot +++ b/csit/suites/aaa/authn/010_Credential_Authentication.robot @@ -68,7 +68,7 @@ Validate That Authentication Fails With Wrong Token Make REST Transaction [Arguments] ${expected_status_code} ${auth_data}=${EMPTY} Create Session ODL_SESSION http://${CONTROLLER}:8181 - ${headers}= Create Dictionary Content-Type application/x-www-form-urlencoded + ${headers}= Create Dictionary Content-Type=application/x-www-form-urlencoded Run Keyword If "${auth_data}" != "${EMPTY}" Set To Dictionary ${headers} Authorization Bearer ${auth_data} ${resp}= RequestsLibrary.GET ODL_SESSION ${OPERATIONAL_NODES_API} headers=${headers} Log STATUS_CODE: ${resp.status_code} CONTENT: ${resp.content} diff --git a/csit/suites/openflowplugin/Flows_Stats_OF13/010__SM_add_upd_del_flows.robot b/csit/suites/openflowplugin/Flows_Stats_OF13/010__SM_add_upd_del_flows.robot index 8ce8cb33df..5ef483eae2 100644 --- a/csit/suites/openflowplugin/Flows_Stats_OF13/010__SM_add_upd_del_flows.robot +++ b/csit/suites/openflowplugin/Flows_Stats_OF13/010__SM_add_upd_del_flows.robot @@ -238,7 +238,7 @@ Check Config Flow Presence Should Be Equal ${expected} ${presence_flow} msg=${msgf} Flow Presence Config Flow - ${headers}= Create Dictionary Accept application/xml + ${headers}= Create Dictionary Accept=application/xml ${resp}= RequestsLibrary.Get session /restconf/config/opendaylight-inventory:nodes/node/openflow:${switch_idx}/table/${table_id}/flow/${flow_id} headers=${headers} Log ${resp} Log ${resp.content} @@ -258,7 +258,7 @@ Check Operational Table Presence Should Be Equal ${expected} ${presence_table} msg=${msgf} Flow Presence Operational Table - ${headers}= Create Dictionary Accept application/xml + ${headers}= Create Dictionary Accept=application/xml ${resp}= RequestsLibrary.Get session /restconf/operational/opendaylight-inventory:nodes/node/openflow:${switch_idx}/table/${table_id} headers=${headers} Log ${resp} Log ${resp.content} diff --git a/csit/suites/openflowplugin/Sanity3Node/010__Flows_OF13_Cluster.robot b/csit/suites/openflowplugin/Sanity3Node/010__Flows_OF13_Cluster.robot index 467f23995a..b66b1d686e 100644 --- a/csit/suites/openflowplugin/Sanity3Node/010__Flows_OF13_Cluster.robot +++ b/csit/suites/openflowplugin/Sanity3Node/010__Flows_OF13_Cluster.robot @@ -402,6 +402,6 @@ Create Controllers Sessions Get Controller Response [Arguments] ${session} ${url} - ${headers}= Create Dictionary Accept application/xml + ${headers}= Create Dictionary Accept=application/xml ${resp}= Get ${session} ${url} headers=${headers} Return From Keyword ${resp} diff --git a/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot b/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot index 7f413e0f57..b7cd419f64 100755 --- a/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot +++ b/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot @@ -72,9 +72,9 @@ Verify TSDR Configuration Interval Post TSDR Configuration Interval [Arguments] ${interval} [Documentation] Configuration TSDR collection interval ${interval} - ${p1} Create Dictionary interval ${interval} - ${p2} Create Dictionary input ${p1} - ${post_data} Create Dictionary setPollingInterval ${p2} + ${p1} Create Dictionary interval=${interval} + ${p2} Create Dictionary input=${p1} + ${post_data} Create Dictionary setPollingInterval=${p2} Log ${post_data} ${resp} RequestsLibrary.Post session ${OPER_INTERVAL} ${post_data} Should Be Equal As Strings ${resp.status_code} 201 diff --git a/tools/Robot_Tool/suites/base/arp_handler.txt b/tools/Robot_Tool/suites/base/arp_handler.txt index 74353e280c..fd4910ef5c 100644 --- a/tools/Robot_Tool/suites/base/arp_handler.txt +++ b/tools/Robot_Tool/suites/base/arp_handler.txt @@ -15,8 +15,8 @@ ${REST_CONTEXT} /controller/nb/v2/subnetservice Add a subnet [Documentation] Add a subnet, list to validate the result. [Tags] add - ${body} Create Dictionary name ${name} subnet 10.0.0.254/8 - ${headers} Create Dictionary Content-Type application/json + ${body} Create Dictionary name=${name} subnet=10.0.0.254/8 + ${headers} Create Dictionary Content-Type=application/json Create Session session http://${CONTROLLER}:8080 headers=${headers} auth=${auth} ${resp} Put session ${REST_CONTEXT}/${CONTAINER}/subnet/${name} data=${body} Should Be Equal As Strings ${resp.status_code} 201 Response status code error @@ -29,8 +29,8 @@ Add a subnet Remove a subnet [Documentation] Remove a subnet, list to validate the result. [Tags] remove - ${body} Create Dictionary name ${name} subnet 10.0.0.254/8 - ${headers} Create Dictionary Content-Type application/json + ${body} Create Dictionary name=${name} subnet=10.0.0.254/8 + ${headers} Create Dictionary Content-Type=application/json Create Session session http://${CONTROLLER}:8080 headers=${headers} auth=${auth} ${resp} Delete session ${REST_CONTEXT}/${CONTAINER}/subnet/${name} Should Be Equal As Strings ${resp.status_code} 204 Response status code error diff --git a/tools/Robot_Tool/suites/base/container_manager.txt b/tools/Robot_Tool/suites/base/container_manager.txt index d302d62d8b..74fa06e87b 100644 --- a/tools/Robot_Tool/suites/base/container_manager.txt +++ b/tools/Robot_Tool/suites/base/container_manager.txt @@ -17,9 +17,9 @@ Add a container [Documentation] Add a container, list to validate the result. [Tags] add ${flowspecs} Convert To List ${EMPTY} - ${body} Create Dictionary container ${name} flowSpecs ${flowspecs} staticVlan - ... 10 nodeConnectors ${nodeconnectors} - ${headers} Create Dictionary Content-Type application/json + ${body} Create Dictionary container=${name} flowSpecs=${flowspecs} staticVlan=10 + ... nodeConnectors=${nodeconnectors} + ${headers} Create Dictionary Content-Type=application/json Create Session session http://${CONTROLLER}:8080 headers=${headers} auth=${auth} ${resp} Put session ${REST_CONTEXT}/container/${name} data=${body} Should Be Equal As Strings ${resp.status_code} 201 Response status code error @@ -33,9 +33,9 @@ Remove a container [Documentation] Remove a container, list to validate the result. [Tags] remove ${flowspecs} Convert To List ${EMPTY} - ${body} Create Dictionary container ${name} flowSpecs ${flowspecs} staticVlan - ... 10 nodeConnectors ${nodeconnectors} - ${headers} Create Dictionary Content-Type application/json + ${body} Create Dictionary container=${name} flowSpecs=${flowspecs} staticVlan=10 + ... nodeConnectors=${nodeconnectors} + ${headers} Create Dictionary Content-Type=application/json Create Session session http://${CONTROLLER}:8080 headers=${headers} auth=${auth} ${resp} Delete session ${REST_CONTEXT}/container/${name} Should Be Equal As Strings ${resp.status_code} 204 Response status code error diff --git a/tools/Robot_Tool/suites/base/forwarding_manager.txt b/tools/Robot_Tool/suites/base/forwarding_manager.txt index 4ec35fb522..b22e81a128 100644 --- a/tools/Robot_Tool/suites/base/forwarding_manager.txt +++ b/tools/Robot_Tool/suites/base/forwarding_manager.txt @@ -15,9 +15,8 @@ ${REST_CONTEXT} /controller/nb/v2/staticroute Add a static route [Documentation] Add a static route, list to validate the result. [Tags] add - ${body} Create Dictionary name ${name} prefix 192.168.1.0/24 nextHop - ... 10.0.0.2 - ${headers} Create Dictionary Content-Type application/json + ${body} Create Dictionary name=${name} prefix=192.168.1.0/24 nextHop=10.0.0.2 + ${headers} Create Dictionary Content-Type=application/json Create Session session http://${CONTROLLER}:8080 headers=${headers} auth=${auth} ${resp} Put session ${REST_CONTEXT}/${CONTAINER}/route/${name} data=${body} Should Be Equal As Strings ${resp.status_code} 201 Response status code error @@ -30,9 +29,8 @@ Add a static route Remove a subnet [Documentation] Remove a subnet, list to validate the result. [Tags] remove - ${body} Create Dictionary name ${name} prefix 192.168.1.0/24 nextHop - ... 10.0.0.2 - ${headers} Create Dictionary Content-Type application/json + ${body} Create Dictionary name=${name} prefix=192.168.1.0/24 nextHop=10.0.0.2 + ${headers} Create Dictionary Content-Type=application/json Create Session session http://${CONTROLLER}:8080 headers=${headers} auth=${auth} ${resp} Delete session ${REST_CONTEXT}/${CONTAINER}/route/${name} Should Be Equal As Strings ${resp.status_code} 204 Response status code error diff --git a/tools/Robot_Tool/suites/base/forwarding_rule_manager.txt b/tools/Robot_Tool/suites/base/forwarding_rule_manager.txt index e2af707ced..59a49d8534 100644 --- a/tools/Robot_Tool/suites/base/forwarding_rule_manager.txt +++ b/tools/Robot_Tool/suites/base/forwarding_rule_manager.txt @@ -16,11 +16,10 @@ ${REST_CONTEXT} /controller/nb/v2/flowprogrammer Add a flow [Documentation] Add a flow, list to validate the result. [Tags] add - ${node} Create Dictionary type OF id ${node_id} + ${node} Create Dictionary type=OF id=${node_id} ${actions} Create List OUTPUT=1 - ${body} Create Dictionary name ${name} installInHw true node - ... ${node} priority 1 etherType 0x800 nwDst - ... 10.0.0.1/32 actions ${actions} + ${body} Create Dictionary name=${name} installInHw=true node=${node} + ... priority=1 etherType=0x800 nwDst=10.0.0.1/32 actions=${actions} ${headers} Create Dictionary Content-Type application/json Create Session session http://${CONTROLLER}:8080 headers=${headers} auth=${auth} ${resp} Put session ${REST_CONTEXT}/${CONTAINER}/node/OF/${node_id}/staticFlow/${name} data=${body} @@ -34,12 +33,11 @@ Add a flow Remove a flow [Documentation] Remove a flow, list to validate the result. [Tags] remove - ${node} Create Dictionary type OF id ${node_id} + ${node} Create Dictionary type=OF id=${node_id} ${actions} Create List OUTPUT=1 - ${body} Create Dictionary name ${name} installInHw true node - ... ${node} priority 1 etherType 0x800 nwDst - ... 10.0.0.1/32 actions ${actions} - ${headers} Create Dictionary Content-Type application/json + ${body} Create Dictionary name=${name} installInHw=true node=${node} + ... priority=1 etherType=0x800 nwDst=10.0.0.1/32 actions=${actions} + ${headers} Create Dictionary Content-Type=application/json Create Session session http://${CONTROLLER}:8080 headers=${headers} auth=${auth} ${resp} Delete session ${REST_CONTEXT}/${CONTAINER}/node/OF/${node_id}/staticFlow/${name} Should Be Equal As Strings ${resp.status_code} 204 Response status code error diff --git a/tools/Robot_Tool/suites/base/host_tracker.txt b/tools/Robot_Tool/suites/base/host_tracker.txt index 61a99cc6d8..ed4259d205 100644 --- a/tools/Robot_Tool/suites/base/host_tracker.txt +++ b/tools/Robot_Tool/suites/base/host_tracker.txt @@ -15,10 +15,10 @@ ${REST_CONTEXT} /controller/nb/v2/hosttracker Add a host [Documentation] Add a host, list to validate the result. [Tags] add - ${body} Create Dictionary nodeType OF dataLayerAddress 5e:bf:79:84:10:a6 vlan - ... 1 nodeId 00:00:00:00:00:00:00:03 nodeConnectorId 9 networkAddress - ... 10.0.1.4 staticHost ${True} nodeConnectorType OF - ${headers} Create Dictionary Content-Type application/json + ${body} Create Dictionary nodeType=OF dataLayerAddress=5e:bf:79:84:10:a6 + ... vlan=1 nodeId=00:00:00:00:00:00:00:03 nodeConnectorId=9 + ... networkAddress=10.0.1.4 staticHost=${True} nodeConnectorType=OF + ${headers} Create Dictionary Content-Type=application/json Create Session session http://${CONTROLLER}:8080 headers=${headers} auth=${auth} ${resp} Put session ${REST_CONTEXT}/${CONTAINER}/address/${name} data=${body} Should Be Equal As Strings ${resp.status_code} 201 Response status code error @@ -31,10 +31,10 @@ Add a host Remove a host [Documentation] Remove a host, list to validate the result. [Tags] remove - ${body} Create Dictionary nodeType OF dataLayerAddress 5e:bf:79:84:10:a6 vlan - ... 1 nodeId 00:00:00:00:00:00:00:03 nodeConnectorId 9 networkAddress - ... 10.0.1.4 staticHost ${True} nodeConnectorType OF - ${headers} Create Dictionary Content-Type application/json + ${body} Create Dictionary nodeType=OF dataLayerAddress=5e:bf:79:84:10:a6 + ... vlan=1 nodeId=00:00:00:00:00:00:00:03 nodeConnectorId=9 + ... networkAddress=10.0.1.4 staticHost=${True} nodeConnectorType=OF + ${headers} Create Dictionary Content-Type=application/json Create Session session http://${CONTROLLER}:8080 headers=${headers} auth=${auth} ${resp} Delete session ${REST_CONTEXT}/${CONTAINER}/address/${name} Should Be Equal As Strings ${resp.status_code} 204 Response status code error diff --git a/tools/Robot_Tool/suites/base/switch_manager.txt b/tools/Robot_Tool/suites/base/switch_manager.txt index 113f6a13a2..e17ff38d49 100644 --- a/tools/Robot_Tool/suites/base/switch_manager.txt +++ b/tools/Robot_Tool/suites/base/switch_manager.txt @@ -55,7 +55,7 @@ Get node ${resp} Get ${ODL_CONTROLLER_SESSION} ${REST_CONTEXT}/${CONTAINER}/nodes Should Be Equal As Strings ${resp.status_code} 200 Response status code error ${result} TO JSON ${resp.content} - ${node} Create Dictionary id ${node_id} type ${node_type} + ${node} Create Dictionary id=${node_id} type=${node_type} ${content} Extract All Nodes ${result} Log ${content} List Should Contain Value ${content} ${node} @@ -93,8 +93,8 @@ Node property should exist Log ${result} ${nodes} Extract All Nodes ${result} ${property_values} Extract Node Property Values ${result} ${property} - ${node} Create Dictionary id ${node_id} type ${node_type} - ${property_value} Create Dictionary value ${value} + ${node} Create Dictionary id=${node_id} type=${node_type} + ${property_value} Create Dictionary value=${value} Log ${property_value} List Should Contain Value ${nodes} ${node} List Should Contain Value ${property_values} ${property_value} @@ -108,8 +108,8 @@ Node property should not exist Log ${result} ${nodes} Extract All Nodes ${result} ${properties} Extract Node Property Values ${result} ${property} - ${node} Create Dictionary id ${node_id} type ${node_type} - ${property} Create Dictionary value ${value} + ${node} Create Dictionary id=${node_id} type=${node_type} + ${property} Create Dictionary value=${value} Log ${property} List Should Contain Value ${nodes} ${node} List Should Not Contain Value ${properties} ${property} @@ -123,7 +123,7 @@ Nodeconnector property should exist Log ${result} ${property_values} Extract Nodeconnector Property Values ${result} ${property} Log ${property_values} - ${property_value} Create Dictionary value ${value} + ${property_value} Create Dictionary value=${value} List Should Contain Value ${property_values} ${property_value} Nodeconnector property should not exist @@ -135,7 +135,7 @@ Nodeconnector property should not exist Log ${result} ${property_values} Extract Nodeconnector Property Values ${result} ${property} Log ${property_values} - ${property_value} Create Dictionary value ${value} + ${property_value} Create Dictionary value=${value} List Should not Contain Value ${property_values} ${property_value} List all nodeconnectors of node diff --git a/tools/Robot_Tool/suites/base/topology_manager.txt b/tools/Robot_Tool/suites/base/topology_manager.txt index 10566b33d7..2ce0569b71 100644 --- a/tools/Robot_Tool/suites/base/topology_manager.txt +++ b/tools/Robot_Tool/suites/base/topology_manager.txt @@ -15,9 +15,10 @@ ${REST_CONTEXT} /controller/nb/v2/topology Add a userlink [Documentation] Add a userlink, list to validate the result. [Tags] add - ${body} Create Dictionary name ${name} status Success srcNodeConnector - ... OF|1@OF|00:00:00:00:00:00:00:02 dstNodeConnector OF|1@OF|00:00:00:00:00:00:00:03 - ${headers} Create Dictionary Content-Type application/json + ${body} Create Dictionary name=${name} status=Success + ... srcNodeConnector=OF|1@OF|00:00:00:00:00:00:00:02 + ... dstNodeConnector=OF|1@OF|00:00:00:00:00:00:00:03 + ${headers} Create Dictionary Content-Type=application/json Create Session session http://${CONTROLLER}:8080 headers=${headers} auth=${auth} ${resp} Put session ${REST_CONTEXT}/${CONTAINER}/userLink/${name} data=${body} Should Be Equal As Strings ${resp.status_code} 201 Response status code error @@ -30,9 +31,10 @@ Add a userlink Remove a userlink [Documentation] Remove a userlink, list to validate the result. [Tags] remove - ${body} Create Dictionary name ${name} status Success srcNodeConnector - ... OF|1@OF|00:00:00:00:00:00:00:02 dstNodeConnector OF|1@OF|00:00:00:00:00:00:00:03 - ${headers} Create Dictionary Content-Type application/json + ${body} Create Dictionary name=${name} status=Success + ... srcNodeConnector=OF|1@OF|00:00:00:00:00:00:00:02 + ... dstNodeConnector=OF|1@OF|00:00:00:00:00:00:00:03 + ${headers} Create Dictionary Content-Type=application/json Create Session session http://${CONTROLLER}:8080 headers=${headers} auth=${auth} ${resp} Delete session ${REST_CONTEXT}/${CONTAINER}/userLink/${name} Should Be Equal As Strings ${resp.status_code} 204 Response status code error diff --git a/tools/Robot_Tool/suites/cluster/015__FRM.txt b/tools/Robot_Tool/suites/cluster/015__FRM.txt index 34dbcded57..3f94fa8f96 100644 --- a/tools/Robot_Tool/suites/cluster/015__FRM.txt +++ b/tools/Robot_Tool/suites/cluster/015__FRM.txt @@ -27,11 +27,10 @@ ${FLOW} "10.0.0.1" Add a flow in C1 [Documentation] Adding a flow, list to validate the result in C1 [Tags] add - ${node} Create Dictionary type OF id ${node_id} + ${node} Create Dictionary type=OF id=${node_id} ${actions} Create List OUTPUT=1 - ${body} Create Dictionary name ${name} installInHw true node - ... ${node} priority 1 etherType 0x800 nwDst - ... 10.0.0.1/32 actions ${actions} + ${body} Create Dictionary name=${name} installInHw=true node=${node} + ... priority=1 etherType=0x800 nwDst=10.0.0.1/32 actions=${actions} Create Session session http://${Controller1_IP}:8080 auth=${AUTH} headers=${HEADERS} ${resp} Put session ${REST_CONTEXT_P}/${CONTAINER}/node/OF/${node_id}/staticFlow/${name} data=${body} Should Be Equal As Strings ${resp.status_code} 201 diff --git a/tools/Robot_Tool/suites/ha/005__two_controller_running.txt b/tools/Robot_Tool/suites/ha/005__two_controller_running.txt index 9ccb3dfa5b..157c04950b 100644 --- a/tools/Robot_Tool/suites/ha/005__two_controller_running.txt +++ b/tools/Robot_Tool/suites/ha/005__two_controller_running.txt @@ -130,7 +130,7 @@ all switches are introduced to both controllers the system is working with C1 and C2 - ${headers} Create Dictionary Content-Type application/json + ${headers} Create Dictionary Content-Type=application/json Create Session session http://${Controller1_IP}:8080 headers=${headers} auth=${auth} ${resp} Get session ${REST_CONTEXT}/${CONTAINER} Should Be Equal As Strings ${resp.status_code} 200 Response status code error @@ -140,7 +140,7 @@ the system is working with C1 and C2 Should Contain X Times ${resp.content} ${nodeconn3} 2 Should Contain X Times ${resp.content} ${nodeconn4} 2 - ${headers} Create Dictionary Content-Type application/json + ${headers} Create Dictionary Content-Type=application/json Create Session session http://${Controller2_IP}:8080 headers=${headers} auth=${auth} ${resp} Get session ${REST_CONTEXT}/${CONTAINER} Should Be Equal As Strings ${resp.status_code} 200 Response status code error diff --git a/tools/Robot_Tool/suites/ha/010__c1_fails.txt b/tools/Robot_Tool/suites/ha/010__c1_fails.txt index c66f3efc28..fd32d38947 100644 --- a/tools/Robot_Tool/suites/ha/010__c1_fails.txt +++ b/tools/Robot_Tool/suites/ha/010__c1_fails.txt @@ -92,7 +92,7 @@ all switches are introduced to both controllers the system is working with C2 - ${headers} Create Dictionary Content-Type application/json + ${headers} Create Dictionary Content-Type=application/json Create Session session http://${Controller2_IP}:8080 headers=${headers} auth=${auth} ${resp} Get session ${REST_CONTEXT}/${CONTAINER} Should Be Equal As Strings ${resp.status_code} 200 Response status code error diff --git a/tools/Robot_Tool/suites/ha/015__c2_fails.txt b/tools/Robot_Tool/suites/ha/015__c2_fails.txt index 47d26400aa..bca9e7cb48 100644 --- a/tools/Robot_Tool/suites/ha/015__c2_fails.txt +++ b/tools/Robot_Tool/suites/ha/015__c2_fails.txt @@ -93,7 +93,7 @@ all switches are introduced to both controllers the system is working with C1 - ${headers} Create Dictionary Content-Type application/json + ${headers} Create Dictionary Content-Type=application/json Create Session session http://${Controller1_IP}:8080 headers=${headers} auth=${auth} ${resp} Get session ${REST_CONTEXT}/${CONTAINER} Should Be Equal As Strings ${resp.status_code} 200 Response status code error diff --git a/tools/Robot_Tool/suites/ha/020__c1_recovers.txt b/tools/Robot_Tool/suites/ha/020__c1_recovers.txt index c6dda48007..daf15dd268 100644 --- a/tools/Robot_Tool/suites/ha/020__c1_recovers.txt +++ b/tools/Robot_Tool/suites/ha/020__c1_recovers.txt @@ -92,7 +92,7 @@ all switches are introduced to both controllers the system is working with C1 and C2 - ${headers} Create Dictionary Content-Type application/json + ${headers} Create Dictionary Content-Type=application/json Create Session session http://${Controller1_IP}:8080 headers=${headers} auth=${auth} ${resp} Get session ${REST_CONTEXT}/${CONTAINER} Should Be Equal As Strings ${resp.status_code} 200 Response status code error @@ -102,7 +102,7 @@ the system is working with C1 and C2 Should Contain X Times ${resp.content} ${nodeconn3} 2 Should Contain X Times ${resp.content} ${nodeconn4} 2 - ${headers} Create Dictionary Content-Type application/json + ${headers} Create Dictionary Content-Type=application/json Create Session session http://${Controller2_IP}:8080 headers=${headers} auth=${auth} ${resp} Get session ${REST_CONTEXT}/${CONTAINER} Should Be Equal As Strings ${resp.status_code} 200 Response status code error diff --git a/tools/Robot_Tool/suites/ha/030__two_controller_see_flow.txt b/tools/Robot_Tool/suites/ha/030__two_controller_see_flow.txt index 5755dc57a3..74471c154d 100644 --- a/tools/Robot_Tool/suites/ha/030__two_controller_see_flow.txt +++ b/tools/Robot_Tool/suites/ha/030__two_controller_see_flow.txt @@ -53,12 +53,11 @@ C2 a controller in cluster of two controllers a flow is installed in a bridge - ${node} Create Dictionary type OF id ${node_id} + ${node} Create Dictionary type=OF id=${node_id} ${actions} Create List OUTPUT=1 - ${body} Create Dictionary name ${name} installInHw true node - ... ${node} priority 995 etherType 0x800 nwDst - ... 10.0.0.1/32 actions ${actions} - ${headers} Create Dictionary Content-Type application/json + ${body} Create Dictionary name=${name} installInHw=true node=${node} + ... priority=995 etherType=0x800 nwDst=10.0.0.1/32 actions=${actions} + ${headers} Create Dictionary Content-Type=application/json Create Session session http://${Controller1_IP}:8080 headers=${headers} auth=${auth} ${resp} Put session ${REST_CONTEXT}/${CONTAINER}/node/OF/${node_id}/staticFlow/${name} data=${body} Should Be Equal As Strings ${resp.status_code} 201 Response status code error @@ -70,7 +69,7 @@ a flow is installed in a bridge C1 see the flow - ${headers} Create Dictionary Content-Type application/json + ${headers} Create Dictionary Content-Type=application/json Create Session session http://${Controller1_IP}:8080 headers=${headers} auth=${auth} ${resp} Get session ${REST_CONTEXT_2} Should Be Equal As Strings ${resp.status_code} 200 Response status code error @@ -80,7 +79,7 @@ C1 see the flow C2 see the flow - ${headers} Create Dictionary Content-Type application/json + ${headers} Create Dictionary Content-Type=application/json Create Session session http://${Controller2_IP}:8080 headers=${headers} auth=${auth} ${resp} Get session ${REST_CONTEXT_2} Should Be Equal As Strings ${resp.status_code} 200 Response status code error diff --git a/tools/Robot_Tool/suites/ha/035__installed_flow_remains.txt b/tools/Robot_Tool/suites/ha/035__installed_flow_remains.txt index 36f2c71e66..ffc0ec4e12 100644 --- a/tools/Robot_Tool/suites/ha/035__installed_flow_remains.txt +++ b/tools/Robot_Tool/suites/ha/035__installed_flow_remains.txt @@ -82,12 +82,11 @@ both controllers get provisioned on all OVS bridges a flow is installed in a bridge - ${node} Create Dictionary type OF id ${node_id} + ${node} Create Dictionary type=OF id=${node_id} ${actions} Create List OUTPUT=1 - ${body} Create Dictionary name ${name} installInHw true node - ... ${node} priority 999 etherType 0x800 nwDst - ... 10.0.0.1/32 actions ${actions} - ${headers} Create Dictionary Content-Type application/json + ${body} Create Dictionary name=${name} installInHw=true node=${node} + ... priority=999 etherType=0x800 nwDst=10.0.0.1/32 actions=${actions} + ${headers} Create Dictionary Content-Type=application/json Create Session session http://${Controller1_IP}:8080 headers=${headers} auth=${auth} ${resp} Put session ${REST_CONTEXT}/${CONTAINER}/node/OF/${node_id}/staticFlow/${name} data=${body} Should Be Equal As Strings ${resp.status_code} 201 Response status code error -- 2.36.6