From 81182f8947712231b9a3c2416824cff58aae6fb2 Mon Sep 17 00:00:00 2001
From: Luis Gomez <ecelgp@gmail.com>
Date: Sun, 26 Apr 2015 13:39:59 -0700
Subject: [PATCH] Adjusting Scalability suite to not log too much to file

Change-Id: I8917afc2add16f1ed43e11b595bd752f3190eef2
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---
 test/csit/libraries/Scalability.txt | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/csit/libraries/Scalability.txt b/test/csit/libraries/Scalability.txt
index 7569550d9c..da3f2315f7 100644
--- a/test/csit/libraries/Scalability.txt
+++ b/test/csit/libraries/Scalability.txt
@@ -14,17 +14,17 @@ Find Max Switches
     ${step}    Convert to Integer    ${step}
     : FOR    ${switches}    IN RANGE    ${start}    ${stop+1}    ${step}
     \    Start Mininet Linear    ${switches}
-    \    ${status}    ${result}    Run Keyword And Ignore Error    Wait Until Keyword Succeeds    ${switches*2}    5s
+    \    ${status}    ${result}    Run Keyword And Ignore Error    Wait Until Keyword Succeeds    ${switches*2}    10s
     \    ...    Check Every Switch    ${switches}
     \    Return From Keyword If    '${status}' == 'FAIL'
-    \    ${status}    ${result}    Run Keyword And Ignore Error    Wait Until Keyword Succeeds    ${switches*2}    5s
+    \    ${status}    ${result}    Run Keyword And Ignore Error    Wait Until Keyword Succeeds    ${switches*2}    10s
     \    ...    Check Linear Topology    ${switches}
     \    Return From Keyword If    '${status}' == 'FAIL'
     \    Stop Mininet
-    \    ${status}    ${result}    Run Keyword And Ignore Error    Wait Until Keyword Succeeds    ${switches*2}    5s
+    \    ${status}    ${result}    Run Keyword And Ignore Error    Wait Until Keyword Succeeds    ${switches*2}    10s
     \    ...    Check No Switches    ${switches}
     \    Return From Keyword If    '${status}' == 'FAIL'
-    \    ${status}    ${result}    Run Keyword And Ignore Error    Wait Until Keyword Succeeds    ${switches*2}    5s
+    \    ${status}    ${result}    Run Keyword And Ignore Error    Wait Until Keyword Succeeds    ${switches*2}    10s
     \    ...    Check No Topology    ${switches}
     \    Return From Keyword If    '${status}' == 'FAIL'
     \    ${max-switches}    Convert To String    ${switches}
@@ -33,8 +33,8 @@ Find Max Switches
 Start Mininet Linear
     [Arguments]    ${switches}
     [Documentation]    Start mininet linear topology with ${switches} nodes
-    Log    Start mininet linear ${switches}
-    ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=${linux_prompt}    timeout=${switches*2}
+    Log To Console    Starting mininet linear ${switches}
+    ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=${linux_prompt}    timeout=${switches*3}
     Set Suite Variable    ${mininet_conn_id}
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
     Write    sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${switches} --switch ovsk,protocols=OpenFlow13
@@ -46,7 +46,7 @@ Check Every Switch
     [Documentation]    Check all switches and stats in operational inventory
     : FOR    ${switch}    IN RANGE    1    ${switches+1}
     \    ${resp}    RequestsLibrary.Get    session    /restconf/operational/opendaylight-inventory:nodes/node/openflow:${switch}
-    \    Log    ${resp.content}
+    \    Log To Console    Checking Switch ${switch}
     \    Should Be Equal As Strings    ${resp.status_code}    200
     \    Should Contain    ${resp.content}    flow-capable-node-connector-statistics
     \    Should Contain    ${resp.content}    flow-table-statistics
@@ -55,7 +55,7 @@ Check Linear Topology
     [Arguments]    ${switches}
     [Documentation]    Check Linear topology given ${switches}
     ${resp}    RequestsLibrary.Get    session    /restconf/operational/network-topology:network-topology/
-    Log    ${resp.content}
+    Log To Console    Checking Topology
     Should Be Equal As Strings    ${resp.status_code}    200
     : FOR    ${switch}    IN RANGE    1    ${switches+1}
     \    Should Contain    ${resp.content}    "node-id":"openflow:${switch}"
@@ -72,7 +72,7 @@ Check No Switches
     [Arguments]    ${switches}
     [Documentation]    Check no switch is in inventory
     ${resp}    RequestsLibrary.Get    session    /restconf/operational/opendaylight-inventory:nodes
-    Log    ${resp.content}
+    Log To Console    Checking No Switches
     Should Be Equal As Strings    ${resp.status_code}    200
     : FOR    ${switch}    IN RANGE    1    ${switches+1}
     \    Should Not Contain    ${resp.content}    openflow:${switch}
@@ -81,14 +81,14 @@ Check No Topology
     [Arguments]    ${switches}
     [Documentation]    Check no switch is in topology
     ${resp}    RequestsLibrary.Get    session    /restconf/operational/network-topology:network-topology/
-    Log    ${resp.content}
+    Log To Console    Checking No Topology
     Should Be Equal As Strings    ${resp.status_code}    200
     : FOR    ${switch}    IN RANGE    1    ${switches+1}
     \    Should Not Contain    ${resp.content}    openflow:${switch}
 
 Stop Mininet
     [Documentation]    Stop mininet
-    Log    Stop Mininet
+    Log To Console    Stopping Mininet
     Switch Connection    ${mininet_conn_id}
     Read
     Write    exit
-- 
2.36.6