Bug 3302: fix for GroupTable
[groupbasedpolicy.git] / renderers / ofoverlay / src / main / java / org / opendaylight / groupbasedpolicy / renderer / ofoverlay / flow / GroupTable.java
index 1ba0fc5b92c64b3dd36517fd966377c7e42d2b8b..99b07671dc0ea0989b7c8eb2100df788b9c8fe3d 100644 (file)
@@ -9,22 +9,19 @@
 package org.opendaylight.groupbasedpolicy.renderer.ofoverlay.flow;
 
 import static org.opendaylight.groupbasedpolicy.renderer.ofoverlay.flow.FlowUtils.actionList;
-import static org.opendaylight.groupbasedpolicy.renderer.ofoverlay.flow.FlowUtils.createBucketPath;
-import static org.opendaylight.groupbasedpolicy.renderer.ofoverlay.flow.FlowUtils.createGroupPath;
 import static org.opendaylight.groupbasedpolicy.renderer.ofoverlay.flow.FlowUtils.createNodePath;
 import static org.opendaylight.groupbasedpolicy.renderer.ofoverlay.flow.FlowUtils.getOfPortNum;
 import static org.opendaylight.groupbasedpolicy.renderer.ofoverlay.flow.FlowUtils.nxLoadTunIPv4Action;
 import static org.opendaylight.groupbasedpolicy.renderer.ofoverlay.flow.FlowUtils.outputAction;
 
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.concurrent.ExecutionException;
 
+import com.google.common.base.Optional;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.groupbasedpolicy.renderer.ofoverlay.OfContext;
-import org.opendaylight.groupbasedpolicy.renderer.ofoverlay.PolicyManager.FlowMap;
+import org.opendaylight.groupbasedpolicy.renderer.ofoverlay.OfWriter;
 import org.opendaylight.groupbasedpolicy.renderer.ofoverlay.flow.OrdinalFactory.EndpointFwdCtxOrdinals;
 import org.opendaylight.groupbasedpolicy.resolver.EgKey;
 import org.opendaylight.groupbasedpolicy.resolver.PolicyInfo;
