aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries
diff options
context:
space:
mode:
authorMiroslav Miklus <mmiklus@cisco.com>2016-10-10 08:49:59 +0200
committerMiroslav Miklus <mmiklus@cisco.com>2016-10-10 15:24:06 +0000
commit19afb923ce31fa51291d12b79d8b63cfce09ab14 (patch)
tree5222b8b349f59caacde646ad13bdf697acf8ffdf /resources/libraries
parent74a354349cf13e8874259faec5473b7bbf25d6e5 (diff)
Ipv6 TEST fixes
- Increase interactive terminal timeout - ip6 heapsize - performance lib fix Change-Id: Iac6beb041200c4b0c5cf29dceb5113df64c6c9b0 Signed-off-by: Miroslav Miklus <mmiklus@cisco.com>
Diffstat (limited to 'resources/libraries')
-rw-r--r--resources/libraries/python/VppConfigGenerator.py2
-rw-r--r--resources/libraries/python/ssh.py6
-rw-r--r--resources/libraries/robot/performance.robot4
3 files changed, 5 insertions, 7 deletions
diff --git a/resources/libraries/python/VppConfigGenerator.py b/resources/libraries/python/VppConfigGenerator.py
index ad3f23483e..d4ef04e65c 100644
--- a/resources/libraries/python/VppConfigGenerator.py
+++ b/resources/libraries/python/VppConfigGenerator.py
@@ -63,7 +63,7 @@ dpdk {{
ip6 {{
hash-buckets 2000000
- heap-size 500m
+ heap-size 1G
}}
"""
diff --git a/resources/libraries/python/ssh.py b/resources/libraries/python/ssh.py
index 8acb54b382..4b3838bbb7 100644
--- a/resources/libraries/python/ssh.py
+++ b/resources/libraries/python/ssh.py
@@ -195,7 +195,7 @@ class SSH(object):
command = 'sudo -S {c} <<< "{i}"'.format(c=cmd, i=cmd_input)
return self.exec_command(command, timeout)
- def interactive_terminal_open(self, time_out=10):
+ def interactive_terminal_open(self, time_out=30):
"""Open interactive terminal on a new channel on the connected Node.
:param time_out: Timeout in seconds.
@@ -228,8 +228,7 @@ class SSH(object):
raise Exception('Socket timeout: {0}'.format(buf))
return chan
- def interactive_terminal_exec_command(self, chan, cmd, prompt,
- time_out=30):
+ def interactive_terminal_exec_command(self, chan, cmd, prompt):
"""Execute command on interactive terminal.
interactive_terminal_open() method has to be called first!
@@ -238,7 +237,6 @@ class SSH(object):
:param cmd: Command to be executed.
:param prompt: Command prompt, sequence of characters used to
indicate readiness to accept commands.
- :param time_out: Timeout in seconds.
:return: Command output.
.. warning:: Interruptingcow is used here, and it uses
diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot
index 4751687a21..b4d723f47d 100644
--- a/resources/libraries/robot/performance.robot
+++ b/resources/libraries/robot/performance.robot
@@ -535,9 +535,9 @@
| | Vpp Route Add | ${dut1} | 2001:1::0 | ${host_prefix} | 2001:3::2
| | ... | interface=${dut1_if1} | count=${count}
| | Vpp Route Add | ${dut2} | 2001:1::0 | ${host_prefix} | 2001:4::1
-| | ... | interface=${dut2_if2} | count=${count}
-| | Vpp Route Add | ${dut2} | 2001:2::0 | ${host_prefix} | 2001:5::2
| | ... | interface=${dut2_if1} | count=${count}
+| | Vpp Route Add | ${dut2} | 2001:2::0 | ${host_prefix} | 2001:5::2
+| | ... | interface=${dut2_if2} | count=${count}
| IPv6 iAcl whitelist initialized in a 3-node circular topology
| | [Documentation]