commit 2c3053057806f30bd90eefbe915bbf3cc3f9c4ce
author Marc De Leenheer <marc@onlab.us> Mon Dec 07 21:37:44 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Fri Dec 11 17:53:38 2015 +0000
tree 5454fabbae4ab76e00982429b052e703de72aaef
parent 0008f1dabd2e6112f18e8829e8834683602912fa

Deprecate IndexedLambda and remove from optical intent compiler.
Allow drivers to report any spectral grid. Bugfixes.

ONOS-3495

Change-Id: Ied946660d48e482c1746d1e87735498b1637bb4b

tools/test/topos/opticalUtils.py

diff --git a/tools/test/topos/opticalUtils.py b/tools/test/topos/opticalUtils.py
index 44f4e37..a990a8e 100644
--- a/tools/test/topos/opticalUtils.py
+++ b/tools/test/topos/opticalUtils.py
@@ -536,7 +536,9 @@
         for link in LINCSwitch.opticalJSON[ 'links' ]:
             linkDict = {}
             linkDict[ 'type' ] = link[ 'type' ]
-            linkDict.update(link[ 'annotations' ])
+            # FIXME: Clean up unnecessary link/device attributes, then re-enable annotations
+            linkDict['durable'] = True
+            # linkDict.update(link[ 'annotations' ])
 
             linkSubj = link[ 'src' ] + '-' + link[ 'dst' ]
             links[ linkSubj ] = { 'basic': linkDict }