Fix python3 issues in OFP

[integration/test.git] / csit / suites / openflowplugin / MD_SAL_NSF_OF13 / 020_restconf_topology.robot

diff --git a/csit/suites/openflowplugin/MD_SAL_NSF_OF13/020_restconf_topology.robot b/csit/suites/openflowplugin/MD_SAL_NSF_OF13/020_restconf_topology.robot
index 9e4d8cd31572670b34c4dc0d8329f6bc90b7500a..85023db7d58e4ece73e9b18e7b0688c08a8a611c 100644 (file)
--- a/csit/suites/openflowplugin/MD_SAL_NSF_OF13/020_restconf_topology.robot
+++ b/csit/suites/openflowplugin/MD_SAL_NSF_OF13/020_restconf_topology.robot
@@ -16,7 +16,7 @@ Get RESTCONF Topology
     [Documentation]    Get RESTCONF Topology and validate the result.
     Wait Until Keyword Succeeds    10s    2s    Check For Elements At URI    ${OPERATIONAL_TOPO_API}    ${node_list}
     ${resp}    RequestsLibrary.Get Request    session    ${OPERATIONAL_TOPO_API}
-    Log    ${resp.content}
+    Log    ${resp.text}
 
 List all the links
     [Documentation]    List all the links in the topology.
@@ -83,12 +83,13 @@ Add Port
 Verify Links
     [Arguments]    ${expected_links}
     ${resp}    RequestsLibrary.Get Request    session    ${OPERATIONAL_TOPO_API}/topology/flow:1
-    Log    ${resp.content}
+    Log    ${resp.text}
     Should Be Equal As Strings    ${resp.status_code}    200
-    ${result}    To JSON    ${resp.content}
+    ${result}    To JSON    ${resp.text}
     Log    ${result}
     ${content}    Get From Dictionary    ${result}    topology
     ${topology}    Get From List    ${content}    0
-    ${link}    Get From Dictionary    ${topology}    link
-    Sort List    ${link}
-    Lists Should be Equal    ${link}    ${expected_links}
+    ${links}    Get From Dictionary    ${topology}    link
+    FOR    ${expected_link}    IN    @{expected_links}
+        Should Contain    ${links}    ${expected_link}
+    END