Specifically use OF1.3 switches
Change-Id: Ibee75a71cf5c6ed04276139d31d5fbf09c6bb4af
diff --git a/TestON/drivers/common/cli/emulator/remotemininetdriver.py b/TestON/drivers/common/cli/emulator/remotemininetdriver.py
index 7ac7912..6aa4ab2 100644
--- a/TestON/drivers/common/cli/emulator/remotemininetdriver.py
+++ b/TestON/drivers/common/cli/emulator/remotemininetdriver.py
@@ -487,39 +487,44 @@
print "get_flowTable(" + str( protoVersion ) +" " + str( sw ) +")"
NOTE: Use format to force consistent flow table output across
- versions"""
- self.handle.sendline( "cd" )
- self.handle.expect( [ "\$", pexpect.EOF, pexpect.TIMEOUT ] )
- if protoVersion == 1.0:
- command = "sudo ovs-ofctl dump-flows " + sw + \
- " -F OpenFlow10-table_id | awk '{OFS=\",\" ; print $1 $3 $6 \
- $7 $8}' | cut -d ',' -f 2- | sort -n -k1 -r"
- self.handle.sendline( command )
- self.handle.expect( [ "k1 -r", pexpect.EOF, pexpect.TIMEOUT ] )
- self.handle.expect(
- [ "OFPST_FLOW", pexpect.EOF, pexpect.TIMEOUT ] )
- response = self.handle.before
- # print "response=", response
- return response
- elif protoVersion == 1.3:
- command = "sudo ovs-ofctl dump-flows " + sw + \
- " -O OpenFlow13 | awk '{OFS=\",\" ; print $1 $3 $6 $7}'\
- | cut -d ',' -f 2- | sort -n -k1 -r"
- self.handle.sendline( command )
- self.handle.expect( [ "k1 -r", pexpect.EOF, pexpect.TIMEOUT ] )
- self.handle.expect(
- [ "OFPST_FLOW", pexpect.EOF, pexpect.TIMEOUT ] )
- response = self.handle.before
- # print "response=", response
- return response
- else:
- main.log.error(
- "Unknown protoVersion in get_flowTable(). given: (" +
- str(
- type( protoVersion ) ) +
- ") '" +
- str( protoVersion ) +
- "'" )
+ versions
+ """
+ try:
+ self.handle.sendline( "cd" )
+ self.handle.expect( "\$" )
+ if protoVersion == 1.0:
+ command = "sudo ovs-ofctl dump-flows " + sw + \
+ " -F OpenFlow10-table_id | awk '{OFS=\",\" ; print $1 $3 $6 \
+ $7 $8}' | cut -d ',' -f 2- | sort -n -k1 -r"
+ self.handle.sendline( command )
+ self.handle.expect( "k1 -r" )
+ self.handle.expect( "OFPST_FLOW" )
+ response = self.handle.before
+ # print "response=", response
+ return response
+ elif protoVersion == 1.3:
+ command = "sudo ovs-ofctl dump-flows " + sw + \
+ " -O OpenFlow13 | awk '{OFS=\",\" ; print $1 $3 $6 $7}'\
+ | cut -d ',' -f 2- | sort -n -k1 -r"
+ self.handle.sendline( command )
+ self.handle.expect( "k1 -r" )
+ self.handle.expect( "OFPST_FLOW" )
+ response = self.handle.before
+ # print "response=", response
+ return response
+ else:
+ main.log.error(
+ "Unknown protoVersion in get_flowTable(). given: (" +
+ str( type( protoVersion ) ) +
+ ") '" + str( protoVersion ) + "'" )
+ except pexpect.EOF:
+ main.log.error( self.name + ": EOF exception found" )
+ main.log.error( self.name + ": " + self.handle.before )
+ main.cleanup()
+ main.exit()
+ except pexpect.TIMEOUT:
+ main.log.exception( self.name + ": Timeout exception: " )
+ return None
def flowComp( self, flow1, flow2 ):
if flow1 == flow2:
diff --git a/TestON/tests/HAclusterRestart/HAclusterRestart.topo b/TestON/tests/HAclusterRestart/HAclusterRestart.topo
index 5f87b9d..fecca38 100644
--- a/TestON/tests/HAclusterRestart/HAclusterRestart.topo
+++ b/TestON/tests/HAclusterRestart/HAclusterRestart.topo
@@ -151,7 +151,7 @@
#Specify the Option for mininet
<arg1> --custom ~/mininet/custom/obelisk.py </arg1>
<arg2> --topo obelisk </arg2>
- <arg3> </arg3>
+ <arg3> --switch ovs,protocols=OpenFlow13 </arg3>
<controller> none </controller>
</COMPONENTS>
</Mininet1>
diff --git a/TestON/tests/HAminorityRestart/HAminorityRestart.topo b/TestON/tests/HAminorityRestart/HAminorityRestart.topo
index 5f87b9d..fecca38 100644
--- a/TestON/tests/HAminorityRestart/HAminorityRestart.topo
+++ b/TestON/tests/HAminorityRestart/HAminorityRestart.topo
@@ -151,7 +151,7 @@
#Specify the Option for mininet
<arg1> --custom ~/mininet/custom/obelisk.py </arg1>
<arg2> --topo obelisk </arg2>
- <arg3> </arg3>
+ <arg3> --switch ovs,protocols=OpenFlow13 </arg3>
<controller> none </controller>
</COMPONENTS>
</Mininet1>
diff --git a/TestON/tests/HAsanity/HAsanity.topo b/TestON/tests/HAsanity/HAsanity.topo
index 5f87b9d..fecca38 100644
--- a/TestON/tests/HAsanity/HAsanity.topo
+++ b/TestON/tests/HAsanity/HAsanity.topo
@@ -151,7 +151,7 @@
#Specify the Option for mininet
<arg1> --custom ~/mininet/custom/obelisk.py </arg1>
<arg2> --topo obelisk </arg2>
- <arg3> </arg3>
+ <arg3> --switch ovs,protocols=OpenFlow13 </arg3>
<controller> none </controller>
</COMPONENTS>
</Mininet1>
diff --git a/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.topo b/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.topo
index 5f87b9d..fecca38 100644
--- a/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.topo
+++ b/TestON/tests/HAsingleInstanceRestart/HAsingleInstanceRestart.topo
@@ -151,7 +151,7 @@
#Specify the Option for mininet
<arg1> --custom ~/mininet/custom/obelisk.py </arg1>
<arg2> --topo obelisk </arg2>
- <arg3> </arg3>
+ <arg3> --switch ovs,protocols=OpenFlow13 </arg3>
<controller> none </controller>
</COMPONENTS>
</Mininet1>