*/
package org.opendaylight.genius.interfacemanager;
+import static java.util.Collections.emptyList;
+import static org.opendaylight.controller.md.sal.binding.api.WriteTransaction.CREATE_MISSING_PARENTS;
+import static org.opendaylight.genius.infra.Datastore.CONFIGURATION;
import static org.opendaylight.genius.interfacemanager.globals.InterfaceInfo.InterfaceType.GRE_TRUNK_INTERFACE;
import static org.opendaylight.genius.interfacemanager.globals.InterfaceInfo.InterfaceType.LOGICAL_GROUP_INTERFACE;
import static org.opendaylight.genius.interfacemanager.globals.InterfaceInfo.InterfaceType.MPLS_OVER_GRE;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import org.apache.commons.lang3.BooleanUtils;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
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.SingleTransactionDataBroker;
+import org.opendaylight.genius.infra.Datastore.Configuration;
import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
-import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;
+import org.opendaylight.genius.infra.TypedWriteTransaction;
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.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.iana._if.type.rev170119.L2vlan;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.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.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState;
.build();
public static BigInteger getDpnFromNodeConnectorId(NodeConnectorId portId) {
+ return new BigInteger(getDpnStringFromNodeConnectorId(portId));
+ }
+
+ public static String getDpnStringFromNodeConnectorId(NodeConnectorId portId) {
/*
* NodeConnectorId is of form 'openflow:dpnid:portnum'
*/
- String[] split = portId.getValue().split(IfmConstants.OF_URI_SEPARATOR);
- return new BigInteger(split[1]);
+ return portId.getValue().split(IfmConstants.OF_URI_SEPARATOR)[1];
}
public static BigInteger getDpnFromInterface(
}
} else {
// For OF Tunnels default egress actions need to set tunnelIps
- IfTunnel ifTunnel = interfaceInfo.getAugmentation(IfTunnel.class);
+ IfTunnel ifTunnel = interfaceInfo.augmentation(IfTunnel.class);
if (BooleanUtils.isTrue(ifTunnel.isTunnelRemoteIpFlow()
&& ifTunnel.getTunnelDestination() != null)) {
result.add(new ActionSetTunnelDestinationIp(actionKeyStart++, ifTunnel.getTunnelDestination()));
// fall through
case VLAN_INTERFACE:
if (isDefaultEgress) {
- IfL2vlan vlanIface = interfaceInfo.getAugmentation(IfL2vlan.class);
+ IfL2vlan vlanIface = interfaceInfo.augmentation(IfL2vlan.class);
LOG.trace("get egress actions for l2vlan interface: {}", vlanIface);
boolean isVlanTransparent = false;
int vlanVid = 0;
if (ifType.isAssignableFrom(L2vlan.class)) {
interfaceType = VLAN_INTERFACE;
} else if (ifType.isAssignableFrom(Tunnel.class)) {
- IfTunnel ifTunnel = iface.getAugmentation(IfTunnel.class);
+ IfTunnel ifTunnel = iface.augmentation(IfTunnel.class);
Class<? extends org.opendaylight.yang.gen.v1.urn.opendaylight
.genius.interfacemanager.rev160406.TunnelTypeBase> tunnelType = ifTunnel
.getTunnelInterfaceType();
public static VlanInterfaceInfo getVlanInterfaceInfo(Interface iface, BigInteger dpId) {
short vlanId = 0;
String portName = null;
- IfL2vlan vlanIface = iface.getAugmentation(IfL2vlan.class);
- ParentRefs parentRefs = iface.getAugmentation(ParentRefs.class);
+ IfL2vlan vlanIface = iface.augmentation(IfL2vlan.class);
+ ParentRefs parentRefs = iface.augmentation(ParentRefs.class);
if (parentRefs != null && parentRefs.getParentInterface() != null) {
portName = parentRefs.getParentInterface();
} else {
return new PhysAddress(southboundMacAddress);
}
- public static void updateInterfaceParentRef(WriteTransaction writeTransaction, String interfaceName,
+ public static void updateInterfaceParentRef(TypedWriteTransaction<Configuration> tx, String interfaceName,
String parentInterface) {
InstanceIdentifier<ParentRefs> parentRefIdentifier = InstanceIdentifier.builder(Interfaces.class)
.child(Interface.class, new InterfaceKey(interfaceName)).augmentation(ParentRefs.class).build();
ParentRefs parentRefs = new ParentRefsBuilder().setParentInterface(parentInterface).build();
- writeTransaction.merge(LogicalDatastoreType.CONFIGURATION, parentRefIdentifier, parentRefs);
+ tx.merge(parentRefIdentifier, parentRefs);
LOG.debug(
"Updating parentRefInterface for interfaceName {}. "
+ "interfaceKey {}, with parentRef augmentation pointing to {}",
.child(BoundServices.class, new BoundServicesKey(servicePriority)).build();
}
- public static void bindService(WriteTransaction writeTransaction, String interfaceName, BoundServices serviceInfo,
- Class<? extends ServiceModeBase> serviceMode) {
+ public static void bindService(TypedWriteTransaction<Configuration> tx, String interfaceName,
+ BoundServices serviceInfo, Class<? extends ServiceModeBase> serviceMode) {
LOG.info("Binding Service {} for : {}", serviceInfo.getServiceName(), interfaceName);
InstanceIdentifier<BoundServices> boundServicesInstanceIdentifier = buildBoundServicesIId(
- serviceInfo.getServicePriority(), interfaceName, serviceMode);
- writeTransaction.put(LogicalDatastoreType.CONFIGURATION, boundServicesInstanceIdentifier, serviceInfo, true);
- }
-
- public static void unbindService(DataBroker dataBroker, JobCoordinator coordinator, String interfaceName,
- InstanceIdentifier<BoundServices> boundServicesInstanceIdentifier) {
- unbindService(new ManagedNewTransactionRunnerImpl(dataBroker), coordinator, interfaceName,
- boundServicesInstanceIdentifier);
+ serviceInfo.getServicePriority(), interfaceName, serviceMode);
+ tx.put(boundServicesInstanceIdentifier, serviceInfo, CREATE_MISSING_PARENTS);
}
public static void unbindService(ManagedNewTransactionRunner txRunner, JobCoordinator coordinator,
String interfaceName, InstanceIdentifier<BoundServices> boundServicesInstanceIdentifier) {
coordinator.enqueueJob(interfaceName, () -> Collections.singletonList(
- txRunner.callWithNewWriteOnlyTransactionAndSubmit(
+ txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION,
tx -> unbindService(tx, interfaceName, boundServicesInstanceIdentifier))));
}
- public static void unbindService(WriteTransaction tx, String interfaceName,
+ public static void unbindService(TypedWriteTransaction<Configuration> tx, String interfaceName,
InstanceIdentifier<BoundServices> boundServicesInstanceIdentifier) {
LOG.info("Unbinding Service from : {}", interfaceName);
- tx.delete(LogicalDatastoreType.CONFIGURATION, boundServicesInstanceIdentifier);
+ tx.delete(boundServicesInstanceIdentifier);
}
public static long getLogicalTunnelSelectGroupId(int lportTag) {
return org.opendaylight.genius.interfacemanager.globals.IfmConstants.VXLAN_GROUPID_MIN + lportTag;
}
+
+ // TODO Replace this with mdsal's DataObjectUtils.nullToEmpty when upgrading to mdsal 3.0.2
+ @Nonnull
+ public static <T> List<T> nullToEmpty(final @Nullable List<T> input) {
+ return input != null ? input : emptyList();
+ }
}
Code Review / genius.git / blobdiff