@@ -33,191 +30,106 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.acti
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.BucketId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupTypes;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.Buckets;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.BucketsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.buckets.Bucket;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.buckets.BucketBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.Group;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.GroupBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.endpoints.Endpoint;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay.rev140528.EndpointLocation.LocationType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay.rev140528.OfOverlayContext;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.overlay.rev150105.TunnelTypeVxlan;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Objects;
-import com.google.common.base.Optional;
-import com.google.common.collect.Ordering;
-
 /**
  * Manage the group tables for handling broadcast/multicast
- *
  */
 
 public class GroupTable extends OfTable {
-    private static final Logger LOG =
-            LoggerFactory.getLogger(GroupTable.class);
+
+    private static final Logger LOG = LoggerFactory.getLogger(GroupTable.class);
 
     public GroupTable(OfContext ctx) {
         super(ctx);
     }
 
-    // @Override
+    FlowCapableNode getFCNodeFromDatastore(NodeId nodeId)
+            throws ExecutionException, InterruptedException {
+        FlowCapableNode fcn = null;
+        ReadOnlyTransaction t = ctx.getDataBroker().newReadOnlyTransaction();
+        InstanceIdentifier<FlowCapableNode> fcniid = createNodePath(nodeId).builder()
+                .augmentation(FlowCapableNode.class).build();
+
+        Optional<FlowCapableNode> r = t.read(LogicalDatastoreType.OPERATIONAL, fcniid).get();
+        if (!r.isPresent()) {
+            LOG.warn("Node {} is not present", fcniid);
+            return null;
+        }
+        fcn = r.get();
+        t.close();
+        return fcn;
+    }
+
     @Override
-    public void update(NodeId nodeId, PolicyInfo policyInfo, FlowMap flowMap)
-            throws Exception {
+    public void update(NodeId nodeId, PolicyInfo policyInfo, OfWriter ofWriter) throws Exception {
         // there appears to be no way of getting only the existing group
         // tables unfortunately, so we have to get the whole goddamned node.
         // Since this is happening concurrently with other things that are
         // working in subtrees of nodes, we have to do two transactions
-        ReadOnlyTransaction t = ctx.getDataBroker().newReadOnlyTransaction();
-        InstanceIdentifier<Node> niid = createNodePath(nodeId);
-        Optional<Node> r =
-                t.read(LogicalDatastoreType.OPERATIONAL, niid).get();
-        if (!r.isPresent())
-            return;
-        FlowCapableNode fcn = r.get().getAugmentation(FlowCapableNode.class);
+        FlowCapableNode fcn = getFCNodeFromDatastore(nodeId);
         if (fcn == null)
             return;
 
-        HashMap<GroupId, GroupCtx> groupMap = new HashMap<>();
-
-        if (fcn.getGroup() != null) {
-            for (Group g : fcn.getGroup()) {
-                GroupCtx gctx = new GroupCtx(g.getGroupId());
-                groupMap.put(g.getGroupId(), gctx);
-
-                Buckets bs = g.getBuckets();
-                if (bs != null && bs.getBucket() != null)
-                    for (Bucket b : bs.getBucket()) {
-                        gctx.bucketMap.put(b.getBucketId(), new BucketCtx(b));
-                    }
-            }
-        }
-
-        // sync(nodeId, policyInfo, dirty, groupMap);
-        sync(nodeId, policyInfo, groupMap);
-
-        WriteTransaction wt = ctx.getDataBroker().newWriteOnlyTransaction();
-        boolean wrote = syncGroupToStore(wt, nodeId, groupMap);
-        if (wrote)
-            wt.submit().get();
+        sync(nodeId, policyInfo, ofWriter);
     }
 
-    protected boolean syncGroupToStore(WriteTransaction wt,
-            NodeId nodeId,
-            HashMap<GroupId, GroupCtx> groupMap) {
-        boolean wrote = false;
-        for (GroupCtx gctx : groupMap.values()) {
-            InstanceIdentifier<Group> giid =
-                    createGroupPath(nodeId, gctx.groupId);
-            if (!gctx.visited) {
-                // Remove group table
-                wrote = true;
-                wt.delete(LogicalDatastoreType.CONFIGURATION, giid);
-            } else {
-                ArrayList<Bucket> buckets = new ArrayList<>();
+    public void sync(NodeId nodeId, PolicyInfo policyInfo, OfWriter ofWriter) throws Exception {
 
-                // update group table
-                for (BucketCtx bctx : gctx.bucketMap.values()) {
-                    BucketId bid;
-                    if (bctx.b != null)
-                        bid = bctx.b.getBucketId();
-                    else
-                        bid = bctx.newb.getBucketId();
-                    InstanceIdentifier<Bucket> biid =
-                            createBucketPath(nodeId,
-                                    gctx.groupId,
-                                    bid);
-                    if (!bctx.visited) {
-                        // remove bucket
-                        wrote = true;
-                        wt.delete(LogicalDatastoreType.CONFIGURATION, biid);
-                    } else if (bctx.b == null) {
-                        // new bucket
-                        buckets.add(bctx.newb);
-                    } else if (!Objects.equal(bctx.newb.getAction(),
-                            Ordering.from(ActionComparator.INSTANCE)
-                                    .sortedCopy(bctx.b.getAction()))) {
-                        // update bucket
-                        buckets.add(bctx.newb);
-                    }
-                }
-                if (buckets.size() > 0) {
-                    GroupBuilder gb = new GroupBuilder()
-                            .setGroupId(gctx.groupId)
-                            .setGroupType(GroupTypes.GroupAll)
-                            .setBuckets(new BucketsBuilder()
-                                    .setBucket(buckets)
-                                    .build());
-                    wrote = true;
-                    wt.merge(LogicalDatastoreType.CONFIGURATION,
-                            giid, gb.build(), true);
-                }
+        for (Endpoint localEp : ctx.getEndpointManager().getEndpointsForNode(nodeId)) {
+            EndpointFwdCtxOrdinals localEpFwdCtxOrds =
+                    OrdinalFactory.getEndpointFwdCtxOrdinals(ctx, policyInfo, localEp);
+            if (localEpFwdCtxOrds == null) {
+                LOG.debug("getEndpointFwdCtxOrdinals is null for EP {}", localEp);
+                continue;
             }
-        }
-        return wrote;
-    }
-
-    protected void sync(NodeId nodeId, PolicyInfo policyInfo, HashMap<GroupId, GroupCtx> groupMap) throws Exception {
 
+            GroupId gid = new GroupId(Long.valueOf(localEpFwdCtxOrds.getFdId()));
+            if (!ofWriter.groupExists(nodeId, gid.getValue())) {
+                LOG.info("createGroup {} {}", nodeId, gid);
+                ofWriter.writeGroup(nodeId, gid);
+            }
 
-            for (Endpoint localEp : ctx.getEndpointManager().getEndpointsForNode(nodeId)) {
-                EndpointFwdCtxOrdinals localEpFwdCtxOrds = OrdinalFactory.getEndpointFwdCtxOrdinals(ctx, policyInfo, localEp);
-                if (localEpFwdCtxOrds == null) {
-                    LOG.debug("getEndpointFwdCtxOrdinals is null for EP {}", localEp);
-                    continue;
-                }
+            for (EgKey epg : ctx.getEndpointManager().getGroupsForNode(nodeId)) {
+
+                // we'll use the fdId with the high bit set for remote bucket
+                // and just the local port number for local bucket
+                for (NodeId destNode : ctx.getEndpointManager().getNodesForGroup(epg)) {
+                    if (nodeId.equals(destNode))
+                        continue;
+
+                    long bucketId = OrdinalFactory.getContextOrdinal(destNode);
+                    bucketId |= 1L << 31;
+
+                    IpAddress tunDst = ctx.getSwitchManager().getTunnelIP(destNode, TunnelTypeVxlan.class);
+                    NodeConnectorId tunPort = ctx.getSwitchManager().getTunnelPort(nodeId, TunnelTypeVxlan.class);
+                    if (tunDst == null || tunPort == null)
+                        continue;
+                    Action tundstAction = null;
+                    if (tunDst.getIpv4Address() != null) {
+                        String nextHop = tunDst.getIpv4Address().getValue();
+                        tundstAction = nxLoadTunIPv4Action(nextHop, true);
+                    } else {
+                        LOG.error("IPv6 tunnel destination {} for {} not supported", tunDst.getIpv6Address().getValue(),
+                                destNode);
+                        continue;
+                    }
+                    BucketBuilder bb = new BucketBuilder().setBucketId(new BucketId(Long.valueOf(bucketId)))
+                            .setAction(actionList(tundstAction, outputAction(tunPort)));
 
-                GroupId gid = new GroupId(Long.valueOf(localEpFwdCtxOrds.getFdId()));
-                GroupCtx gctx = groupMap.get(gid);
-                if (gctx == null) {
-                    groupMap.put(gid, gctx = new GroupCtx(gid));
+                    ofWriter.writeBucket(nodeId, gid, bb.build());
                 }
-                gctx.visited = true;
-
-                for (EgKey epg : ctx.getEndpointManager().getGroupsForNode(nodeId)) {
-
-
-                    // we'll use the fdId with the high bit set for remote bucket
-                    // and just the local port number for local bucket
-                    for (NodeId destNode : ctx.getEndpointManager().getNodesForGroup(epg)) {
-                        if (nodeId.equals(destNode))
-                            continue;
-
-                        long bucketId = OrdinalFactory.getContextOrdinal(destNode);
-                        bucketId |= 1L << 31;
-
-                        IpAddress tunDst =
-                                ctx.getSwitchManager().getTunnelIP(destNode, TunnelTypeVxlan.class);
-                        NodeConnectorId tunPort =
-                                ctx.getSwitchManager().getTunnelPort(nodeId, TunnelTypeVxlan.class);
-                        if (tunDst == null || tunPort == null)
-                            continue;
-                        Action tundstAction = null;
-                        if (tunDst.getIpv4Address() != null) {
-                            String nextHop = tunDst.getIpv4Address().getValue();
-                            tundstAction = nxLoadTunIPv4Action(nextHop, true);
-                        } else {
-                            LOG.error("IPv6 tunnel destination {} for {} not supported",
-                                    tunDst.getIpv6Address().getValue(),
-                                    destNode);
-                            continue;
-                        }
-                    BucketBuilder bb = new BucketBuilder().setBucketId(new BucketId(Long.valueOf(bucketId))).setAction(actionList(tundstAction, outputAction(tunPort)));
-
-
-
-                        updateBucket(gctx, bb);
-                    }
-                OfOverlayContext ofc =
-                        localEp.getAugmentation(OfOverlayContext.class);
+                OfOverlayContext ofc = localEp.getAugmentation(OfOverlayContext.class);
                 if (ofc == null || ofc.getNodeConnectorId() == null ||
                         (LocationType.External.equals(ofc.getLocationType())))
                     continue;
@@ -226,49 +138,16 @@ public class GroupTable extends OfTable {
                 try {
                     bucketId = getOfPortNum(ofc.getNodeConnectorId());
                 } catch (NumberFormatException e) {
-                    LOG.warn("Could not parse port number {}",
-                            ofc.getNodeConnectorId(), e);
+                    LOG.warn("Could not parse port number {}", ofc.getNodeConnectorId(), e);
                     continue;
                 }
 
                 Action output = outputAction(ofc.getNodeConnectorId());
-                BucketBuilder bb = new BucketBuilder()
-                        .setBucketId(new BucketId(Long.valueOf(bucketId)))
+                BucketBuilder bb = new BucketBuilder().setBucketId(new BucketId(Long.valueOf(bucketId)))
                         .setAction(actionList(output));
-                updateBucket(gctx, bb);
+                ofWriter.writeBucket(nodeId, gid, bb.build());
             }
         }
     }
 
-    private static void updateBucket(GroupCtx gctx, BucketBuilder bb) {
-        BucketCtx bctx = gctx.bucketMap.get(bb.getBucketId());
-        if (bctx == null) {
-            gctx.bucketMap.put(bb.getBucketId(),
-                    bctx = new BucketCtx(null));
-        }
-        bctx.visited = true;
-        bctx.newb = bb.build();
-    }
-
-    protected static class BucketCtx {
-        Bucket b;
-        Bucket newb;
-        boolean visited = false;
-
-        public BucketCtx(Bucket b) {
-            super();
-            this.b = b;
-        }
-    }
-
-    protected static class GroupCtx {
-        GroupId groupId;
-        Map<BucketId, BucketCtx> bucketMap = new HashMap<>();
-        boolean visited = false;
-
-        public GroupCtx(GroupId groupId) {
-            super();
-            this.groupId = groupId;
-        }
-    }
 }