Fix python3 issues in OVSDB

Signed-off-by: Srinivas Rachakonda <srinivas.rachakonda@gmail.com>
Change-Id: I57bcf759f96c2d7d47ffd9acc9e21599d58c2c36

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 1af7400b4906ad8ee391535bca4e510fe7a67b25..acf9ca17fadc3e0c24aaa3ef3c15c724e8e9cd89 100644 (file)
--- a/csit/suites/ovsdb/Southbound_Domain/010__configure_1_ovsdb_node.robot
+++ b/csit/suites/ovsdb/Southbound_Domain/010__configure_1_ovsdb_node.robot
@@ -39,9 +39,9 @@ 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    ${CONFIG_TOPO_API}
 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    ${CONFIG_TOPO_API}

-    OVSDB.Log Request    ${resp.content}
+    OVSDB.Log Request    ${resp.text}

     BuiltIn.Should Be Equal As Strings    ${resp.status_code}    200
     BuiltIn.Should Be Equal As Strings    ${resp.status_code}    200

-    BuiltIn.Should Contain    ${resp.content}    ${BRIDGE}
+    BuiltIn.Should Contain    ${resp.text}    ${BRIDGE}

 
 Get Operational Topology with Bridge
     [Documentation]    This request will fetch the operational topology from the connected OVSDB nodes to verify the bridge is added to the data store
 
 Get Operational Topology with Bridge
     [Documentation]    This request will fetch the operational topology from the connected OVSDB nodes to verify the bridge is added to the data store


@@ -80,7 +80,7 @@ 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    ${CONFIG_TOPO_API}
 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    ${CONFIG_TOPO_API}

-    OVSDB.Log Request    ${resp.content}
+    OVSDB.Log Request    ${resp.text}

     BuiltIn.Should Be Equal As Strings    ${resp.status_code}    200
     BuiltIn.Wait Until Keyword Succeeds    8s    2s    Utils.Check For Elements At URI    ${OPERATIONAL_TOPO_API}/topology/ovsdb:1    ${NODE_LIST}    pretty_print_json=True
 
     BuiltIn.Should Be Equal As Strings    ${resp.status_code}    200
     BuiltIn.Wait Until Keyword Succeeds    8s    2s    Utils.Check For Elements At URI    ${OPERATIONAL_TOPO_API}/topology/ovsdb:1    ${NODE_LIST}    pretty_print_json=True
 


@@ -110,7 +110,7 @@ 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    ${CONFIG_TOPO_API}
 Get Config Topology After Reconnect
     [Documentation]    This will fetch the configuration topology from configuration data store after reconnect
     ${resp}    RequestsLibrary.Get Request    session    ${CONFIG_TOPO_API}

-    OVSDB.Log Request    ${resp.content}
+    OVSDB.Log Request    ${resp.text}

     BuiltIn.Should Be Equal As Strings    ${resp.status_code}    200
     BuiltIn.Wait Until Keyword Succeeds    8s    2s    Utils.Check For Elements At URI    ${OPERATIONAL_TOPO_API}/topology/ovsdb:1    ${NODE_LIST}    pretty_print_json=True
 
     BuiltIn.Should Be Equal As Strings    ${resp.status_code}    200
     BuiltIn.Wait Until Keyword Succeeds    8s    2s    Utils.Check For Elements At URI    ${OPERATIONAL_TOPO_API}/topology/ovsdb:1    ${NODE_LIST}    pretty_print_json=True
 


@@ -137,9 +137,9 @@ 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    ${CONFIG_TOPO_API}
 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    ${CONFIG_TOPO_API}

-    OVSDB.Log Request    ${resp.content}
+    OVSDB.Log Request    ${resp.text}

     BuiltIn.Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
     BuiltIn.Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}

-    BuiltIn.Should Contain    ${resp.content}    ${QOS}
+    BuiltIn.Should Contain    ${resp.text}    ${QOS}

 
 Get QOS Operational Topology with port
     [Documentation]    This request will fetch the operational topology from the connected OVSDB nodes to verify the QOS is added to the data store
 
 Get QOS Operational Topology with port
     [Documentation]    This request will fetch the operational topology from the connected OVSDB nodes to verify the QOS is added to the data store


