Changing OF13 suite order to start with OF10, also increase of some timers for stability

Change-Id: Ibf9525825cc9d18e7ebbd9d3e5bb2bb9ce2f3249
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/test/csit/suites/base-of13/010__restconf_flows.txt b/test/csit/suites/base-of13/010__restconf_flows.txt
index c5e5d862ee4bfb9e9824c0c274fbaf1ebee05090..b224754b92a68d7853aa2c48cbfd9aa55ae1de96 100644 (file)
--- a/test/csit/suites/base-of13/010__restconf_flows.txt
+++ b/test/csit/suites/base-of13/010__restconf_flows.txt
@@ -11,92 +11,50 @@ Variables         ../../variables/Variables.py
 
 ${REST_CON}        /restconf/config/opendaylight-inventory:nodes
 ${REST_OPR}        /restconf/operational/opendaylight-inventory:nodes
-${BODY1}                  <flow xmlns="urn:opendaylight:flow:inventory"><priority>2</priority><flow-name>Foo</flow-name><match><ethernet-match><ethernet-type><type>2048</type></ethernet-type></ethernet-match><ipv4-destination>10.0.10.1/32</ipv4-destination></match><id>139</id><table_id>2</table_id><instructions><instruction><order>0</order><apply-actions><action><order>0</order><dec-nw-ttl/></action></apply-actions></instruction></instructions></flow>
-${BODY2}                  <flow xmlns="urn:opendaylight:flow:inventory"><priority>2</priority><flow-name>Foo</flow-name><match><ethernet-match><ethernet-type><type>2048</type></ethernet-type></ethernet-match><ipv4-destination>10.0.20.1/32</ipv4-destination></match><id>152</id><table_id>2</table_id><instructions><instruction><order>0</order><apply-actions><action><order>0</order><output-action><output-node-connector>1</output-node-connector><max-length>60</max-length></output-action></action></apply-actions></instruction></instructions></flow>
+${BODY2}                  <flow xmlns="urn:opendaylight:flow:inventory"><priority>2</priority><flow-name>Foo</flow-name><match><ethernet-match><ethernet-type><type>2048</type></ethernet-type></ethernet-match><ipv4-destination>10.0.20.1/32</ipv4-destination></match><id>152</id><table_id>0</table_id><instructions><instruction><order>0</order><apply-actions><action><order>0</order><output-action><output-node-connector>openflow:1:1</output-node-connector></output-action></action></apply-actions></instruction></instructions></flow>
 
 *** Test Cases *** 
-Add a flow - Sending IPv4 Dest Address and Eth type
-    [Documentation]    Push a flow through REST-API
-    [Tags]   Push
-    ${resp}   Putxml    session   ${REST_CON}/node/openflow:1/table/2/flow/139    data=${BODY1}
-    Should Be Equal As Strings    ${resp.status_code}    200
-       
-Verify after adding flow config - Sending IPv4 Dest Address and Eth type
-    [Documentation]    Verify the flow
-    [Tags]   Get
-    ${resp}    Get    session     ${REST_CON}/node/openflow:1/table/2
-    Should Be Equal As Strings    ${resp.status_code}    200  
-    Should Contain     ${resp.content}    139    
-
-Verify after adding flow operational - Sending IPv4 Dest Address and Eth type
-    [Documentation]    Verify the flow
-    [Tags]   Get
-    Sleep   20
-    ${resp}    Get    session     ${REST_OPR}/node/openflow:1/table/2
-    Should Be Equal As Strings    ${resp.status_code}    200
-    Should Contain     ${resp.content}    10.0.10.1
-
-Remove a flow - - Sending IPv4 Dest Address and Eth type
-    [Documentation]    Remove a flow
-    [Tags]    remove
-    ${resp}   Delete    session   ${REST_CON}/node/openflow:1/table/2/flow/139    
-    Should Be Equal As Strings    ${resp.status_code}    200
-   
-Verify after deleting flow config - Sending IPv4 Dest Address and Eth type
-    [Documentation]    Verify the flow
-    [Tags]   Get
-    ${resp}    Get    session     ${REST_CON}/node/openflow:1/table/2
-    Should Be Equal As Strings    ${resp.status_code}    200  
-    Should Not Contain     ${resp.content}    139
-
-# Reason in using high time is, I used STOPWATCH to check the timer after deleting the flow config
-Verify after deleting flow operational - Sending IPv4 Dest Address and Eth type
-    [Documentation]    Verify the flow
-    [Tags]   Get
-    Sleep   42
-    ${resp}    Get    session     ${REST_OPR}/node/openflow:1/table/2
-    Should Be Equal As Strings    ${resp.status_code}    200
-    Should Not Contain     ${resp.content}    10.0.10.1
  
 Add a flow - Output to physical port#
     [Documentation]    Push a flow through REST-API
     [Tags]   Push
