commit d92b10c9084f58e92efd879b86b3e8b1e03cfcfe
author Yuta HIGUCHI <y-higuchi@onlab.us> Mon Aug 25 09:30:28 2014 -0700
committer Saurav Das <sauravdas@alumni.stanford.edu> Fri Sep 05 11:47:22 2014 -0700
tree 1457b8db3227784e4221d5a7f25f2b0795f6c488
parent a507baf41f38d37a8987d105d181e16f124515a6

Fixing topology related interface/class tree

- (Mutable)Topology no longer implements ImmutableTopology

    --- BaseTopology (was ImmutableTopology)
     |
     +-- ImmutableTopology (new)
     |
     +-- MutableTopology (was Topology)
       |
       +-- RefreshableTopology
       |
       +-- TopologyInternal
            This interface is placed in wrong place. To be fixed later.

Change-Id: Ifa9defcc7c0fc22bba19977fe4ea57eaf792275e

src/main/java/net/onrc/onos/core/packetservice/PacketModule.java

diff --git a/src/main/java/net/onrc/onos/core/packetservice/PacketModule.java b/src/main/java/net/onrc/onos/core/packetservice/PacketModule.java
index 61fa735..ce79994 100644
--- a/src/main/java/net/onrc/onos/core/packetservice/PacketModule.java
+++ b/src/main/java/net/onrc/onos/core/packetservice/PacketModule.java
@@ -25,7 +25,7 @@
 import net.onrc.onos.core.topology.ITopologyService;
 import net.onrc.onos.core.topology.Port;
 import net.onrc.onos.core.topology.Switch;
-import net.onrc.onos.core.topology.Topology;
+import net.onrc.onos.core.topology.MutableTopology;
 import net.onrc.onos.core.util.Dpid;
 import net.onrc.onos.core.util.PortNumber;
 import net.onrc.onos.core.util.SwitchPort;
@@ -51,7 +51,7 @@
     private final CopyOnWriteArrayList<IPacketListener> listeners;
 
     private IFloodlightProviderService floodlightProvider;
-    private Topology topology;
+    private MutableTopology mutableTopology;
     private IDatagridService datagrid;
     private IFlowPusherService flowPusher;
 
@@ -76,7 +76,7 @@
                 }
             }
             Multimap<Long, Short> outPorts = value.calculateOutPorts(
-                    localPorts, topology);
+                    localPorts, mutableTopology);
             sendPacketToSwitches(outPorts, value.getPacketData());
         }
 
@@ -164,13 +164,13 @@
         Switch topologySwitch;
         Port inPort;
         try {
-            topology.acquireReadLock();
+            mutableTopology.acquireReadLock();
             Dpid dpid = new Dpid(sw.getId());
             PortNumber p = PortNumber.uint16(inport);
-            topologySwitch = topology.getSwitch(dpid);
-            inPort = topology.getPort(dpid, p);
+            topologySwitch = mutableTopology.getSwitch(dpid);
+            inPort = mutableTopology.getPort(dpid, p);
         } finally {
-            topology.releaseReadLock();
+            mutableTopology.releaseReadLock();
         }
 
         if (topologySwitch == null || inPort == null) {
@@ -217,7 +217,7 @@
             throws FloodlightModuleException {
         floodlightProvider =
                 context.getServiceImpl(IFloodlightProviderService.class);
-        topology = context.getServiceImpl(ITopologyService.class)
+        mutableTopology = context.getServiceImpl(ITopologyService.class)
                 .getTopology();
         datagrid = context.getServiceImpl(IDatagridService.class);
         flowPusher = context.getServiceImpl(IFlowPusherService.class);