This patch prepares the lispflowmapping project for Magnesium: update
odlparent to 6.0.0, mdsal to 5.0.3, and deal with the fallout,
including, but not limited to, checkstyle and spotbugs being on by
default, the uint changes in yangtools, etc.
Change-Id: Id1b3bf0201755ef29678e17e8c60fa9adbf253a6
Signed-off-by: Lori Jakab <lojakab@cisco.com>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
50 files changed:
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>5.0.2</version>
+ <version>6.0.0</version>
<relativePath/>
</parent>
<relativePath/>
</parent>
for plugin configuration etc. -->
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent</artifactId>
for plugin configuration etc. -->
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent</artifactId>
- <version>5.0.2</version>
+ <version>6.0.0</version>
<relativePath/>
</parent>
<relativePath/>
</parent>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>4.0.6</version>
+ <version>5.0.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<type>pom</type>
<scope>import</scope>
</dependency>
build failure. Please do not modify this unless you have a good reason. -->
<name>ODL :: lispflowmapping :: ${project.artifactId}</name>
build failure. Please do not modify this unless you have a good reason. -->
<name>ODL :: lispflowmapping :: ${project.artifactId}</name>
+ <properties>
+ <odlparent.checkstyle.enforce>false</odlparent.checkstyle.enforce>
+ <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
<dependencies>
<dependency>
<groupId>junit</groupId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>feature-repo-parent</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>5.0.2</version>
+ <version>6.0.0</version>
<relativePath/>
</parent>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>5.0.2</version>
+ <version>6.0.0</version>
<relativePath/>
</parent>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>5.0.2</version>
+ <version>6.0.0</version>
<relativePath/>
</parent>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>5.0.2</version>
+ <version>6.0.0</version>
<relativePath/>
</parent>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>5.0.2</version>
+ <version>6.0.0</version>
<relativePath/>
</parent>
<relativePath/>
</parent>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>4.0.6</version>
+ <version>5.0.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<type>pom</type>
<scope>import</scope>
</dependency>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>5.0.2</version>
+ <version>6.0.0</version>
<relativePath/>
</parent>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>5.0.2</version>
+ <version>6.0.0</version>
<relativePath/>
</parent>
<relativePath/>
</parent>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>4.0.6</version>
+ <version>5.0.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<type>pom</type>
<scope>import</scope>
</dependency>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>5.0.2</version>
+ <version>6.0.0</version>
<relativePath/>
</parent>
<relativePath/>
</parent>
-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-lispflowmapping-southbound">
<feature name="odl-lispflowmapping-southbound">
-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-lispflowmapping-southbound">
<feature name="odl-lispflowmapping-southbound">
- <feature version="[5,6)">odl-netty-4</feature>
- <feature version="[5,6)">odl-guava</feature>
+ <feature version="[6,7)">odl-netty-4</feature>
+ <feature version="[6,7)">odl-guava</feature>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>5.0.2</version>
+ <version>6.0.0</version>
<relativePath/>
</parent>
<relativePath/>
</parent>
import static org.opendaylight.lispflowmapping.integrationtest.MappingServiceIntegrationTest.ourAddress;
import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_A;
import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_D5;
import static org.opendaylight.lispflowmapping.integrationtest.MappingServiceIntegrationTest.ourAddress;
import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_A;
import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_D5;
+import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava;
import com.google.common.net.InetAddresses;
import java.nio.ByteBuffer;
import com.google.common.net.InetAddresses;
import java.nio.ByteBuffer;
private final Boolean DEFAULT_ROUTED = true;
private final byte[] DEFAULT_SITE_ID = new byte[]{0, 0, 0, 0, 0, 0, 0, 0};
private final Boolean DEFAULT_ROUTED = true;
private final byte[] DEFAULT_SITE_ID = new byte[]{0, 0, 0, 0, 0, 0, 0, 0};
- private final MappingAuthkey NULL_AUTH_KEY = new MappingAuthkeyBuilder().setKeyType(0).build();
+ private final MappingAuthkey NULL_AUTH_KEY = new MappingAuthkeyBuilder().setKeyType(fromJava(0)).build();
private final IMappingService mapService;
private final IFlowMapping lms;
private final IMappingService mapService;
private final IFlowMapping lms;
final LocatorRecordBuilder locatorRecordBuilder = new LocatorRecordBuilder();
locatorRecordBuilder.setRloc(rloc);
locatorRecordBuilder.setLocatorId(rlocStr);
final LocatorRecordBuilder locatorRecordBuilder = new LocatorRecordBuilder();
locatorRecordBuilder.setRloc(rloc);
locatorRecordBuilder.setLocatorId(rlocStr);
- locatorRecordBuilder.setPriority(priority);
- locatorRecordBuilder.setWeight(weight);
- locatorRecordBuilder.setMulticastPriority(DEFAULT_MULTICAST_PRIORITY);
- locatorRecordBuilder.setMulticastWeight(DEFAULT_MULTICAST_WEIGHT);
+ locatorRecordBuilder.setPriority(fromJava(priority));
+ locatorRecordBuilder.setWeight(fromJava(weight));
+ locatorRecordBuilder.setMulticastPriority(fromJava(DEFAULT_MULTICAST_PRIORITY));
+ locatorRecordBuilder.setMulticastWeight(fromJava(DEFAULT_MULTICAST_WEIGHT));
locatorRecordBuilder.setLocalLocator(DEFAULT_LOCAL_LOCATOR);
locatorRecordBuilder.setRlocProbed(DEFAULT_RLOC_PROBED);
locatorRecordBuilder.setRouted(DEFAULT_ROUTED);
locatorRecordBuilder.setLocalLocator(DEFAULT_LOCAL_LOCATOR);
locatorRecordBuilder.setRlocProbed(DEFAULT_RLOC_PROBED);
locatorRecordBuilder.setRouted(DEFAULT_ROUTED);
- final boolean isWeightEquals = expectedTargetSite.getWeight() == locatorRecord.getWeight();
+ final boolean isWeightEquals = expectedTargetSite.getWeight() == locatorRecord.getWeight().toJava();
if (isPossibleAssertPingResultImmediately(expectedPingWorks, isWeightEquals, "Weight isn't equal." +
"Expected value " + expectedTargetSite.getWeight() + ". Value from mapping" +
locatorRecord.getWeight() + ".")) {
return true;
}
if (isPossibleAssertPingResultImmediately(expectedPingWorks, isWeightEquals, "Weight isn't equal." +
"Expected value " + expectedTargetSite.getWeight() + ". Value from mapping" +
locatorRecord.getWeight() + ".")) {
return true;
}
- final boolean isPriorityEquals = expectedTargetSite.getPriority() == locatorRecord.getPriority();
+ final boolean isPriorityEquals =
+ expectedTargetSite.getPriority() == locatorRecord.getPriority().toJava();
if (isPossibleAssertPingResultImmediately(expectedPingWorks, isPriorityEquals, "Priority isn't " +
"equal. Expected value " + expectedTargetSite.getPriority() + ". Value from mapping" +
locatorRecord.getPriority() + ".")) {
if (isPossibleAssertPingResultImmediately(expectedPingWorks, isPriorityEquals, "Priority isn't " +
"equal. Expected value " + expectedTargetSite.getPriority() + ". Value from mapping" +
locatorRecord.getPriority() + ".")) {
final Set<Eid> eids = new HashSet<>();
for (String host : hosts) {
eids.add(LispAddressUtil.asIpv4PrefixBinaryEid(host + "/" + IP_MASK,
final Set<Eid> eids = new HashSet<>();
for (String host : hosts) {
eids.add(LispAddressUtil.asIpv4PrefixBinaryEid(host + "/" + IP_MASK,
- new InstanceIdType(MultiSiteScenarioUtil.VNI2)));
+ new InstanceIdType(fromJava(MultiSiteScenarioUtil.VNI2))));
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>karaf4-parent</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>karaf4-parent</artifactId>
- <version>5.0.2</version>
+ <version>6.0.0</version>
<relativePath/>
</parent>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>4.0.6</version>
+ <version>5.0.3</version>
<relativePath/>
</parent>
<relativePath/>
</parent>
<properties>
<pmd.cpd.fail>true</pmd.cpd.fail>
<properties>
<pmd.cpd.fail>true</pmd.cpd.fail>
+ <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
</properties>
<dependencies>
</properties>
<dependencies>
<artifactId>rfc6991-ietf-inet-types</artifactId>
</dependency>
</dependencies>
<artifactId>rfc6991-ietf-inet-types</artifactId>
</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>
public final class ConfigIni {
public final class ConfigIni {
- protected static final Logger LOG = LoggerFactory.getLogger(ConfigIni.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ConfigIni.class);
private boolean mappingMerge;
private boolean smr;
private String elpPolicy;
private boolean mappingMerge;
private boolean smr;
private String elpPolicy;
- this.smrRetryCount = Integer.valueOf(str);
+ this.smrRetryCount = Integer.parseInt(str);
LOG.debug("Setting configuration variable '{}' to '{}'", LISP_SMR_RETRY_COUNT, smrRetryCount);
} catch (NumberFormatException e) {
LOG.debug("Configuration variable '{}' was not set correctly. SMR retry count "
LOG.debug("Setting configuration variable '{}' to '{}'", LISP_SMR_RETRY_COUNT, smrRetryCount);
} catch (NumberFormatException e) {
LOG.debug("Configuration variable '{}' was not set correctly. SMR retry count "
- this.smrTimeout = Long.valueOf(str);
+ this.smrTimeout = Long.parseLong(str);
LOG.debug("Setting configuration variable '{}' to '{}'", LISP_SMR_TIMEOUT, smrTimeout);
} catch (NumberFormatException e) {
LOG.debug("Configuration variable '{}' was not set correctly. SMR timeout "
LOG.debug("Setting configuration variable '{}' to '{}'", LISP_SMR_TIMEOUT, smrTimeout);
} catch (NumberFormatException e) {
LOG.debug("Configuration variable '{}' was not set correctly. SMR timeout "
- this.negativeMappingTTL = Integer.valueOf(str);
+ this.negativeMappingTTL = Integer.parseInt(str);
LOG.debug("Setting configuration variable '{}' to '{}'", LISP_NEGATIVE_MAPPING_TTL, negativeMappingTTL);
} catch (NumberFormatException e) {
LOG.debug("Configuration variable '{}' was not set correctly. Negative TTL "
LOG.debug("Setting configuration variable '{}' to '{}'", LISP_NEGATIVE_MAPPING_TTL, negativeMappingTTL);
} catch (NumberFormatException e) {
LOG.debug("Configuration variable '{}' was not set correctly. Negative TTL "
build failure. Please do not modify this unless you have a good reason. -->
<name>ODL :: lispflowmapping :: ${project.artifactId}</name>
build failure. Please do not modify this unless you have a good reason. -->
<name>ODL :: lispflowmapping :: ${project.artifactId}</name>
+ <properties>
+ <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
+ </properties>
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
*
*/
public class DataStoreBackEnd implements TransactionChainListener {
*
*/
public class DataStoreBackEnd implements TransactionChainListener {
- protected static final Logger LOG = LoggerFactory.getLogger(DataStoreBackEnd.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DataStoreBackEnd.class);
private static final InstanceIdentifier<MappingDatabase> DATABASE_ROOT =
InstanceIdentifier.create(MappingDatabase.class);
private static final InstanceIdentifier<LastUpdated> LAST_UPDATED =
private static final InstanceIdentifier<MappingDatabase> DATABASE_ROOT =
InstanceIdentifier.create(MappingDatabase.class);
private static final InstanceIdentifier<LastUpdated> LAST_UPDATED =
private static long getLispInstanceId(Eid eid) {
Address address = eid.getAddress();
if (address instanceof InstanceId) {
private static long getLispInstanceId(Eid eid) {
Address address = eid.getAddress();
if (address instanceof InstanceId) {
- return ((InstanceId) address).getInstanceId().getIid().getValue();
+ return ((InstanceId) address).getInstanceId().getIid().getValue().toJava();
} else if (eid.getVirtualNetworkId() != null) {
} else if (eid.getVirtualNetworkId() != null) {
- return eid.getVirtualNetworkId().getValue();
+ return eid.getVirtualNetworkId().getValue().toJava();
build failure. Please do not modify this unless you have a good reason. -->
<name>ODL :: lispflowmapping :: ${project.artifactId}</name>
build failure. Please do not modify this unless you have a good reason. -->
<name>ODL :: lispflowmapping :: ${project.artifactId}</name>
+ <properties>
+ <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
}
LocatorRecord locatorRecord = mappingData.getRecord().getLocatorRecord().get(0);
}
LocatorRecord locatorRecord = mappingData.getRecord().getLocatorRecord().get(0);
- long serviceIndex = ((ServicePath) eid.getAddress()).getServicePath().getServiceIndex();
+ long serviceIndex = ((ServicePath) eid.getAddress()).getServicePath().getServiceIndex().toJava();
int index = LispAddressUtil.STARTING_SERVICE_INDEX - (int) serviceIndex;
Rloc rloc = locatorRecord.getRloc();
if (rloc.getAddress() instanceof Ipv4 || rloc.getAddress() instanceof Ipv6) {
int index = LispAddressUtil.STARTING_SERVICE_INDEX - (int) serviceIndex;
Rloc rloc = locatorRecord.getRloc();
if (rloc.getAddress() instanceof Ipv4 || rloc.getAddress() instanceof Ipv6) {
private static Eid getVirtualParent(Eid eid) {
if (eid.getAddress() instanceof Ipv4PrefixBinary) {
Ipv4PrefixBinary prefix = (Ipv4PrefixBinary) eid.getAddress();
private static Eid getVirtualParent(Eid eid) {
if (eid.getAddress() instanceof Ipv4PrefixBinary) {
Ipv4PrefixBinary prefix = (Ipv4PrefixBinary) eid.getAddress();
- short parentPrefixLength = (short) (prefix.getIpv4MaskLength() - 1);
+ short parentPrefixLength = (short) (prefix.getIpv4MaskLength().toJava() - 1);
byte[] parentPrefix = MaskUtil.normalizeByteArray(prefix.getIpv4AddressBinary().getValue(),
parentPrefixLength);
return LispAddressUtil.asIpv4PrefixBinaryEid(eid, parentPrefix, parentPrefixLength);
} else if (eid.getAddress() instanceof Ipv6PrefixBinary) {
Ipv6PrefixBinary prefix = (Ipv6PrefixBinary) eid.getAddress();
byte[] parentPrefix = MaskUtil.normalizeByteArray(prefix.getIpv4AddressBinary().getValue(),
parentPrefixLength);
return LispAddressUtil.asIpv4PrefixBinaryEid(eid, parentPrefix, parentPrefixLength);
} else if (eid.getAddress() instanceof Ipv6PrefixBinary) {
Ipv6PrefixBinary prefix = (Ipv6PrefixBinary) eid.getAddress();
- short parentPrefixLength = (short) (prefix.getIpv6MaskLength() - 1);
+ short parentPrefixLength = (short) (prefix.getIpv6MaskLength().toJava() - 1);
byte[] parentPrefix = MaskUtil.normalizeByteArray(prefix.getIpv6AddressBinary().getValue(),
parentPrefixLength);
return LispAddressUtil.asIpv6PrefixBinaryEid(eid, parentPrefix, parentPrefixLength);
byte[] parentPrefix = MaskUtil.normalizeByteArray(prefix.getIpv6AddressBinary().getValue(),
parentPrefixLength);
return LispAddressUtil.asIpv6PrefixBinaryEid(eid, parentPrefix, parentPrefixLength);
package org.opendaylight.lispflowmapping.implementation.lisp;
package org.opendaylight.lispflowmapping.implementation.lisp;
+import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava;
+
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import java.util.ArrayList;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import java.util.ArrayList;
ExplicitLocatorPath teAddress = ((ExplicitLocatorPath) container.getAddress());
SimpleAddress nextHop = getNextELPHop(teAddress, itrRlocs);
if (nextHop != null) {
ExplicitLocatorPath teAddress = ((ExplicitLocatorPath) container.getAddress());
SimpleAddress nextHop = getNextELPHop(teAddress, itrRlocs);
if (nextHop != null) {
- java.lang.Short priority = record.getPriority();
+ java.lang.Short priority = record.getPriority().toJava();
if (elpPolicy.equalsIgnoreCase("both")) {
recordBuilder.getLocatorRecord().add(
new LocatorRecordBuilder().setLocalLocator(record.isLocalLocator())
if (elpPolicy.equalsIgnoreCase("both")) {
recordBuilder.getLocatorRecord().add(
new LocatorRecordBuilder().setLocalLocator(record.isLocalLocator())
recordBuilder.getLocatorRecord().add(
new LocatorRecordBuilder().setLocalLocator(record.isLocalLocator())
.setRlocProbed(record.isRlocProbed()).setWeight(record.getWeight())
recordBuilder.getLocatorRecord().add(
new LocatorRecordBuilder().setLocalLocator(record.isLocalLocator())
.setRlocProbed(record.isRlocProbed()).setWeight(record.getWeight())
- .setPriority(priority).setMulticastWeight(record.getMulticastWeight())
+ .setPriority(fromJava(priority)).setMulticastWeight(record.getMulticastWeight())
.setMulticastPriority(record.getMulticastPriority()).setRouted(record.isRouted())
.setRloc(LispAddressUtil.toRloc(nextHop))
.setLocatorId(record.getLocatorId()).build());
.setMulticastPriority(record.getMulticastPriority()).setRouted(record.isRouted())
.setRloc(LispAddressUtil.toRloc(nextHop))
.setLocatorId(record.getLocatorId()).build());
*/
package org.opendaylight.lispflowmapping.implementation.util;
*/
package org.opendaylight.lispflowmapping.implementation.util;
+import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava;
+
import com.google.common.base.Preconditions;
import java.util.ArrayList;
import java.util.Date;
import com.google.common.base.Preconditions;
import java.util.ArrayList;
import java.util.Date;
if (sbLocatorMap.containsKey(nbRloc)) {
// common locator found. use the NB record as the common locator.
if (sbLocatorMap.containsKey(nbRloc)) {
// common locator found. use the NB record as the common locator.
- if (sbLocatorMap.get(nbRloc).getPriority() == (short) 255) {
+ if (sbLocatorMap.get(nbRloc).getPriority().toJava() == (short) 255) {
// if SB locator has p == 255 then common locator takes all NB fields except for p
// which must be set to 255
LocatorRecordBuilder lrb = new LocatorRecordBuilder(nbLocator);
// if SB locator has p == 255 then common locator takes all NB fields except for p
// which must be set to 255
LocatorRecordBuilder lrb = new LocatorRecordBuilder(nbLocator);
- lrb.setPriority((short) 255);
+ lrb.setPriority(fromJava((short) 255));
commonLocators.add(lrb.build());
} else {
commonLocators.add(nbLocator);
commonLocators.add(lrb.build());
} else {
commonLocators.add(nbLocator);
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava;
import java.util.ArrayList;
import java.util.Date;
import java.util.ArrayList;
import java.util.Date;
public void getCommonLocatorRecords_priorityCheck() {
LocatorRecordBuilder nbLocatorRecordBuilder1 = new LocatorRecordBuilder()
.setRloc(IPV4_RLOC_1)
public void getCommonLocatorRecords_priorityCheck() {
LocatorRecordBuilder nbLocatorRecordBuilder1 = new LocatorRecordBuilder()
.setRloc(IPV4_RLOC_1)
- .setPriority((short) 1)
+ .setPriority(fromJava((short) 1))
.setLocatorId("NB-locator-id");
LocatorRecordBuilder sbLocatorRecordBuilder1 = new LocatorRecordBuilder()
.setRloc(IPV4_RLOC_1)
.setLocatorId("NB-locator-id");
LocatorRecordBuilder sbLocatorRecordBuilder1 = new LocatorRecordBuilder()
.setRloc(IPV4_RLOC_1)
- .setPriority((short) 255)
+ .setPriority(fromJava((short) 255))
.setLocatorId("SB-locator-id");
LocatorRecordBuilder nbLocatorRecordBuilder2 = new LocatorRecordBuilder()
.setRloc(IPV4_RLOC_2)
.setLocatorId("SB-locator-id");
LocatorRecordBuilder nbLocatorRecordBuilder2 = new LocatorRecordBuilder()
.setRloc(IPV4_RLOC_2)
- .setPriority((short) 1)
+ .setPriority(fromJava((short) 1))
.setLocatorId("NB-locator-id");
LocatorRecordBuilder sbLocatorRecordBuilder2 = new LocatorRecordBuilder()
.setRloc(IPV4_RLOC_2)
.setLocatorId("NB-locator-id");
LocatorRecordBuilder sbLocatorRecordBuilder2 = new LocatorRecordBuilder()
.setRloc(IPV4_RLOC_2)
- .setPriority((short) 254)
+ .setPriority(fromJava((short) 254))
.setLocatorId("SB-locator-id");
final MappingRecordBuilder nbMappingRecordBuilder = getDefaultMappingRecordBuilder();
.setLocatorId("SB-locator-id");
final MappingRecordBuilder nbMappingRecordBuilder = getDefaultMappingRecordBuilder();
assertEquals("NB-locator-id", resultLocator_1.getLocatorId());
// priority changed to 255
assertEquals("NB-locator-id", resultLocator_1.getLocatorId());
// priority changed to 255
- assertEquals(255, (short) resultLocator_1.getPriority());
+ assertEquals(255, (short) resultLocator_1.getPriority().toJava());
assertEquals("NB-locator-id", resultLocator_2.getLocatorId());
// priority remains original
assertEquals("NB-locator-id", resultLocator_2.getLocatorId());
// priority remains original
- assertEquals(1, (short) resultLocator_2.getPriority());
+ assertEquals(1, (short) resultLocator_2.getPriority().toJava());
}
private static MappingData getDefaultMappingData() {
}
private static MappingData getDefaultMappingData() {
build failure. Please do not modify this unless you have a good reason. -->
<name>ODL :: lispflowmapping :: ${project.artifactId}</name>
build failure. Please do not modify this unless you have a good reason. -->
<name>ODL :: lispflowmapping :: ${project.artifactId}</name>
+ <properties>
+ <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
+ </properties>
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
</dependencies>
<version>${project.version}</version>
</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>
Eid eid = (Eid) key;
if (eid.getAddress() instanceof Ipv4PrefixBinary) {
Ipv4PrefixBinary prefix = (Ipv4PrefixBinary) eid.getAddress();
Eid eid = (Eid) key;
if (eid.getAddress() instanceof Ipv4PrefixBinary) {
Ipv4PrefixBinary prefix = (Ipv4PrefixBinary) eid.getAddress();
- ip4Trie.insert(prefix.getIpv4AddressBinary().getValue(), prefix.getIpv4MaskLength(), key);
+ ip4Trie.insert(prefix.getIpv4AddressBinary().getValue(), prefix.getIpv4MaskLength().toJava(), key);
} else if (eid.getAddress() instanceof Ipv6PrefixBinary) {
Ipv6PrefixBinary prefix = (Ipv6PrefixBinary) eid.getAddress();
} else if (eid.getAddress() instanceof Ipv6PrefixBinary) {
Ipv6PrefixBinary prefix = (Ipv6PrefixBinary) eid.getAddress();
- ip6Trie.insert(prefix.getIpv6AddressBinary().getValue(), prefix.getIpv6MaskLength(), key);
+ ip6Trie.insert(prefix.getIpv6AddressBinary().getValue(), prefix.getIpv6MaskLength().toJava(), key);
private RadixTrie<Object>.TrieNode lookupBestNode(Eid eid) {
if (eid.getAddress() instanceof Ipv4PrefixBinary) {
Ipv4PrefixBinary prefix = (Ipv4PrefixBinary) eid.getAddress();
private RadixTrie<Object>.TrieNode lookupBestNode(Eid eid) {
if (eid.getAddress() instanceof Ipv4PrefixBinary) {
Ipv4PrefixBinary prefix = (Ipv4PrefixBinary) eid.getAddress();
- return ip4Trie.lookupBest(prefix.getIpv4AddressBinary().getValue(), prefix.getIpv4MaskLength());
+ return ip4Trie.lookupBest(prefix.getIpv4AddressBinary().getValue(), prefix.getIpv4MaskLength().toJava());
} else if (eid.getAddress() instanceof Ipv6PrefixBinary) {
Ipv6PrefixBinary prefix = (Ipv6PrefixBinary) eid.getAddress();
} else if (eid.getAddress() instanceof Ipv6PrefixBinary) {
Ipv6PrefixBinary prefix = (Ipv6PrefixBinary) eid.getAddress();
- return ip6Trie.lookupBest(prefix.getIpv6AddressBinary().getValue(), prefix.getIpv6MaskLength());
+ return ip6Trie.lookupBest(prefix.getIpv6AddressBinary().getValue(), prefix.getIpv6MaskLength().toJava());
switch (method) {
case COVERING:
node = ip4Trie.lookupCoveringLessSpecific(prefix.getIpv4AddressBinary().getValue(),
switch (method) {
case COVERING:
node = ip4Trie.lookupCoveringLessSpecific(prefix.getIpv4AddressBinary().getValue(),
- prefix.getIpv4MaskLength());
+ prefix.getIpv4MaskLength().toJava());
- node = ip4Trie.lookupParent(prefix.getIpv4AddressBinary().getValue(), prefix.getIpv4MaskLength());
+ node = ip4Trie.lookupParent(prefix.getIpv4AddressBinary().getValue(),
+ prefix.getIpv4MaskLength().toJava());
- node = ip4Trie.lookupSibling(prefix.getIpv4AddressBinary().getValue(), prefix.getIpv4MaskLength());
+ node = ip4Trie.lookupSibling(prefix.getIpv4AddressBinary().getValue(),
+ prefix.getIpv4MaskLength().toJava());
break;
case VIRTUAL_PARENT_SIBLING:
node = ip4Trie.lookupVirtualParentSibling(prefix.getIpv4AddressBinary().getValue(),
break;
case VIRTUAL_PARENT_SIBLING:
node = ip4Trie.lookupVirtualParentSibling(prefix.getIpv4AddressBinary().getValue(),
- prefix.getIpv4MaskLength());
+ prefix.getIpv4MaskLength().toJava());
break;
case WIDEST_NEGATIVE:
node = ip4Trie.lookupWidestNegative(prefix.getIpv4AddressBinary().getValue(),
break;
case WIDEST_NEGATIVE:
node = ip4Trie.lookupWidestNegative(prefix.getIpv4AddressBinary().getValue(),
- prefix.getIpv4MaskLength());
+ prefix.getIpv4MaskLength().toJava());
break;
default:
node = null;
break;
default:
node = null;
switch (method) {
case COVERING:
node = ip6Trie.lookupCoveringLessSpecific(prefix.getIpv6AddressBinary().getValue(),
switch (method) {
case COVERING:
node = ip6Trie.lookupCoveringLessSpecific(prefix.getIpv6AddressBinary().getValue(),
- prefix.getIpv6MaskLength());
+ prefix.getIpv6MaskLength().toJava());
- node = ip6Trie.lookupParent(prefix.getIpv6AddressBinary().getValue(), prefix.getIpv6MaskLength());
+ node = ip6Trie.lookupParent(prefix.getIpv6AddressBinary().getValue(),
+ prefix.getIpv6MaskLength().toJava());
- node = ip6Trie.lookupSibling(prefix.getIpv6AddressBinary().getValue(), prefix.getIpv6MaskLength());
+ node = ip6Trie.lookupSibling(prefix.getIpv6AddressBinary().getValue(),
+ prefix.getIpv6MaskLength().toJava());
break;
case VIRTUAL_PARENT_SIBLING:
node = ip6Trie.lookupVirtualParentSibling(prefix.getIpv6AddressBinary().getValue(),
break;
case VIRTUAL_PARENT_SIBLING:
node = ip6Trie.lookupVirtualParentSibling(prefix.getIpv6AddressBinary().getValue(),
- prefix.getIpv6MaskLength());
+ prefix.getIpv6MaskLength().toJava());
break;
case WIDEST_NEGATIVE:
node = ip6Trie.lookupWidestNegative(prefix.getIpv6AddressBinary().getValue(),
break;
case WIDEST_NEGATIVE:
node = ip6Trie.lookupWidestNegative(prefix.getIpv6AddressBinary().getValue(),
- prefix.getIpv6MaskLength());
+ prefix.getIpv6MaskLength().toJava());
break;
default:
node = null;
break;
default:
node = null;
Set<RadixTrie<Object>.TrieNode> nodes = null;
if (key.getAddress() instanceof Ipv4PrefixBinary) {
Ipv4PrefixBinary prefix = (Ipv4PrefixBinary) key.getAddress();
Set<RadixTrie<Object>.TrieNode> nodes = null;
if (key.getAddress() instanceof Ipv4PrefixBinary) {
Ipv4PrefixBinary prefix = (Ipv4PrefixBinary) key.getAddress();
- nodes = ip4Trie.lookupSubtree(prefix.getIpv4AddressBinary().getValue(), prefix.getIpv4MaskLength());
+ nodes = ip4Trie.lookupSubtree(prefix.getIpv4AddressBinary().getValue(),
+ prefix.getIpv4MaskLength().toJava());
} else if (key.getAddress() instanceof Ipv6PrefixBinary) {
Ipv6PrefixBinary prefix = (Ipv6PrefixBinary) key.getAddress();
} else if (key.getAddress() instanceof Ipv6PrefixBinary) {
Ipv6PrefixBinary prefix = (Ipv6PrefixBinary) key.getAddress();
- nodes = ip6Trie.lookupSubtree(prefix.getIpv6AddressBinary().getValue(), prefix.getIpv6MaskLength());
+ nodes = ip6Trie.lookupSubtree(prefix.getIpv6AddressBinary().getValue(),
+ prefix.getIpv6MaskLength().toJava());
}
return nodesToEids(key, nodes);
}
}
return nodesToEids(key, nodes);
}
Eid eid = (Eid) key;
if (eid.getAddress() instanceof Ipv4PrefixBinary) {
Ipv4PrefixBinary prefix = (Ipv4PrefixBinary) eid.getAddress();
Eid eid = (Eid) key;
if (eid.getAddress() instanceof Ipv4PrefixBinary) {
Ipv4PrefixBinary prefix = (Ipv4PrefixBinary) eid.getAddress();
- ip4Trie.remove(prefix.getIpv4AddressBinary().getValue(), prefix.getIpv4MaskLength());
+ ip4Trie.remove(prefix.getIpv4AddressBinary().getValue(), prefix.getIpv4MaskLength().toJava());
} else if (eid.getAddress() instanceof Ipv6PrefixBinary) {
Ipv6PrefixBinary prefix = (Ipv6PrefixBinary) eid.getAddress();
} else if (eid.getAddress() instanceof Ipv6PrefixBinary) {
Ipv6PrefixBinary prefix = (Ipv6PrefixBinary) eid.getAddress();
- ip6Trie.remove(prefix.getIpv6AddressBinary().getValue(), prefix.getIpv6MaskLength());
+ ip6Trie.remove(prefix.getIpv6AddressBinary().getValue(), prefix.getIpv6MaskLength().toJava());
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>4.0.6</version>
+ <version>5.0.3</version>
<relativePath/>
</parent>
<relativePath/>
</parent>
<properties>
<pmd.cpd.fail>true</pmd.cpd.fail>
<properties>
<pmd.cpd.fail>true</pmd.cpd.fail>
+ <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
</properties>
<dependencies>
</properties>
<dependencies>
<scope>test</scope>
</dependency>
</dependencies>
<scope>test</scope>
</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>
*/
package org.opendaylight.lispflowmapping.lisp.serializer;
*/
package org.opendaylight.lispflowmapping.lisp.serializer;
+import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava;
+
import java.nio.ByteBuffer;
import org.apache.commons.lang3.BooleanUtils;
import java.nio.ByteBuffer;
import org.apache.commons.lang3.BooleanUtils;
protected LocatorRecord deserialize(ByteBuffer buffer) {
LocatorRecordBuilder builder = new LocatorRecordBuilder();
protected LocatorRecord deserialize(ByteBuffer buffer) {
LocatorRecordBuilder builder = new LocatorRecordBuilder();
- builder.setPriority((short) ByteUtil.getUnsignedByte(buffer));
- builder.setWeight((short) ByteUtil.getUnsignedByte(buffer));
- builder.setMulticastPriority((short) ByteUtil.getUnsignedByte(buffer));
- builder.setMulticastWeight((short) ByteUtil.getUnsignedByte(buffer));
+ builder.setPriority(fromJava((short) ByteUtil.getUnsignedByte(buffer)));
+ builder.setWeight(fromJava((short) ByteUtil.getUnsignedByte(buffer)));
+ builder.setMulticastPriority(fromJava((short) ByteUtil.getUnsignedByte(buffer)));
+ builder.setMulticastWeight(fromJava((short) ByteUtil.getUnsignedByte(buffer)));
byte flags = (byte) buffer.getShort();
builder.setLocalLocator(ByteUtil.extractBit(flags, Flags.LOCAL_LOCATOR));
builder.setRlocProbed(ByteUtil.extractBit(flags, Flags.RLOC_PROBED));
byte flags = (byte) buffer.getShort();
builder.setLocalLocator(ByteUtil.extractBit(flags, Flags.LOCAL_LOCATOR));
builder.setRlocProbed(ByteUtil.extractBit(flags, Flags.RLOC_PROBED));
*/
package org.opendaylight.lispflowmapping.lisp.serializer.address;
*/
package org.opendaylight.lispflowmapping.lisp.serializer.address;
+import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava;
+
import java.nio.ByteBuffer;
import org.opendaylight.lispflowmapping.lisp.type.LispCanonicalAddressFormatEnum;
import java.nio.ByteBuffer;
import org.opendaylight.lispflowmapping.lisp.type.LispCanonicalAddressFormatEnum;
ApplicationData appData = ((org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types
.rev151105.lisp.address.address.ApplicationData) lispAddress.getAddress()).getApplicationData();
buffer.put(ByteUtil.partialIntToByteArray(NumberUtil.asInt(appData.getIpTos()), Length.TOC));
ApplicationData appData = ((org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types
.rev151105.lisp.address.address.ApplicationData) lispAddress.getAddress()).getApplicationData();
buffer.put(ByteUtil.partialIntToByteArray(NumberUtil.asInt(appData.getIpTos()), Length.TOC));
- buffer.put((byte) NumberUtil.asShort(appData.getProtocol()));
+ buffer.put((byte) NumberUtil.asShort(appData.getProtocol().toJava()));
if (appData.getLocalPortLow() != null) {
buffer.putShort(NumberUtil.asShort(appData.getLocalPortLow().getValue().shortValue()));
} else {
if (appData.getLocalPortLow() != null) {
buffer.putShort(NumberUtil.asShort(appData.getLocalPortLow().getValue().shortValue()));
} else {
byte[] rawIPTos = new byte[3];
buffer.get(rawIPTos);
builder.setIpTos(ByteUtil.getPartialInt(rawIPTos));
byte[] rawIPTos = new byte[3];
buffer.get(rawIPTos);
builder.setIpTos(ByteUtil.getPartialInt(rawIPTos));
- builder.setProtocol((short) ByteUtil.getUnsignedByte(buffer));
- builder.setLocalPortLow(new PortNumber(ByteUtil.asUnsignedShort(buffer.getShort())));
- builder.setLocalPortHigh(new PortNumber(ByteUtil.asUnsignedShort(buffer.getShort())));
- builder.setRemotePortLow(new PortNumber(ByteUtil.asUnsignedShort(buffer.getShort())));
- builder.setRemotePortHigh(new PortNumber(ByteUtil.asUnsignedShort(buffer.getShort())));
+ builder.setProtocol(fromJava((short) ByteUtil.getUnsignedByte(buffer)));
+ builder.setLocalPortLow(new PortNumber(fromJava(ByteUtil.asUnsignedShort(buffer.getShort()))));
+ builder.setLocalPortHigh(new PortNumber(fromJava(ByteUtil.asUnsignedShort(buffer.getShort()))));
+ builder.setRemotePortLow(new PortNumber(fromJava(ByteUtil.asUnsignedShort(buffer.getShort()))));
+ builder.setRemotePortHigh(new PortNumber(fromJava(ByteUtil.asUnsignedShort(buffer.getShort()))));
SimpleAddress address = SimpleAddressSerializer.getInstance().deserialize(buffer, ctx);
builder.setAddress(address);
return new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
SimpleAddress address = SimpleAddressSerializer.getInstance().deserialize(buffer, ctx);
builder.setAddress(address);
return new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
*/
package org.opendaylight.lispflowmapping.lisp.serializer.address;
*/
package org.opendaylight.lispflowmapping.lisp.serializer.address;
+import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava;
+
import java.nio.ByteBuffer;
import org.opendaylight.lispflowmapping.lisp.type.LispCanonicalAddressFormatEnum;
import org.opendaylight.lispflowmapping.lisp.util.ByteUtil;
import java.nio.ByteBuffer;
import org.opendaylight.lispflowmapping.lisp.type.LispCanonicalAddressFormatEnum;
import org.opendaylight.lispflowmapping.lisp.util.ByteUtil;
ServicePath sp = (ServicePath) lispAddress.getAddress();
buffer.put(ByteUtil.partialIntToByteArray(NumberUtil.asInt(
sp.getServicePath().getServicePathId().getValue().intValue()), Length.SPI));
ServicePath sp = (ServicePath) lispAddress.getAddress();
buffer.put(ByteUtil.partialIntToByteArray(NumberUtil.asInt(
sp.getServicePath().getServicePathId().getValue().intValue()), Length.SPI));
- buffer.put((byte) NumberUtil.asShort(sp.getServicePath().getServiceIndex()));
+ buffer.put((byte) NumberUtil.asShort(sp.getServicePath().getServiceIndex().toJava()));
ServicePathBuilder spb = new ServicePathBuilder();
byte[] spi = new byte[3];
buffer.get(spi);
ServicePathBuilder spb = new ServicePathBuilder();
byte[] spi = new byte[3];
buffer.get(spi);
- spb.setServicePathId(new ServicePathIdType((long) ByteUtil.getPartialInt(spi)));
- spb.setServiceIndex((short) ByteUtil.getUnsignedByte(buffer));
+ spb.setServicePathId(new ServicePathIdType(fromJava((long) ByteUtil.getPartialInt(spi))));
+ spb.setServiceIndex(fromJava((short) ByteUtil.getUnsignedByte(buffer)));
return new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
.lisp.address.address.ServicePathBuilder().setServicePath(spb.build()).build();
}
return new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
.lisp.address.address.ServicePathBuilder().setServicePath(spb.build()).build();
}
Long vni = null;
if (lispAddress.getVirtualNetworkId() != null) {
Long vni = null;
if (lispAddress.getVirtualNetworkId() != null) {
- vni = lispAddress.getVirtualNetworkId().getValue();
+ vni = lispAddress.getVirtualNetworkId().getValue().toJava();
}
return getAddrString(dst, addr, vni);
}
return getAddrString(dst, addr, vni);
*/
package org.opendaylight.lispflowmapping.lisp.util;
*/
package org.opendaylight.lispflowmapping.lisp.util;
+import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava;
+
import com.google.common.base.Preconditions;
import com.google.common.net.InetAddresses;
import java.net.Inet4Address;
import com.google.common.base.Preconditions;
import com.google.common.net.InetAddresses;
import java.net.Inet4Address;
}
public static Eid asIpv4PrefixBinaryEid(long vni, final String prefix) {
}
public static Eid asIpv4PrefixBinaryEid(long vni, final String prefix) {
- InstanceIdType iid = new InstanceIdType(vni);
+ InstanceIdType iid = new InstanceIdType(fromJava(vni));
return asIpv4PrefixBinaryEid(prefix, iid);
}
return asIpv4PrefixBinaryEid(prefix, iid);
}
short mask = Short.valueOf(MaskUtil.getPrefixMask(prefix));
byte[] ipv4 = InetAddresses.forString(address).getAddress();
return toEid(new Ipv4PrefixBinaryBuilder().setIpv4AddressBinary(new Ipv4AddressBinary(ipv4))
short mask = Short.valueOf(MaskUtil.getPrefixMask(prefix));
byte[] ipv4 = InetAddresses.forString(address).getAddress();
return toEid(new Ipv4PrefixBinaryBuilder().setIpv4AddressBinary(new Ipv4AddressBinary(ipv4))
- .setIpv4MaskLength(mask).build(), iiType);
+ .setIpv4MaskLength(fromJava(mask)).build(), iiType);
}
public static Eid asIpv4PrefixBinaryEid(Eid eid, byte[] address, short mask) {
}
public static Eid asIpv4PrefixBinaryEid(Eid eid, byte[] address, short mask) {
}
public static Eid asIpv4PrefixBinaryEid(long vni, byte[] address, short mask) {
}
public static Eid asIpv4PrefixBinaryEid(long vni, byte[] address, short mask) {
- return asIpv4PrefixBinaryEid(new InstanceIdType(vni), address, mask);
+ return asIpv4PrefixBinaryEid(new InstanceIdType(fromJava(vni)), address, mask);
}
public static Eid asIpv4PrefixBinaryEid(InstanceIdType vni, byte[] address, short mask) {
}
public static Eid asIpv4PrefixBinaryEid(InstanceIdType vni, byte[] address, short mask) {
builder.setAddressType(Ipv4PrefixBinaryAfi.class);
builder.setVirtualNetworkId(vni);
builder.setAddress(new Ipv4PrefixBinaryBuilder().setIpv4AddressBinary(new Ipv4AddressBinary(address))
builder.setAddressType(Ipv4PrefixBinaryAfi.class);
builder.setVirtualNetworkId(vni);
builder.setAddress(new Ipv4PrefixBinaryBuilder().setIpv4AddressBinary(new Ipv4AddressBinary(address))
- .setIpv4MaskLength(mask).build());
+ .setIpv4MaskLength(fromJava(mask)).build());
return builder.build();
}
return builder.build();
}
}
public static Eid asIpv4Eid(String address, long vni) {
}
public static Eid asIpv4Eid(String address, long vni) {
- return toEid(new Ipv4AddressBinary(InetAddresses.forString(address).getAddress()), new InstanceIdType(vni));
+ return toEid(new Ipv4AddressBinary(InetAddresses.forString(address).getAddress()),
+ new InstanceIdType(fromJava(vni)));
}
public static Eid asIpv6Eid(String address) {
}
public static Eid asIpv6Eid(String address) {
}
public static Eid asIpv6Eid(String address, long vni) {
}
public static Eid asIpv6Eid(String address, long vni) {
- return toEid(new Ipv6AddressBinary(InetAddresses.forString(address).getAddress()), new InstanceIdType(vni));
+ return toEid(new Ipv6AddressBinary(InetAddresses.forString(address).getAddress()),
+ new InstanceIdType(fromJava(vni)));
}
public static Eid asIpv6PrefixEid(String prefix) {
}
public static Eid asIpv6PrefixEid(String prefix) {
}
public static Eid asIpv6PrefixBinaryEid(long vni, final String prefix) {
}
public static Eid asIpv6PrefixBinaryEid(long vni, final String prefix) {
- InstanceIdType iid = new InstanceIdType(vni);
+ InstanceIdType iid = new InstanceIdType(fromJava(vni));
return asIpv6PrefixBinaryEid(prefix, iid);
}
return asIpv6PrefixBinaryEid(prefix, iid);
}
short mask = Short.valueOf(MaskUtil.getPrefixMask(prefix));
byte[] ipv6 = InetAddresses.forString(address).getAddress();
return toEid(new Ipv6PrefixBinaryBuilder().setIpv6AddressBinary(new Ipv6AddressBinary(ipv6))
short mask = Short.valueOf(MaskUtil.getPrefixMask(prefix));
byte[] ipv6 = InetAddresses.forString(address).getAddress();
return toEid(new Ipv6PrefixBinaryBuilder().setIpv6AddressBinary(new Ipv6AddressBinary(ipv6))
- .setIpv6MaskLength(mask).build(), iiType);
+ .setIpv6MaskLength(fromJava(mask)).build(), iiType);
}
public static Eid asIpv6PrefixBinaryEid(Eid eid, byte[] address, short mask) {
}
public static Eid asIpv6PrefixBinaryEid(Eid eid, byte[] address, short mask) {
}
public static Eid asIpv6PrefixBinaryEid(long vni, byte[] address, short mask) {
}
public static Eid asIpv6PrefixBinaryEid(long vni, byte[] address, short mask) {
- return asIpv6PrefixBinaryEid(new InstanceIdType(vni), address, mask);
+ return asIpv6PrefixBinaryEid(new InstanceIdType(fromJava(vni)), address, mask);
}
public static Eid asIpv6PrefixBinaryEid(InstanceIdType vni, byte[] address, short mask) {
}
public static Eid asIpv6PrefixBinaryEid(InstanceIdType vni, byte[] address, short mask) {
builder.setAddressType(Ipv6PrefixBinaryAfi.class);
builder.setVirtualNetworkId(vni);
builder.setAddress(new Ipv6PrefixBinaryBuilder().setIpv6AddressBinary(new Ipv6AddressBinary(address))
builder.setAddressType(Ipv6PrefixBinaryAfi.class);
builder.setVirtualNetworkId(vni);
builder.setAddress(new Ipv6PrefixBinaryBuilder().setIpv6AddressBinary(new Ipv6AddressBinary(address))
- .setIpv6MaskLength(mask).build());
+ .setIpv6MaskLength(fromJava(mask)).build());
return builder.build();
}
return builder.build();
}
EidBuilder eb = new EidBuilder();
eb.setAddressType(ServicePathLcaf.class);
if (vni >= 0) {
EidBuilder eb = new EidBuilder();
eb.setAddressType(ServicePathLcaf.class);
if (vni >= 0) {
- eb.setVirtualNetworkId(new InstanceIdType(vni));
+ eb.setVirtualNetworkId(new InstanceIdType(fromJava(vni)));
}
org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
.lisp.address.address.service.path.ServicePathBuilder spb =
new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
.lisp.address.address.service.path.ServicePathBuilder();
}
org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
.lisp.address.address.service.path.ServicePathBuilder spb =
new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
.lisp.address.address.service.path.ServicePathBuilder();
- spb.setServicePathId(new ServicePathIdType(servicePathId));
- spb.setServiceIndex(serviceIndex);
+ spb.setServicePathId(new ServicePathIdType(fromJava(servicePathId)));
+ spb.setServiceIndex(fromJava(serviceIndex));
return eb.setAddress(addressFromServicePath(spb.build())).build();
}
public static Eid asMacEid(String address, long vni) {
return eb.setAddress(addressFromServicePath(spb.build())).build();
}
public static Eid asMacEid(String address, long vni) {
- return toEid(new MacAddress(address), new InstanceIdType(vni));
+ return toEid(new MacAddress(address), new InstanceIdType(fromJava(vni)));
}
public static Eid asMacEid(String address) {
}
public static Eid asMacEid(String address) {
}
public static Eid asDistinguishedNameEid(String address, long vni) {
}
public static Eid asDistinguishedNameEid(String address, long vni) {
- return toEid(new MacAddress(address), new InstanceIdType(vni));
+ return toEid(new MacAddress(address), new InstanceIdType(fromJava(vni)));
}
public static Eid asDistinguishedNameEid(String address) {
}
public static Eid asDistinguishedNameEid(String address) {
public static Eid asSrcDstEid(String src, String dst, int smask, int dmask, long vni) {
EidBuilder builder = new EidBuilder();
builder.setAddressType(SourceDestKeyLcaf.class);
public static Eid asSrcDstEid(String src, String dst, int smask, int dmask, long vni) {
EidBuilder builder = new EidBuilder();
builder.setAddressType(SourceDestKeyLcaf.class);
- builder.setVirtualNetworkId(new InstanceIdType(Long.valueOf(vni)));
+ builder.setVirtualNetworkId(new InstanceIdType(fromJava(Long.valueOf(vni))));
builder.setAddress(
new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
.lisp.address.address.SourceDestKeyBuilder()
builder.setAddress(
new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
.lisp.address.address.SourceDestKeyBuilder()
List<LocatorRecord> locatorRecords = new ArrayList<LocatorRecord>();
for (Rloc locator : locators) {
LocatorRecordBuilder locatorBuilder = new LocatorRecordBuilder();
List<LocatorRecord> locatorRecords = new ArrayList<LocatorRecord>();
for (Rloc locator : locators) {
LocatorRecordBuilder locatorBuilder = new LocatorRecordBuilder();
- locatorBuilder.setLocalLocator(false).setRlocProbed(false).setWeight((short) 1).setPriority((short) 1)
- .setMulticastWeight((short) 1).setMulticastPriority((short) 1).setRouted(true)
+ locatorBuilder.setLocalLocator(false).setRlocProbed(false)
+ .setWeight(fromJava((short) 1)).setPriority(fromJava((short) 1))
+ .setMulticastWeight(fromJava((short) 1)).setMulticastPriority(fromJava((short) 1)).setRouted(true)
.setRloc(locator).setLocatorId("SFC_LISP").build();
locatorRecords.add(locatorBuilder.build());
}
.setRloc(locator).setLocatorId("SFC_LISP").build();
locatorRecords.add(locatorBuilder.build());
}
Ipv4PrefixBinaryBuilder pb = new Ipv4PrefixBinaryBuilder();
byte[] address = InetAddresses.forString(MaskUtil.getAddressStringForIpv4Prefix(prefix)).getAddress();
pb.setIpv4AddressBinary(new Ipv4AddressBinary(address));
Ipv4PrefixBinaryBuilder pb = new Ipv4PrefixBinaryBuilder();
byte[] address = InetAddresses.forString(MaskUtil.getAddressStringForIpv4Prefix(prefix)).getAddress();
pb.setIpv4AddressBinary(new Ipv4AddressBinary(address));
- pb.setIpv4MaskLength(MaskUtil.getMaskForAddress(prefix));
+ pb.setIpv4MaskLength(fromJava(MaskUtil.getMaskForAddress(prefix)));
Ipv6PrefixBinaryBuilder pb = new Ipv6PrefixBinaryBuilder();
byte[] address = InetAddresses.forString(MaskUtil.getAddressStringForIpv6Prefix(prefix)).getAddress();
pb.setIpv6AddressBinary(new Ipv6AddressBinary(address));
Ipv6PrefixBinaryBuilder pb = new Ipv6PrefixBinaryBuilder();
byte[] address = InetAddresses.forString(MaskUtil.getAddressStringForIpv6Prefix(prefix)).getAddress();
pb.setIpv6AddressBinary(new Ipv6AddressBinary(address));
- pb.setIpv6MaskLength(MaskUtil.getMaskForAddress(prefix));
+ pb.setIpv6MaskLength(fromJava(MaskUtil.getMaskForAddress(prefix)));
.lisp.address.address.Ipv4Prefix convertFromBinary(Ipv4PrefixBinary prefix) {
return new Ipv4PrefixBuilder().setIpv4Prefix(IetfInetUtil.INSTANCE.ipv4PrefixFor(
prefix.getIpv4AddressBinary().getValue(),
.lisp.address.address.Ipv4Prefix convertFromBinary(Ipv4PrefixBinary prefix) {
return new Ipv4PrefixBuilder().setIpv4Prefix(IetfInetUtil.INSTANCE.ipv4PrefixFor(
prefix.getIpv4AddressBinary().getValue(),
- prefix.getIpv4MaskLength())).build();
+ prefix.getIpv4MaskLength().toJava())).build();
}
private static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
.lisp.address.address.Ipv6Prefix convertFromBinary(Ipv6PrefixBinary prefix) {
return new Ipv6PrefixBuilder().setIpv6Prefix(IetfInetUtil.INSTANCE.ipv6PrefixFor(
prefix.getIpv6AddressBinary().getValue(),
}
private static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
.lisp.address.address.Ipv6Prefix convertFromBinary(Ipv6PrefixBinary prefix) {
return new Ipv6PrefixBuilder().setIpv6Prefix(IetfInetUtil.INSTANCE.ipv6PrefixFor(
prefix.getIpv6AddressBinary().getValue(),
- prefix.getIpv6MaskLength())).build();
+ prefix.getIpv6MaskLength().toJava())).build();
}
private static Ipv4 convertFromBinary(Ipv4Binary address) {
}
private static Ipv4 convertFromBinary(Ipv4Binary address) {
public static short getIpPrefixMask(Eid eid) {
Address addr = eid.getAddress();
if (addr instanceof Ipv4PrefixBinary) {
public static short getIpPrefixMask(Eid eid) {
Address addr = eid.getAddress();
if (addr instanceof Ipv4PrefixBinary) {
- return ((Ipv4PrefixBinary) addr).getIpv4MaskLength();
+ return ((Ipv4PrefixBinary) addr).getIpv4MaskLength().toJava();
} else if (addr instanceof Ipv6PrefixBinary) {
} else if (addr instanceof Ipv6PrefixBinary) {
- return ((Ipv6PrefixBinary) addr).getIpv6MaskLength();
+ return ((Ipv6PrefixBinary) addr).getIpv6MaskLength().toJava();
try {
if (address instanceof Ipv4PrefixBinary) {
byte[] addr = ((Ipv4PrefixBinary) address).getIpv4AddressBinary().getValue();
try {
if (address instanceof Ipv4PrefixBinary) {
byte[] addr = ((Ipv4PrefixBinary) address).getIpv4AddressBinary().getValue();
- short mask = ((Ipv4PrefixBinary) address).getIpv4MaskLength();
+ short mask = ((Ipv4PrefixBinary) address).getIpv4MaskLength().toJava();
return LispAddressUtil.asIpv4PrefixBinaryEid(eid, normalizeByteArray(addr, mask), mask);
} else if (address instanceof Ipv6PrefixBinary) {
byte[] addr = ((Ipv6PrefixBinary) address).getIpv6AddressBinary().getValue();
return LispAddressUtil.asIpv4PrefixBinaryEid(eid, normalizeByteArray(addr, mask), mask);
} else if (address instanceof Ipv6PrefixBinary) {
byte[] addr = ((Ipv6PrefixBinary) address).getIpv6AddressBinary().getValue();
- short mask = ((Ipv6PrefixBinary) address).getIpv6MaskLength();
+ short mask = ((Ipv6PrefixBinary) address).getIpv6MaskLength().toJava();
return LispAddressUtil.asIpv6PrefixBinaryEid(eid, normalizeByteArray(addr, mask), mask);
} else if (address instanceof Ipv4Prefix) {
String[] v4prefix = splitPrefix(((Ipv4Prefix)address).getIpv4Prefix().getValue());
return LispAddressUtil.asIpv6PrefixBinaryEid(eid, normalizeByteArray(addr, mask), mask);
} else if (address instanceof Ipv4Prefix) {
String[] v4prefix = splitPrefix(((Ipv4Prefix)address).getIpv4Prefix().getValue());
return normalizeSrcDst(eid);
} else if (address instanceof ServicePath) {
// Build new Service Path eid with service index set to 0
return normalizeSrcDst(eid);
} else if (address instanceof ServicePath) {
// Build new Service Path eid with service index set to 0
- long spi = ((ServicePath) address).getServicePath().getServicePathId().getValue();
- long vni = eid.getVirtualNetworkId() != null ? eid.getVirtualNetworkId().getValue() : -1;
+ long spi = ((ServicePath) address).getServicePath().getServicePathId().getValue().toJava();
+ long vni = eid.getVirtualNetworkId() != null ? eid.getVirtualNetworkId().getValue().toJava() : -1;
return LispAddressUtil.asServicePathEid(vni, spi, (short)0);
}
} catch (UnknownHostException e) {
return LispAddressUtil.asServicePathEid(vni, spi, (short)0);
}
} catch (UnknownHostException e) {
} else if (address instanceof InstanceId) {
return getMaskForAddress(((InstanceId)address).getInstanceId().getAddress());
} else if (address instanceof Ipv4PrefixBinary) {
} else if (address instanceof InstanceId) {
return getMaskForAddress(((InstanceId)address).getInstanceId().getAddress());
} else if (address instanceof Ipv4PrefixBinary) {
- return ((Ipv4PrefixBinary) address).getIpv4MaskLength();
+ return ((Ipv4PrefixBinary) address).getIpv4MaskLength().toJava();
} else if (address instanceof Ipv6PrefixBinary) {
} else if (address instanceof Ipv6PrefixBinary) {
- return ((Ipv6PrefixBinary) address).getIpv6MaskLength();
+ return ((Ipv6PrefixBinary) address).getIpv6MaskLength().toJava();
*/
package org.opendaylight.lispflowmapping.lisp.util;
*/
package org.opendaylight.lispflowmapping.lisp.util;
+import org.opendaylight.yangtools.yang.common.Uint8;
+
public final class NumberUtil {
// Utility class, should not be instantiated
private NumberUtil() {
public final class NumberUtil {
// Utility class, should not be instantiated
private NumberUtil() {
+ public static short asShort(Uint8 number) {
+ if (number != null) {
+ return number.toJava();
+ }
+ return 0;
+ }
+
public static long asLong(Long number) {
if (number != null) {
return number;
public static long asLong(Long number) {
if (number != null) {
return number;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava;
import com.google.common.net.InetAddresses;
import java.net.Inet4Address;
import com.google.common.net.InetAddresses;
import java.net.Inet4Address;
private static final Long AS_NUMBER_TEST = 100L;
private static final Long INSTANCE_ID_TYPE_VALUE_TEST = 121L;
private static final Short INSTANCE_ID_TYPE_VALUE_SHORT_TEST = 122;
private static final Long AS_NUMBER_TEST = 100L;
private static final Long INSTANCE_ID_TYPE_VALUE_TEST = 121L;
private static final Short INSTANCE_ID_TYPE_VALUE_SHORT_TEST = 122;
- private static final InstanceIdType INSTANCE_ID_TYPE_TEST = new InstanceIdType(INSTANCE_ID_TYPE_VALUE_TEST);
+ private static final InstanceIdType INSTANCE_ID_TYPE_TEST = new InstanceIdType(
+ fromJava(INSTANCE_ID_TYPE_VALUE_TEST));
private static final String INCORRECT_IP_ADDRESS_TEST = "incorrect ip address";
private static final String MAC_ADDRESS_VALUE_TEST = "aa:bb:cc:dd:ee:ff";
private static final String INCORRECT_IP_ADDRESS_TEST = "incorrect ip address";
private static final String MAC_ADDRESS_VALUE_TEST = "aa:bb:cc:dd:ee:ff";
private static final Ipv4Prefix IPV4_ADDRESS_PREFIX_TEST = new Ipv4Prefix(IPV4_ADDRESS_PREFIX_VALUE_TEST);
private static final Ipv4PrefixBinary IPV4_ADDRESS_PREFIX_BINARY_1 = new Ipv4PrefixBinaryBuilder()
.setIpv4AddressBinary(new Ipv4AddressBinary(IPV4_ADDRESS_BYTES_A_TEST))
private static final Ipv4Prefix IPV4_ADDRESS_PREFIX_TEST = new Ipv4Prefix(IPV4_ADDRESS_PREFIX_VALUE_TEST);
private static final Ipv4PrefixBinary IPV4_ADDRESS_PREFIX_BINARY_1 = new Ipv4PrefixBinaryBuilder()
.setIpv4AddressBinary(new Ipv4AddressBinary(IPV4_ADDRESS_BYTES_A_TEST))
- .setIpv4MaskLength(MASK_OK_TEST).build();
+ .setIpv4MaskLength(fromJava(MASK_OK_TEST)).build();
private static final Ipv4PrefixBinary IPV4_ADDRESS_PREFIX_BINARY_2 = new Ipv4PrefixBinaryBuilder()
.setIpv4AddressBinary(new Ipv4AddressBinary(IPV4_ADDRESS_BYTES_A_TEST))
private static final Ipv4PrefixBinary IPV4_ADDRESS_PREFIX_BINARY_2 = new Ipv4PrefixBinaryBuilder()
.setIpv4AddressBinary(new Ipv4AddressBinary(IPV4_ADDRESS_BYTES_A_TEST))
- .setIpv4MaskLength(MASK_OK_DEFAULT_IPV4_TEST).build();
+ .setIpv4MaskLength(fromJava(MASK_OK_DEFAULT_IPV4_TEST)).build();
private static final IpPrefix IP_ADDRESS_PREFIX_WITH_IPV4_TEST = new IpPrefix(IPV4_ADDRESS_PREFIX_TEST);
private static final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp
.address.address.Ipv4Prefix IPV4_PREFIX = new Ipv4PrefixBuilder()
private static final IpPrefix IP_ADDRESS_PREFIX_WITH_IPV4_TEST = new IpPrefix(IPV4_ADDRESS_PREFIX_TEST);
private static final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp
.address.address.Ipv4Prefix IPV4_PREFIX = new Ipv4PrefixBuilder()
private static final IpAddress IP_ADDRESS_IPV6_TEST = new IpAddress(IPV6_ADDRESS_TEST);
private static final Ipv6PrefixBinary IPV6_ADDRESS_PREFIX_BINARY_1 = new Ipv6PrefixBinaryBuilder()
.setIpv6AddressBinary(new Ipv6AddressBinary(IPV6_ADDRESS_BYTES_A_TEST))
private static final IpAddress IP_ADDRESS_IPV6_TEST = new IpAddress(IPV6_ADDRESS_TEST);
private static final Ipv6PrefixBinary IPV6_ADDRESS_PREFIX_BINARY_1 = new Ipv6PrefixBinaryBuilder()
.setIpv6AddressBinary(new Ipv6AddressBinary(IPV6_ADDRESS_BYTES_A_TEST))
- .setIpv6MaskLength(MASK_OK_TEST).build();
+ .setIpv6MaskLength(fromJava(MASK_OK_TEST)).build();
private static final Ipv6PrefixBinary IPV6_ADDRESS_PREFIX_BINARY_2 = new Ipv6PrefixBinaryBuilder()
.setIpv6AddressBinary(new Ipv6AddressBinary(IPV6_ADDRESS_BYTES_A_TEST))
private static final Ipv6PrefixBinary IPV6_ADDRESS_PREFIX_BINARY_2 = new Ipv6PrefixBinaryBuilder()
.setIpv6AddressBinary(new Ipv6AddressBinary(IPV6_ADDRESS_BYTES_A_TEST))
- .setIpv6MaskLength(MASK_OK_DEFAULT_IPV6_TEST).build();
+ .setIpv6MaskLength(fromJava(MASK_OK_DEFAULT_IPV6_TEST)).build();
private static final Eid IPV6_ADDRESS_PREFIX_BINARY_EID_1 = new EidBuilder()
.setAddress(IPV6_ADDRESS_PREFIX_BINARY_1)
.setAddressType(Ipv6PrefixBinaryAfi.class)
private static final Eid IPV6_ADDRESS_PREFIX_BINARY_EID_1 = new EidBuilder()
.setAddress(IPV6_ADDRESS_PREFIX_BINARY_1)
.setAddressType(Ipv6PrefixBinaryAfi.class)
*/
@Test
public void addressFromSimpleAddressTest_asNumber() {
*/
@Test
public void addressFromSimpleAddressTest_asNumber() {
- final SimpleAddress simpleAddress = new SimpleAddress(new AsNumber(NUMBER_TEST));
+ final SimpleAddress simpleAddress = new SimpleAddress(new AsNumber(fromJava(NUMBER_TEST)));
final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress(
simpleAddress);
assertEquals(AsNumberAfi.class, addressClass);
final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress(
simpleAddress);
assertEquals(AsNumberAfi.class, addressClass);
.address.service.path.ServicePathBuilder servicePathBuilder = new org.opendaylight.yang.gen.v1.urn.ietf
.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
.address.service.path.ServicePathBuilder();
.address.service.path.ServicePathBuilder servicePathBuilder = new org.opendaylight.yang.gen.v1.urn.ietf
.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
.address.service.path.ServicePathBuilder();
- servicePathBuilder.setServiceIndex(SERVICE_INDEX_TEST);
- servicePathBuilder.setServicePathId(new ServicePathIdType(DUMMY_SERVICE_PATH_ID_TYPE));
+ servicePathBuilder.setServiceIndex(fromJava(SERVICE_INDEX_TEST));
+ servicePathBuilder.setServicePathId(new ServicePathIdType(fromJava(DUMMY_SERVICE_PATH_ID_TYPE)));
ServicePath expectedAddress = servicePathBuilder.build();
final Address testedAddress = LispAddressUtil.addressFromServicePath(expectedAddress);
ServicePath expectedAddress = servicePathBuilder.build();
final Address testedAddress = LispAddressUtil.addressFromServicePath(expectedAddress);
*/
@Test
public void addressFromAsNumberTest_withAdNumber() {
*/
@Test
public void addressFromAsNumberTest_withAdNumber() {
- final AsNumber expectedAddress = new AsNumber(AS_NUMBER_TEST);
+ final AsNumber expectedAddress = new AsNumber(fromJava(AS_NUMBER_TEST));
final Address testedAddress = LispAddressUtil.addressFromAsNumber(expectedAddress);
assertTrue(testedAddress instanceof org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp
.address.types.rev151105.lisp.address.address.AsNumber);
final Address testedAddress = LispAddressUtil.addressFromAsNumber(expectedAddress);
assertTrue(testedAddress instanceof org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp
.address.types.rev151105.lisp.address.address.AsNumber);
assertArrayEquals(IPV6_ADDRESS_BYTES_A_TEST, ((Ipv6PrefixBinary) eidFromIpv6PrefixBinary
.getAddress()).getIpv6AddressBinary().getValue());
assertEquals(expectedMask,
assertArrayEquals(IPV6_ADDRESS_BYTES_A_TEST, ((Ipv6PrefixBinary) eidFromIpv6PrefixBinary
.getAddress()).getIpv6AddressBinary().getValue());
assertEquals(expectedMask,
- (short) ((Ipv6PrefixBinary) eidFromIpv6PrefixBinary.getAddress()).getIpv6MaskLength());
+ (short) ((Ipv6PrefixBinary) eidFromIpv6PrefixBinary.getAddress()).getIpv6MaskLength().toJava());
}
private void verifyToEidWithIpv4(final Eid eidFromIpv4, final boolean isVniChecked) {
}
private void verifyToEidWithIpv4(final Eid eidFromIpv4, final boolean isVniChecked) {
assertArrayEquals(IPV4_ADDRESS_BYTES_A_TEST,
((Ipv4PrefixBinary) eidFromIpv4PrefixBinary.getAddress()).getIpv4AddressBinary().getValue());
assertEquals(expectedMask,
assertArrayEquals(IPV4_ADDRESS_BYTES_A_TEST,
((Ipv4PrefixBinary) eidFromIpv4PrefixBinary.getAddress()).getIpv4AddressBinary().getValue());
assertEquals(expectedMask,
- (short) ((Ipv4PrefixBinary) eidFromIpv4PrefixBinary.getAddress()).getIpv4MaskLength());
+ (short) ((Ipv4PrefixBinary) eidFromIpv4PrefixBinary.getAddress()).getIpv4MaskLength().toJava());
}
private void verifyToEidWithIpv6Binary(final Eid eidFromIpv6, final boolean isVniChecked) {
}
private void verifyToEidWithIpv6Binary(final Eid eidFromIpv6, final boolean isVniChecked) {
assertFalse(locatorRecord.isLocalLocator());
assertFalse(locatorRecord.isRlocProbed());
assertTrue(locatorRecord.isRouted());
assertFalse(locatorRecord.isLocalLocator());
assertFalse(locatorRecord.isRlocProbed());
assertTrue(locatorRecord.isRouted());
- assertTrue(1 == locatorRecord.getWeight());
- assertTrue(1 == locatorRecord.getPriority());
- assertTrue(1 == locatorRecord.getMulticastWeight());
- assertTrue(1 == locatorRecord.getMulticastPriority());
+ assertTrue(1 == locatorRecord.getWeight().toJava());
+ assertTrue(1 == locatorRecord.getPriority().toJava());
+ assertTrue(1 == locatorRecord.getMulticastWeight().toJava());
+ assertTrue(1 == locatorRecord.getMulticastPriority().toJava());
assertEquals("SFC_LISP", locatorRecord.getLocatorId());
}
}
assertEquals("SFC_LISP", locatorRecord.getLocatorId());
}
}
ServicePath servicePath = ((org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp
.address.types.rev151105.lisp.address.address.ServicePath) eid.getAddress()).getServicePath();
assertNotNull(servicePath);
ServicePath servicePath = ((org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp
.address.types.rev151105.lisp.address.address.ServicePath) eid.getAddress()).getServicePath();
assertNotNull(servicePath);
- assertEquals(SERVICE_INDEX_TEST, servicePath.getServiceIndex());
- assertEquals(SERVICE_PATH_ID_TEST, servicePath.getServicePathId().getValue());
+ assertEquals((short) SERVICE_INDEX_TEST, servicePath.getServiceIndex().toJava());
+ assertEquals((long) SERVICE_PATH_ID_TEST, servicePath.getServicePathId().getValue().toJava());
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava;
import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.Inet4Address;
import java.net.Inet6Address;
private static final Ipv4AddressBinary IPV4_ADDRESS_BINARY = new Ipv4AddressBinary(ipv4ByteAddress);
private static final Ipv6AddressBinary IPV6_ADDRESS_BINARY = new Ipv6AddressBinary(ipv6ByteAddress);
private static final Ipv4PrefixBinary IPV4_PREFIX_BINARY = new Ipv4PrefixBinaryBuilder()
private static final Ipv4AddressBinary IPV4_ADDRESS_BINARY = new Ipv4AddressBinary(ipv4ByteAddress);
private static final Ipv6AddressBinary IPV6_ADDRESS_BINARY = new Ipv6AddressBinary(ipv6ByteAddress);
private static final Ipv4PrefixBinary IPV4_PREFIX_BINARY = new Ipv4PrefixBinaryBuilder()
- .setIpv4AddressBinary(IPV4_ADDRESS_BINARY).setIpv4MaskLength((short) 32).build();
+ .setIpv4AddressBinary(IPV4_ADDRESS_BINARY).setIpv4MaskLength(fromJava((short) 32)).build();
private static final Ipv6PrefixBinary IPV6_PREFIX_BINARY = new Ipv6PrefixBinaryBuilder()
private static final Ipv6PrefixBinary IPV6_PREFIX_BINARY = new Ipv6PrefixBinaryBuilder()
- .setIpv6AddressBinary(IPV6_ADDRESS_BINARY).setIpv6MaskLength((short) 128).build();
+ .setIpv6AddressBinary(IPV6_ADDRESS_BINARY).setIpv6MaskLength(fromJava((short) 128)).build();
private static final Address ADDRESS_IPV4 = new Ipv4Builder().setIpv4(IPV4_ADDRESS).build();
private static final Address ADDRESS_IPV6 = new Ipv6Builder().setIpv6(new Ipv6Address(IPV6_STRING)).build();
private static final Address ADDRESS_IPV4 = new Ipv4Builder().setIpv4(IPV4_ADDRESS).build();
private static final Address ADDRESS_IPV6 = new Ipv6Builder().setIpv6(new Ipv6Address(IPV6_STRING)).build();
// expected result
assertArrayEquals(ipv4ExpectedByteAddress, resultPrefix.getIpv4AddressBinary().getValue());
// expected result
assertArrayEquals(ipv4ExpectedByteAddress, resultPrefix.getIpv4AddressBinary().getValue());
- assertEquals((short) 20, (short) resultPrefix.getIpv4MaskLength());
+ assertEquals((short) 20, (short) resultPrefix.getIpv4MaskLength().toJava());
// expected result
assertArrayEquals(ipv6ExpectedByteAddress, resultPrefix.getIpv6AddressBinary().getValue());
// expected result
assertArrayEquals(ipv6ExpectedByteAddress, resultPrefix.getIpv6AddressBinary().getValue());
- assertEquals((short) 66, (short) resultPrefix.getIpv6MaskLength());
+ assertEquals((short) 66, (short) resultPrefix.getIpv6MaskLength().toJava());
// expected result
final byte[] expectedResult = Inet4Address.getByName("255.255.240.0").getAddress();
assertArrayEquals(expectedResult, resultPrefix.getIpv4AddressBinary().getValue());
// expected result
final byte[] expectedResult = Inet4Address.getByName("255.255.240.0").getAddress();
assertArrayEquals(expectedResult, resultPrefix.getIpv4AddressBinary().getValue());
- assertEquals((short) 20, (short) resultPrefix.getIpv4MaskLength());
+ assertEquals((short) 20, (short) resultPrefix.getIpv4MaskLength().toJava());
// expected result
final byte[] expectedResult = Inet6Address.getByName("1111:2222:3333:4444:4000::").getAddress();
assertArrayEquals(expectedResult, resultPrefix.getIpv6AddressBinary().getValue());
// expected result
final byte[] expectedResult = Inet6Address.getByName("1111:2222:3333:4444:4000::").getAddress();
assertArrayEquals(expectedResult, resultPrefix.getIpv6AddressBinary().getValue());
- assertEquals((short) 66, (short) resultPrefix.getIpv6MaskLength());
+ assertEquals((short) 66, (short) resultPrefix.getIpv6MaskLength().toJava());
return new InstanceIdBuilder()
.setInstanceId(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types
.rev151105.lisp.address.address.instance.id.InstanceIdBuilder()
return new InstanceIdBuilder()
.setInstanceId(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types
.rev151105.lisp.address.address.instance.id.InstanceIdBuilder()
- .setIid(new InstanceIdType(1L))
+ .setIid(new InstanceIdType(fromJava(1L)))
.setAddress(new SimpleAddress(new IpPrefix(IPV4_PREFIX)))
.setAddress(new SimpleAddress(new IpPrefix(IPV4_PREFIX)))
- .setMaskLength((short) 32).build())
+ .setMaskLength(fromJava((short) 32)).build())
return new InstanceIdBuilder()
.setInstanceId(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types
.rev151105.lisp.address.address.instance.id.InstanceIdBuilder()
return new InstanceIdBuilder()
.setInstanceId(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types
.rev151105.lisp.address.address.instance.id.InstanceIdBuilder()
- .setIid(new InstanceIdType(1L))
+ .setIid(new InstanceIdType(fromJava(1L)))
.setAddress(new SimpleAddress(new IpAddress(new Ipv4Address(IPV4_STRING_1)))).build())
.build();
}
.setAddress(new SimpleAddress(new IpAddress(new Ipv4Address(IPV4_STRING_1)))).build())
.build();
}
.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.service.path.ServicePathBuilder();
return new ServicePathBuilder().setServicePath(servicePathBuilder
.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.service.path.ServicePathBuilder();
return new ServicePathBuilder().setServicePath(servicePathBuilder
- .setServiceIndex((short) 1)
- .setServicePathId(new ServicePathIdType(1L)).build())
+ .setServiceIndex(fromJava((short) 1))
+ .setServicePathId(new ServicePathIdType(fromJava(1L))).build())
if (eid.getVirtualNetworkId() == null) {
return 0;
} else {
if (eid.getVirtualNetworkId() == null) {
return 0;
} else {
- return eid.getVirtualNetworkId().getValue();
+ return eid.getVirtualNetworkId().getValue().toJava();
if (eid.getVirtualNetworkId() == null) {
return 0;
} else {
if (eid.getVirtualNetworkId() == null) {
return 0;
} else {
- return eid.getVirtualNetworkId().getValue();
+ return eid.getVirtualNetworkId().getValue().toJava();
if (eid.getVirtualNetworkId() == null) {
return 0;
} else {
if (eid.getVirtualNetworkId() == null) {
return 0;
} else {
- return eid.getVirtualNetworkId().getValue();
+ return eid.getVirtualNetworkId().getValue().toJava();
@Override
public Object getMapping(Eid srcEid, Eid dstEid) {
@Override
public Object getMapping(Eid srcEid, Eid dstEid) {
- final XtrId xtrId = null;
- return getMapping(dstEid, xtrId);
+ return getMapping(dstEid, (XtrId) null);
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>4.0.6</version>
+ <version>5.0.3</version>
<relativePath/>
</parent>
<relativePath/>
</parent>
build failure. Please do not modify this unless you have a good reason. -->
<name>ODL :: lispflowmapping :: ${project.artifactId}</name>
build failure. Please do not modify this unless you have a good reason. -->
<name>ODL :: lispflowmapping :: ${project.artifactId}</name>
+ <properties>
+ <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
+ </properties>
+
<dependencyManagement>
<dependencies>
<dependency>
<dependencyManagement>
<dependencies>
<dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-singleton-common-api</artifactId>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-singleton-common-api</artifactId>
- <version>4.0.6</version>
+ <version>5.0.3</version>
</dependency>
<!--Needed for testing-->
</dependency>
<!--Needed for testing-->
});
return Futures.transform(probeVppNodeForConnection,
});
return Futures.transform(probeVppNodeForConnection,
- vd -> nodeIdToKeyedInstanceIdentifierMap.get(newOrModifiedNode.getNodeId()).iterator().next(),
- MoreExecutors.directExecutor());
+ vd -> nodeIdToKeyedInstanceIdentifierMap.get(newOrModifiedNode.getNodeId()).iterator().next(),
+ MoreExecutors.directExecutor());
}
private void processNodeOnConnection(final Node newOrModifiedNode) {
}
private void processNodeOnConnection(final Node newOrModifiedNode) {
Field field = portDataProcessor.getClass().getDeclaredField("hostInformationManager");
field.setAccessible(true);
field.set(portDataProcessor, hostInformationManager);
Field field = portDataProcessor.getClass().getDeclaredField("hostInformationManager");
field.setAccessible(true);
field.set(portDataProcessor, hostInformationManager);
- } catch (Exception e) {
+ } catch (NoSuchFieldException | IllegalAccessException e) {
throw new RuntimeException("Unable to set hostInformationManager", e);
}
throw new RuntimeException("Unable to set hostInformationManager", e);
}
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent</artifactId>
- <version>5.0.2</version>
+ <version>6.0.0</version>
<relativePath/>
</parent>
<relativePath/>
</parent>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>4.0.6</version>
+ <version>5.0.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencyManagement>
<build>
</dependencyManagement>
<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>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@Override
protected Object doExecute() throws Exception {
@Override
protected Object doExecute() throws Exception {
- mappingServiceShell.addDefaultKeyIPv4();
- mappingServiceShell.addDefaultKeyIPv6();
+ if (mappingServiceShell != null) {
+ mappingServiceShell.addDefaultKeyIPv4();
+ mappingServiceShell.addDefaultKeyIPv6();
+ }
@Override
@SuppressWarnings("checkstyle:RegexpSinglelineJava")
protected Object doExecute() throws Exception {
@Override
@SuppressWarnings("checkstyle:RegexpSinglelineJava")
protected Object doExecute() throws Exception {
- if (debug) {
- System.out.print(mappingServiceShell.printKeys());
- } else {
- System.out.print(mappingServiceShell.prettyPrintKeys());
+ if (mappingServiceShell != null) {
+ if (debug) {
+ System.out.print(mappingServiceShell.printKeys());
+ } else {
+ System.out.print(mappingServiceShell.prettyPrintKeys());
+ }
@Override
@SuppressWarnings("checkstyle:RegexpSinglelineJava")
protected Object doExecute() throws Exception {
@Override
@SuppressWarnings("checkstyle:RegexpSinglelineJava")
protected Object doExecute() throws Exception {
- if (debug) {
- System.out.print(mappingServiceShell.printMappings());
- } else {
- System.out.print(mappingServiceShell.prettyPrintMappings());
+ if (mappingServiceShell != null) {
+ if (debug) {
+ System.out.print(mappingServiceShell.printMappings());
+ } else {
+ System.out.print(mappingServiceShell.prettyPrintMappings());
+ }
build failure. Please do not modify this unless you have a good reason. -->
<name>ODL :: lispflowmapping :: ${project.artifactId}</name>
build failure. Please do not modify this unless you have a good reason. -->
<name>ODL :: lispflowmapping :: ${project.artifactId}</name>
+ <properties>
+ <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
<groupId>org.opendaylight.lispflowmapping</groupId>
<artifactId>common.unittest.tools</artifactId>
</dependency>
<groupId>org.opendaylight.lispflowmapping</groupId>
<artifactId>common.unittest.tools</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>2.28.2</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
+ <version>2.28.2</version>
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
public void handleSerializedLispBuffer(TransportAddress address, ByteBuffer outBuffer,
final MessageType packetType) {
InetAddress ip = getInetAddress(address);
public void handleSerializedLispBuffer(TransportAddress address, ByteBuffer outBuffer,
final MessageType packetType) {
InetAddress ip = getInetAddress(address);
- handleSerializedLispBuffer(ip, outBuffer, packetType, address.getPort().getValue(), null);
+ handleSerializedLispBuffer(ip, outBuffer, packetType, address.getPort().getValue().toJava(), null);
}
public void handleSerializedLispBuffer(InetAddress address, ByteBuffer outBuffer,
}
public void handleSerializedLispBuffer(InetAddress address, ByteBuffer outBuffer,
package org.opendaylight.lispflowmapping.southbound.lisp;
package org.opendaylight.lispflowmapping.southbound.lisp;
+import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava;
+
import io.netty.buffer.ByteBufUtil;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler;
import io.netty.buffer.ByteBufUtil;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler;
TransportAddressBuilder transportAddressBuilder = new TransportAddressBuilder();
transportAddressBuilder.setIpAddress(
LispNotificationHelper.getIpAddressBinaryFromInetAddress(finalSourceAddress));
TransportAddressBuilder transportAddressBuilder = new TransportAddressBuilder();
transportAddressBuilder.setIpAddress(
LispNotificationHelper.getIpAddressBinaryFromInetAddress(finalSourceAddress));
- transportAddressBuilder.setPort(new PortNumber(port));
+ transportAddressBuilder.setPort(new PortNumber(fromJava(port)));
requestMappingBuilder.setTransportAddress(transportAddressBuilder.build());
lispSbPlugin.sendNotificationIfPossible(requestMappingBuilder.build());
} catch (RuntimeException re) {
requestMappingBuilder.setTransportAddress(transportAddressBuilder.build());
lispSbPlugin.sendNotificationIfPossible(requestMappingBuilder.build());
} catch (RuntimeException re) {
TransportAddressBuilder transportAddressBuilder = new TransportAddressBuilder();
transportAddressBuilder.setIpAddress(LispNotificationHelper.getIpAddressBinaryFromInetAddress(
sourceAddress));
TransportAddressBuilder transportAddressBuilder = new TransportAddressBuilder();
transportAddressBuilder.setIpAddress(LispNotificationHelper.getIpAddressBinaryFromInetAddress(
sourceAddress));
- transportAddressBuilder.setPort(new PortNumber(port));
+ transportAddressBuilder.setPort(new PortNumber(fromJava(port)));
addMappingBuilder.setTransportAddress(transportAddressBuilder.build());
lispSbPlugin.sendNotificationIfPossible(addMappingBuilder.build());
if (artificialEntry != null) {
addMappingBuilder.setTransportAddress(transportAddressBuilder.build());
lispSbPlugin.sendNotificationIfPossible(addMappingBuilder.build());
if (artificialEntry != null) {
MapRegisterCacheValue mapRegisterValue) {
if (mapRegisterValue.getMappingAuthkey().getKeyType() != null) {
ByteBuffer outBuffer = transformMapRegisterToMapNotify(inBuffer);
MapRegisterCacheValue mapRegisterValue) {
if (mapRegisterValue.getMappingAuthkey().getKeyType() != null) {
ByteBuffer outBuffer = transformMapRegisterToMapNotify(inBuffer);
- if (mapRegisterValue.getMappingAuthkey().getKeyType() != 0) {
+ if (mapRegisterValue.getMappingAuthkey().getKeyType().toJava() != 0) {
outBuffer = calculateAndSetNewMAC(outBuffer, mapRegisterValue.getMappingAuthkey().getKeyString());
}
outBuffer.position(0);
outBuffer = calculateAndSetNewMAC(outBuffer, mapRegisterValue.getMappingAuthkey().getKeyString());
}
outBuffer.position(0);
TransportAddressBuilder transportAddressBuilder = new TransportAddressBuilder();
transportAddressBuilder.setIpAddress(LispNotificationHelper
.getIpAddressBinaryFromInetAddress(sourceAddress));
TransportAddressBuilder transportAddressBuilder = new TransportAddressBuilder();
transportAddressBuilder.setIpAddress(LispNotificationHelper
.getIpAddressBinaryFromInetAddress(sourceAddress));
- transportAddressBuilder.setPort(new PortNumber(port));
+ transportAddressBuilder.setPort(new PortNumber(fromJava(port)));
gotMapNotifyBuilder.setTransportAddress(transportAddressBuilder.build());
lispSbPlugin.sendNotificationIfPossible(gotMapNotifyBuilder.build());
} catch (RuntimeException re) {
gotMapNotifyBuilder.setTransportAddress(transportAddressBuilder.build());
lispSbPlugin.sendNotificationIfPossible(gotMapNotifyBuilder.build());
} catch (RuntimeException re) {
TransportAddressBuilder transportAddressBuilder = new TransportAddressBuilder();
transportAddressBuilder.setIpAddress(LispNotificationHelper
.getIpAddressBinaryFromInetAddress(sourceAddress));
TransportAddressBuilder transportAddressBuilder = new TransportAddressBuilder();
transportAddressBuilder.setIpAddress(LispNotificationHelper
.getIpAddressBinaryFromInetAddress(sourceAddress));
- transportAddressBuilder.setPort(new PortNumber(port));
+ transportAddressBuilder.setPort(new PortNumber(fromJava(port)));
gotMapReplyBuilder.setTransportAddress(transportAddressBuilder.build());
lispSbPlugin.sendNotificationIfPossible(gotMapReplyBuilder.build());
} catch (RuntimeException re) {
gotMapReplyBuilder.setTransportAddress(transportAddressBuilder.build());
lispSbPlugin.sendNotificationIfPossible(gotMapReplyBuilder.build());
} catch (RuntimeException re) {