Bug 5617: OfOverlay Refactoring - Destination mapper

[groupbasedpolicy.git] / renderers / ofoverlay / src / main / java / org / opendaylight / groupbasedpolicy / renderer / ofoverlay / mapper / source / SourceMapper.java

diff --git a/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/mapper/source/SourceMapper.java b/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/mapper/source/SourceMapper.java
index 937c022b4219bdb376920fe4c5585e985cecabd5..9d6fc038fa3e6706042236154cc4388e0034de58 100755 (executable)
--- a/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/mapper/source/SourceMapper.java
+++ b/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/mapper/source/SourceMapper.java
@@ -123,7 +123,8 @@ public class SourceMapper extends FlowTable {
                 for (EgKey peer : peers) {
                     Collection<Endpoint> peerEgEndpoints = ctx.getEndpointManager().getEndpointsForGroup(peer);
                     for (Endpoint peerEgEndpoint : peerEgEndpoints) {
-                        OrdinalFactory.EndpointFwdCtxOrdinals ordinals = getEndpointOrdinals(ctx, peerEgEndpoint);
+                        OrdinalFactory.EndpointFwdCtxOrdinals ordinals =
+                                OrdinalFactory.getEndpointFwdCtxOrdinals(ctx, peerEgEndpoint);
                         flows.createTunnelFlow(destinationMapperId, TUNNEL_FLOW, tunnelPort, ordinals,
                                 ofWriter);
                         flows.createBroadcastFlow(destinationMapperId, BROADCAST_FLOW, tunnelPort,
@@ -138,7 +139,8 @@ public class SourceMapper extends FlowTable {
         }
         IndexedTenant tenant = ctx.getTenant(endpoint.getTenant());
         // Sync the local EP information
-        OrdinalFactory.EndpointFwdCtxOrdinals endpointFwdCtxOrdinals = getEndpointOrdinals(ctx, endpoint);
+        OrdinalFactory.EndpointFwdCtxOrdinals endpointFwdCtxOrdinals =
+                OrdinalFactory.getEndpointFwdCtxOrdinals(ctx, endpoint);
         MacAddress macAddress = endpoint.getMacAddress();
         if (endpointFwdCtxOrdinals != null) {
             OfOverlayContext ofOverlayContext = endpoint.getAugmentation(OfOverlayContext.class);
@@ -150,15 +152,6 @@ public class SourceMapper extends FlowTable {
         }
     }
 
-    private OrdinalFactory.EndpointFwdCtxOrdinals getEndpointOrdinals(OfContext ctx, Endpoint endpoint) {
-        try {
-            return OrdinalFactory.getEndpointFwdCtxOrdinals(ctx, endpoint);
-        } catch (Exception e) {
-            LOG.error("Failed to get fwd ctx ordinals for endpoint {}", endpoint);
-            return null;
-        }
-    }
-
     private Set<EgKey> getEndpointGroups(Endpoint endpoint) {
         Set<EgKey> endpointGroups = new HashSet<>();
         if (endpoint.getEndpointGroup() != null) {