@@ -149,9 +149,9 @@ 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    ${CONFIG_TOPO_API}
 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    ${CONFIG_TOPO_API}

-    OVSDB.Log Request    ${resp.content}
+    OVSDB.Log Request    ${resp.text}

     BuiltIn.Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
     BuiltIn.Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}

-    BuiltIn.Should Contain    ${resp.content}    ${QUEUE}
+    BuiltIn.Should Contain    ${resp.text}    ${QUEUE}

 
 Get Queue Operational Topology with port
     [Documentation]    This request will fetch the operational topology from the connected OVSDB nodes to verify the Queue is added to the data store
 
 Get Queue Operational Topology with port
     [Documentation]    This request will fetch the operational topology from the connected OVSDB nodes to verify the Queue is added to the data store


@@ -181,9 +181,9 @@ Delete the OVSDB Node HOST1
 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    ${CONFIG_TOPO_API}
 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    ${CONFIG_TOPO_API}

-    OVSDB.Log Request    ${resp.content}
+    OVSDB.Log Request    ${resp.text}

     BuiltIn.Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
     BuiltIn.Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}

-    BuiltIn.Should Not Contain    ${resp.content}    ovsdb:HOST1
+    BuiltIn.Should Not Contain    ${resp.text}    ovsdb:HOST1

 
 Check For Bug 4756
     [Documentation]    bug 4756 has been seen in the OVSDB Southbound suites. This test case should be one of the last test
 
 Check For Bug 4756
     [Documentation]    bug 4756 has been seen in the OVSDB Southbound suites. This test case should be one of the last test

diff --git a/csit/suites/ovsdb/Southbound_Domain/020__connection_manager.robot b/csit/suites/ovsdb/Southbound_Domain/020__connection_manager.robot
index a6fe714b779a3c921f7d6fa14221eee011c7e658..9e790f1110e33fdae00c8c8d10f9ce5692d43092 100644 (file)
--- a/csit/suites/ovsdb/Southbound_Domain/020__connection_manager.robot
+++ b/csit/suites/ovsdb/Southbound_Domain/020__connection_manager.robot
@@ -44,9 +44,9 @@ 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    ${CONFIG_TOPO_API}
 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    ${CONFIG_TOPO_API}

-    OVSDB.Log Request    ${resp.content}
+    OVSDB.Log Request    ${resp.text}

     BuiltIn.Should Be Equal As Strings    ${resp.status_code}    200
     BuiltIn.Should Be Equal As Strings    ${resp.status_code}    200

-    BuiltIn.Should Not Contain    ${resp.content}    ovsdb://${TOOLS_SYSTEM_IP}:${OVSDB_NODE_PORT}/bridge/${BRIDGE1}
+    BuiltIn.Should Not Contain    ${resp.text}    ovsdb://${TOOLS_SYSTEM_IP}:${OVSDB_NODE_PORT}/bridge/${BRIDGE1}

 
 Create a Bridge through controller
     [Documentation]    This will create bridge on the specified OVSDB node.
 
 Create a Bridge through controller
     [Documentation]    This will create bridge on the specified OVSDB node.


@@ -60,9 +60,9 @@ 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    ${CONFIG_TOPO_API}
 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    ${CONFIG_TOPO_API}

-    OVSDB.Log Request    ${resp.content}
+    OVSDB.Log Request    ${resp.text}

     BuiltIn.Should Be Equal As Strings    ${resp.status_code}    200
     BuiltIn.Should Be Equal As Strings    ${resp.status_code}    200

-    BuiltIn.Should Contain    ${resp.content}    ovsdb://uuid/${OVSDB_UUID}/bridge/${BRIDGE2}
+    BuiltIn.Should Contain    ${resp.text}    ovsdb://uuid/${OVSDB_UUID}/bridge/${BRIDGE2}

 
 Create bridge of already added bridge
     [Documentation]    This will add bridge to the config datastore
 
 Create bridge of already added bridge
     [Documentation]    This will add bridge to the config datastore


@@ -71,9 +71,9 @@ 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    ${CONFIG_TOPO_API}
 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    ${CONFIG_TOPO_API}