-    ${resp}   Putxml    session   ${REST_CON}/node/openflow:1/table/2/flow/152    data=${BODY2}
+    ${resp}   Putxml    session   ${REST_CON}/node/openflow:1/table/0/flow/152    data=${BODY2}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Verify after adding flow config - Output to physical port#
     [Documentation]    Verify the flow
     [Tags]   Get
-    ${resp}    Get    session     ${REST_CON}/node/openflow:1/table/2
+    ${resp}    Get    session     ${REST_CON}/node/openflow:1/table/0
     Should Be Equal As Strings    ${resp.status_code}    200  
     Should Contain     ${resp.content}    152
  
 Verify after adding flow operational - Output to physical port#
     [Documentation]    Verify the flow
     [Tags]   Get
-    Sleep    20        
-    ${resp}    Get    session     ${REST_OPR}/node/openflow:1/table/2
+    Sleep    40
+    ${resp}    Get    session     ${REST_OPR}/node/openflow:1/table/0
     Should Be Equal As Strings    ${resp.status_code}    200
     Should Contain     ${resp.content}    10.0.20.1
 
 Remove a flow - Output to physical port#
     [Documentation]    Remove a flow
     [Tags]    remove
-    ${resp}   Delete    session   ${REST_CON}/node/openflow:1/table/2/flow/152    
+    ${resp}   Delete    session   ${REST_CON}/node/openflow:1/table/0/flow/152    
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Verify after deleting flow config - Output to physical port#
     [Documentation]    Verify the flow
     [Tags]   Get
-    ${resp}    Get    session     ${REST_CON}/node/openflow:1/table/2
-    Should Be Equal As Strings    ${resp.status_code}    200 
+    ${resp}    Get    session     ${REST_CON}/node/openflow:1/table/0
+    Should Be Equal As Strings    ${resp.status_code}    200
     Should Not Contain     ${resp.content}    152
 
+#    Standing bug #368 - This has been fixed
 Verify after deleting flow operational - Output to physical port#
     [Documentation]    Verify the flow
     [Tags]   Get
-    Sleep    45
-    ${resp}    Get    session     ${REST_OPR}/node/openflow:1/table/2
+    Sleep    60
+    ${resp}    Get    session     ${REST_OPR}/node/openflow:1/table/0
     Should Be Equal As Strings    ${resp.status_code}    200
     Should Not Contain     ${resp.content}    10.0.20.1
 

diff --git a/test/csit/suites/base-of13/030__forwarding_rules_manager.txt b/test/csit/suites/base-of13/030__forwarding_rules_manager.txt
index c807e3ae15551cd798c2a55f60cbf7b2a2c32c49..f63c3bb2238d6834310ac1c1554f6458588277c5 100644 (file)
--- a/test/csit/suites/base-of13/030__forwarding_rules_manager.txt
+++ b/test/csit/suites/base-of13/030__forwarding_rules_manager.txt
@@ -31,10 +31,10 @@ Add a flow
     ${result}    To JSON    ${resp.content}
     ${content}    Get From Dictionary    ${result}    ${key}
     List Should Contain Value    ${content}    ${body}
-    Sleep      20
 Check flow in flow stats
-    [Documentation]    Show flow stats and validate result
+   [Documentation]    Show flow stats and validate result
     [Tags]    get
