[Falcon] Cleanup of unused annotations in optical test topos.
First round of cleanups in opticalUtils.py.
Change-Id: I5f627fc471220c3a7194d913764f8c84e6f0fe6e
diff --git a/tools/test/topos/metro.py b/tools/test/topos/metro.py
index 5a73cb6..65a57bd 100755
--- a/tools/test/topos/metro.py
+++ b/tools/test/topos/metro.py
@@ -90,7 +90,7 @@
oean = { "optical.regens": 0 }
self.addSwitch('OE%s' % i, dpid='0000ffffffffff0%s' % i, annotations=oean, cls=LINCSwitch)
- an = { "optical.waves": 80, "optical.type": "WDM", "optical.kms": 1000, "durable": "true" }
+ an = { "durable": "true" }
self.addLink('OE1', 'OE2', port1=50, port2=30, annotations=an, cls=LINCLink)
self.addLink('OE2', 'OE3', port1=50, port2=30, annotations=an, cls=LINCLink)
self.addLink('OE3', 'OE1', port1=50, port2=30, annotations=an, cls=LINCLink)
@@ -188,7 +188,7 @@
# connect COs to core - sort of hard-wired at this moment
for i in range(1,len(domains)):
- an = { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" }
+ an = { "bandwidth": 100000, "durable": "true" }
net.addLink(domains[i].getTether(), d0.getSwitches('OE%s' % i),
port1=OVS_AP, port2=OE_AP, speed=10000, annotations=an, cls=LINCLink)