-    OVSDB.Log Request    ${resp.content}
+    OVSDB.Log Request    ${resp.text}

     BuiltIn.Should Be Equal As Strings    ${resp.status_code}    200
     BuiltIn.Should Be Equal As Strings    ${resp.status_code}    200

-    BuiltIn.Should Contain    ${resp.content}    ovsdb://uuid/${OVSDB_UUID}/bridge/${BRIDGE1}
+    BuiltIn.Should Contain    ${resp.text}    ovsdb://uuid/${OVSDB_UUID}/bridge/${BRIDGE1}

 
 Delete bridge manually
     Utils.Run Command On Mininet    ${TOOLS_SYSTEM_IP}    sudo ovs-vsctl del-br ${BRIDGE2}
 
 Delete bridge manually
     Utils.Run Command On Mininet    ${TOOLS_SYSTEM_IP}    sudo ovs-vsctl del-br ${BRIDGE2}


@@ -86,9 +86,9 @@ 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    ${CONFIG_TOPO_API}
 Config Topology Still Contains Bridge
     [Documentation]    This request will fetch the configuration topology from configuration data store
     ${resp} =    RequestsLibrary.Get Request    session    ${CONFIG_TOPO_API}

-    OVSDB.Log Request    ${resp.content}
+    OVSDB.Log Request    ${resp.text}

     BuiltIn.Should Be Equal As Strings    ${resp.status_code}    200
     BuiltIn.Should Be Equal As Strings    ${resp.status_code}    200

-    BuiltIn.Should Contain    ${resp.content}    ovsdb://uuid/${OVSDB_UUID}/bridge/${BRIDGE2}
+    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.
 
 Delete the Bridge through rest call
     [Documentation]    This request will delete the bridge node from the config data store.

diff --git a/csit/suites/ovsdb/Southbound_Domain/Bug_Validation.robot b/csit/suites/ovsdb/Southbound_Domain/Bug_Validation.robot
index d5a64238d3b6e9b0bd9458d9f576e3859826eea5..fdd97691889a8848b8f3f0fb7d4541d044fd96c4 100644 (file)
--- a/csit/suites/ovsdb/Southbound_Domain/Bug_Validation.robot
+++ b/csit/suites/ovsdb/Southbound_Domain/Bug_Validation.robot
@@ -115,9 +115,9 @@ Bug 5177
     ${node} =    BuiltIn.Set Variable    uuid/${OVSDB_UUID}
     OVSDB.Add Bridge To Ovsdb Node    ${node}    ${TOOLS_SYSTEM_IP}    ${BRIDGE}    0000000000005177
     ${resp} =    RequestsLibrary.Get Request    session    ${CONFIG_TOPO_API}
     ${node} =    BuiltIn.Set Variable    uuid/${OVSDB_UUID}
     OVSDB.Add Bridge To Ovsdb Node    ${node}    ${TOOLS_SYSTEM_IP}    ${BRIDGE}    0000000000005177
     ${resp} =    RequestsLibrary.Get Request    session    ${CONFIG_TOPO_API}

-    OVSDB.Log Request    ${resp.content}
+    OVSDB.Log Request    ${resp.text}

     BuiltIn.Should Be Equal As Strings    ${resp.status_code}    200
     BuiltIn.Should Be Equal As Strings    ${resp.status_code}    200

-    BuiltIn.Should Contain    ${resp.content}    ${node}/bridge/${BRIDGE}
+    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}
     BuiltIn.Wait Until Keyword Succeeds    8s    2s    Utils.Check For Elements At URI    ${OPERATIONAL_TOPO_API}/topology/ovsdb:1    ${list}    pretty_print_json=True
     Utils.Run Command On Mininet    ${TOOLS_SYSTEM_IP}    sudo ovs-vsctl set-manager tcp:${ODL_SYSTEM_IP}:${OVSDBPORT}
     @{list} =    BuiltIn.Create List    ${BRIDGE}
     BuiltIn.Wait Until Keyword Succeeds    8s    2s    Utils.Check For Elements At URI    ${OPERATIONAL_TOPO_API}/topology/ovsdb:1    ${list}    pretty_print_json=True