+    Sleep      40
     ${resp}    Get    session    ${REST_CONTEXT_ST}/${CONTAINER}/flow
     Should Be Equal As Strings    ${resp.status_code}    200 
     Log    ${resp.content}
@@ -54,10 +54,10 @@ Remove a flow
     ${result}    To JSON    ${resp.content}
     ${content}    Get From Dictionary    ${result}    ${key}
     List Should Not Contain Value    ${content}    ${body}
-    Sleep      30
 Check flow is not in flow stats
     [Documentation]    Show flow stats and validate result
     [Tags]    get
+    Sleep      40
     ${resp}    Get    session    ${REST_CONTEXT_ST}/${CONTAINER}/flow
     Should Be Equal As Strings    ${resp.status_code}    200  
     Log    ${resp.content}

diff --git a/test/csit/suites/base-of13/035__host_tracker.txt b/test/csit/suites/base-of13/035__host_tracker.txt
index a8969b4a9926c8872a0aeb3a7ee2213fe94a0477..b6d634de5695dbd23bf2a522d2b447d6b1bb0744 100644 (file)
--- a/test/csit/suites/base-of13/035__host_tracker.txt
+++ b/test/csit/suites/base-of13/035__host_tracker.txt
@@ -31,7 +31,7 @@ Add a host
 Check flow in flow stats
     [Documentation]    Show flow stats and validate result
     [Tags]   get
-    Sleep      20
+    Sleep      40
     ${resp}    Get    session    ${REST_CONTEXT_ST}/${CONTAINER}/flow
     Should Be Equal As Strings    ${resp.status_code}    200   
     Log    ${resp.content}
@@ -52,7 +52,7 @@ Remove a host
 Check flow is not in flow stats
     [Documentation]    Show flow stats and validate result
     [Tags]    get
-    Sleep      30
+    Sleep      40
     ${resp}    Get    session    ${REST_CONTEXT_ST}/${CONTAINER}/flow
     Should Be Equal As Strings    ${resp.status_code}    200
     Log    ${resp.content}

diff --git a/test/csit/suites/base-of13/100__restart_mininet_OF10.txt b/test/csit/suites/base-of13/100__restart_mininet_OF13.txt
similarity index 89%
rename from test/csit/suites/base-of13/100__restart_mininet_OF10.txt
rename to test/csit/suites/base-of13/100__restart_mininet_OF13.txt
index 6f7b14720bc0104de6ca072c00054ae40dad134a..bdeb1a69c6d403b17946b9abad31696f7dcf823b 100644 (file)
--- a/test/csit/suites/base-of13/100__restart_mininet_OF10.txt
+++ b/test/csit/suites/base-of13/100__restart_mininet_OF13.txt
@@ -1,10 +1,10 @@
 *** Settings ***
 Documentation    Restat Mininet with OF10 simulation 
-Documentation    Test suite for the OpenDaylight base edition with of10
+Documentation    Test suite for the OpenDaylight base edition with of13
 Library     SSHLibrary
 
 *** Variables ***
-${start}=  sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2
+${start}=  sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 --switch ovsk,protocols=OpenFlow13
 
 *** Test Cases ***
 Stop Mininet

diff --git a/test/csit/suites/base-of13/110__restconf_flows.txt b/test/csit/suites/base-of13/110__restconf_flows.txt
index 4b4678c916e7c512f182e2998040e958a94302ca..3176ee55ffe9b97b4ff1774a7991e972b8364824 100644 (file)
--- a/test/csit/suites/base-of13/110__restconf_flows.txt
+++ b/test/csit/suites/base-of13/110__restconf_flows.txt
@@ -11,50 +11,92 @@ Variables         ../../variables/Variables.py
 
 ${REST_CON}        /restconf/config/opendaylight-inventory:nodes
 ${REST_OPR}        /restconf/operational/opendaylight-inventory:nodes
