Merge branch 'nicira-role'
diff --git a/DEVELOPING b/DEVELOPING
index ea6945a..f4383dc 100644
--- a/DEVELOPING
+++ b/DEVELOPING
@@ -13,7 +13,6 @@
|-- tests
| `-- test cases
`-- tools
- |-- munger
`-- pylibopenflow
The tools directory is what processes the OpenFlow header
@@ -39,14 +38,6 @@
testutils.py: Test utilities
base_tests.py: Base test classes
-Important Notes
-+++++++++++++++
-
- 1. If you change any of the code generation scripts in
- tools/munger/scripts you must re-run make -C tools/munger to
- regenerate the OpenFlow message classes. Make sure you
- commit the generated code.
-
Adding Your Own Test Cases
++++++++++++++++++++++++++
@@ -75,22 +66,6 @@
Send a pull request on GitHub to floodlight/oftest.
-Other Info
-++++++++++
-
- * Build doc with
- + cd <oftest>/tools/munger
- + make doc
- Places the results in <oftest>/doc/html
- If you have problems, check the install location doxypy.py and
- that it is set correctly in <oftest>/doc/Doxyfile
-
- * Run lint on sources
- + cd <oftest>/tools/munger
- + make lint
- Places results in <oftest>/lint/*.log
- The file controller.log currently has some errors indicated
-
To Do
+++++
diff --git a/oft b/oft
index 92709ab..36569f5 100755
--- a/oft
+++ b/oft
@@ -487,6 +487,11 @@
if config["random_seed"] is not None:
logging.info("Random seed: %d" % config["random_seed"])
random.seed(config["random_seed"])
+else:
+ # Generate random seed and report to log file
+ seed = random.randrange(100000000)
+ logging.info("Autogen random seed: %d" % seed)
+ random.seed(seed)
# Remove python's signal handler which raises KeyboardError. Exiting from an
# exception waits for all threads to terminate which might not happen.
diff --git a/src/python/loxi/of10/message.py b/src/python/loxi/of10/message.py
index d80dac3..d3a9f57 100644
--- a/src/python/loxi/of10/message.py
+++ b/src/python/loxi/of10/message.py
@@ -3781,7 +3781,7 @@
if buffer_id != None:
self.buffer_id = buffer_id
else:
- self.buffer_id = 0
+ self.buffer_id = 0xffffffff
if in_port != None:
self.in_port = in_port
else: