Table Miss Entries for FIB

Signed-off-by: Dimple Jain <dimple.jain@ericsson.com>
Change-Id: If48b44cc3c04c6ff5a5b4fccf7edf20817de528a

diff --git a/fibmanager/fibmanager-impl/pom.xml b/fibmanager/fibmanager-impl/pom.xml
index d9f46bcd7c3155e329b018a8b6188cbb73c83a3a..6995c9ac3083f428243cfb03be01b6cb762bac2b 100644 (file)
--- a/fibmanager/fibmanager-impl/pom.xml
+++ b/fibmanager/fibmanager-impl/pom.xml
@@ -46,6 +46,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>nexthopmgr-api</artifactId>
       <version>${vpnservices.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin.model</groupId>
+      <artifactId>model-flow-service</artifactId>
+      <version>${openflowplugin.version}</version>
+    </dependency>
   </dependencies>
 
 </project>

diff --git a/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/vpnservice/fibmanager/FibManager.java b/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/vpnservice/fibmanager/FibManager.java
index 96f22c4a7d1291807e2f6f79b0787000143e234c..70a6d209ee2551cafafeb67a0b76b5655598f7b7 100644 (file)
--- a/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/vpnservice/fibmanager/FibManager.java
+++ b/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/vpnservice/fibmanager/FibManager.java
@@ -398,4 +398,42 @@ public class FibManager extends AbstractDataChangeListener<VrfEntry> implements
     }
     return vpnId;
   }
+
+    public void processNodeAdd(long dpnId) {
+        LOG.debug("Received notification to install TableMiss entries for dpn {} ", dpnId);
+        makeTableMissFlow(dpnId, NwConstants.ADD_FLOW);
+    }
+
+    private void makeTableMissFlow(long dpnId, int addOrRemove) {
+        final BigInteger COOKIE_TABLE_MISS = new BigInteger("1030000", 16);
+        // Instruction to punt to controller
+        List<InstructionInfo> instructions = new ArrayList<InstructionInfo>();
+        List<ActionInfo> actionsInfos = new ArrayList<ActionInfo>();
+        actionsInfos.add(new ActionInfo(ActionType.punt_to_controller, new String[] {}));
+        instructions.add(new InstructionInfo(InstructionType.write_actions, actionsInfos));
+        List<MatchInfo> matches = new ArrayList<MatchInfo>();
+        FlowEntity flowEntityLfib = MDSALUtil.buildFlowEntity(dpnId, L3_LFIB_TABLE,
+                getFlowRef(dpnId, L3_LFIB_TABLE, NwConstants.TABLE_MISS_FLOW),
+                NwConstants.TABLE_MISS_PRIORITY, "Table Miss", 0, 0, COOKIE_TABLE_MISS, matches, instructions);
+
+        FlowEntity flowEntityFib = MDSALUtil.buildFlowEntity(dpnId,L3_FIB_TABLE, getFlowRef(dpnId, L3_FIB_TABLE, NwConstants.TABLE_MISS_FLOW),
+                NwConstants.TABLE_MISS_PRIORITY, "FIB Table Miss Flow", 0, 0, COOKIE_VM_FIB_TABLE,
+                matches, instructions);
+
+        if (addOrRemove == NwConstants.ADD_FLOW) {
+            LOG.debug("Invoking MDSAL to install Table Miss Entries");
+            mdsalManager.installFlow(flowEntityLfib);
+            mdsalManager.installFlow(flowEntityFib);
+        } else {
+            mdsalManager.removeFlow(flowEntityLfib);
+            mdsalManager.removeFlow(flowEntityFib);
+
+        }
+    }
+
+    private String getFlowRef(long dpnId, short tableId, int tableMiss) {
+        return new StringBuffer().append(FLOWID_PREFIX).append(dpnId).append(NwConstants.FLOWID_SEPARATOR)
+                .append(tableId).append(NwConstants.FLOWID_SEPARATOR).append(tableMiss)
+                .append(FLOWID_PREFIX).toString();
+    }
 }