-${BODY2}                  <flow xmlns="urn:opendaylight:flow:inventory"><priority>2</priority><flow-name>Foo</flow-name><match><ethernet-match><ethernet-type><type>2048</type></ethernet-type></ethernet-match><ipv4-destination>10.0.20.1/32</ipv4-destination></match><id>152</id><table_id>0</table_id><instructions><instruction><order>0</order><apply-actions><action><order>0</order><output-action><output-node-connector>openflow:1:1</output-node-connector></output-action></action></apply-actions></instruction></instructions></flow>
+${BODY1}                  <flow xmlns="urn:opendaylight:flow:inventory"><priority>2</priority><flow-name>Foo</flow-name><match><ethernet-match><ethernet-type><type>2048</type></ethernet-type></ethernet-match><ipv4-destination>10.0.10.1/32</ipv4-destination></match><id>139</id><table_id>2</table_id><instructions><instruction><order>0</order><apply-actions><action><order>0</order><dec-nw-ttl/></action></apply-actions></instruction></instructions></flow>
+${BODY2}                  <flow xmlns="urn:opendaylight:flow:inventory"><priority>2</priority><flow-name>Foo</flow-name><match><ethernet-match><ethernet-type><type>2048</type></ethernet-type></ethernet-match><ipv4-destination>10.0.20.1/32</ipv4-destination></match><id>152</id><table_id>2</table_id><instructions><instruction><order>0</order><apply-actions><action><order>0</order><output-action><output-node-connector>1</output-node-connector><max-length>60</max-length></output-action></action></apply-actions></instruction></instructions></flow>
 
 *** Test Cases *** 
+Add a flow - Sending IPv4 Dest Address and Eth type
+    [Documentation]    Push a flow through REST-API
+    [Tags]   Push
+    ${resp}   Putxml    session   ${REST_CON}/node/openflow:1/table/2/flow/139    data=${BODY1}
+    Should Be Equal As Strings    ${resp.status_code}    200
+       
+Verify after adding flow config - Sending IPv4 Dest Address and Eth type
+    [Documentation]    Verify the flow
+    [Tags]   Get
+    ${resp}    Get    session     ${REST_CON}/node/openflow:1/table/2
+    Should Be Equal As Strings    ${resp.status_code}    200  
+    Should Contain     ${resp.content}    139    
+
+Verify after adding flow operational - Sending IPv4 Dest Address and Eth type
+    [Documentation]    Verify the flow
+    [Tags]   Get
+    Sleep   40
+    ${resp}    Get    session     ${REST_OPR}/node/openflow:1/table/2
+    Should Be Equal As Strings    ${resp.status_code}    200
+    Should Contain     ${resp.content}    10.0.10.1
+
+Remove a flow - - Sending IPv4 Dest Address and Eth type
+    [Documentation]    Remove a flow
+    [Tags]    remove
+    ${resp}   Delete    session   ${REST_CON}/node/openflow:1/table/2/flow/139    
+    Should Be Equal As Strings    ${resp.status_code}    200
+   
+Verify after deleting flow config - Sending IPv4 Dest Address and Eth type
+    [Documentation]    Verify the flow
+    [Tags]   Get
+    ${resp}    Get    session     ${REST_CON}/node/openflow:1/table/2
+    Should Be Equal As Strings    ${resp.status_code}    200  
+    Should Not Contain     ${resp.content}    139
+
+# Reason in using high time is, I used STOPWATCH to check the timer after deleting the flow config
+Verify after deleting flow operational - Sending IPv4 Dest Address and Eth type
+    [Documentation]    Verify the flow
+    [Tags]   Get
+    Sleep   60
+    ${resp}    Get    session     ${REST_OPR}/node/openflow:1/table/2
+    Should Be Equal As Strings    ${resp.status_code}    200
+    Should Not Contain     ${resp.content}    10.0.10.1
  
 Add a flow - Output to physical port#
     [Documentation]    Push a flow through REST-API
     [Tags]   Push
-    ${resp}   Putxml    session   ${REST_CON}/node/openflow:1/table/0/flow/152    data=${BODY2}
+    ${resp}   Putxml    session   ${REST_CON}/node/openflow:1/table/2/flow/152    data=${BODY2}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Verify after adding flow config - Output to physical port#
     [Documentation]    Verify the flow
     [Tags]   Get
