commit c44b62489e4e54f3608e9a59217961e1ea77cf1b
author Rich Lane <rich.lane@bigswitch.com> Thu Jan 10 12:23:54 2013 -0800
committer Rich Lane <rich.lane@bigswitch.com> Fri Jan 11 08:20:20 2013 -0800
tree 8b800d429ed2240536cac953813986d26590f4b2
parent 78ef8b98ef2a87532c73644d62da804d7f1d5a1c

controller: fix version negotiation

src/python/oftest/controller.py

diff --git a/src/python/oftest/controller.py b/src/python/oftest/controller.py
index f7471f6..a18168e 100644
--- a/src/python/oftest/controller.py
+++ b/src/python/oftest/controller.py
@@ -225,10 +225,10 @@
 
             self.logger.debug("Msg in: buf len %d. hdr.type %s. hdr.len %d hdr.version %d" %
                               (len(pkt), ofp.cstruct.ofp_type_map[hdr.type], hdr.length, hdr.version))
-            if hdr.version != ofp.cstruct.OFP_VERSION:
-                self.logger.error("Version %d does not match OFTest version %d"
-                                  % (hdr.version, ofp.cstruct.OFP_VERSION))
-                print "Version %d does not match OFTest version %d" % \
+            if hdr.version < ofp.cstruct.OFP_VERSION:
+                self.logger.error("Switch only supports up to OpenFlow version %d (OFTest version is %d)",
+                                  hdr.version, ofp.cstruct.OFP_VERSION)
+                print "Switch only supports up to OpenFlow version %d (OFTest version is %d)" % \
                     (hdr.version, ofp.cstruct.OFP_VERSION)
                 self.disconnect()
                 return