*/
package org.opendaylight.netvirt.vpnmanager;
-import com.google.common.base.Optional;
import com.google.common.primitives.Ints;
-import java.math.BigInteger;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.List;
+import java.util.Optional;
import java.util.concurrent.ExecutionException;
import javax.inject.Inject;
import javax.inject.Singleton;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
+import org.eclipse.jdt.annotation.Nullable;
import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
import org.opendaylight.genius.mdsalutil.MetaDataUtil;
import org.opendaylight.genius.mdsalutil.NwConstants;
import org.opendaylight.genius.mdsalutil.packet.Ethernet;
import org.opendaylight.genius.mdsalutil.packet.IPv4;
+import org.opendaylight.infrautils.metrics.Counter;
+import org.opendaylight.infrautils.metrics.Labeled;
+import org.opendaylight.infrautils.metrics.MetricDescriptor;
+import org.opendaylight.infrautils.metrics.MetricProvider;
import org.opendaylight.infrautils.utils.concurrent.JdkFutures;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.netvirt.vpnmanager.api.ICentralizedSwitchProvider;
import org.opendaylight.netvirt.vpnmanager.api.VpnHelper;
-import org.opendaylight.netvirt.vpnmanager.utilities.VpnManagerCounters;
+import org.opendaylight.netvirt.vpnmanager.iplearn.ipv4.ArpUtils;
+import org.opendaylight.netvirt.vpnmanager.utilities.CounterUtility;
import org.opendaylight.openflowplugin.libraries.liblldp.BitBufferHelper;
import org.opendaylight.openflowplugin.libraries.liblldp.BufferException;
import org.opendaylight.openflowplugin.libraries.liblldp.HexEncode;
-import org.opendaylight.openflowplugin.libraries.liblldp.NetUtils;
import org.opendaylight.openflowplugin.libraries.liblldp.Packet;
import org.opendaylight.openflowplugin.libraries.liblldp.PacketException;
-import org.opendaylight.yang.gen.v1.urn.huawei.params.xml.ns.yang.l3vpn.rev140815.vpn.interfaces.VpnInterface;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefixBuilder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.id.to.vpn.instance.VpnIds;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.ext.routers.Routers;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.ext.routers.routers.ExternalIps;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.l3vpn.rev200204.vpn.interfaces.VpnInterface;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.networkmaps.NetworkMap;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.neutron.vpn.portip.port.data.VpnPortipToPort;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.subnetmaps.Subnetmap;
import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingListener;
import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService;
import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketReceived;
import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.TransmitPacketInput;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
private final OdlInterfaceRpcService odlInterfaceRpcService;
private final ICentralizedSwitchProvider centralizedSwitchProvider;
private final IInterfaceManager interfaceManager;
- private final VpnManagerCounters vpnManagerCounters;
private final Ipv6NdUtilService ipv6NdUtilService;
+ private final Labeled<Labeled<Counter>> packetInCounter;
private final VpnUtil vpnUtil;
@Inject
public SubnetRoutePacketInHandler(final DataBroker dataBroker, final PacketProcessingService packetService,
final OdlInterfaceRpcService odlInterfaceRpcService,
final ICentralizedSwitchProvider centralizedSwitchProvider, final IInterfaceManager interfaceManager,
- VpnManagerCounters vpnManagerCounters, final Ipv6NdUtilService ipv6NdUtilService, VpnUtil vpnUtil) {
+ final Ipv6NdUtilService ipv6NdUtilService, MetricProvider metricProvider, VpnUtil vpnUtil) {
this.dataBroker = dataBroker;
this.packetService = packetService;
this.odlInterfaceRpcService = odlInterfaceRpcService;
this.centralizedSwitchProvider = centralizedSwitchProvider;
this.interfaceManager = interfaceManager;
- this.vpnManagerCounters = vpnManagerCounters;
this.ipv6NdUtilService = ipv6NdUtilService;
+ packetInCounter = metricProvider.newCounter(MetricDescriptor.builder().anchor(this)
+ .project(CounterUtility.getProject()).module(CounterUtility.getModule())
+ .id(CounterUtility.getSubnetRouteId()).build(), "action","sourceIp.destinationIp");
this.vpnUtil = vpnUtil;
}
@Override
public void onPacketReceived(PacketReceived notification) {
- short tableId = notification.getTableId().getValue();
+ short tableId = notification.getTableId().getValue().toJava();
LOG.trace("{} onPacketReceived: Packet punted from table {}", LOGGING_PREFIX, tableId);
+ if (!vpnUtil.isArpLearningEnabled()) {
+ LOG.trace("Not handling packet as ARP Based Learning is disabled");
+ return;
+ }
byte[] data = notification.getPayload();
if (notification.getMatch() == null || notification.getMatch().getMetadata() == null) {
LOG.error("{} onPacketReceived: Received from table {} where the match or metadata are null",
LOGGING_PREFIX, tableId);
return;
}
- BigInteger metadata = notification.getMatch().getMetadata().getMetadata();
+ Uint64 metadata = notification.getMatch().getMetadata().getMetadata();
Ethernet res = new Ethernet();
if (tableId == NwConstants.L3_SUBNET_ROUTE_TABLE) {
LOG.trace("{} onPacketReceived: Some packet received as {}", LOGGING_PREFIX, notification);
try {
- res.deserialize(data, 0, data.length * NetUtils.NUM_BITS_IN_A_BYTE);
+ res.deserialize(data, 0, data.length * Byte.SIZE);
} catch (PacketException e) {
LOG.error("{} onPacketReceived: Failed to decode Packet ", LOGGING_PREFIX, e);
- vpnManagerCounters.subnetRoutePacketFailed();
+ Counter counter = packetInCounter.label(CounterUtility.subnet_route_packet_failed.toString())
+ .label(CounterUtility.getSubnetRouteInvalidPacket());
+ counter.increment();
return;
}
byte[] srcIpBytes = null;
IPv4 ipv4 = (IPv4) pkt;
srcIpBytes = Ints.toByteArray(ipv4.getSourceAddress());
dstIpBytes = Ints.toByteArray(ipv4.getDestinationAddress());
+ srcIpStr = NWUtil.toStringIpAddress(srcIpBytes);
+ dstIpStr = NWUtil.toStringIpAddress(dstIpBytes);
+ Counter counter = packetInCounter.label(CounterUtility.subnet_route_packet_recived.toString())
+ .label(srcIpStr + "." + dstIpStr);
+ counter.increment();
// It is an ARP request on a configured VPN. So we must
// attempt to respond.
} else {
LOG.trace("{} onPacketReceived: Non-IP packet received as {}", LOGGING_PREFIX, notification);
return;
}
- srcIpStr = NWUtil.toStringIpAddress(srcIpBytes);
- dstIpStr = NWUtil.toStringIpAddress(dstIpBytes);
-
- handleIpPackets(srcIpBytes, dstIpBytes, srcIpStr, dstIpStr, srcMac, metadata);
+ handleIpPackets(srcIpBytes, dstIpBytes, NWUtil.toStringIpAddress(srcIpBytes),
+ NWUtil.toStringIpAddress(dstIpBytes), srcMac, metadata);
- } catch (UnknownHostException | InterruptedException | ExecutionException | BufferException ex) {
+ } catch (InterruptedException | ExecutionException | BufferException ex) {
// Failed to handle packet
- vpnManagerCounters.subnetRoutePacketFailed();
+ Counter counter = packetInCounter.label(CounterUtility.subnet_route_packet_failed.toString())
+ .label(NWUtil.toStringIpAddress(srcIpBytes) + "." + NWUtil.toStringIpAddress(srcIpBytes));
+ counter.increment();
LOG.error("{} onPacketReceived: Failed to handle subnetroute packet.", LOGGING_PREFIX, ex);
- } catch (ReadFailedException e) {
- vpnManagerCounters.subnetRoutePacketFailed();
- LOG.error("{} onPacketReceived: Failed to read data-store.", LOGGING_PREFIX, e);
+ } catch (UnknownHostException e) {
+ Counter counter = packetInCounter.label(CounterUtility.subnet_route_packet_failed.toString())
+ .label(CounterUtility.getSubnetRouteInvalidPacket());
+ counter.increment();
+ LOG.error("{} onPacketReceived: Unknown host detected while handling subnetroute", LOGGING_PREFIX, e);
}
return;
}
}
private void handleIpPackets(byte[] srcIp, byte[] dstIp, String srcIpStr, String dstIpStr, String srcMac,
- BigInteger metadata)
- throws UnknownHostException, InterruptedException, ExecutionException, ReadFailedException {
- long vpnId = MetaDataUtil.getVpnIdFromMetadata(metadata);
+ Uint64 metadata)
+ throws UnknownHostException, InterruptedException, ExecutionException {
+ Uint32 vpnId = Uint32.valueOf(MetaDataUtil.getVpnIdFromMetadata(metadata));
LOG.info("{} onPacketReceived: Processing IP Packet received with Source IP {} and Target IP {}"
+ " and vpnId {}", LOGGING_PREFIX, srcIpStr, dstIpStr, vpnId);
if (!vpnIdsOptional.isPresent()) {
// Donot trigger subnetroute logic for packets from
// unknown VPNs
- vpnManagerCounters.subnetRoutePacketIgnored();
+ Counter counter = packetInCounter.label(CounterUtility.subnet_route_packet_drop.toString())
+ .label(srcIpStr + "." + dstIpStr);
+ counter.increment();
LOG.info("{} onPacketReceived: Ignoring IPv4 packet with destination Ip {} and source Ip {}"
+ " as it came on unknown VPN with ID {}", LOGGING_PREFIX, dstIpStr, srcIpStr, vpnId);
return;
}
String vpnIdVpnInstanceName = vpnIdsOptional.get().getVpnInstanceName();
- if (vpnUtil.getNeutronPortFromVpnPortFixedIp(vpnIdVpnInstanceName, dstIpStr) != null) {
- vpnManagerCounters.subnetRoutePacketIgnored();
+ VpnPortipToPort persistedIP =
+ vpnUtil.getNeutronPortFromVpnPortFixedIp(vpnIdVpnInstanceName, dstIpStr);
+ if (persistedIP != null && !persistedIP.isLearntIp()) {
+ Counter counter = packetInCounter.label(CounterUtility.subnet_route_packet_drop.toString())
+ .label(srcIpStr + "." + dstIpStr);
+ counter.increment();
LOG.info("{} onPacketReceived: IP Packet received with Target IP {} source IP {} vpnId {} "
+ "is a valid Neutron port,ignoring subnet route processing", LOGGING_PREFIX, dstIpStr,
srcIp, vpnId);
}
if (vpnUtil.getLearntVpnVipToPort(vpnIdVpnInstanceName, dstIpStr) != null) {
- vpnManagerCounters.subnetRoutePacketIgnored();
+ Counter counter = packetInCounter.label(CounterUtility.subnet_route_packet_failed.toString())
+ .label(srcIpStr + "." + dstIpStr);
+ counter.increment();
LOG.info("{} onPacketReceived: IP Packet received with Target IP {} source Ip {} vpnId {}"
+ " is an already discovered IPAddress, ignoring subnet route processing",
LOGGING_PREFIX, dstIpStr, srcIp, vpnId);
long elanTag = MetaDataUtil.getElanTagFromMetadata(metadata);
if (elanTag == 0L) {
- vpnManagerCounters.subnetRoutePacketFailed();
+ Counter counter = packetInCounter.label(CounterUtility.subnet_route_packet_failed.toString())
+ .label(srcIpStr + "." + dstIpStr);
+ counter.increment();
LOG.error("{} onPacketReceived: elanTag value from metadata found to be 0, for IP "
+ " Packet received with Target IP {} src Ip {} vpnId {}",
LOGGING_PREFIX, dstIpStr, srcIp, vpnId);
getTargetSubnetForPacketOut(elanTag, dstIpStr);
if (targetSubnetForPacketOut != null) {
// Handle subnet routes ip requests
- transmitArpOrNsPacket(targetSubnetForPacketOut.getNhDpnId(), srcIpStr, srcMac, dstIp, dstIpStr, elanTag);
+ transmitArpOrNsPacket(targetSubnetForPacketOut.getNhDpnId(),
+ srcIpStr, srcMac, dstIp, dstIpStr, elanTag);
} else {
- vpnManagerCounters.subnetRoutePacketFailed();
+ Counter counter = packetInCounter.label(CounterUtility.subnet_route_packet_failed.toString())
+ .label(srcIpStr + "." + dstIpStr);
+ counter.increment();
LOG.debug("{} handleBgpVpnSubnetRoute: Could not find target subnet for packet out {}", LOGGING_PREFIX,
dstIpStr);
}
}
- private void handleInternalVpnSubnetRoutePacket(BigInteger metadata, byte[] dstIp, String srcIpStr, String dstIpStr,
+ private void handleInternalVpnSubnetRoutePacket(Uint64 metadata, byte[] dstIp, String srcIpStr, String dstIpStr,
String vpnIdVpnInstanceName, long elanTag)
throws InterruptedException, ExecutionException, UnknownHostException {
String vmVpnInterfaceName = vpnUtil.getVpnInterfaceName(metadata);
VpnInterface vmVpnInterface = vpnUtil.getVpnInterface(vmVpnInterfaceName);
if (vmVpnInterface == null) {
LOG.error("Vpn interface {} doesn't exist.", vmVpnInterfaceName);
- vpnManagerCounters.subnetRoutePacketFailed();
+ Counter counter = packetInCounter.label(CounterUtility.subnet_route_packet_failed.toString())
+ .label(srcIpStr + "." + dstIpStr);
+ counter.increment();
return;
}
if (VpnHelper.doesVpnInterfaceBelongToVpnInstance(vpnIdVpnInstanceName,
vmVpnInterface.getVpnInstanceNames())
&& !vpnUtil.isBgpVpnInternet(vpnIdVpnInstanceName)) {
LOG.trace("Unknown IP is in internal network");
- handlePacketToInternalNetwork(dstIp, dstIpStr, elanTag);
+ handlePacketToInternalNetwork(dstIp, dstIpStr, elanTag, srcIpStr);
} else {
LOG.trace("Unknown IP is in external network");
String vpnName = vpnUtil.getInternetVpnFromVpnInstanceList(vmVpnInterface.getVpnInstanceNames());
}
}
- private void transmitArpOrNsPacket(BigInteger dpnId, String sourceIpAddress, String sourceMac, byte[] dstIpBytes,
+ private void transmitArpOrNsPacket(Uint64 dpnId, String sourceIpAddress, String sourceMac, byte[] dstIpBytes,
String dstIpAddress, long elanTag) throws UnknownHostException {
long groupid = VpnUtil.getRemoteBCGroup(elanTag);
if (NWUtil.isIpv4Address(dstIpAddress)) {
- LOG.debug("Sending ARP: srcIp={}, srcMac={}, dstIp={}, dpId={}, elan-tag={}", sourceIpAddress, sourceMac,
- dstIpAddress, dpnId, elanTag);
- vpnManagerCounters.subnetRoutePacketArpSent();
+ LOG.debug("Sending ARP: srcIp={}, srcMac={}, dstIp={}, dpId={}, elan-tag={}, groupid={}", sourceIpAddress,
+ sourceMac, dstIpAddress, dpnId, elanTag, groupid);
+ Counter counter = packetInCounter.label(CounterUtility.subnet_route_packet_arp_sent.toString())
+ .label(sourceIpAddress + "." + dstIpAddress);
+ counter.increment();
TransmitPacketInput packetInput =
ArpUtils.createArpRequestInput(dpnId, groupid, HexEncode.bytesFromHexString(sourceMac),
JdkFutures.addErrorLogging(packetService.transmitPacket(packetInput), LOG, "Transmit packet");
} else {
// IPv6 case
- LOG.debug("Sending NS: srcIp={}, srcMac={}, dstIp={}, dpId={}, elan-tag={}", sourceIpAddress, sourceMac,
- dstIpAddress, dpnId, elanTag);
- vpnManagerCounters.subnetRoutePacketNsSent();
+ LOG.debug("Sending NS: srcIp={}, srcMac={}, dstIp={}, dpId={}, elan-tag={}, groupid={}", sourceIpAddress,
+ sourceMac, dstIpAddress, dpnId, elanTag, groupid);
+ Counter counter = packetInCounter.label(CounterUtility.subnet_route_packet_ns_sent.toString())
+ .label(sourceIpAddress + "." + dstIpAddress);
+ counter.increment();
VpnUtil.sendNeighborSolicationToOfGroup(this.ipv6NdUtilService, new Ipv6Address(sourceIpAddress),
new MacAddress(sourceMac), new Ipv6Address(dstIpAddress), groupid, dpnId);
}
}
- private void handlePacketToInternalNetwork(byte[] dstIp, String dstIpStr, long elanTag)
+ private void handlePacketToInternalNetwork(byte[] dstIp, String dstIpStr, long elanTag, String srcIpStr)
throws UnknownHostException {
try {
SubnetOpDataEntry targetSubnetForPacketOut =
if (targetSubnetForPacketOut == null) {
LOG.debug("Couldn't find matching subnet for elan tag {} and destination ip {}", elanTag, dstIpStr);
- vpnManagerCounters.subnetRoutePacketFailed();
+ Counter counter = packetInCounter.label(CounterUtility.subnet_route_packet_failed.toString())
+ .label(srcIpStr + "." + dstIpStr);
+ counter.increment();
return;
}
VpnUtil.buildSubnetmapIdentifier(targetSubnetForPacketOut.getSubnetId()));
if (!subnetMap.isPresent()) {
LOG.debug("Couldn't find subnet map for subnet {}", targetSubnetForPacketOut.getSubnetId());
- vpnManagerCounters.subnetRoutePacketFailed();
+ Counter counter = packetInCounter.label(CounterUtility.subnet_route_packet_failed.toString())
+ .label(srcIpStr + "." + dstIpStr);
+ counter.increment();
return;
}
String sourceIp = subnetMap.get().getRouterInterfaceFixedIp();
if (sourceIp == null) {
LOG.debug("Subnet map {} doesn't have a router interface ip defined", subnetMap.get().getId());
- vpnManagerCounters.subnetRoutePacketFailed();
+ Counter counter = packetInCounter.label(CounterUtility.subnet_route_packet_failed.toString())
+ .label("." + dstIpStr);
+ counter.increment();
return;
}
if (sourceMac == null) {
LOG.debug("Subnet map {} doesn't have a router interface mac address defined",
subnetMap.get().getId());
- vpnManagerCounters.subnetRoutePacketFailed();
+ Counter counter = packetInCounter.label(CounterUtility.subnet_route_packet_failed.toString())
+ .label(sourceIp + "." + dstIpStr);
+ counter.increment();
return;
}
- transmitArpOrNsPacket(targetSubnetForPacketOut.getNhDpnId(), sourceIp, sourceMac, dstIp, dstIpStr, elanTag);
- } catch (ReadFailedException e) {
+ transmitArpOrNsPacket(targetSubnetForPacketOut.getNhDpnId(),
+ sourceIp, sourceMac, dstIp, dstIpStr, elanTag);
+ } catch (InterruptedException | ExecutionException e) {
LOG.error("handlePacketToInternalNetwork: Failed to read data store for destIp {} elanTag {}", dstIpStr,
elanTag);
}
String routerId = vpnUtil.getAssociatedExternalRouter(srcIpStr);
if (null == routerId) {
LOG.debug("This ip is not associated with any external router: {}", srcIpStr);
+ return;
}
handlePacketToExternalNetwork(new Uuid(vpnIdVpnInstanceName), routerId, dstIp, dstIpStr, elanTag);
}
long elanTag) throws UnknownHostException {
Routers externalRouter = vpnUtil.getExternalRouter(routerId);
if (externalRouter == null) {
- vpnManagerCounters.subnetRoutePacketFailed();
+ Counter counter = packetInCounter.label(CounterUtility.subnet_route_packet_failed.toString())
+ .label("." + dstIpStr);
+ counter.increment();
LOG.debug("{} handlePacketToExternalNetwork: Can't find external router with id {}", LOGGING_PREFIX,
routerId);
return;
List<ExternalIps> externalIps = externalRouter.getExternalIps();
if (externalIps == null || externalIps.isEmpty()) {
- vpnManagerCounters.subnetRoutePacketFailed();
+ Counter counter = packetInCounter.label(CounterUtility.subnet_route_packet_failed.toString())
+ .label("." + dstIpStr);
+ counter.increment();
LOG.debug("{} handlePacketToExternalNetwork: Router {} doesn't have any external ips.",
LOGGING_PREFIX, externalRouter.getRouterName());
return;
java.util.Optional<ExternalIps> externalIp = externalRouter.getExternalIps().stream()
.filter(eip -> vpnInstanceNameUuid.equals(eip.getSubnetId())).findFirst();
if (!externalIp.isPresent()) {
- vpnManagerCounters.subnetRoutePacketFailed();
+ Counter counter = packetInCounter.label(CounterUtility.subnet_route_packet_failed.toString())
+ .label(externalIp.get().getIpAddress() + "." + dstIpStr);
+ counter.increment();
LOG.debug("{} handlePacketToExternalNetwork: Router {} doesn't have an external ip for subnet id {}.",
LOGGING_PREFIX, externalRouter.getRouterName(), vpnInstanceNameUuid);
return;
}
- BigInteger dpnId = centralizedSwitchProvider.getPrimarySwitchForRouter(externalRouter.getRouterName());
- if (BigInteger.ZERO.equals(dpnId)) {
- vpnManagerCounters.subnetRoutePacketFailed();
+ Uint64 dpnId = centralizedSwitchProvider.getPrimarySwitchForRouter(externalRouter.getRouterName());
+ if (Uint64.ZERO.equals(dpnId)) {
+ Counter counter = packetInCounter.label(CounterUtility.subnet_route_packet_failed.toString())
+ .label(externalIp.get().getIpAddress() + "." + dstIpStr);
+ counter.increment();
LOG.debug("{} handlePacketToExternalNetwork: Could not find primary switch for router {}.",
LOGGING_PREFIX, externalRouter.getRouterName());
return;
transmitArpOrNsPacket(dpnId, externalIp.get().getIpAddress(), externalRouter.getExtGwMacAddress(), dstIp,
dstIpStr, elanTag);
+
+ Counter counter = packetInCounter.label(CounterUtility.subnet_route_packet_processed.toString())
+ .label(externalIp.get().getIpAddress() + "." + dstIpStr);
+ counter.increment();
}
// return only the first VPN subnetopdataentry
+ @Nullable
private SubnetOpDataEntry getTargetSubnetForPacketOut(long elanTag, String ipAddress) {
ElanTagName elanInfo = vpnUtil.getElanInfoByElanTag(elanTag);
if (elanInfo == null) {
List<Uuid> subnetList = optionalNetworkMap.get().getSubnetIdList();
LOG.debug("{} getTargetDpnForPacketOut: Obtained subnetList as {} for network {}", LOGGING_PREFIX,
subnetList, elanInfo.getName());
- for (Uuid subnetId : subnetList) {
- String vpnName = null;
- Subnetmap sn = vpnUtil.getSubnetmapFromItsUuid(subnetId);
- if (sn != null && sn.getVpnId() != null) {
- vpnName = sn.getVpnId().getValue();
- }
- if (vpnName == null) {
- continue;
- }
- Optional<SubnetOpDataEntry> optionalSubs;
- optionalSubs = SingleTransactionDataBroker.syncReadOptional(dataBroker,
+ if (subnetList != null) {
+ for (Uuid subnetId : subnetList) {
+ String vpnName = null;
+ Subnetmap sn = vpnUtil.getSubnetmapFromItsUuid(subnetId);
+ if (sn != null && sn.getVpnId() != null) {
+ vpnName = sn.getVpnId().getValue();
+ }
+ if (vpnName == null) {
+ continue;
+ }
+ Optional<SubnetOpDataEntry> optionalSubs = SingleTransactionDataBroker.syncReadOptional(dataBroker,
LogicalDatastoreType.OPERATIONAL, VpnUtil.buildSubnetOpDataEntryInstanceIdentifier(subnetId));
- if (!optionalSubs.isPresent()) {
- continue;
- }
- SubnetOpDataEntry subOpEntry = optionalSubs.get();
- if (subOpEntry.getNhDpnId() != null) {
- LOG.trace("{} getTargetDpnForPacketOut: Viewing Subnet {}", LOGGING_PREFIX, subnetId.getValue());
- IpPrefix cidr = new IpPrefix(subOpEntry.getSubnetCidr().toCharArray());
- boolean match = NWUtil.isIpAddressInRange(new IpAddress(ipAddress.toCharArray()), cidr);
- LOG.trace("{} getTargetDpnForPacketOut: Viewing Subnet {} matching {}", LOGGING_PREFIX,
+ if (!optionalSubs.isPresent()) {
+ continue;
+ }
+ SubnetOpDataEntry subOpEntry = optionalSubs.get();
+ if (subOpEntry.getNhDpnId() != null) {
+ LOG.trace("{} getTargetDpnForPacketOut: Viewing Subnet {}", LOGGING_PREFIX,
+ subnetId.getValue());
+ IpPrefix cidr = IpPrefixBuilder.getDefaultInstance(subOpEntry.getSubnetCidr());
+ boolean match = NWUtil.isIpAddressInRange(IpAddressBuilder.getDefaultInstance(ipAddress), cidr);
+ LOG.trace("{} getTargetDpnForPacketOut: Viewing Subnet {} matching {}", LOGGING_PREFIX,
subnetId.getValue(), match);
- if (match) {
- return subOpEntry;
+ if (match) {
+ return subOpEntry;
+ }
}
}
}
- } catch (ReadFailedException e) {
+ } catch (InterruptedException | ExecutionException e) {
LOG.error("{} getTargetDpnForPacketOut: Failed to read data store for elan {}", LOGGING_PREFIX,
elanInfo.getName());
}
}
public boolean isTunnel(String interfaceName) {
- org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang
- .ietf.interfaces.rev140508.interfaces.Interface configIface =
- interfaceManager.getInterfaceInfoFromConfigDataStore(interfaceName);
- return configIface.augmentation(IfTunnel.class) != null;
+ return interfaceManager.getInterfaceInfoFromConfigDataStore(interfaceName).augmentation(IfTunnel.class) != null;
}
}
Code Review / netvirt.git / blobdiff