Adjust timeout
Change-Id: Ice38430e726bceebdd77cbfff077b98b901ffe6b
diff --git a/TestON/tests/HAclusterRestart/HAclusterRestart.params b/TestON/tests/HAclusterRestart/HAclusterRestart.params
index 213fc0d..b2d9728 100644
--- a/TestON/tests/HAclusterRestart/HAclusterRestart.params
+++ b/TestON/tests/HAclusterRestart/HAclusterRestart.params
@@ -49,8 +49,8 @@
<target10>10.0.0.27</target10>
</PING>
<timers>
- <LinkDiscovery>.2</LinkDiscovery>
- <SwitchDiscovery>.2</SwitchDiscovery>
+ <LinkDiscovery>12</LinkDiscovery>
+ <SwitchDiscovery>12</SwitchDiscovery>
</timers>
<kill>
<switch> s5 </switch>
diff --git a/TestON/tests/HAminorityRestart/HAminorityRestart.params b/TestON/tests/HAminorityRestart/HAminorityRestart.params
index 87d1cea..1e08a6b 100644
--- a/TestON/tests/HAminorityRestart/HAminorityRestart.params
+++ b/TestON/tests/HAminorityRestart/HAminorityRestart.params
@@ -49,8 +49,8 @@
<target10>10.0.0.27</target10>
</PING>
<timers>
- <LinkDiscovery>.2</LinkDiscovery>
- <SwitchDiscovery>.2</SwitchDiscovery>
+ <LinkDiscovery>12</LinkDiscovery>
+ <SwitchDiscovery>12</SwitchDiscovery>
</timers>
<kill>
<switch> s5 </switch>
diff --git a/TestON/tests/HAsanity/HAsanity.params b/TestON/tests/HAsanity/HAsanity.params
index abc5385..0aefe97 100644
--- a/TestON/tests/HAsanity/HAsanity.params
+++ b/TestON/tests/HAsanity/HAsanity.params
@@ -68,8 +68,8 @@
<target10>10.0.0.27</target10>
</PING>
<timers>
- <LinkDiscovery>.2</LinkDiscovery>
- <SwitchDiscovery>.2</SwitchDiscovery>
+ <LinkDiscovery>12</LinkDiscovery>
+ <SwitchDiscovery>12</SwitchDiscovery>
</timers>
<kill>
<switch> s5 </switch>
diff --git a/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.params b/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.params
index b0b644e..ce0abe0 100644
--- a/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.params
+++ b/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.params
@@ -58,8 +58,8 @@
<target10>10.0.0.27</target10>
</PING>
<timers>
- <LinkDiscovery>.2</LinkDiscovery>
- <SwitchDiscovery>.2</SwitchDiscovery>
+ <LinkDiscovery>12</LinkDiscovery>
+ <SwitchDiscovery>12</SwitchDiscovery>
</timers>
<kill>
<switch> s5 </switch>
diff --git a/TestON/tests/SCPFmaxIntents/Dependency/rerouteTopo.py b/TestON/tests/SCPFmaxIntents/Dependency/rerouteTopo.py
index 9c5650c..a2fe9fe 100755
--- a/TestON/tests/SCPFmaxIntents/Dependency/rerouteTopo.py
+++ b/TestON/tests/SCPFmaxIntents/Dependency/rerouteTopo.py
@@ -15,27 +15,27 @@
class MyTopo( Topo ):
- def __init__( self ):
- # Initialize topology
- Topo.__init__( self )
+ def __init__( self ):
+ # Initialize topology
+ Topo.__init__( self )
- host1 = self.addHost('h1', ip='10.1.0.1/24')
- host2 = self.addHost('h2', ip='10.1.0.2/24')
- host3 = self.addHost('h3', ip='10.1.0.3/24')
+ host1 = self.addHost('h1', ip='10.1.0.1/24')
+ host2 = self.addHost('h2', ip='10.1.0.2/24')
+ host3 = self.addHost('h3', ip='10.1.0.3/24')
- s1 = self.addSwitch( 's1' )
- s2 = self.addSwitch( 's2' )
- s3 = self.addSwitch( 's3' )
+ s1 = self.addSwitch( 's1' )
+ s2 = self.addSwitch( 's2' )
+ s3 = self.addSwitch( 's3' )
- self.addLink(s1, host1)
- self.addLink(s2, host2)
- self.addLink(s3, host3)
+ self.addLink(s1, host1)
+ self.addLink(s2, host2)
+ self.addLink(s3, host3)
- self.addLink(s1,s2)
- self.addLink(s1,s3)
- self.addLink(s2,s3)
+ self.addLink(s1,s2)
+ self.addLink(s1,s3)
+ self.addLink(s2,s3)
- topos = { 'mytopo': ( lambda: MyTopo() ) }
+ topos = { 'mytopo': ( lambda: MyTopo() ) }
# HERE THE CODE DEFINITION OF THE TOPOLOGY ENDS