Bump version odlparent->6.0.0,mdsal->5.0.3

[genius.git] / interfacemanager / interfacemanager-impl / src / main / java / org / opendaylight / genius / interfacemanager / servicebindings / flowbased / state / helpers / FlowBasedEgressServicesStateBindHelper.java

diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/state/helpers/FlowBasedEgressServicesStateBindHelper.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/state/helpers/FlowBasedEgressServicesStateBindHelper.java
index 1d68c6d11ee92ad07fa9b857bc53d7cc0e0b37df..565ff9dea3db2e2d596c69563c319c39b6ff5478 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/state/helpers/FlowBasedEgressServicesStateBindHelper.java
+++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/state/helpers/FlowBasedEgressServicesStateBindHelper.java
@@ -8,12 +8,14 @@
 package org.opendaylight.genius.interfacemanager.servicebindings.flowbased.state.helpers;
 
 import com.google.common.util.concurrent.ListenableFuture;
-import java.math.BigInteger;
 import java.util.Comparator;
 import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import org.apache.aries.blueprint.annotation.service.Reference;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.genius.infra.Datastore.Configuration;
+import org.opendaylight.genius.infra.TypedReadWriteTransaction;
 import org.opendaylight.genius.interfacemanager.IfmUtil;
 import org.opendaylight.genius.interfacemanager.commons.InterfaceManagerCommonUtils;
 import org.opendaylight.genius.interfacemanager.servicebindings.flowbased.utilities.FlowBasedServicesUtils;
@@ -21,6 +23,7 @@ import org.opendaylight.genius.mdsalutil.NwConstants;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.service.bindings.services.info.BoundServices;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId;
+import org.opendaylight.yangtools.yang.common.Uint64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,46 +35,45 @@ public class FlowBasedEgressServicesStateBindHelper extends AbstractFlowBasedSer
     private final InterfaceManagerCommonUtils interfaceManagerCommonUtils;
 
     @Inject
-    public FlowBasedEgressServicesStateBindHelper(final DataBroker dataBroker,
+    public FlowBasedEgressServicesStateBindHelper(@Reference final DataBroker dataBroker,
             final InterfaceManagerCommonUtils interfaceManagerCommonUtils) {
         super(dataBroker);
         this.interfaceManagerCommonUtils = interfaceManagerCommonUtils;
     }
 
     @Override
-    public void bindServicesOnInterface(List<ListenableFuture<Void>> futures, List<BoundServices> allServices,
+    public void bindServicesOnInterface(TypedReadWriteTransaction<Configuration> tx, List<BoundServices> allServices,
                                         Interface ifState) {
         LOG.info("bind all egress services for interface: {}", ifState.getName());
         NodeConnectorId nodeConnectorId = FlowBasedServicesUtils.getNodeConnectorIdFromInterface(ifState);
-        BigInteger dpId = IfmUtil.getDpnFromNodeConnectorId(nodeConnectorId);
-        futures.add(getTxRunner().callWithNewWriteOnlyTransactionAndSubmit(tx -> {
-            allServices.sort(Comparator.comparing(BoundServices::getServicePriority));
-            BoundServices highestPriority = allServices.remove(0);
-            short nextServiceIndex = (short) (allServices.size() > 0 ? allServices.get(0).getServicePriority()
-                    : highestPriority.getServicePriority() + 1);
-            org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang
-                    .ietf.interfaces.rev140508.interfaces.Interface iface = interfaceManagerCommonUtils
-                    .getInterfaceFromConfigDS(ifState.getName());
-            FlowBasedServicesUtils.installEgressDispatcherFlows(dpId, highestPriority, ifState.getName(), tx,
-                    ifState.getIfIndex(), NwConstants.DEFAULT_SERVICE_INDEX, nextServiceIndex, iface);
-            BoundServices prev = null;
-            for (BoundServices boundService : allServices) {
-                if (prev != null) {
-                    FlowBasedServicesUtils.installEgressDispatcherFlows(dpId, prev, ifState.getName(), tx,
-                            ifState.getIfIndex(), prev.getServicePriority(), boundService.getServicePriority(), iface);
-                }
-                prev = boundService;
-            }
+        Uint64 dpId = IfmUtil.getDpnFromNodeConnectorId(nodeConnectorId);
+        allServices.sort(Comparator.comparing(BoundServices::getServicePriority));
+        BoundServices highestPriority = allServices.remove(0);
+        short nextServiceIndex = (short) (allServices.size() > 0 ? allServices.get(0).getServicePriority().toJava()
+                : highestPriority.getServicePriority().toJava() + 1);
+        org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang
+                .ietf.interfaces.rev140508.interfaces.Interface iface = interfaceManagerCommonUtils
+                .getInterfaceFromConfigDS(ifState.getName());
+        FlowBasedServicesUtils.installEgressDispatcherFlows(dpId, highestPriority, ifState.getName(), tx,
+                ifState.getIfIndex(), NwConstants.DEFAULT_SERVICE_INDEX, nextServiceIndex, iface);
+        BoundServices prev = null;
+        for (BoundServices boundService : allServices) {
             if (prev != null) {
                 FlowBasedServicesUtils.installEgressDispatcherFlows(dpId, prev, ifState.getName(), tx,
-                        ifState.getIfIndex(), prev.getServicePriority(), (short) (prev.getServicePriority() + 1),
-                        iface);
+                        ifState.getIfIndex(), prev.getServicePriority().toJava(),
+                        boundService.getServicePriority().toJava(), iface);
             }
-        }));
+            prev = boundService;
+        }
+        if (prev != null) {
+            FlowBasedServicesUtils.installEgressDispatcherFlows(dpId, prev, ifState.getName(), tx,
+                    ifState.getIfIndex(), prev.getServicePriority().toJava(),
+                    (short) (prev.getServicePriority().toJava() + 1), iface);
+        }
     }
 
     @Override
-    public void bindServicesOnInterfaceType(List<ListenableFuture<Void>> futures, BigInteger dpnId, String ifaceName) {
-        LOG.info("bindServicesOnInterfaceType Egress - WIP");
+    public void bindServicesOnInterfaceType(List<ListenableFuture<Void>> futures, Uint64 dpnId, String ifaceName) {
+        // TODO: No-op?
     }
 }