commit fa7428408d4e0f6e7e177e24b9db501f66433b3d
author Yuta HIGUCHI <y-higuchi@onlab.us> Thu Jul 03 22:35:13 2014 -0700
committer Gerrit Code Review <gerrit2@gerrit.onos.onlab.us> Tue Jul 08 13:07:52 2014 -0700
tree 8be2e6c10034c5cf2977880b7b72068236bf0974
parent f6978ce75956b3b121771b43303a496647240928

Move indices to TopologyImpl.

Change-Id: I3efd73129fafb786e959810e8239ce14d26af6d7

src/main/java/net/onrc/onos/core/topology/TopologyManager.java

diff --git a/src/main/java/net/onrc/onos/core/topology/TopologyManager.java b/src/main/java/net/onrc/onos/core/topology/TopologyManager.java
index 8302ff3..3cff46a 100644
--- a/src/main/java/net/onrc/onos/core/topology/TopologyManager.java
+++ b/src/main/java/net/onrc/onos/core/topology/TopologyManager.java
@@ -894,12 +894,11 @@
             reorderedAddedPortEvents.put(id, portEvent);
             return;
         }
-        SwitchImpl switchImpl = getSwitchImpl(sw);
 
         Port port = sw.getPort(portEvent.getPortNumber());
         if (port == null) {
             port = new PortImpl(topology, sw, portEvent.getPortNumber());
-            switchImpl.addPort(port);
+            topology.putPort(port);
         } else {
             // TODO: Update the port attributes
             log.debug("Update port attributes");
@@ -967,7 +966,7 @@
 
         // Remove the Port from the Switch
         SwitchImpl switchImpl = getSwitchImpl(sw);
-        switchImpl.removePort(port);
+        topology.removePort(port);
 
         apiRemovedPortEvents.add(portEvent);
     }
@@ -1116,7 +1115,6 @@
 
             // Add Device <-> Port attachment
             PortImpl portImpl = getPortImpl(port);
-            portImpl.addDevice(device);
             deviceImpl.addAttachmentPoint(port);
             attachmentFound = true;
         }
@@ -1140,30 +1138,13 @@
      */
     @GuardedBy("topology.writeLock")
     private void removeDevice(DeviceEvent deviceEvent) {
-        log.debug("Removing a device to the topology: mac {}", deviceEvent.getMac());
+        log.debug("Removing a device from the topology: mac {}", deviceEvent.getMac());
         Device device = topology.getDeviceByMac(deviceEvent.getMac());
         if (device == null) {
             log.warn("Device {} already removed, ignoring", deviceEvent);
             return;
         }
-        DeviceImpl deviceImpl = getDeviceImpl(device);
 
-        // Process each attachment point
-        for (SwitchPort swp : deviceEvent.getAttachmentPoints()) {
-            // Attached Ports must exist
-            Port port = topology.getPort(swp.getDpid(), swp.getPortNumber());
-            if (port == null) {
-                log.warn("Port for the attachment point {} did not exist. skipping attachment point mutation", swp);
-                continue;
-            }
-
-            // Remove Device <-> Port attachment
-            PortImpl portImpl = getPortImpl(port);
-            portImpl.removeDevice(device);
-            deviceImpl.removeAttachmentPoint(port);
-        }
-
-        log.debug("Removing the device info into the Topology: mac {}", deviceEvent.getMac());
         topology.removeDevice(device);
         apiRemovedDeviceEvents.add(deviceEvent);
     }