X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FWorkflowsOpenFlow.robot;h=50ec659d444fbf3cd001dd7051bff6981401f0aa;hb=a24488972a386c12e4c49ec883ef60974a019ed3;hp=c857dba04062ed2a099d7193dff40d09f12eb36a;hpb=bef3d31662c84b20a0ff6359e71e954a14095aed;p=integration%2Ftest.git

diff --git a/csit/libraries/WorkflowsOpenFlow.robot b/csit/libraries/WorkflowsOpenFlow.robot
index c857dba040..50ec659d44 100644
--- a/csit/libraries/WorkflowsOpenFlow.robot
+++ b/csit/libraries/WorkflowsOpenFlow.robot
@@ -11,6 +11,7 @@ Resource          CompareStream.robot
 Resource          MininetKeywords.robot
 Resource          KarafKeywords.robot
 Resource          ../variables/Variables.robot
+Resource          ../variables/openflowplugin/Variables.robot
 
 *** Variables ***
 ${log_level}      ERROR
@@ -31,8 +32,8 @@ Workflow Linear Topology
     ${controller_list}=    Create List    ${ODL_SYSTEM_IP}
     ${flow_count}=    Convert to Integer    ${flow_count}
     ${flows_ovs_25}=    Evaluate    ${flow_count} + ${switches}
-    ${flows_before}=    CompareStream.Set_Variable_If_At_Least_Boron    ${switches}    ${0}
-    ${flows_after}=    CompareStream.Set_Variable_If_At_Least_Boron    ${flows_ovs_25}    ${flow_count}
+    ${flows_before}=    Set Variable    ${switches}
+    ${flows_after}=    Set Variable    ${flows_ovs_25}
     ${flows}    ${notes}    ScaleClient.Generate New Flow Details    flows=${flow_count}    switches=${switches}    swspread=${swspread}    tables=${tables}
     ...    tabspread=${tabspread}
     # Workflow starts
@@ -46,6 +47,8 @@ Workflow Linear Topology
     Return From Keyword If    '${status}' == 'FAIL'    ${status}    Controller is dead    ${topology_discover_time}
     ${status}    ${result}    Run Keyword And Ignore Error    Utils.Verify Controller Has No Null Pointer Exceptions    ${ODL_SYSTEM_IP}
     Return From Keyword If    '${status}' == 'FAIL'    ${status}    Controller has NPE    ${topology_discover_time}
+    ${status}    ${result}    Run Keyword And Ignore Error    Utils.Verify Controller Has No Runtime Exceptions    ${ODL_SYSTEM_IP}
+    Return From Keyword If    '${status}' == 'FAIL'    ${status}    Controller has RuntimeException    ${topology_discover_time}
     Log To Console    Checking ${switches} switches
     ${status}    ${result}    Run Keyword And Ignore Error    Wait Until Keyword Succeeds    ${switches*2}    2s    FlowLib.Check Switches In Inventory
     ...    ${switches}
@@ -111,8 +114,8 @@ Workflow Full Mesh Topology
     ${controller_list}=    Create List    ${ODL_SYSTEM_IP}
     ${flow_count}=    Convert to Integer    ${flow_count}
     ${flows_ovs_25}=    Evaluate    ${flow_count} + ${switches}
-    ${flows_before}=    CompareStream.Set_Variable_If_At_Least_Boron    ${switches}    ${0}
-    ${flows_after}=    CompareStream.Set_Variable_If_At_Least_Boron    ${flows_ovs_25}    ${flow_count}
+    ${flows_before}=    Set Variable    ${switches}
+    ${flows_after}=    Set Variable    ${flows_ovs_25}
     ${flows}    ${notes}    ScaleClient.Generate New Flow Details    flows=${flow_count}    switches=${switches}    swspread=${swspread}    tables=${tables}
     ...    tabspread=${tabspread}
     # Workflow starts
@@ -126,8 +129,10 @@ Workflow Full Mesh Topology
     Return From Keyword If    '${status}' == 'FAIL'    ${status}    Controller is dead    ${topology_discover_time}
     ${status}    ${result}    Run Keyword And Ignore Error    Utils.Verify Controller Has No Null Pointer Exceptions    ${ODL_SYSTEM_IP}
     Return From Keyword If    '${status}' == 'FAIL'    ${status}    Controller has NPE    ${topology_discover_time}
+    ${status}    ${result}    Run Keyword And Ignore Error    Utils.Verify Controller Has No Runtime Exceptions    ${ODL_SYSTEM_IP}
+    Return From Keyword If    '${status}' == 'FAIL'    ${status}    Controller has RuntimeException    ${topology_discover_time}
     Log To Console    Checking ${switches} switches
-    ${status}    ${result}    Run Keyword And Ignore Error    Wait Until Keyword Succeeds    10s    2s    FlowLib.Check Switches In Inventory
+    ${status}    ${result}    Run Keyword And Ignore Error    Wait Until Keyword Succeeds    30s    2s    FlowLib.Check Switches In Inventory
     ...    ${switches}
     Return From Keyword If    '${status}' == 'FAIL'    ${status}    Fail checking switch    ${topology_discover_time}
     Log To Console    Check number of links in inventory is ${links}
@@ -178,6 +183,6 @@ Workflow Setup
 
 Workflow Teardown
     [Documentation]    Cleanup when workflow is interrupt
-    Run Keyword And Ignore Error    RequestsLibrary.Delete Request    session    ${CONFIG_NODES_API}
+    Run Keyword And Ignore Error    RequestsLibrary.Delete Request    session    ${RFC8040_NODES_API}
     Utils.Clean Mininet System
     RequestsLibrary.Delete All Sessions