-    ${resp}    Get    session     ${REST_CON}/node/openflow:1/table/0
+    ${resp}    Get    session     ${REST_CON}/node/openflow:1/table/2
     Should Be Equal As Strings    ${resp.status_code}    200  
     Should Contain     ${resp.content}    152
  
 Verify after adding flow operational - Output to physical port#
     [Documentation]    Verify the flow
     [Tags]   Get
-    Sleep    20
-    ${resp}    Get    session     ${REST_OPR}/node/openflow:1/table/0
+    Sleep    40        
+    ${resp}    Get    session     ${REST_OPR}/node/openflow:1/table/2
     Should Be Equal As Strings    ${resp.status_code}    200
     Should Contain     ${resp.content}    10.0.20.1
 
 Remove a flow - Output to physical port#
     [Documentation]    Remove a flow
     [Tags]    remove
-    ${resp}   Delete    session   ${REST_CON}/node/openflow:1/table/0/flow/152    
+    ${resp}   Delete    session   ${REST_CON}/node/openflow:1/table/2/flow/152    
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Verify after deleting flow config - Output to physical port#
     [Documentation]    Verify the flow
     [Tags]   Get
-    ${resp}    Get    session     ${REST_CON}/node/openflow:1/table/0
-    Should Be Equal As Strings    ${resp.status_code}    200
+    ${resp}    Get    session     ${REST_CON}/node/openflow:1/table/2
+    Should Be Equal As Strings    ${resp.status_code}    200 
     Should Not Contain     ${resp.content}    152
 
-#    Standing bug #368 - This has been fixed
 Verify after deleting flow operational - Output to physical port#
     [Documentation]    Verify the flow
     [Tags]   Get
-    Sleep    40
-    ${resp}    Get    session     ${REST_OPR}/node/openflow:1/table/0
+    Sleep    60
+    ${resp}    Get    session     ${REST_OPR}/node/openflow:1/table/2
     Should Be Equal As Strings    ${resp.status_code}    200
     Should Not Contain     ${resp.content}    10.0.20.1
 

diff --git a/test/csit/suites/base-of13/130__forwarding_rules_manager.txt b/test/csit/suites/base-of13/130__forwarding_rules_manager.txt
index 253bd1d20ca1ae8db1c4c186107612f4b8fb8499..f63c3bb2238d6834310ac1c1554f6458588277c5 100644 (file)
--- a/test/csit/suites/base-of13/130__forwarding_rules_manager.txt
+++ b/test/csit/suites/base-of13/130__forwarding_rules_manager.txt
@@ -34,7 +34,7 @@ Add a flow
 Check flow in flow stats
    [Documentation]    Show flow stats and validate result
     [Tags]    get
-    Sleep      20
+    Sleep      40
     ${resp}    Get    session    ${REST_CONTEXT_ST}/${CONTAINER}/flow
     Should Be Equal As Strings    ${resp.status_code}    200 
     Log    ${resp.content}
@@ -57,7 +57,7 @@ Remove a flow
 Check flow is not in flow stats
     [Documentation]    Show flow stats and validate result
     [Tags]    get
-    Sleep      30
+    Sleep      40
     ${resp}    Get    session    ${REST_CONTEXT_ST}/${CONTAINER}/flow
     Should Be Equal As Strings    ${resp.status_code}    200  
     Log    ${resp.content}

diff --git a/test/csit/suites/base-of13/135__host_tracker.txt b/test/csit/suites/base-of13/135__host_tracker.txt
index 2576c291d58d985a328477b9618b75ef7c08797b..b6d634de5695dbd23bf2a522d2b447d6b1bb0744 100644 (file)
--- a/test/csit/suites/base-of13/135__host_tracker.txt
+++ b/test/csit/suites/base-of13/135__host_tracker.txt
@@ -29,9 +29,9 @@ Add a host
     ${content}    Get From Dictionary    ${result}    ${key}
     List Should Contain Value    ${content}    ${body} 
 Check flow in flow stats
