X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=interfacemanager%2Finterfacemanager-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fgenius%2Finterfacemanager%2Frpcservice%2FInterfaceManagerRpcService.java;h=36812378161e5a9af31854bcb4959f2dfc31e25d;hb=65a219113c2eeb50eaec80cf1cb3cc30f5a532f4;hp=69887087f8aba50d06b615a55424dd3fd3d23b13;hpb=c0815f2cf63211c02688ff79883aaf84cf312ee8;p=genius.git diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/rpcservice/InterfaceManagerRpcService.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/rpcservice/InterfaceManagerRpcService.java index 69887087f..368123781 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/rpcservice/InterfaceManagerRpcService.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/rpcservice/InterfaceManagerRpcService.java @@ -9,76 +9,42 @@ package org.opendaylight.genius.interfacemanager.rpcservice; import com.google.common.base.Optional; -import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import com.google.common.util.concurrent.SettableFuture; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.concurrent.Future; import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.genius.interfacemanager.IfmConstants; import org.opendaylight.genius.interfacemanager.IfmUtil; import org.opendaylight.genius.interfacemanager.commons.InterfaceManagerCommonUtils; import org.opendaylight.genius.interfacemanager.commons.InterfaceMetaUtils; -import org.opendaylight.genius.mdsalutil.ActionInfo; import org.opendaylight.genius.mdsalutil.InstructionInfo; -import org.opendaylight.genius.mdsalutil.InstructionType; import org.opendaylight.genius.mdsalutil.MDSALUtil; -import org.opendaylight.genius.mdsalutil.MatchFieldType; import org.opendaylight.genius.mdsalutil.MatchInfo; import org.opendaylight.genius.mdsalutil.NwConstants; import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager; +import org.opendaylight.genius.mdsalutil.matches.MatchEthernetType; +import org.opendaylight.genius.mdsalutil.matches.MatchMplsLabel; +import org.opendaylight.genius.mdsalutil.matches.MatchTunnelId; 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.interfaces.rev140508.interfaces.Interface; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.Instruction; +import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.meta.rev160406.DpnToInterfaceList; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.meta.rev160406.IfIndexesInterfaceMap; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.meta.rev160406._if.indexes._interface.map.IfIndexInterface; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.meta.rev160406._if.indexes._interface.map.IfIndexInterfaceKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.meta.rev160406.bridge._interface.info.BridgeEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.meta.rev160406.bridge._interface.info.BridgeEntryKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.meta.rev160406.bridge._interface.info.bridge.entry.BridgeInterfaceEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.meta.rev160406.dpn.to._interface.list.DpnToInterface; +import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.meta.rev160406.dpn.to._interface.list.DpnToInterfaceKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.meta.rev160406.dpn.to._interface.list.dpn.to._interface.InterfaceNameEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfTunnel; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.ParentRefs; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelTypeBase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelTypeMplsOverGre; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.CreateTerminatingServiceActionsInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetDpidFromInterfaceInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetDpidFromInterfaceOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetDpidFromInterfaceOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetEgressActionsForInterfaceInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetEgressActionsForInterfaceOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetEgressActionsForInterfaceOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetEgressInstructionsForInterfaceInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetEgressInstructionsForInterfaceOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetEgressInstructionsForInterfaceOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetEndpointIpForDpnInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetEndpointIpForDpnOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetEndpointIpForDpnOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetInterfaceFromIfIndexInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetInterfaceFromIfIndexOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetInterfaceFromIfIndexOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetInterfaceTypeInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetInterfaceTypeOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetInterfaceTypeOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetNodeconnectorIdFromInterfaceInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetNodeconnectorIdFromInterfaceOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetNodeconnectorIdFromInterfaceOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetPortFromInterfaceInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetPortFromInterfaceOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetPortFromInterfaceOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetTunnelTypeInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetTunnelTypeOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetTunnelTypeOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.OdlInterfaceRpcService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.RemoveTerminatingServiceActionsInput; +import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.*; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcError; @@ -87,15 +53,27 @@ import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.inject.Inject; +import javax.inject.Singleton; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.Future; +import java.util.stream.Collectors; + +@Singleton public class InterfaceManagerRpcService implements OdlInterfaceRpcService { + private static final Logger LOG = LoggerFactory.getLogger(InterfaceManagerRpcService.class); - DataBroker dataBroker; - IMdsalApiManager mdsalMgr; + private final DataBroker dataBroker; + private final IMdsalApiManager mdsalMgr; - public InterfaceManagerRpcService(DataBroker dataBroker, IMdsalApiManager mdsalMgr) { + @Inject + public InterfaceManagerRpcService(final DataBroker dataBroker, final IMdsalApiManager iMdsalApiManager) { this.dataBroker = dataBroker; - this.mdsalMgr = mdsalMgr; + this.mdsalMgr = iMdsalApiManager; } @Override @@ -107,26 +85,27 @@ public class InterfaceManagerRpcService implements OdlInterfaceRpcService { InterfaceKey interfaceKey = new InterfaceKey(interfaceName); Interface interfaceInfo = InterfaceManagerCommonUtils.getInterfaceFromConfigDS(interfaceKey, dataBroker); if (interfaceInfo == null) { - rpcResultBuilder = getRpcErrorResultForGetDpnIdRpc(interfaceName, "missing Interface in Config DataStore"); + rpcResultBuilder = getRpcErrorResultForGetDpnIdRpc(interfaceName, + "missing Interface in Config DataStore"); return Futures.immediateFuture(rpcResultBuilder.build()); } if (Tunnel.class.equals(interfaceInfo.getType())) { ParentRefs parentRefs = interfaceInfo.getAugmentation(ParentRefs.class); dpId = parentRefs.getDatapathNodeIdentifier(); } else { - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface ifState = - InterfaceManagerCommonUtils.getInterfaceStateFromOperDS(interfaceName, dataBroker); + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state + .Interface ifState + = InterfaceManagerCommonUtils.getInterfaceStateFromOperDS(interfaceName, dataBroker); if (ifState != null) { String lowerLayerIf = ifState.getLowerLayerIf().get(0); NodeConnectorId nodeConnectorId = new NodeConnectorId(lowerLayerIf); - dpId = new BigInteger(IfmUtil.getDpnFromNodeConnectorId(nodeConnectorId)); + dpId = IfmUtil.getDpnFromNodeConnectorId(nodeConnectorId); } else { - rpcResultBuilder = getRpcErrorResultForGetDpnIdRpc(interfaceName, "missing Interface-state"); - return Futures.immediateFuture(rpcResultBuilder.build()); + rpcResultBuilder = getRpcErrorResultForGetDpnIdRpc(interfaceName, "missing Interface-state"); + return Futures.immediateFuture(rpcResultBuilder.build()); } } - GetDpidFromInterfaceOutputBuilder output = new GetDpidFromInterfaceOutputBuilder().setDpid( - (dpId)); + GetDpidFromInterfaceOutputBuilder output = new GetDpidFromInterfaceOutputBuilder().setDpid(dpId); rpcResultBuilder = RpcResultBuilder.success(); rpcResultBuilder.withResult(output.build()); } catch (Exception e) { @@ -135,131 +114,58 @@ public class InterfaceManagerRpcService implements OdlInterfaceRpcService { return Futures.immediateFuture(rpcResultBuilder.build()); } - private RpcResultBuilder getRpcErrorResultForGetDpnIdRpc(String interfaceName, String errMsg) { + private RpcResultBuilder getRpcErrorResultForGetDpnIdRpc(String interfaceName, + String errMsg) { errMsg = String.format("Retrieval of datapath id for the key {%s} failed due to %s", interfaceName, errMsg); - LOG.error(errMsg); - RpcResultBuilder rpcResultBuilder = RpcResultBuilder.failed().withError(RpcError.ErrorType.APPLICATION, errMsg); + LOG.debug(errMsg); + RpcResultBuilder rpcResultBuilder = RpcResultBuilder + .failed().withError(RpcError.ErrorType.APPLICATION, errMsg); return rpcResultBuilder; } - @Override - public Future> createTerminatingServiceActions(final CreateTerminatingServiceActionsInput input) { - final SettableFuture> result = SettableFuture.create(); - try{ - LOG.info("create terminatingServiceAction on DpnId = {} for tunnel-key {}", input.getDpid() , input.getTunnelKey()); - Interface interfaceInfo = InterfaceManagerCommonUtils.getInterfaceFromConfigDS(new InterfaceKey(input.getInterfaceName()),dataBroker); - IfTunnel tunnelInfo = interfaceInfo.getAugmentation(IfTunnel.class); - if(tunnelInfo != null) { - ListenableFuture installFlowResult =(tunnelInfo.getTunnelInterfaceType().isAssignableFrom(TunnelTypeMplsOverGre.class))? - makeLFIBFlow(input.getDpid(),input.getTunnelKey(), input.getInstruction(), NwConstants.ADD_FLOW) : - makeTerminatingServiceFlow(tunnelInfo, input.getDpid(), input.getTunnelKey(), input.getInstruction(), NwConstants.ADD_FLOW); - Futures.addCallback(installFlowResult, new FutureCallback(){ - - @Override - public void onSuccess(Void aVoid) { - result.set(RpcResultBuilder.success().build()); - } - - @Override - public void onFailure(Throwable error) { - String msg = String.format("Unable to install terminating service flow for %s", input.getInterfaceName()); - LOG.error("create terminating service actions failed. {}. {}", msg, error); - result.set(RpcResultBuilder.failed().withError(RpcError.ErrorType.APPLICATION, msg, error).build()); - } - }); - result.set(RpcResultBuilder.success().build()); - } else { - String msg = String.format("Terminating Service Actions cannot be created for a non-tunnel interface %s",input.getInterfaceName()); - LOG.error(msg); - result.set(RpcResultBuilder.failed().withError(RpcError.ErrorType.APPLICATION, msg).build()); - } - }catch(Exception e){ - String msg = String.format("create Terminating Service Actions for %s failed",input.getInterfaceName()); - LOG.error("create Terminating Service Actions for {} failed due to {}" ,input.getDpid(), e); - result.set(RpcResultBuilder.failed().withError(RpcError.ErrorType.APPLICATION, msg, e.getMessage()).build()); - } - return result; - } - - @Override - public Future> removeTerminatingServiceActions(final RemoveTerminatingServiceActionsInput input) { - final SettableFuture> result = SettableFuture.create(); - try{ - dataBroker.newWriteOnlyTransaction(); - LOG.info("remove terminatingServiceAction on DpnId = {} for tunnel-key {}", input.getDpid() , input.getTunnelKey()); - - Interface interfaceInfo = InterfaceManagerCommonUtils.getInterfaceFromConfigDS(new InterfaceKey(input.getInterfaceName()),dataBroker); - IfTunnel tunnelInfo = interfaceInfo.getAugmentation(IfTunnel.class); - if(tunnelInfo != null) { - ListenableFuture removeFlowResult = (tunnelInfo.getTunnelInterfaceType().isAssignableFrom(TunnelTypeMplsOverGre.class))? - makeLFIBFlow(input.getDpid(),input.getTunnelKey(), null, NwConstants.DEL_FLOW) : - makeTerminatingServiceFlow(tunnelInfo, input.getDpid(), input.getTunnelKey(), null, NwConstants.DEL_FLOW); - Futures.addCallback(removeFlowResult, new FutureCallback(){ - - @Override - public void onSuccess(Void aVoid) { - result.set(RpcResultBuilder.success().build()); - } - - @Override - public void onFailure(Throwable error) { - String msg = String.format("Unable to install terminating service flow %s", input.getInterfaceName()); - LOG.error("create terminating service actions failed. {}. {}", msg, error); - result.set(RpcResultBuilder.failed().withError(RpcError.ErrorType.APPLICATION, msg, error).build()); - } - }); - result.set(RpcResultBuilder.success().build()); - } else { - String msg = String.format("Terminating Service Actions cannot be removed for a non-tunnel interface %s", - input.getInterfaceName()); - LOG.error(msg); - result.set(RpcResultBuilder.failed().withError(RpcError.ErrorType.APPLICATION, msg).build()); - } - }catch(Exception e){ - LOG.error("Remove Terminating Service Actions for {} failed due to {}" ,input.getDpid(), e); - String msg = String.format("Remove Terminating Service Actions for %d failed.", input.getDpid()); - result.set(RpcResultBuilder.failed().withError(RpcError.ErrorType.APPLICATION, msg, e.getMessage()).build()); - } - return result; - } - @Override public Future> getEndpointIpForDpn(GetEndpointIpForDpnInput input) { RpcResultBuilder rpcResultBuilder; try { BridgeEntryKey bridgeEntryKey = new BridgeEntryKey(input.getDpid()); - InstanceIdentifier bridgeEntryInstanceIdentifier = - InterfaceMetaUtils.getBridgeEntryIdentifier(bridgeEntryKey); - BridgeEntry bridgeEntry = - InterfaceMetaUtils.getBridgeEntryFromConfigDS(bridgeEntryInstanceIdentifier, - dataBroker); - // local ip of any of the bridge interface entry will be the dpn end point ip + InstanceIdentifier bridgeEntryInstanceIdentifier = InterfaceMetaUtils + .getBridgeEntryIdentifier(bridgeEntryKey); + BridgeEntry bridgeEntry = InterfaceMetaUtils.getBridgeEntryFromConfigDS(bridgeEntryInstanceIdentifier, + dataBroker); + // local ip of any of the bridge interface entry will be the dpn end + // point ip BridgeInterfaceEntry bridgeInterfaceEntry = bridgeEntry.getBridgeInterfaceEntry().get(0); InterfaceKey interfaceKey = new InterfaceKey(bridgeInterfaceEntry.getInterfaceName()); Interface interfaceInfo = InterfaceManagerCommonUtils.getInterfaceFromConfigDS(interfaceKey, dataBroker); IfTunnel tunnel = interfaceInfo.getAugmentation(IfTunnel.class); - GetEndpointIpForDpnOutputBuilder endpointIpForDpnOutput = new GetEndpointIpForDpnOutputBuilder().setLocalIps(Arrays.asList(tunnel.getTunnelSource())); + GetEndpointIpForDpnOutputBuilder endpointIpForDpnOutput = new GetEndpointIpForDpnOutputBuilder() + .setLocalIps(Collections.singletonList(tunnel.getTunnelSource())); rpcResultBuilder = RpcResultBuilder.success(); rpcResultBuilder.withResult(endpointIpForDpnOutput.build()); - }catch(Exception e){ - LOG.error("Retrieval of endpoint of for dpn {} failed due to {}" ,input.getDpid(), e); + } catch (Exception e) { + LOG.error("Retrieval of endpoint of for dpn {} failed due to {}", input.getDpid(), e); rpcResultBuilder = RpcResultBuilder.failed(); } return Futures.immediateFuture(rpcResultBuilder.build()); } @Override - public Future> getEgressInstructionsForInterface(GetEgressInstructionsForInterfaceInput input) { + public Future> getEgressInstructionsForInterface( + GetEgressInstructionsForInterfaceInput input) { RpcResultBuilder rpcResultBuilder; try { - List instructions = IfmUtil.getEgressInstructionsForInterface(input.getIntfName(), input.getTunnelKey(), dataBroker, false); - GetEgressInstructionsForInterfaceOutputBuilder output = new GetEgressInstructionsForInterfaceOutputBuilder(). - setInstruction(instructions); + List instructions = IfmUtil.getEgressInstructionsForInterface(input.getIntfName(), + input.getTunnelKey(), dataBroker, false); + GetEgressInstructionsForInterfaceOutputBuilder output = new GetEgressInstructionsForInterfaceOutputBuilder() + .setInstruction(instructions); rpcResultBuilder = RpcResultBuilder.success(); rpcResultBuilder.withResult(output.build()); - }catch(Exception e){ - LOG.error("Retrieval of egress actions for the key {} failed due to {}" ,input.getIntfName(), e.getMessage()); - rpcResultBuilder = RpcResultBuilder.failed(); + } catch (Exception e) { + String errMsg = String.format("Retrieval of egress instructions for the key {%s} failed due to %s", input.getIntfName(), + e.getMessage()); + LOG.debug(errMsg); + rpcResultBuilder = RpcResultBuilder + .failed().withError(RpcError.ErrorType.APPLICATION, errMsg); } return Futures.immediateFuture(rpcResultBuilder.build()); } @@ -272,12 +178,15 @@ public class InterfaceManagerRpcService implements OdlInterfaceRpcService { InterfaceKey interfaceKey = new InterfaceKey(interfaceName); Interface interfaceInfo = InterfaceManagerCommonUtils.getInterfaceFromConfigDS(interfaceKey, dataBroker); if (interfaceInfo == null) { - String errMsg = String.format("Retrieval of Interface Type for the key {%s} failed due to missing Interface in Config DataStore", interfaceName); + String errMsg = String.format("Retrieval of Interface Type for the key {%s} failed due to " + + "missing Interface in Config DataStore", interfaceName); LOG.error(errMsg); - rpcResultBuilder = RpcResultBuilder.failed().withError(RpcError.ErrorType.APPLICATION, errMsg); + rpcResultBuilder = RpcResultBuilder.failed() + .withError(RpcError.ErrorType.APPLICATION, errMsg); return Futures.immediateFuture(rpcResultBuilder.build()); } - GetInterfaceTypeOutputBuilder output = new GetInterfaceTypeOutputBuilder().setInterfaceType(interfaceInfo.getType()); + GetInterfaceTypeOutputBuilder output = new GetInterfaceTypeOutputBuilder() + .setInterfaceType(interfaceInfo.getType()); rpcResultBuilder = RpcResultBuilder.success(); rpcResultBuilder.withResult(output.build()); } catch (Exception e) { @@ -295,15 +204,18 @@ public class InterfaceManagerRpcService implements OdlInterfaceRpcService { InterfaceKey interfaceKey = new InterfaceKey(interfaceName); Interface interfaceInfo = InterfaceManagerCommonUtils.getInterfaceFromConfigDS(interfaceKey, dataBroker); if (interfaceInfo == null) { - String errMsg = String.format("Retrieval of Tunnel Type for the key {%s} failed due to missing Interface in Config DataStore", interfaceName); + String errMsg = String.format( + "Retrieval of Tunnel Type for the key {%s} failed due to missing Interface in Config DataStore", + interfaceName); LOG.error(errMsg); - rpcResultBuilder = RpcResultBuilder.failed().withError(RpcError.ErrorType.APPLICATION, errMsg); + rpcResultBuilder = RpcResultBuilder.failed() + .withError(RpcError.ErrorType.APPLICATION, errMsg); return Futures.immediateFuture(rpcResultBuilder.build()); } if (Tunnel.class.equals(interfaceInfo.getType())) { IfTunnel tnl = interfaceInfo.getAugmentation(IfTunnel.class); - Class tun_type = tnl.getTunnelInterfaceType(); - GetTunnelTypeOutputBuilder output = new GetTunnelTypeOutputBuilder().setTunnelType(tun_type); + Class tunType = tnl.getTunnelInterfaceType(); + GetTunnelTypeOutputBuilder output = new GetTunnelTypeOutputBuilder().setTunnelType(tunType); rpcResultBuilder = RpcResultBuilder.success(); rpcResultBuilder.withResult(output.build()); } else { @@ -318,25 +230,27 @@ public class InterfaceManagerRpcService implements OdlInterfaceRpcService { } @Override - public Future> getEgressActionsForInterface(GetEgressActionsForInterfaceInput input) { + public Future> getEgressActionsForInterface( + GetEgressActionsForInterfaceInput input) { RpcResultBuilder rpcResultBuilder; try { LOG.debug("Get Egress Action for interface {} with key {}", input.getIntfName(), input.getTunnelKey()); - List actionsList = IfmUtil.getEgressActionsForInterface(input.getIntfName(), - input.getTunnelKey(), - dataBroker, false); - GetEgressActionsForInterfaceOutputBuilder output = new GetEgressActionsForInterfaceOutputBuilder(). - setAction(actionsList); + List actionsList = IfmUtil.getEgressActionsForInterface(input.getIntfName(), input.getTunnelKey(), + input.getActionKey(), dataBroker, false); + GetEgressActionsForInterfaceOutputBuilder output = new GetEgressActionsForInterfaceOutputBuilder() + .setAction(actionsList); rpcResultBuilder = RpcResultBuilder.success(); rpcResultBuilder.withResult(output.build()); - }catch(Exception e){ - LOG.error("Retrieval of egress actions for the key {} failed due to {}" ,input.getIntfName(), e.getMessage()); - rpcResultBuilder = RpcResultBuilder.failed(); + } catch (Exception e) { + String errMsg = String.format("Retrieval of egress actions for {%s} failed due to %s", input.getIntfName(), + e.getMessage()); + LOG.debug(errMsg); + rpcResultBuilder = RpcResultBuilder + .failed().withError(RpcError.ErrorType.APPLICATION, errMsg); } return Futures.immediateFuture(rpcResultBuilder.build()); } - @Override public Future> getPortFromInterface(GetPortFromInterfaceInput input) { RpcResultBuilder rpcResultBuilder; @@ -344,45 +258,51 @@ public class InterfaceManagerRpcService implements OdlInterfaceRpcService { try { BigInteger dpId = null; long portNo = 0; - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface ifState = - InterfaceManagerCommonUtils.getInterfaceStateFromOperDS(interfaceName, dataBroker); + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state + .Interface ifState = InterfaceManagerCommonUtils.getInterfaceStateFromOperDS(interfaceName, + dataBroker); if (ifState != null) { String lowerLayerIf = ifState.getLowerLayerIf().get(0); NodeConnectorId nodeConnectorId = new NodeConnectorId(lowerLayerIf); - dpId = new BigInteger(IfmUtil.getDpnFromNodeConnectorId(nodeConnectorId)); - portNo = Long.valueOf(IfmUtil.getPortNoFromNodeConnectorId(nodeConnectorId)); + dpId = IfmUtil.getDpnFromNodeConnectorId(nodeConnectorId); + portNo = IfmUtil.getPortNumberFromNodeConnectorId(nodeConnectorId); + String phyAddress = ifState.getPhysAddress().getValue(); // FIXME Assuming portName and interfaceName are same - GetPortFromInterfaceOutputBuilder output = new GetPortFromInterfaceOutputBuilder().setDpid(dpId). - setPortname(interfaceName).setPortno(Long.valueOf(portNo)); + GetPortFromInterfaceOutputBuilder output = new GetPortFromInterfaceOutputBuilder().setDpid(dpId) + .setPortname(interfaceName).setPortno(portNo).setPhyAddress(phyAddress); rpcResultBuilder = RpcResultBuilder.success(); rpcResultBuilder.withResult(output.build()); } else { rpcResultBuilder = getRpcErrorResultForGetPortRpc(interfaceName, "missing Interface state"); } - }catch(Exception e){ + } catch (Exception e) { rpcResultBuilder = getRpcErrorResultForGetPortRpc(interfaceName, e.getMessage()); } return Futures.immediateFuture(rpcResultBuilder.build()); } - private RpcResultBuilder getRpcErrorResultForGetPortRpc(String interfaceName, String errMsg) { + private RpcResultBuilder getRpcErrorResultForGetPortRpc(String interfaceName, + String errMsg) { errMsg = String.format("Retrieval of Port for the key {%s} failed due to %s", interfaceName, errMsg); LOG.error(errMsg); - RpcResultBuilder rpcResultBuilder = RpcResultBuilder.failed().withError(RpcError.ErrorType.APPLICATION, errMsg); + RpcResultBuilder rpcResultBuilder = RpcResultBuilder + .failed().withError(RpcError.ErrorType.APPLICATION, errMsg); return rpcResultBuilder; } @Override - public Future> getNodeconnectorIdFromInterface(GetNodeconnectorIdFromInterfaceInput input) { + public Future> getNodeconnectorIdFromInterface( + GetNodeconnectorIdFromInterfaceInput input) { String interfaceName = input.getIntfName(); RpcResultBuilder rpcResultBuilder; try { - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface ifState = - InterfaceManagerCommonUtils.getInterfaceStateFromOperDS(interfaceName, dataBroker); + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state + .Interface ifState = InterfaceManagerCommonUtils.getInterfaceStateFromOperDS(interfaceName, dataBroker); String lowerLayerIf = ifState.getLowerLayerIf().get(0); NodeConnectorId nodeConnectorId = new NodeConnectorId(lowerLayerIf); - GetNodeconnectorIdFromInterfaceOutputBuilder output = new GetNodeconnectorIdFromInterfaceOutputBuilder().setNodeconnectorId(nodeConnectorId); + GetNodeconnectorIdFromInterfaceOutputBuilder output = new GetNodeconnectorIdFromInterfaceOutputBuilder() + .setNodeconnectorId(nodeConnectorId); rpcResultBuilder = RpcResultBuilder.success(); rpcResultBuilder.withResult(output.build()); } catch (Exception e) { @@ -393,15 +313,19 @@ public class InterfaceManagerRpcService implements OdlInterfaceRpcService { } @Override - public Future> getInterfaceFromIfIndex(GetInterfaceFromIfIndexInput input) { + public Future> getInterfaceFromIfIndex( + GetInterfaceFromIfIndexInput input) { Integer ifIndex = input.getIfIndex(); RpcResultBuilder rpcResultBuilder = null; try { - InstanceIdentifier id = InstanceIdentifier.builder(IfIndexesInterfaceMap.class).child(IfIndexInterface.class, new IfIndexInterfaceKey(ifIndex)).build(); - Optional ifIndexesInterface = IfmUtil.read(LogicalDatastoreType.OPERATIONAL, id, dataBroker); - if(ifIndexesInterface.isPresent()) { + InstanceIdentifier id = InstanceIdentifier.builder(IfIndexesInterfaceMap.class) + .child(IfIndexInterface.class, new IfIndexInterfaceKey(ifIndex)).build(); + Optional ifIndexesInterface = IfmUtil.read(LogicalDatastoreType.OPERATIONAL, id, + dataBroker); + if (ifIndexesInterface.isPresent()) { String interfaceName = ifIndexesInterface.get().getInterfaceName(); - GetInterfaceFromIfIndexOutputBuilder output = new GetInterfaceFromIfIndexOutputBuilder().setInterfaceName(interfaceName); + GetInterfaceFromIfIndexOutputBuilder output = new GetInterfaceFromIfIndexOutputBuilder() + .setInterfaceName(interfaceName); rpcResultBuilder = RpcResultBuilder.success(); rpcResultBuilder.withResult(output.build()); } @@ -412,6 +336,32 @@ public class InterfaceManagerRpcService implements OdlInterfaceRpcService { return Futures.immediateFuture(rpcResultBuilder.build()); } + @Override + public Future> getDpnInterfaceList(GetDpnInterfaceListInput input) { + BigInteger dpnid = input.getDpid(); + RpcResultBuilder rpcResultBuilder = null; + try { + InstanceIdentifier id = InstanceIdentifier.builder(DpnToInterfaceList.class) + .child(DpnToInterface.class, new DpnToInterfaceKey(dpnid)).build(); + Optional entry = IfmUtil.read(LogicalDatastoreType.OPERATIONAL, id, dataBroker); + if (entry.isPresent()) { + List interfaceNameEntries = entry.get().getInterfaceNameEntry(); + if (interfaceNameEntries != null && !interfaceNameEntries.isEmpty()) { + List interfaceList = interfaceNameEntries.stream().map(InterfaceNameEntry::getInterfaceName) + .collect(Collectors.toList()); + GetDpnInterfaceListOutputBuilder output = new GetDpnInterfaceListOutputBuilder() + .setInterfacesList(interfaceList); + rpcResultBuilder = RpcResultBuilder.success(); + rpcResultBuilder.withResult(output.build()); + } + } + } catch (Exception e) { + LOG.error("Retrieval of interfaceNameList for the dpnId {} failed due to {}", dpnid, e); + rpcResultBuilder = RpcResultBuilder.failed(); + } + return Futures.immediateFuture(rpcResultBuilder.build()); + } + protected static List buildInstructions(List listInstructionInfo) { if (listInstructionInfo != null) { List instructions = new ArrayList<>(); @@ -427,14 +377,13 @@ public class InterfaceManagerRpcService implements OdlInterfaceRpcService { return null; } - private ListenableFuture makeTerminatingServiceFlow(IfTunnel tunnelInfo, BigInteger dpnId, BigInteger tunnelKey, List instruction, int addOrRemove) { + private ListenableFuture makeTerminatingServiceFlow(IfTunnel tunnelInfo, BigInteger dpnId, + BigInteger tunnelKey, List instruction, int addOrRemove) { List mkMatches = new ArrayList<>(); - mkMatches.add(new MatchInfo(MatchFieldType.tunnel_id, new BigInteger[] {tunnelKey})); - short tableId = tunnelInfo.isInternal() ? NwConstants.INTERNAL_TUNNEL_TABLE : - NwConstants.EXTERNAL_TUNNEL_TABLE; - final String flowRef = getFlowRef(dpnId,tableId, tunnelKey); - Flow terminatingSerFlow = MDSALUtil.buildFlowNew(tableId, flowRef, - 5, "TST Flow Entry", 0, 0, + mkMatches.add(new MatchTunnelId(tunnelKey)); + short tableId = tunnelInfo.isInternal() ? NwConstants.INTERNAL_TUNNEL_TABLE : NwConstants.EXTERNAL_TUNNEL_TABLE; + final String flowRef = getFlowRef(dpnId, tableId, tunnelKey); + Flow terminatingSerFlow = MDSALUtil.buildFlowNew(tableId, flowRef, 5, "TST Flow Entry", 0, 0, IfmConstants.TUNNEL_TABLE_COOKIE.add(tunnelKey), mkMatches, instruction); if (addOrRemove == NwConstants.ADD_FLOW) { return mdsalMgr.installFlow(dpnId, terminatingSerFlow); @@ -443,17 +392,16 @@ public class InterfaceManagerRpcService implements OdlInterfaceRpcService { return mdsalMgr.removeFlow(dpnId, terminatingSerFlow); } - private ListenableFuture makeLFIBFlow(BigInteger dpnId, BigInteger tunnelKey, List instruction, int addOrRemove) { + private ListenableFuture makeLFIBFlow(BigInteger dpnId, BigInteger tunnelKey, List instruction, + int addOrRemove) { List mkMatches = new ArrayList<>(); - mkMatches.add(new MatchInfo(MatchFieldType.eth_type, - new long[]{0x8847L})); - mkMatches.add(new MatchInfo(MatchFieldType.mpls_label, new String[]{Long.toString(tunnelKey.longValue())})); + mkMatches.add(MatchEthernetType.MPLS_UNICAST); + mkMatches.add(new MatchMplsLabel(tunnelKey.longValue())); // Install the flow entry in L3_LFIB_TABLE String flowRef = getFlowRef(dpnId, NwConstants.L3_LFIB_TABLE, tunnelKey); - Flow lfibFlow = MDSALUtil.buildFlowNew(NwConstants.L3_LFIB_TABLE, flowRef, - IfmConstants.DEFAULT_FLOW_PRIORITY, "LFIB Entry", 0, 0, - IfmConstants.COOKIE_VM_LFIB_TABLE, mkMatches, instruction); + Flow lfibFlow = MDSALUtil.buildFlowNew(NwConstants.L3_LFIB_TABLE, flowRef, IfmConstants.DEFAULT_FLOW_PRIORITY, + "LFIB Entry", 0, 0, IfmConstants.COOKIE_VM_LFIB_TABLE, mkMatches, instruction); if (addOrRemove == NwConstants.ADD_FLOW) { return mdsalMgr.installFlow(dpnId, lfibFlow); } @@ -461,7 +409,7 @@ public class InterfaceManagerRpcService implements OdlInterfaceRpcService { } private String getFlowRef(BigInteger dpnId, short tableId, BigInteger tunnelKey) { - return new StringBuffer().append(IfmConstants.TUNNEL_TABLE_FLOWID_PREFIX).append(dpnId).append(NwConstants.FLOWID_SEPARATOR) - .append(tableId).append(NwConstants.FLOWID_SEPARATOR).append(tunnelKey).toString(); + return IfmConstants.TUNNEL_TABLE_FLOWID_PREFIX + dpnId + NwConstants.FLOWID_SEPARATOR + tableId + + NwConstants.FLOWID_SEPARATOR + tunnelKey; } }