diff --git a/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/vpnservice/fibmanager/FibManagerProvider.java b/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/vpnservice/fibmanager/FibManagerProvider.java
index b9ddfbb4a44605ee23006bdfd61ba42865ff3f54..d08ec0959ca2aa02d95ca4e13d7ab62d0dd74317 100644 (file)
--- a/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/vpnservice/fibmanager/FibManagerProvider.java
+++ b/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/vpnservice/fibmanager/FibManagerProvider.java
@@ -24,6 +24,7 @@ public class FibManagerProvider implements BindingAwareProvider, AutoCloseable {
   private FibManager fibManager;
   private IMdsalApiManager mdsalManager;
   private IVpnManager vpnmanager;
+  private FibNodeCapableListener fibNcListener;
 
   @Override
   public void onSessionInitiated(ProviderContext session) {
@@ -34,6 +35,7 @@ public class FibManagerProvider implements BindingAwareProvider, AutoCloseable {
       fibManager = new FibManager(dataBroker, nexthopService);
       fibManager.setMdsalManager(mdsalManager);
       fibManager.setVpnmanager(vpnmanager);
+      fibNcListener = new FibNodeCapableListener(dataBroker, fibManager);
     } catch (Exception e) {
       LOG.error("Error initializing services", e);
     }
@@ -43,6 +45,7 @@ public class FibManagerProvider implements BindingAwareProvider, AutoCloseable {
   public void close() throws Exception {
     LOG.info("FibManagerProvider Closed");
     fibManager.close();
+    fibNcListener.close();
   }
 
   public void setMdsalManager(IMdsalApiManager mdsalManager) {

diff --git a/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/vpnservice/fibmanager/FibNodeCapableListener.java b/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/vpnservice/fibmanager/FibNodeCapableListener.java
new file mode 100644 (file)
index 0000000..26bc947
--- /dev/null
+++ b/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/vpnservice/fibmanager/FibNodeCapableListener.java
@@ -0,0 +1,71 @@
+package org.opendaylight.vpnservice.fibmanager;
+
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
+import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
+import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.vpnservice.AbstractDataChangeListener;
+import org.opendaylight.vpnservice.mdsalutil.MDSALUtil;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
+import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class FibNodeCapableListener extends AbstractDataChangeListener<FlowCapableNode> implements AutoCloseable{
+    private static final Logger LOG = LoggerFactory.getLogger(FibNodeCapableListener.class);
+    private ListenerRegistration<DataChangeListener> listenerRegistration;
+    private FibManager fibManager;
+
+    public FibNodeCapableListener(final DataBroker dataBroker, FibManager fibManager) {
+        super(FlowCapableNode.class);
+        registerListener(dataBroker);
+        this.fibManager = fibManager;
+    }
+
+    private void registerListener(final DataBroker db) {
+        try {
+            listenerRegistration = db.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL,
+                    getWildCardPath(), FibNodeCapableListener.this, DataChangeScope.ONE);
+        } catch (final Exception e) {
+            LOG.error("FibNodeConnectorListener: DataChange listener registration fail!", e);
+            throw new IllegalStateException("FibNodeConnectorListener: registration Listener failed.", e);
+        }
+    }
+
+    private InstanceIdentifier<FlowCapableNode> getWildCardPath() {
+        return InstanceIdentifier.create(Nodes.class).child(Node.class).augmentation(FlowCapableNode.class);
+    }
+
+    @Override
+    public void close() throws Exception {
+        if (listenerRegistration != null) {
+            try {
+                listenerRegistration.close();
+            } catch (final Exception e) {
+                LOG.error("Error when cleaning up DataChangeListener.", e);
+            }
+            listenerRegistration = null;
+        }
+        LOG.info("FibNodeConnectorListener Closed");
+    }
+
+    @Override
+    protected void add(InstanceIdentifier<FlowCapableNode> identifier, FlowCapableNode node) {
+        LOG.trace("FlowCapableNode Added: key: " + identifier + ", value=" + node );
+        NodeKey nodeKey = identifier.firstKeyOf(Node.class, NodeKey.class);
+        long dpnId = MDSALUtil.getDpnIdFromNodeName(nodeKey.getId());
+        fibManager.processNodeAdd(dpnId);
+    }
+
+    @Override
+    protected void remove(InstanceIdentifier<FlowCapableNode> identifier, FlowCapableNode del) {
+    }
+
+    @Override
+    protected void update(InstanceIdentifier<FlowCapableNode> identifier, FlowCapableNode original, FlowCapableNode update) {
+    }
+}