commit 4da46f8e6431e54606af6acb9a32c36f8f7f2394
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Tue Jul 05 19:52:04 2016 -0700
committer Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Tue Jul 05 19:52:04 2016 -0700
tree 2eba62c7f06390b62a4400da4cf5b503b1ee7cd0
parent bbb2e3650945a6f7385f3a4d56c6641086e3133d

Sticky big switch virtual port assignment.

- Try to assign same virtual port number to known physical port.

Change-Id: I0934b0007a246685d51f443fc58ee56486c46278

ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchManager.java

diff --git a/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchManager.java b/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchManager.java
index 920150c..0e8ec4f 100644
--- a/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchManager.java
+++ b/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchManager.java
@@ -46,6 +46,10 @@
 import org.onosproject.store.service.Versioned;
 import org.slf4j.Logger;
 
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -84,11 +88,22 @@
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected StorageService storageService;
 
-    // Holds the physical port to virtual port number mapping
+    /**
+     * Holds the physical port to virtual port number mapping.
+     */
     private ConsistentMap<ConnectPoint, Long> portMap;
 
     // Counter for virtual port numbers
     private AtomicCounter portCounter;
+
+    // TODO listen to portMap event and populate Cache to properly deal with
+    // distributed deployment.
+    /**
+     * History of physical port to virtual port number mapping.
+     * Intended to avoid virtual port number explosion.
+     */
+    private LoadingCache<ConnectPoint, Long> p2vMap;
+
     // TODO: Add other listeners once we decide what an edge really is
     private EdgePortListener edgeListener = new InternalEdgeListener();
     private DeviceListener deviceListener = new InternalDeviceListener();
@@ -105,6 +120,9 @@
                 .withMeteringDisabled()
                 .build()
                 .asAtomicCounter();
+        p2vMap = CacheBuilder.newBuilder()
+                .build(CacheLoader.from(portCounter::getAndIncrement));
+
         eventDispatcher.addSink(BigSwitchEvent.class, listenerRegistry);
         //portCounter.compareAndSet(0, 1);     // Start counting from 1, doesn't work??
         buildPorts();
@@ -219,7 +237,7 @@
             PortDescription descr = null;
             switch (event.type()) {
                 case EDGE_PORT_ADDED:
-                    portMap.put(event.subject(), portCounter.getAndIncrement());
+                    portMap.put(event.subject(), getVirtualPortNumber(event.subject()));
                     descr = toVirtualPortDescription(event.subject());
                     bigSwitchEvent = BigSwitchEvent.Type.PORT_ADDED;
                     break;
@@ -274,6 +292,10 @@
 
     private void buildPorts() {
         edgePortService.getEdgePoints()
-                .forEach(cp -> portMap.put(cp, portCounter.getAndIncrement()));
+                .forEach(cp -> portMap.put(cp, getVirtualPortNumber(cp)));
+    }
+
+    private Long getVirtualPortNumber(ConnectPoint cp) {
+        return p2vMap.getUnchecked(cp);
     }
 }