import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
import com.google.common.util.concurrent.ListenableFuture;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.math.BigInteger;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
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.genius.datastoreutils.DataStoreJobCoordinator;
+import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
+import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
+import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;
import org.opendaylight.genius.interfacemanager.commons.InterfaceManagerCommonUtils;
import org.opendaylight.genius.interfacemanager.globals.InterfaceInfo;
import org.opendaylight.genius.interfacemanager.globals.VlanInterfaceInfo;
-import org.opendaylight.genius.interfacemanager.servicebindings.flowbased.utilities.FlowBasedServicesUtils;
import org.opendaylight.genius.mdsalutil.ActionInfo;
import org.opendaylight.genius.mdsalutil.MDSALUtil;
import org.opendaylight.genius.mdsalutil.MetaDataUtil;
import org.opendaylight.genius.mdsalutil.NwConstants;
+import org.opendaylight.genius.mdsalutil.actions.ActionGroup;
import org.opendaylight.genius.mdsalutil.actions.ActionNxResubmit;
import org.opendaylight.genius.mdsalutil.actions.ActionOutput;
import org.opendaylight.genius.mdsalutil.actions.ActionPushVlan;
import org.opendaylight.genius.mdsalutil.actions.ActionSetFieldVlanVid;
import org.opendaylight.genius.mdsalutil.actions.ActionSetTunnelDestinationIp;
import org.opendaylight.genius.mdsalutil.actions.ActionSetTunnelSourceIp;
+import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.L2vlan;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.Tunnel;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdPools;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.ReleaseIdInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.ReleaseIdInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.ReleaseIdOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.id.pools.IdPool;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.id.pools.IdPoolKey;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfL2vlan;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class IfmUtil {
+public final class IfmUtil {
+
private static final Logger LOG = LoggerFactory.getLogger(IfmUtil.class);
private static final int INVALID_ID = 0;
+ private IfmUtil() {
+ throw new IllegalStateException("Utility class");
+ }
+
private static final ImmutableMap<Class<? extends TunnelTypeBase>, InterfaceInfo.InterfaceType>
TUNNEL_TYPE_MAP = new ImmutableMap.Builder<Class<? extends TunnelTypeBase>, InterfaceInfo.InterfaceType>()
.put(TunnelTypeGre.class, GRE_TRUNK_INTERFACE).put(TunnelTypeMplsOverGre.class, MPLS_OVER_GRE)
new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang
.ietf.interfaces.rev140508.interfaces.state.InterfaceKey(
interfaceName));
- InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang
- .ietf.interfaces.rev140508.interfaces.state.Interface> id = idBuilder
- .build();
- return id;
+ return idBuilder.build();
}
public static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang
return 0;
}
+ /**
+ * Synchronous blocking read from data store.
+ *
+ * @deprecated Use
+ * {@link SingleTransactionDataBroker#syncReadOptional(DataBroker, LogicalDatastoreType, InstanceIdentifier)}
+ * instead of this.
+ */
+ @Deprecated
public static <T extends DataObject> Optional<T> read(LogicalDatastoreType datastoreType,
InstanceIdentifier<T> path, DataBroker broker) {
try (ReadOnlyTransaction tx = broker.newReadOnlyTransaction()) {
}
public static List<Action> getEgressActionsForInterface(String interfaceName, Long tunnelKey, Integer actionKey,
- DataBroker dataBroker, Boolean isDefaultEgress) {
+ InterfaceManagerCommonUtils interfaceUtils, Boolean isDefaultEgress) {
List<ActionInfo> listActionInfo = getEgressActionInfosForInterface(interfaceName, tunnelKey,
- actionKey == null ? 0 : actionKey, dataBroker, isDefaultEgress);
+ actionKey == null ? 0 : actionKey, interfaceUtils, isDefaultEgress);
List<Action> actionsList = new ArrayList<>();
for (ActionInfo actionInfo : listActionInfo) {
actionsList.add(actionInfo.buildAction());
}
public static List<Instruction> getEgressInstructionsForInterface(String interfaceName, Long tunnelKey,
- DataBroker dataBroker, Boolean isDefaultEgress) {
+ InterfaceManagerCommonUtils interfaceUtils, Boolean isDefaultEgress) {
List<Instruction> instructions = new ArrayList<>();
List<Action> actionList = MDSALUtil.buildActions(
- getEgressActionInfosForInterface(interfaceName, tunnelKey, 0, dataBroker, isDefaultEgress));
+ getEgressActionInfosForInterface(interfaceName, tunnelKey, 0, interfaceUtils, isDefaultEgress));
instructions.add(MDSALUtil.buildApplyActionsInstruction(actionList));
return instructions;
}
public static List<Instruction> getEgressInstructionsForInterface(Interface interfaceInfo, String portNo,
- Long tunnelKey, boolean isDefaultEgress, int ifIndex) {
+ Long tunnelKey, boolean isDefaultEgress,
+ int ifIndex, long groupId) {
List<Instruction> instructions = new ArrayList<>();
InterfaceInfo.InterfaceType ifaceType = getInterfaceType(interfaceInfo);
- List<Action> actionList = MDSALUtil.buildActions(getEgressActionInfosForInterface(interfaceInfo, portNo,
- ifaceType, tunnelKey, 0, isDefaultEgress, ifIndex));
+ List<Action> actionList = MDSALUtil.buildActions(
+ getEgressActionInfosForInterface(interfaceInfo, portNo, ifaceType, tunnelKey, 0,
+ isDefaultEgress, ifIndex, groupId));
instructions.add(MDSALUtil.buildApplyActionsInstruction(actionList));
return instructions;
}
public static List<ActionInfo> getEgressActionInfosForInterface(String interfaceName, int actionKeyStart,
- DataBroker dataBroker, Boolean isDefaultEgress) {
- return getEgressActionInfosForInterface(interfaceName, null, actionKeyStart, dataBroker, isDefaultEgress);
+ InterfaceManagerCommonUtils interfaceUtils, Boolean isDefaultEgress) {
+ return getEgressActionInfosForInterface(interfaceName, null, actionKeyStart, interfaceUtils, isDefaultEgress);
}
/**
* Optional.
* @param actionKeyStart
* action key
- * @param dataBroker
- * databroker
+ * @param interfaceUtils
+ * InterfaceManagerCommonUtils
* @return list of actions
*/
public static List<ActionInfo> getEgressActionInfosForInterface(String interfaceName, Long tunnelKey,
- int actionKeyStart, DataBroker dataBroker, Boolean isDefaultEgress) {
- Interface interfaceInfo = InterfaceManagerCommonUtils.getInterfaceFromConfigDS(new InterfaceKey(interfaceName),
- dataBroker);
+ int actionKeyStart, InterfaceManagerCommonUtils interfaceUtils, Boolean isDefaultEgress) {
+ Interface interfaceInfo = interfaceUtils.getInterfaceFromConfigDS(new InterfaceKey(interfaceName));
if (interfaceInfo == null) {
throw new NullPointerException("Interface information not present in config DS for " + interfaceName);
}
org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang
- .ietf.interfaces.rev140508.interfaces.state.Interface ifState = InterfaceManagerCommonUtils
- .getInterfaceState(interfaceName, dataBroker);
+ .ietf.interfaces.rev140508.interfaces.state.Interface ifState =
+ interfaceUtils.getInterfaceState(interfaceName);
if (ifState == null) {
throw new NullPointerException("Interface information not present in oper DS for " + interfaceName);
}
InterfaceInfo.InterfaceType ifaceType = getInterfaceType(interfaceInfo);
return getEgressActionInfosForInterface(interfaceInfo, portNo, ifaceType, tunnelKey, actionKeyStart,
- isDefaultEgress, ifState.getIfIndex());
+ isDefaultEgress, ifState.getIfIndex(), 0);
}
/**
* @param actionKeyStart the start for the first key assigned for the new actions
* @param isDefaultEgress if it is the default egress
* @param ifIndex interface index
+ * @param groupId group Id
* @return list of actions for the interface
*/
// The following suppression is for javac, not for checkstyle
@SuppressWarnings("fallthrough")
+ @SuppressFBWarnings("SF_SWITCH_FALLTHROUGH")
public static List<ActionInfo> getEgressActionInfosForInterface(Interface interfaceInfo, String portNo,
InterfaceInfo.InterfaceType ifaceType, Long tunnelKey, int actionKeyStart, boolean isDefaultEgress,
- int ifIndex) {
+ int ifIndex, long groupId) {
List<ActionInfo> result = new ArrayList<>();
switch (ifaceType) {
case MPLS_OVER_GRE:
case VLAN_INTERFACE:
if (isDefaultEgress) {
IfL2vlan vlanIface = interfaceInfo.getAugmentation(IfL2vlan.class);
- LOG.trace("L2Vlan: {}", vlanIface);
+ LOG.trace("get egress actions for l2vlan interface: {}", vlanIface);
boolean isVlanTransparent = false;
int vlanVid = 0;
if (vlanIface != null) {
break;
case LOGICAL_GROUP_INTERFACE:
if (isDefaultEgress) {
- LOG.debug("MULTIPLE_VxLAN_TUNNELS: default egress action treatment will be added later");
+ result.add(new ActionGroup(groupId));
} else {
addEgressActionInfosForInterface(ifIndex, actionKeyStart, result);
}
break;
+
default:
LOG.warn("Interface Type {} not handled yet", ifaceType);
break;
long regValue = MetaDataUtil.getReg6ValueForLPortDispatcher(ifIndex, NwConstants.DEFAULT_SERVICE_INDEX);
result.add(new ActionRegLoad(actionKeyStart++, NxmNxReg6.class, IfmConstants.REG6_START_INDEX,
IfmConstants.REG6_END_INDEX, regValue));
- result.add(new ActionNxResubmit(actionKeyStart++, NwConstants.EGRESS_LPORT_DISPATCHER_TABLE));
+ result.add(new ActionNxResubmit(actionKeyStart, NwConstants.EGRESS_LPORT_DISPATCHER_TABLE));
}
public static NodeId getNodeIdFromNodeConnectorId(NodeConnectorId ncId) {
- return new NodeId(ncId.getValue().substring(0, ncId.getValue().lastIndexOf(":")));
+ return new NodeId(ncId.getValue().substring(0, ncId.getValue().lastIndexOf(':')));
}
public static BigInteger[] mergeOpenflowMetadataWriteInstructions(List<Instruction> instructions) {
public static void releaseId(IdManagerService idManager, String poolName, String idKey) {
ReleaseIdInput idInput = new ReleaseIdInputBuilder().setPoolName(poolName).setIdKey(idKey).build();
try {
- Future<RpcResult<Void>> result = idManager.releaseId(idInput);
- RpcResult<Void> rpcResult = result.get();
+ ListenableFuture<RpcResult<ReleaseIdOutput>> result = idManager.releaseId(idInput);
+ RpcResult<ReleaseIdOutput> rpcResult = result.get();
if (!rpcResult.isSuccessful()) {
- LOG.warn("RPC Call to release Id {} with Key {} returned with Errors {}", idKey, rpcResult.getErrors());
+ LOG.warn("RPC Call to release Id with Key {} returned with Errors {}", idKey, rpcResult.getErrors());
}
} catch (InterruptedException | ExecutionException e) {
LOG.warn("Exception when releasing Id for key {}", idKey, e);
return null;
}
- public static NodeConnectorId getNodeConnectorIdFromInterface(String interfaceName, DataBroker dataBroker) {
- return FlowBasedServicesUtils.getNodeConnectorIdFromInterface(interfaceName, dataBroker);
- }
-
public static NodeConnectorId getNodeConnectorIdFromInterface(
org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang
.ietf.interfaces.rev140508.interfaces.state.Interface ifState) {
Class<? extends org.opendaylight.yang.gen.v1.urn.opendaylight
.genius.interfacemanager.rev160406.TunnelTypeBase> tunnelType = ifTunnel
.getTunnelInterfaceType();
- interfaceType = TUNNEL_TYPE_MAP.get(tunnelType);
+ interfaceType = tunnelType.isAssignableFrom(TunnelTypeLogicalGroup.class)
+ ? InterfaceInfo.InterfaceType.LOGICAL_GROUP_INTERFACE : TUNNEL_TYPE_MAP.get(tunnelType);
}
return interfaceType;
}
- public static VlanInterfaceInfo getVlanInterfaceInfo(String interfaceName, Interface iface, BigInteger dpId) {
+ public static VlanInterfaceInfo getVlanInterfaceInfo(Interface iface, BigInteger dpId) {
short vlanId = 0;
String portName = null;
IfL2vlan vlanIface = iface.getAugmentation(IfL2vlan.class);
writeTransaction.put(LogicalDatastoreType.CONFIGURATION, boundServicesInstanceIdentifier, serviceInfo, true);
}
- public static void unbindService(DataBroker dataBroker, String interfaceName,
+ public static void unbindService(DataBroker dataBroker, JobCoordinator coordinator, String interfaceName,
+ InstanceIdentifier<BoundServices> boundServicesInstanceIdentifier) {
+ unbindService(new ManagedNewTransactionRunnerImpl(dataBroker), coordinator, interfaceName,
+ boundServicesInstanceIdentifier);
+ }
+
+ public static void unbindService(ManagedNewTransactionRunner txRunner, JobCoordinator coordinator,
+ String interfaceName, InstanceIdentifier<BoundServices> boundServicesInstanceIdentifier) {
+ coordinator.enqueueJob(interfaceName, () -> Collections.singletonList(
+ txRunner.callWithNewWriteOnlyTransactionAndSubmit(
+ tx -> unbindService(tx, interfaceName, boundServicesInstanceIdentifier))));
+ }
+
+ public static void unbindService(WriteTransaction tx, String interfaceName,
InstanceIdentifier<BoundServices> boundServicesInstanceIdentifier) {
LOG.info("Unbinding Service from : {}", interfaceName);
- DataStoreJobCoordinator dataStoreJobCoordinator = DataStoreJobCoordinator.getInstance();
- dataStoreJobCoordinator.enqueueJob(interfaceName, () -> {
- WriteTransaction writeTransaction = dataBroker.newWriteOnlyTransaction();
- writeTransaction.delete(LogicalDatastoreType.CONFIGURATION, boundServicesInstanceIdentifier);
- List<ListenableFuture<Void>> futures = new ArrayList<>();
- futures.add(writeTransaction.submit());
- return futures;
- });
+ tx.delete(LogicalDatastoreType.CONFIGURATION, boundServicesInstanceIdentifier);
}
public static long getLogicalTunnelSelectGroupId(int lportTag) {
Code Review / genius.git / blobdiff