Add OCh signal type to optical path intent.
Revert changes to LINC-OE specialized flowmod handling.

Change-Id: Ic4f333a44b7cd8a3111bfcba87ea909943eec56d
diff --git a/tools/test/topos/opticalUtils.py b/tools/test/topos/opticalUtils.py
index f1559b4..52a54b2 100644
--- a/tools/test/topos/opticalUtils.py
+++ b/tools/test/topos/opticalUtils.py
@@ -67,7 +67,7 @@
 from mininet.cli import CLI
 
 # Sleep time and timeout values in seconds
-SLEEP_TIME = .5
+SLEEP_TIME = 2
 TIMEOUT = 60
 
 class OpticalSwitch(Switch):