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 <Marcus.G.Williams@gmail.com>

diff --git a/csit/libraries/AAAKeywords.robot b/csit/libraries/AAAKeywords.robot
index 04ad225b42f9b607a707f87d1272f42b73de9bfc..bb2899b56f28a929141a364f8961d36a728ac1c6 100644 (file)
--- 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 ffccd72aeeb53e8209ed3585d5d36bdeb40af4b4..c52481f0f7e8cdb81cb0f2c19fc863d16fbe19cf 100644 (file)
--- 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 ce7518adb284be1dc315775f5568a1089b29c7eb..631125201b04b992af1d9d03ecde9c1cb1b55536 100644 (file)
--- 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 8ce8cb33dfa2ce4abe75beceaac8ce9ab54ae0de..5ef483eae23ea038283cff8c7369184d30a6a628 100644 (file)
--- 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 467f23995a50495fdf6b5aded64e63ff67bfdc0a..b66b1d686eb051a8dd17cd751058f8c4888a0818 100644 (file)
--- 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 7f413e0f57541fe07508d42dad4b85ced9ffb407..b7cd419f647c62fc6d8df28f0c51cf828fb9e69f 100755 (executable)
--- 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 74353e280c8d195bf898302e20a68b54d31258d7..fd4910ef5c4e02f00adb1bb8c00498dc79657da9 100644 (file)
--- 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 d302d62d8b54573b3608db10a9e7c58ddf8faba8..74fa06e87bd607dcde99f78ee79d4ca21e10179f 100644 (file)
--- 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 4ec35fb522aa40ce8c011ae1c9b84935212c74b6..b22e81a128a344276b06ccffd5baa3081effe49b 100644 (file)
--- 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 e2af707ced3c18b906089c3d1e11d890755b666a..59a49d85348e35f15a38fc67ac53e5b169ed69e2 100644 (file)
--- 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 61a99cc6d832b7d4ab0db4be127a3ab37b83119a..ed4259d2055faff29b53466e4b87ce2a135299e7 100644 (file)
--- 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 113f6a13a2500944df7c9231b3ef4d3de7eaf1e2..e17ff38d493756e3f5656acaa6823ae96b425095 100644 (file)
--- 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 10566b33d76bb636143f9859bd18d5e94f51e32a..2ce0569b710520fede54cbfbec8a93723a50913c 100644 (file)
--- 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 34dbcded57a4fa857f6d66238084b07bc5fd32f6..3f94fa8f9616eb7a367e565eba640c8fc3141145 100644 (file)
--- 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 9ccb3dfa5be5521c4decf5db8c3812a77cd24907..157c04950b500f3ef1e98a3402a793aaa9c9a343 100644 (file)
--- 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 c66f3efc280461c63212ff1eabdd32e1709af801..fd32d38947926f89e7ad08b085bdee7fed3c8bc5 100644 (file)
--- 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 47d26400aa9059c0aafb33e65397a5cbf915619d..bca9e7cb485a9600689279aecdb911b55f59be62 100644 (file)
--- 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 c6dda48007e4234f6f27fb4d41074dd358360b18..daf15dd2685e03344a1182ec12f305a216731f4a 100644 (file)
--- 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 5755dc57a3df7bbb6cde73a9670dabac9fdc209b..74471c154d34287c98fefaab21d88d98be1cc7ea 100644 (file)
--- 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 36f2c71e660be7bb8e9dbc863b90c97b85d19f98..ffc0ec4e12f30878cfbaa12e320596e189753770 100644 (file)
--- 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