</dependency>
</dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <!-- Enforce odlparent checkstyle -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
<!--
Maven Site Configuration
</dependency>
</dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <!-- Temporarily override the odlparent checkstyle configuration.
- We want to enforce some simple rules and add more as we clean up code -->
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>checkstyle/java_rules.xml</configLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <excludes>org/opendaylight/yang/gen/**,**/config/yang/**</excludes>
- <failsOnError>true</failsOnError>
- <consoleOutput>true</consoleOutput>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.lispflowmapping</groupId>
- <artifactId>common.build.tools</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
<!--
Maven Site Configuration
import org.opendaylight.lispflowmapping.implementation.lisp.MapResolver;
import org.opendaylight.lispflowmapping.implementation.lisp.MapServer;
import org.opendaylight.lispflowmapping.implementation.util.LispNotificationHelper;
-import org.opendaylight.lispflowmapping.lisp.type.LispMessage;
import org.opendaylight.lispflowmapping.interfaces.lisp.IFlowMapping;
import org.opendaylight.lispflowmapping.interfaces.lisp.IMapNotifyHandler;
import org.opendaylight.lispflowmapping.interfaces.lisp.IMapRequestResultHandler;
import org.opendaylight.lispflowmapping.interfaces.lisp.IMapResolverAsync;
import org.opendaylight.lispflowmapping.interfaces.lisp.IMapServerAsync;
import org.opendaylight.lispflowmapping.interfaces.mappingservice.IMappingService;
+import org.opendaylight.lispflowmapping.lisp.type.LispMessage;
import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.AddMapping;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.GotMapNotify;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.GotMapReply;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.sb.rev150904.SendMapNotifyInputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.sb.rev150904.SendMapReplyInputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.sb.rev150904.SendMapRequestInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingOrigin;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Pair<MapNotify, List<TransportAddress>> result = handleMapRegister(mapRegisterNotification.getMapRegister());
if (result != null && result.getLeft() != null) {
MapNotify mapNotify = result.getLeft();
- List <TransportAddress> rlocs = result.getRight();
+ List<TransportAddress> rlocs = result.getRight();
if (rlocs == null) {
TransportAddressBuilder tab = new TransportAddressBuilder();
tab.setIpAddress(mapRegisterNotification.getTransportAddress().getIpAddress());
*/
package org.opendaylight.lispflowmapping.implementation;
+import com.google.common.base.Preconditions;
+import com.google.common.util.concurrent.Futures;
import java.util.ArrayList;
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.NotificationPublishService;
+import org.opendaylight.lispflowmapping.dsbackend.DataStoreBackEnd;
import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
import org.opendaylight.lispflowmapping.implementation.mdsal.AuthenticationKeyDataListener;
-import org.opendaylight.lispflowmapping.dsbackend.DataStoreBackEnd;
import org.opendaylight.lispflowmapping.implementation.mdsal.MappingDataListener;
import org.opendaylight.lispflowmapping.implementation.util.DSBEInputUtil;
import org.opendaylight.lispflowmapping.implementation.util.RPCInputConvertorUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.Futures;
-
/**
* Dispatcher of API calls that implements the RPC and Java APIs in mappingservice.yang and IMappingService
* respectively. It also coordinates and acts as container for all objects in charge of
return Futures.immediateFuture(rpcResultBuilder.build());
}
+ @Override
+ public void addMapping(MappingOrigin origin, Eid key, SiteId siteId, Object data, boolean merge) {
+ // SB registrations are first written to the MappingSystem and only afterwards are persisted to the datastore
+ if (origin.equals(MappingOrigin.Southbound)) {
+ // Store data first in MapCache and only afterwards persist to datastore. This should be used only for SB
+ // registrations
+ mappingSystem.addMapping(origin, key, data, merge);
+ dsbe.addMapping(DSBEInputUtil.toMapping(origin, key, siteId, (MappingRecord) data));
+ if (((MappingRecord) data).getXtrId() != null) {
+ dsbe.addXtrIdMapping(DSBEInputUtil.toXtrIdMapping((MappingRecord) data));
+ }
+ } else {
+ dsbe.addMapping(DSBEInputUtil.toMapping(origin, key, siteId, (MappingRecord) data));
+ }
+ }
+
+ @Override
+ public void updateMappingRegistration(MappingOrigin origin, Eid key, Long timestamp) {
+ mappingSystem.updateMappingRegistration(origin, key, timestamp);
+ }
+
@Override
public Future<RpcResult<GetKeyOutput>> getKey(GetKeyInput input) {
Preconditions.checkNotNull(input, "get-key RPC input must be not null!");
return Futures.immediateFuture(rpcResultBuilder.build());
}
+ @Override
+ public Object getMapping(MappingOrigin origin, Eid key) {
+ return mappingSystem.getMapping(origin, key);
+ }
+
+ @Override
+ public Object getMapping(Eid key) {
+ return mappingSystem.getMapping(key);
+ }
+
+ @Override
+ public Object getMapping(Eid srcKey, Eid dstKey) {
+ return mappingSystem.getMapping(srcKey, dstKey);
+ }
+
@Override
public Future<RpcResult<Void>> removeKey(RemoveKeyInput input) {
Preconditions.checkNotNull(input, "remove-key RPC input must be not null!");
return Futures.immediateFuture(rpcResultBuilder.build());
}
+ @Override
+ public void removeMapping(MappingOrigin origin, Eid key) {
+ dsbe.removeMapping(DSBEInputUtil.toMapping(origin, key));
+ }
+
@Override
public Future<RpcResult<Void>> updateKey(UpdateKeyInput input) {
Preconditions.checkNotNull(input, "update-key RPC input must be not null!");
return null;
}
- @Override
- public void addMapping(MappingOrigin origin, Eid key, SiteId siteId, Object data, boolean merge) {
- // SB registrations are first written to the MappingSystem and only afterwards are persisted to the datastore
- if (origin.equals(MappingOrigin.Southbound)) {
- // Store data first in MapCache and only afterwards persist to datastore. This should be used only for SB
- // registrations
- mappingSystem.addMapping(origin, key, data, merge);
- dsbe.addMapping(DSBEInputUtil.toMapping(origin, key, siteId, (MappingRecord) data));
- if (((MappingRecord) data).getXtrId() != null) {
- dsbe.addXtrIdMapping(DSBEInputUtil.toXtrIdMapping((MappingRecord) data));
- }
- } else {
- dsbe.addMapping(DSBEInputUtil.toMapping(origin, key, siteId, (MappingRecord) data));
- }
- }
-
- @Override
- public void updateMappingRegistration(MappingOrigin origin, Eid key, Long timestamp) {
- mappingSystem.updateMappingRegistration(origin, key, timestamp);
- }
-
- @Override
- public Object getMapping(MappingOrigin origin, Eid key) {
- return mappingSystem.getMapping(origin, key);
- }
-
- @Override
- public Object getMapping(Eid key) {
- return mappingSystem.getMapping(key);
- }
-
- @Override
- public Object getMapping(Eid srcKey, Eid dstKey) {
- return mappingSystem.getMapping(srcKey, dstKey);
- }
-
@Override
public Eid getWidestNegativePrefix(Eid key) {
return mappingSystem.getWidestNegativePrefix(key);
}
- @Override
- public void removeMapping(MappingOrigin origin, Eid key) {
- dsbe.removeMapping(DSBEInputUtil.toMapping(origin, key));
- }
-
@Override
public void addAuthenticationKey(Eid key, MappingAuthkey authKey) {
dsbe.addAuthenticationKey(DSBEInputUtil.toAuthenticationKey(key, authKey));
convertedLocators = convertFromBinaryIfNecessary(originalLocators);
}
- if (LispAddressUtil.addressNeedsConversionFromBinary(originalRecord.getEid().getAddress()) ||
- (originalLocators != null && convertedLocators != null)) {
+ if (LispAddressUtil.addressNeedsConversionFromBinary(originalRecord.getEid().getAddress())
+ || (originalLocators != null && convertedLocators != null)) {
MappingRecordBuilder mrb = new MappingRecordBuilder(originalRecord);
mrb.setEid(LispAddressUtil.convertFromBinary(originalRecord.getEid()));
if (convertedLocators != null) {
import org.slf4j.LoggerFactory;
/**
+ * Implement Karaf commands to interact with the Mapping Service.
+ *
* @author Lorand Jakab
*
*/
import java.util.ArrayList;
import java.util.EnumMap;
import java.util.List;
-
-import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
import org.opendaylight.lispflowmapping.dsbackend.DataStoreBackEnd;
-import org.opendaylight.lispflowmapping.mapcache.FlatMapCache;
-import org.opendaylight.lispflowmapping.mapcache.MultiTableMapCache;
-import org.opendaylight.lispflowmapping.mapcache.SimpleMapCache;
+import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
import org.opendaylight.lispflowmapping.implementation.util.DSBEInputUtil;
import org.opendaylight.lispflowmapping.implementation.util.MappingMergeUtil;
import org.opendaylight.lispflowmapping.interfaces.dao.ILispDAO;
import org.opendaylight.lispflowmapping.interfaces.mappingservice.IMappingService;
import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
+import org.opendaylight.lispflowmapping.mapcache.FlatMapCache;
+import org.opendaylight.lispflowmapping.mapcache.MultiTableMapCache;
+import org.opendaylight.lispflowmapping.mapcache.SimpleMapCache;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.SimpleAddress;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ExplicitLocatorPath;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4;
/**
* The Mapping System coordinates caching of md-sal stored mappings and if so configured enables longest prefix match
- * mapping lookups
+ * mapping lookups.
*
* @author Florin Coras
*
*/
public class MappingSystem implements IMappingSystem {
- private final static Logger LOG = LoggerFactory.getLogger(MappingSystem.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MappingSystem.class);
private boolean iterateMask;
private boolean notificationService;
private boolean overwrite;
}
}
+ @Override
+ public Object getMapping(Eid dst) {
+ return getMapping((Eid)null, dst);
+ }
+
+ @Override
+ public Object getMapping(MappingOrigin origin, Eid key) {
+ if (origin.equals(MappingOrigin.Southbound)) {
+ return getSbMappingWithExpiration(null, key);
+ }
+ return tableMap.get(origin).getMapping(null, key);
+ }
+
private Object getMappingNbFirst(Eid src, Eid dst) {
// Default lookup policy is northboundFirst
return mappingObject;
}
- @Override
- public Object getMapping(Eid dst) {
- return getMapping((Eid)null, dst);
- }
-
- @Override
- public Object getMapping(MappingOrigin origin, Eid key) {
- if (origin.equals(MappingOrigin.Southbound)) {
- return getSbMappingWithExpiration(null, key);
- }
- return tableMap.get(origin).getMapping(null, key);
- }
-
@Override
public Eid getWidestNegativePrefix(Eid key) {
- Eid nbPrefix, sbPrefix;
- nbPrefix = pmc.getWidestNegativeMapping(key);
+ Eid nbPrefix = pmc.getWidestNegativeMapping(key);
if (nbPrefix == null) {
return null;
}
- sbPrefix = smc.getWidestNegativeMapping(key);
+ Eid sbPrefix = smc.getWidestNegativeMapping(key);
if (sbPrefix == null) {
return null;
}
// since prefixes overlap, just return the more specific (larger mask)
if (LispAddressUtil.getIpPrefixMask(nbPrefix) < LispAddressUtil.getIpPrefixMask(sbPrefix)) {
return sbPrefix;
- } else{
+ } else {
return nbPrefix;
}
}
/**
- * Restore all mappings and keys from mdsal datastore
+ * Restore all mappings and keys from mdsal datastore.
*/
private void restoreDaoFromDatastore() {
List<Mapping> mappings = dsbe.getAllMappings();
*/
package org.opendaylight.lispflowmapping.implementation.config;
+import org.opendaylight.lispflowmapping.interfaces.mappingservice.IMappingService;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.opendaylight.lispflowmapping.interfaces.mappingservice.IMappingService;
public final class ConfigIni {
private static final ConfigIni INSTANCE = new ConfigIni();
private ConfigIni() {
- Bundle b = FrameworkUtil.getBundle(this.getClass());
+ Bundle bundle = FrameworkUtil.getBundle(this.getClass());
BundleContext context = null;
- if (b != null) {
- context = b.getBundleContext();
+ if (bundle != null) {
+ context = bundle.getBundleContext();
}
// Initialize mappingMerge first, since mappingOverwrite depends on it
if (str == null) {
str = System.getProperty(LISP_REGISTER_VALIDITY_SB);
if (str == null) {
- LOG.debug("Configuration variable '{}' is unset. Setting to default value: '3.33 minutes' "
- , LISP_REGISTER_VALIDITY_SB);
+ LOG.debug("Configuration variable '{}' is unset. Setting to default value: '3.33 minutes' ",
+ LISP_REGISTER_VALIDITY_SB);
return;
}
}
if (regValidity >= MIN_REGISTRATION_VALIDITY_SB) {
this.registrationValiditySb = regValidity;
}
- }
- catch (NumberFormatException e) {
+ } catch (NumberFormatException e) {
this.registrationValiditySb = MIN_REGISTRATION_VALIDITY_SB;
LOG.debug("Configuration variable 'registerValiditySb' was not set correctly. Registration validity for"
+ "South Bound Map Registers is set to default value of 3.3 minutes");
}
public void setLookupPolicy(IMappingService.LookupPolicy lookupPolicy) {
- this.lookupPolicy = lookupPolicy;
+ this.lookupPolicy = lookupPolicy;
}
public static ConfigIni getInstance() {
private static boolean isEqualIpVersion(IpAddressBinary srcRloc, Rloc rloc) {
if (srcRloc.getIpv4AddressBinary() != null) {
- if (rloc.getAddressType() == Ipv4Afi.class ||
- rloc.getAddressType() == Ipv4BinaryAfi.class ||
- rloc.getAddressType() == Ipv4PrefixAfi.class ||
- rloc.getAddressType() == Ipv4PrefixBinaryAfi.class) {
+ if (rloc.getAddressType() == Ipv4Afi.class
+ || rloc.getAddressType() == Ipv4BinaryAfi.class
+ || rloc.getAddressType() == Ipv4PrefixAfi.class
+ || rloc.getAddressType() == Ipv4PrefixBinaryAfi.class) {
return true;
}
- } else if (rloc.getAddressType() == Ipv6Afi.class ||
- rloc.getAddressType() == Ipv6BinaryAfi.class ||
- rloc.getAddressType() == Ipv6PrefixAfi.class ||
- rloc.getAddressType() == Ipv6PrefixBinaryAfi.class) {
+ } else if (rloc.getAddressType() == Ipv6Afi.class
+ || rloc.getAddressType() == Ipv6BinaryAfi.class
+ || rloc.getAddressType() == Ipv6PrefixAfi.class
+ || rloc.getAddressType() == Ipv6PrefixBinaryAfi.class) {
return true;
}
return false;
MappingRecordBuilder recordBuilder = new MappingRecordBuilder();
recordBuilder.setAuthoritative(false);
recordBuilder.setMapVersion((short) 0);
- if (eid.getAddressType().equals(Ipv4PrefixBinaryAfi.class) ||
- eid.getAddressType().equals(Ipv6PrefixBinaryAfi.class)) {
+ if (eid.getAddressType().equals(Ipv4PrefixBinaryAfi.class)
+ || eid.getAddressType().equals(Ipv6PrefixBinaryAfi.class)) {
recordBuilder.setEid(mapService.getWidestNegativePrefix(eid));
} else {
recordBuilder.setEid(eid);
Address hopAddress = LispAddressUtil.addressFromSimpleAddress(hop.getAddress());
for (ItrRloc itrRloc : itrRlocs) {
if (itrRloc.getRloc().getAddress().equals(hopAddress)) {
- int i = hops.indexOf(hop);
- if (i < hops.size() - 1) {
- nextHop = hops.get(i + 1).getAddress();
+ int iterator = hops.indexOf(hop);
+ if (iterator < hops.size() - 1) {
+ nextHop = hops.get(iterator + 1).getAddress();
return nextHop;
}
}
package org.opendaylight.lispflowmapping.implementation.lisp;
+import com.google.common.base.Preconditions;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.SocketException;
import java.util.Objects;
import java.util.Set;
import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.exception.ExceptionUtils;
import org.opendaylight.controller.md.sal.binding.api.NotificationService;
import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
import org.opendaylight.lispflowmapping.interfaces.dao.SubKeys;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.OdlMappingserviceListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Preconditions;
public class MapServer implements IMapServerAsync, OdlMappingserviceListener {
mapService.addMapping(MappingOrigin.Southbound, mapping.getEid(), getSiteId(mapRegister), mapping, merge);
if (subscriptionService) {
- MappingRecord newMapping = merge ?
- (MappingRecord) mapService.getMapping(MappingOrigin.Southbound, mapping.getEid()) : mapping;
+ MappingRecord newMapping = merge
+ ? (MappingRecord) mapService.getMapping(MappingOrigin.Southbound, mapping.getEid()) : mapping;
if (mappingChanged(oldMapping, newMapping)) {
if (LOG.isDebugEnabled()) {
MapNotifyBuilderHelper.setFromMapRegister(builder, mapRegister);
}
List<MappingRecordItem> mappings = builder.getMappingRecordItem();
- if (mappings != null && mappings.get(0) != null && mappings.get(0).getMappingRecord() != null &&
- mappings.get(0).getMappingRecord().getEid() != null) {
+ if (mappings != null && mappings.get(0) != null && mappings.get(0).getMappingRecord() != null
+ && mappings.get(0).getMappingRecord().getEid() != null) {
MappingAuthkey authkey = mapService.getAuthenticationKey(mappings.get(0).getMappingRecord().getEid());
if (authkey != null) {
builder.setAuthenticationData(LispAuthenticationUtil.createAuthenticationData(builder.build(),
}
}
+ @SuppressWarnings("checkstyle:IllegalCatch")
private void handleSmr(Eid eid, Set<SubscriberRLOC> subscribers, IMapNotifyHandler callback) {
if (subscribers == null) {
return;
mrb.getEidItem().add(new EidItemBuilder().setEid(subscriber.getSrcEid()).build());
callback.handleSMR(mrb.build(), subscriber.getSrcRloc());
} catch (Exception e) {
- LOG.error("Errors encountered while handling SMR:" + ExceptionUtils.getStackTrace(e));
+ LOG.error("Errors encountered while handling SMR:", e);
}
}
}
}
Enumeration<InetAddress> addresses = current.getInetAddresses();
while (addresses.hasMoreElements()) {
- InetAddress current_addr = addresses.nextElement();
+ InetAddress currentAddr = addresses.nextElement();
// Skip loopback and link local addresses
- if (current_addr.isLoopbackAddress() || current_addr.isLinkLocalAddress()) {
+ if (currentAddr.isLoopbackAddress() || currentAddr.isLinkLocalAddress()) {
continue;
}
- LOG.debug(current_addr.getHostAddress());
- return current_addr;
+ LOG.debug(currentAddr.getHostAddress());
+ return currentAddr;
}
}
} catch (SocketException se) {
package org.opendaylight.lispflowmapping.implementation.mdsal;
import java.util.Collection;
-
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
+import org.opendaylight.controller.md.sal.binding.api.DataObjectModification.ModificationType;
import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
import org.opendaylight.lispflowmapping.interfaces.mapcache.IMappingSystem;
import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.opendaylight.controller.md.sal.binding.api.DataObjectModification.ModificationType;
/**
* DataListener for all AuthenticationKey modification events.
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
import org.opendaylight.controller.md.sal.binding.api.DataObjectModification.ModificationType;
convertedLocators = convertToBinaryIfNecessary(originalLocators);
}
- if (LispAddressUtil.addressNeedsConversionToBinary(originalRecord.getEid().getAddress()) ||
- (originalLocators != null && convertedLocators != null)) {
+ if (LispAddressUtil.addressNeedsConversionToBinary(originalRecord.getEid().getAddress())
+ || (originalLocators != null && convertedLocators != null)) {
MappingRecordBuilder mrb = new MappingRecordBuilder(originalRecord);
mrb.setEid(LispAddressUtil.convertToBinary(originalRecord.getEid()));
if (convertedLocators != null) {
import java.util.Arrays;
import java.util.List;
-
import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.SiteId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.mapping.XtrIdMappingBuilder;
/**
+ * DataStoreBackEnd utilities.
+ *
* @author Florin Coras
*
*/
import com.google.common.base.Splitter;
import com.google.common.net.InetAddresses;
-
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-
import org.opendaylight.lispflowmapping.lisp.type.LispMessage;
import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
+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.PortNumber;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.SimpleAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ApplicationData;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.DistinguishedName;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv6;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.KeyValueAddress;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.IpAddressBinary;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.IpAddressBinaryBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.Ipv4AddressBinary;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingOrigin;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.Mapping;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.MappingBuilder;
-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.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.SimpleAddress;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ApplicationData;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.DistinguishedName;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv6;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.KeyValueAddress;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
return tab.build();
}
- public static InetAddress getAddressByName(String IPAddress) {
+ public static InetAddress getAddressByName(String ipAddress) {
try {
- InetAddress address = InetAddress.getByName(IPAddress);
+ InetAddress address = InetAddress.getByName(ipAddress);
return address;
} catch (UnknownHostException e) {
- LOG.debug("Unknown host {}", IPAddress, e);
+ LOG.debug("Unknown host {}", ipAddress, e);
return null;
}
}
public static List<Mapping> getMapping(AddMapping mapRegisterNotification) {
List<Mapping> mappings = new ArrayList<Mapping>();
- for (int i=0; i<mapRegisterNotification.getMapRegister().getMappingRecordItem().size(); i++) {
+ for (int i = 0; i < mapRegisterNotification.getMapRegister().getMappingRecordItem().size(); i++) {
MappingRecord record = mapRegisterNotification.getMapRegister().getMappingRecordItem().get(i)
.getMappingRecord();
MappingBuilder mb = new MappingBuilder();
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.Mapping;
/**
+ * Utility class to convert a mapping change into a notification.
+ *
* @author Florin Coras
*
*/
*/
package org.opendaylight.lispflowmapping.implementation.util;
+import com.google.common.base.Preconditions;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
+import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
+import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
+import org.opendaylight.lispflowmapping.lisp.util.MaskUtil;
+import org.opendaylight.lispflowmapping.lisp.util.SourceDestKeyHelper;
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.Ipv4Prefix;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.Address;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.source.dest.key.SourceDestKey;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.source.dest.key.SourceDestKeyBuilder;
-import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
-import org.opendaylight.lispflowmapping.lisp.util.MaskUtil;
-import org.opendaylight.lispflowmapping.lisp.util.SourceDestKeyHelper;
-import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecord;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecordBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecord;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Preconditions;
-
/**
- * Utility class to implement merging of locator sets
+ * Utility class to implement merging of locator sets.
*
* @author Lorand Jakab
*
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.MappingBuilder;
/**
- * Converts RPC *Input object to other object types
+ * Converts RPC *Input object to other object types.
*
* @author Lorand Jakab
*
return toAuthenticationKey(input.getEid(), null);
}
+ private static AuthenticationKey toAuthenticationKey(Eid address, MappingAuthkey key) {
+ AuthenticationKeyBuilder akb = new AuthenticationKeyBuilder();
+ akb.setEidUri(new EidUri(LispAddressStringifier.getURIString(address)));
+ akb.setEid(address);
+ if (key != null) {
+ akb.setMappingAuthkey(key);
+ }
+ return akb.build();
+ }
+
public static Mapping toMapping(AddMappingInput input) {
return toMapping(input.getMappingRecord());
}
return toMapping(input.getEid());
}
- private static AuthenticationKey toAuthenticationKey(Eid address, MappingAuthkey key) {
- AuthenticationKeyBuilder akb = new AuthenticationKeyBuilder();
- akb.setEidUri(new EidUri(LispAddressStringifier.getURIString(address)));
- akb.setEid(address);
- if (key != null) {
- akb.setMappingAuthkey(key);
- }
- return akb.build();
- }
-
private static Mapping toMapping(MappingRecord mapping) {
MappingBuilder mb = new MappingBuilder();
mb.setEidUri(new EidUri(LispAddressStringifier.getURIString(mapping.getEid())));
import static org.junit.Assert.assertNull;
import com.google.common.collect.Lists;
-
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
-
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.MutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.GotMapNotify;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.GotMapReply;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MapNotify;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MapRegister;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MapReply;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MappingKeepAlive;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.RequestMapping;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.XtrRequestMapping;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.list.EidItemBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MapRegister;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container
- .MapRegisterCacheMetadata;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container
- .MapRegisterCacheMetadataBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container
- .map.register.cache.metadata.EidLispAddress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container
- .map.register.cache.metadata.EidLispAddressBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container.MapRegisterCacheMetadata;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container.MapRegisterCacheMetadataBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container.map.register.cache.metadata.EidLispAddress;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container.map.register.cache.metadata.EidLispAddressBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapnotifymessage.MapNotifyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.
- MappingRecordBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.list.
- MappingRecordItemBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecordBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.list.MappingRecordItemBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapreplymessage.MapReplyBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.maprequest.SourceEidBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.maprequestmessage.MapRequest;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
-import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
import org.opendaylight.lispflowmapping.dsbackend.DataStoreBackEnd;
+import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
import org.opendaylight.lispflowmapping.implementation.util.MappingMergeUtil;
import org.opendaylight.lispflowmapping.inmemorydb.HashMapDb;
import org.opendaylight.lispflowmapping.interfaces.dao.ILispDAO;
import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
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.Ipv4Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
- .ExplicitLocatorPathLcaf;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.ExplicitLocatorPathLcaf;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.Ipv4PrefixAfi;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.ServicePathIdType;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.SimpleAddress;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
- .address.ExplicitLocatorPath;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
- .address.ExplicitLocatorPathBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
- .address.Ipv4PrefixBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
- .address.ServicePath;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
- .address.ServicePathBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
- .address.explicit.locator.path.explicit.locator.path.Hop;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
- .address.explicit.locator.path.explicit.locator.path.HopBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
- .address.Ipv4Binary;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ExplicitLocatorPath;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ExplicitLocatorPathBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4PrefixBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ServicePath;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ServicePathBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.explicit.locator.path.explicit.locator.path.Hop;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.explicit.locator.path.explicit.locator.path.HopBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv4Binary;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.SiteId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.EidBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecordBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkeyBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecord;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container
- .MappingRecordBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecordBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.Rloc;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.RlocBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.EidUri;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.AuthenticationKeyBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.Mapping;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.MappingBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container
- .MappingAuthkey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container
- .MappingAuthkeyBuilder;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
/**
* This method injects mocks which can not be injected the usual way using Mockito.
- *
- * @throws NoSuchFieldException
- * @throws IllegalAccessException
*/
private static void injectMocks() throws NoSuchFieldException, IllegalAccessException {
final Field smcField = MappingSystem.class.getDeclaredField("smc");
/**
* This method changes the lookup policy.
- *
- * @throws NoSuchFieldException
- * @throws IllegalAccessException
*/
private static void setLookupPolicy(IMappingService.LookupPolicy policy) throws NoSuchFieldException,
IllegalAccessException {
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecordBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapnotifymessage.MapNotify;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapnotifymessage.MapNotifyBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkeyBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecord;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecordBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.list.MappingRecordItem;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.transport.address.TransportAddress;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.transport.address.TransportAddressBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingOrigin;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkeyBuilder;
@RunWith(MockitoJUnitRunner.class)
public class MapServerTest {
}
private static List<TransportAddress> getTransportAddressList() {
- TransportAddressBuilder transportAddressBuilder_1 = new TransportAddressBuilder()
+ TransportAddressBuilder transportAddressBuilder1 = new TransportAddressBuilder()
.setIpAddress(IPV4_BINARY_1)
.setPort(new PortNumber(LispMessage.PORT_NUM));
- TransportAddressBuilder transportAddressBuilder_2 = new TransportAddressBuilder()
+ TransportAddressBuilder transportAddressBuilder2 = new TransportAddressBuilder()
.setIpAddress(IPV4_BINARY_2)
.setPort(new PortNumber(LispMessage.PORT_NUM));
final List<TransportAddress> transportAddressList = Lists.newArrayList(
- transportAddressBuilder_1.build(),
- transportAddressBuilder_2.build());
+ transportAddressBuilder1.build(),
+ transportAddressBuilder2.build());
return transportAddressList;
}
import java.util.ArrayList;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
-
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.runners.MockitoJUnitRunner;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
+import org.opendaylight.lispflowmapping.dsbackend.DataStoreBackEnd;
import org.opendaylight.lispflowmapping.implementation.MappingService;
import org.opendaylight.lispflowmapping.implementation.MappingSystem;
import org.opendaylight.lispflowmapping.implementation.mdsal.AuthenticationKeyDataListener;
-import org.opendaylight.lispflowmapping.dsbackend.DataStoreBackEnd;
import org.opendaylight.lispflowmapping.implementation.mdsal.MappingDataListener;
import org.opendaylight.lispflowmapping.implementation.util.DSBEInputUtil;
import org.opendaylight.lispflowmapping.implementation.util.RPCInputConvertorUtil;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.SiteId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.XtrId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkeyBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecord;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container
- .MappingRecordBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecordBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.AddKeyInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.AddKeyInputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.AddKeysInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.UpdateMappingInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.UpdateMappingInputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.UpdateMappingsInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container
- .MappingAuthkey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container
- .MappingAuthkeyBuilder;
import org.opendaylight.yangtools.yang.common.RpcError;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
/**
* Tests {@link MappingService#addKey} method.
- *
- * @throws ExecutionException
- * @throws InterruptedException
*/
@Test
public void addKeyTest() throws ExecutionException, InterruptedException {
/**
* Tests {@link MappingService#addKey} method with null MappingAuthkey.
- *
- * @throws ExecutionException
- * @throws InterruptedException
*/
@Test
public void addKeyTest_withNullMapAuthkey() throws ExecutionException, InterruptedException {
/**
* Tests {@link MappingService#addMapping} method.
- *
- * @throws ExecutionException
- * @throws InterruptedException
*/
@Test
public void addMappingTest() throws ExecutionException, InterruptedException {
/**
* Tests {@link MappingService#getKey} method.
- *
- * @throws ExecutionException
- * @throws InterruptedException
*/
@Test
public void getKeyTest() throws ExecutionException, InterruptedException {
/**
* Tests {@link MappingService#getKey} method with null MappingAuthkey.
- *
- * @throws ExecutionException
- * @throws InterruptedException
*/
@Test
public void getKeyTest_withNullMappingAuthkey() throws ExecutionException, InterruptedException {
/**
* Tests {@link MappingService#getMapping} method.
- *
- * @throws ExecutionException
- * @throws InterruptedException
*/
@Test
public void getMappingTest() throws ExecutionException, InterruptedException {
/**
* Tests {@link MappingService#getMapping} method with null MappingRecord.
- *
- * @throws ExecutionException
- * @throws InterruptedException
*/
@Test
public void getMappingTest_withNullMapRecord() throws ExecutionException, InterruptedException {
/**
* Tests {@link MappingService#removeKey} method.
- *
- * @throws ExecutionException
- * @throws InterruptedException
*/
@Test
public void removeKeyTest() throws ExecutionException, InterruptedException {
/**
* Tests {@link MappingService#removeMapping} method.
- *
- * @throws ExecutionException
- * @throws InterruptedException
*/
@Test
public void removeMappingTest() throws ExecutionException, InterruptedException {
/**
* Tests {@link MappingService#updateKey} method.
- *
- * @throws ExecutionException
- * @throws InterruptedException
*/
@Test
public void updateKeyTest() throws ExecutionException, InterruptedException {
/**
* Tests {@link MappingService#updateKey} method with null MappingAuthkey.
- *
- * @throws ExecutionException
- * @throws InterruptedException
*/
@Test
public void updateKeyTest_withNullMapAuthkey() throws ExecutionException, InterruptedException {
/**
* Tests {@link MappingService#updateMapping} method.
- *
- * @throws ExecutionException
- * @throws InterruptedException
*/
@Test
public void updateMappingTest() throws ExecutionException, InterruptedException {
/**
* Tests {@link MappingService#addMapping} method from southbound.
- *
- * @throws ExecutionException
- * @throws InterruptedException
*/
@Test
public void addMappingTest_fromSouthbound() throws ExecutionException, InterruptedException {
/**
* Tests {@link MappingService#addMapping} method from northbound.
- *
- * @throws ExecutionException
- * @throws InterruptedException
*/
@Test
public void addMappingTest_fromNorthbound() throws ExecutionException, InterruptedException {
.setRecordTtl(60)
.setEid(IPV4_EID);
}
-}
+}
\ No newline at end of file
*/
package org.opendaylight.lispflowmapping.implementation.mdsal;
-import static org.opendaylight.controller.md.sal.binding.api.DataObjectModification.ModificationType;
-
import com.google.common.collect.Lists;
import java.util.List;
import org.junit.Before;
import org.mockito.Mockito;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
+import org.opendaylight.controller.md.sal.binding.api.DataObjectModification.ModificationType;
import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.lispflowmapping.interfaces.mapcache.IMappingSystem;
import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkeyBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.AuthenticationKey;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.AuthenticationKeyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container
- .MappingAuthkeyBuilder;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
public class AuthenticationKeyDataListenerTest {
*/
package org.opendaylight.lispflowmapping.implementation.mdsal;
-import static org.opendaylight.controller.md.sal.binding.api.DataObjectModification.ModificationType;
-
import com.google.common.collect.Lists;
import java.util.List;
import org.junit.Before;
import org.mockito.Mockito;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
+import org.opendaylight.controller.md.sal.binding.api.DataObjectModification.ModificationType;
import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecord;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container
- .MappingRecordBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecordBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingChange;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingChanged;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingOrigin;
/**
* Tests {@link MappingDataListener#onDataTreeChanged} method with DELETE modification type from northbound.
- *
- * @throws InterruptedException
*/
@Test
@SuppressWarnings("unchecked")
public void onDataTreeChangedTest_delete_NB() throws InterruptedException {
final List<DataTreeModification<Mapping>> changes = Lists.newArrayList(change_del);
- final MappingChanged mapChanged = MSNotificationInputUtil.
- toMappingChanged(MAPPING_EID_1_NB, MappingChange.Removed);
+ final MappingChanged mapChanged = MSNotificationInputUtil
+ .toMappingChanged(MAPPING_EID_1_NB, MappingChange.Removed);
Mockito.when(mod_del.getDataBefore()).thenReturn(MAPPING_EID_1_NB);
mappingDataListener.onDataTreeChanged(changes);
/**
* Tests {@link MappingDataListener#onDataTreeChanged} method with SUBTREE_MODIFIED modification type from
* northbound.
- *
- * @throws InterruptedException
*/
@Test
@SuppressWarnings("unchecked")
public void onDataTreeChangedTest_subtreeModified_NB() throws InterruptedException {
final List<DataTreeModification<Mapping>> changes = Lists.newArrayList(change_subtreeModified);
- final MappingChanged mapChanged = MSNotificationInputUtil.
- toMappingChanged(MAPPING_EID_2_NB, MappingChange.Updated);
+ final MappingChanged mapChanged = MSNotificationInputUtil
+ .toMappingChanged(MAPPING_EID_2_NB, MappingChange.Updated);
Mockito.when(mod_subtreeModified.getDataAfter()).thenReturn(MAPPING_EID_2_NB);
mappingDataListener.onDataTreeChanged(changes);
/**
* Tests {@link MappingDataListener#onDataTreeChanged} method with WRITE modification type from northbound.
- *
- * @throws InterruptedException
*/
@Test
@SuppressWarnings("unchecked")
/**
* Tests {@link MappingDataListener#onDataTreeChanged} method with multiple changes.
- *
- * @throws InterruptedException
*/
@Test
@SuppressWarnings("unchecked")
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.DistinguishedNameType;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.SimpleAddress;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
- .address.ApplicationData;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
- .address.ApplicationDataBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
- .address.DistinguishedNameBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
- .address.Ipv4PrefixBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
- .address.KeyValueAddress;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
- .address.KeyValueAddressBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ApplicationData;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ApplicationDataBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.DistinguishedNameBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4PrefixBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.KeyValueAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.KeyValueAddressBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.IpAddressBinary;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.Ipv4AddressBinary;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.Ipv6AddressBinary;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.AddMappingBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.SiteId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container
- .MappingRecordBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecordBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.list.MappingRecordItem;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.list
- .MappingRecordItemBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapregisternotification
- .MapRegisterBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.list.MappingRecordItemBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapregisternotification.MapRegisterBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.Rloc;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.RlocBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.transport.address.TransportAddress;
private static final Ipv4Address ADDRESS_IPV4 = new Ipv4Address(IPV4_STRING);
private static final Ipv6Address ADDRESS_IPV6 = new Ipv6Address(IPV6_STRING);
- private static final Ipv4AddressBinary ADDRESS_IPV4_BINARY = new Ipv4AddressBinary(InetAddresses.
- forString(IPV4_STRING).getAddress());
- private static final Ipv6AddressBinary ADDRESS_IPV6_BINARY = new Ipv6AddressBinary(InetAddresses.
- forString(IPV6_STRING).getAddress());
+ private static final Ipv4AddressBinary ADDRESS_IPV4_BINARY = new Ipv4AddressBinary(InetAddresses
+ .forString(IPV4_STRING).getAddress());
+ private static final Ipv6AddressBinary ADDRESS_IPV6_BINARY = new Ipv6AddressBinary(InetAddresses
+ .forString(IPV6_STRING).getAddress());
private static final int PORT = 9999;
private static final DistinguishedNameType DISTINGUISHED_NAME_TYPE =
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
-
import org.junit.Test;
import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecord;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecordBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecord;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container
- .MappingRecordBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecordBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.Rloc;
public class MappingMergeUtilTest {
*/
@Test
public void computeNbSbIntersectionTest_withMaskableIpv4PrefixEIDs_() {
- MappingRecord NBmappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_PREFIX_EID_1).build();
- MappingRecord SBmappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_PREFIX_EID_2).build();
+ MappingRecord nbMappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_PREFIX_EID_1).build();
+ MappingRecord sbMappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_PREFIX_EID_2).build();
// result
MappingRecord result = (MappingRecord) MappingMergeUtil
- .computeNbSbIntersection(NBmappingRecord, SBmappingRecord);
+ .computeNbSbIntersection(nbMappingRecord, sbMappingRecord);
assertEquals(IPV4_PREFIX_EID_1, result.getEid());
}
*/
@Test
public void computeNbSbIntersectionTest_withMaskableIpv4PrefixEIDs() {
- MappingRecord NBmappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_PREFIX_EID_2).build();
- MappingRecord SBmappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_PREFIX_EID_1).build();
+ MappingRecord nbMappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_PREFIX_EID_2).build();
+ MappingRecord sbMappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_PREFIX_EID_1).build();
// result
MappingRecord result = (MappingRecord) MappingMergeUtil
- .computeNbSbIntersection(NBmappingRecord, SBmappingRecord);
+ .computeNbSbIntersection(nbMappingRecord, sbMappingRecord);
assertEquals(IPV4_PREFIX_EID_1, result.getEid());
}
*/
@Test
public void computeNbSbIntersectionTest_withMaskableSourceDestKeyEIDs_Ipv4SB() {
- MappingRecord NBmappingRecord = getDefaultMappingRecordBuilder().setEid(SOURCE_DEST_KEY_EID_1).build();
- MappingRecord SBmappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_PREFIX_EID_1).build();
+ MappingRecord nbMappingRecord = getDefaultMappingRecordBuilder().setEid(SOURCE_DEST_KEY_EID_1).build();
+ MappingRecord sbMappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_PREFIX_EID_1).build();
// result
final MappingRecord result = (MappingRecord) MappingMergeUtil
- .computeNbSbIntersection(NBmappingRecord, SBmappingRecord);
+ .computeNbSbIntersection(nbMappingRecord, sbMappingRecord);
final Eid eid = LispAddressUtil.asSrcDstEid(IPV4_STRING_3 ,IPV4_STRING_1 ,24 , 24, 1);
assertEquals(eid, result.getEid());
*/
@Test
public void computeNbSbIntersectionTest_withMaskableSourceDestKeyEIDs_Ipv6SB() {
- MappingRecord NBmappingRecord = getDefaultMappingRecordBuilder().setEid(SOURCE_DEST_KEY_EID_1).build();
- MappingRecord SBmappingRecord = getDefaultMappingRecordBuilder().setEid(IPV6_PREFIX_EID).build();
+ MappingRecord nbMappingRecord = getDefaultMappingRecordBuilder().setEid(SOURCE_DEST_KEY_EID_1).build();
+ MappingRecord sbMappingRecord = getDefaultMappingRecordBuilder().setEid(IPV6_PREFIX_EID).build();
// result
final MappingRecord result = (MappingRecord) MappingMergeUtil
- .computeNbSbIntersection(NBmappingRecord, SBmappingRecord);
+ .computeNbSbIntersection(nbMappingRecord, sbMappingRecord);
final Eid eid = LispAddressUtil.asSrcDstEid(IPV4_STRING_3 ,IPV6_STRING ,24 , 96, 1);
assertEquals(eid, result.getEid());
*/
@Test
public void getCommonLocatorRecords_withEmptyLocatorRecords() {
- MappingRecord NBmappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_EID_2).build();
- MappingRecord SBmappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_EID_1).build();
+ MappingRecord nbMappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_EID_2).build();
+ MappingRecord sbMappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_EID_1).build();
// result
MappingRecord result = (MappingRecord) MappingMergeUtil
- .computeNbSbIntersection(NBmappingRecord, SBmappingRecord);
+ .computeNbSbIntersection(nbMappingRecord, sbMappingRecord);
assertEquals(0, result.getLocatorRecord().size());
}
*/
@Test
public void getCommonLocatorRecords_withNullLocatorRecords() {
- MappingRecord NBmappingRecord = getDefaultMappingRecordBuilder().setLocatorRecord(null).build();
- MappingRecord SBmappingRecord = getDefaultMappingRecordBuilder().setLocatorRecord(null).build();
+ MappingRecord nbMappingRecord = getDefaultMappingRecordBuilder().setLocatorRecord(null).build();
+ MappingRecord sbMappingRecord = getDefaultMappingRecordBuilder().setLocatorRecord(null).build();
// result
MappingRecord result = (MappingRecord) MappingMergeUtil
- .computeNbSbIntersection(NBmappingRecord, SBmappingRecord);
+ .computeNbSbIntersection(nbMappingRecord, sbMappingRecord);
assertNull(result.getLocatorRecord());
}
*/
@Test
public void getCommonLocatorRecords_priorityCheck() {
- LocatorRecordBuilder NBlocatorRecordBuilder_1 = new LocatorRecordBuilder()
+ LocatorRecordBuilder nbLocatorRecordBuilder1 = new LocatorRecordBuilder()
.setRloc(IPV4_RLOC_1)
.setPriority((short) 1)
.setLocatorId("NB-locator-id");
- LocatorRecordBuilder SBlocatorRecordBuilder_1 = new LocatorRecordBuilder()
+ LocatorRecordBuilder sbLocatorRecordBuilder1 = new LocatorRecordBuilder()
.setRloc(IPV4_RLOC_1)
.setPriority((short) 255)
.setLocatorId("SB-locator-id");
- LocatorRecordBuilder NBlocatorRecordBuilder_2 = new LocatorRecordBuilder()
+ LocatorRecordBuilder nbLocatorRecordBuilder2 = new LocatorRecordBuilder()
.setRloc(IPV4_RLOC_2)
.setPriority((short) 1)
.setLocatorId("NB-locator-id");
- LocatorRecordBuilder SBlocatorRecordBuilder_2 = new LocatorRecordBuilder()
+ LocatorRecordBuilder sbLocatorRecordBuilder2 = new LocatorRecordBuilder()
.setRloc(IPV4_RLOC_2)
.setPriority((short) 254)
.setLocatorId("SB-locator-id");
- final MappingRecordBuilder NBmappingRecordBuilder = getDefaultMappingRecordBuilder();
- NBmappingRecordBuilder.getLocatorRecord().add(NBlocatorRecordBuilder_1.build());
- NBmappingRecordBuilder.getLocatorRecord().add(NBlocatorRecordBuilder_2.build());
+ final MappingRecordBuilder nbMappingRecordBuilder = getDefaultMappingRecordBuilder();
+ nbMappingRecordBuilder.getLocatorRecord().add(nbLocatorRecordBuilder1.build());
+ nbMappingRecordBuilder.getLocatorRecord().add(nbLocatorRecordBuilder2.build());
- final MappingRecordBuilder SBmappingRecordBuilder = getDefaultMappingRecordBuilder();
- SBmappingRecordBuilder.getLocatorRecord().add(SBlocatorRecordBuilder_1.build());
- SBmappingRecordBuilder.getLocatorRecord().add(SBlocatorRecordBuilder_2.build());
+ final MappingRecordBuilder sbMappingRecordBuilder = getDefaultMappingRecordBuilder();
+ sbMappingRecordBuilder.getLocatorRecord().add(sbLocatorRecordBuilder1.build());
+ sbMappingRecordBuilder.getLocatorRecord().add(sbLocatorRecordBuilder2.build());
// result
final MappingRecord result = (MappingRecord) MappingMergeUtil
- .computeNbSbIntersection(NBmappingRecordBuilder.build(), SBmappingRecordBuilder.build());
+ .computeNbSbIntersection(nbMappingRecordBuilder.build(), sbMappingRecordBuilder.build());
final Iterator<LocatorRecord> iterator = result.getLocatorRecord().iterator();
final LocatorRecord resultLocator_1 = iterator.next();
final LocatorRecord resultLocator_2 = iterator.next();
</dependency>
</dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <!-- Enforce odlparent checkstyle -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
<!--
Maven Site Configuration
</dependency>
</dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <!-- Enforce odlparent checkstyle -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
<!--
Maven Site Configuration
</dependencies>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <!-- Enforce odlparent checkstyle -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
</dependencies>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <!-- Enforce odlparent checkstyle -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
</dependency>
</dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <!-- Enforce odlparent checkstyle -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
<!--
Maven Site Configuration
Code Review / lispflowmapping.git / commitdiff