add --of-version option
This option is used to choose which OpenFlow protocol module is aliased to
"ofp", which the controller and tests import. When we have an OpenFlow protocol
module that works with all versions of OpenFlow we can remove this hack without
changing the command line interface or test API.
diff --git a/src/python/oftest/base_tests.py b/src/python/oftest/base_tests.py
index 343cdf8..5c6c9cf 100644
--- a/src/python/oftest/base_tests.py
+++ b/src/python/oftest/base_tests.py
@@ -12,7 +12,7 @@
from oftest import config
import oftest.controller as controller
import oftest.dataplane as dataplane
-import of10 as ofp
+import ofp
class SimpleProtocol(unittest.TestCase):
"""
diff --git a/src/python/oftest/controller.py b/src/python/oftest/controller.py
index a18168e..d6d2c70 100644
--- a/src/python/oftest/controller.py
+++ b/src/python/oftest/controller.py
@@ -35,7 +35,7 @@
from threading import Thread
from threading import Lock
from threading import Condition
-import of10 as ofp
+import ofp
import ofutils