-   [Documentation]    Show flow stats and validate result
+    [Documentation]    Show flow stats and validate result
     [Tags]   get
-    Sleep      20
+    Sleep      40
     ${resp}    Get    session    ${REST_CONTEXT_ST}/${CONTAINER}/flow
     Should Be Equal As Strings    ${resp.status_code}    200   
     Log    ${resp.content}
@@ -52,7 +52,7 @@ Remove a host
 Check flow is not in flow stats
     [Documentation]    Show flow stats and validate result
     [Tags]    get
-    Sleep      30
+    Sleep      40
     ${resp}    Get    session    ${REST_CONTEXT_ST}/${CONTAINER}/flow
     Should Be Equal As Strings    ${resp.status_code}    200
     Log    ${resp.content}

diff --git a/test/csit/suites/base-of13/140__forwarding_manager.txt b/test/csit/suites/base-of13/140__forwarding_manager.txt
index 6e0da492f120adc4846fbd1316dc5f3d402ae12a..58930c769f4242c7a7c820d2033c317324da3e58 100644 (file)
--- a/test/csit/suites/base-of13/140__forwarding_manager.txt
+++ b/test/csit/suites/base-of13/140__forwarding_manager.txt
@@ -28,14 +28,14 @@ Add a static route
     ${content}    Get From Dictionary    ${result}    ${key}
     List Should Contain Value    ${content}    ${body}
     Sleep      20
-#    This works locally but fails at OpenDaylight
+#     This works locally but NOT in OpenDaylight
 #Check flow in flow stats
 #    [Documentation]    Show flow stats and validate result
 #    [Tags]    get
 #    ${resp}    Get    session    ${REST_CONTEXT_ST}/${CONTAINER}/flow
 #    Should Be Equal As Strings    ${resp.status_code}    200 
 #    Log    ${resp.content}
-#    Should Contain X Times   ${resp.content}    10.0.0.2     3
+#    Should Contain X Times    ${resp.content}    10.0.0.2     3
 Remove a static route
     [Documentation]    Remove a static route, list to validate the result.
     [Tags]    remove

diff --git a/test/csit/suites/base-of13/145__arp_handler.txt b/test/csit/suites/base-of13/145__arp_handler.txt
index 1470fb0da6efc948d905572c9a6a1da0b12f71fd..210ec4444139815958ede6e4473acc2ab123b832 100644 (file)
--- a/test/csit/suites/base-of13/145__arp_handler.txt
+++ b/test/csit/suites/base-of13/145__arp_handler.txt
@@ -25,13 +25,13 @@ List Subnets
     ${content}   Get From List    ${subnet}    0
     Dictionary Should Contain Value   ${content}   0.0.0.0/0
 Ping h1 to h4
-   [Documentation]    Ping h1 to h4, verify no packet loss
+    [Documentation]    Ping h1 to h4, verify no packet loss
     [Tags]   Get
     Write   h1 ping -w 6 h4
     Sleep   6
     Write   h4 ping -w 6 h1
     Sleep   6
-     ${result}    Read
+    ${result}    Read
     Should Contain   ${result}   64 bytes
 List hosts
     [Documentation]    List hosts and verify h1 and h4

diff --git a/test/csit/suites/base-of13/__init__.txt b/test/csit/suites/base-of13/__init__.txt
index a291d3a607cf9a784d239f95d8207f054bc4ecdf..b5163c363e854d76c2cbd545afb124a113b766f6 100644 (file)
--- a/test/csit/suites/base-of13/__init__.txt
+++ b/test/csit/suites/base-of13/__init__.txt
@@ -1,11 +1,11 @@
 *** Settings ***
-Documentation     Test suite for the OpenDaylight base edition with of13
+Documentation     Test suite for the OpenDaylight base edition with of10
 Suite Setup       Start Suite
 Suite Teardown    Stop Suite
 Library     SSHLibrary
 
 *** Variables ***
-${start}=   sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 --switch ovsk,protocols=OpenFlow13
+${start}=   sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,2 
 
 ** Keywords ***
 Start Suite