Use RFC8040 URL for OVSDB tests

[integration/test.git] / csit / libraries / BulkomaticKeywords.robot

diff --git a/csit/libraries/BulkomaticKeywords.robot b/csit/libraries/BulkomaticKeywords.robot
index 84e3697112b7fc01c7afb0111ec8c71dd76177d5..6b37c65d4d293a83d875fd8cbba9c6029f79b4c0 100644 (file)
--- a/csit/libraries/BulkomaticKeywords.robot
+++ b/csit/libraries/BulkomaticKeywords.robot
@@ -6,9 +6,9 @@ Resource          Utils.robot
 Variables         ../variables/Variables.py
 
 *** Variables ***
-${ADD_BULK_CONFIG_NODES_API}    /restconf/operations/sal-bulk-flow:flow-test
-${GET_BULK_CONFIG_NODES_API}    /restconf/operations/sal-bulk-flow:read-flow-test
-${ADD_TABLE_NODEs_API}    /restconf/operations/sal-bulk-flow:table-test
+${ADD_BULK_CONFIG_NODES_API}    /rests/operations/sal-bulk-flow:flow-test
+${GET_BULK_CONFIG_NODES_API}    /rests/operations/sal-bulk-flow:read-flow-test
+${ADD_TABLE_NODEs_API}    /rests/operations/sal-bulk-flow:table-test
 ${jolokia_write_op_status}    /jolokia/read/org.opendaylight.openflowplugin.applications.bulk.o.matic:type=FlowCounter/WriteOpStatus
 ${jolokia_read_op_status}    /jolokia/read/org.opendaylight.openflowplugin.applications.bulk.o.matic:type=FlowCounter/ReadOpStatus
 ${jolokia_flow_count_status}    /jolokia/read/org.opendaylight.openflowplugin.applications.bulk.o.matic:type=FlowCounter/FlowCount
@@ -90,12 +90,15 @@ Get Bulk Flow And Verify Count In Cluster
     [Arguments]    ${json_body_get}    ${timeout}    ${flow_count}    ${controller_index_list}=${EMPTY}
     [Documentation]    Get Bulk Flow and Verify Flow Count in ${controller_index_list} matches ${flow_count}.
     ${index_list} =    ClusterManagement.List Indices Or All    given_list=${controller_index_list}
-    : FOR    ${index}    IN    @{index_list}
-    \    Get Bulk Flow    ${json_body_get}    ${index}
-    : FOR    ${index}    IN    @{index_list}
-    \    Wait Until Read Finishes    ${index}    ${timeout}
-    : FOR    ${index}    IN    @{index_list}
-    \    Verify Flow Count    ${flow_count}    ${index}
+    FOR    ${index}    IN    @{index_list}
+        Get Bulk Flow    ${json_body_get}    ${index}
+    END
+    FOR    ${index}    IN    @{index_list}
+        Wait Until Read Finishes    ${index}    ${timeout}
+    END
+    FOR    ${index}    IN    @{index_list}
+        Verify Flow Count    ${flow_count}    ${index}
+    END
 
 Set DPN And Flow Count In Json Add
     [Arguments]    ${json_config}    ${dpn_count}    ${flows_count}