Fixing an issue with OpticalLinkProvider and reverting some topo changes.

Change-Id: If57d529127323d0d2b0f8778ce68527de6284c77
diff --git a/tools/test/topos/optical2.py b/tools/test/topos/optical2.py
index b491cca..36cdbad 100644
--- a/tools/test/topos/optical2.py
+++ b/tools/test/topos/optical2.py
@@ -64,19 +64,12 @@
         self.addIntf(s5,'tap33')
         self.addIntf(s6,'tap34')
 
-        self.addIntf(s1,'tap35')
-        self.addIntf(s2,'tap36')
-        self.addIntf(s3,'tap37')
-        self.addIntf(s4,'tap38')
-        self.addIntf(s5,'tap39')
-        self.addIntf(s6,'tap40')
-
         # if you use, sudo mn --custom custom/optical.py, then register the topo:
 topos = {'optical': ( lambda: OpticalTopo() )}
 
 
 def run():
-    c = RemoteController('c','192.168.56.101',6633)
+    c = RemoteController('c','127.0.0.1',6633)
     net = Mininet( topo=OpticalTopo(),controller=None,autoSetMacs=True)
     net.addController(c)
     net.start()