<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-eos-binding-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-annotations</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>com.guicedee.services</groupId>
<artifactId>javax.inject</artifactId>
Nodes nodes = new NodesBuilder()
.setNode(BindingMap.of(new NodeBuilder()
.withKey(nodeKey)
- .addAugmentation(new FlowCapableNodeBuilder().build())
+ .addAugmentation(new FlowCapableNodeBuilder().setDescription("test node").build())
.build()))
.build();
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<artifactId>model-topology</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-annotations</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>com.guicedee.services</groupId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>karaf4-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
</parent>
<groupId>org.opendaylight.openflowplugin</groupId>
<artifactId>openflowplugin-karaf</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
}
private static IpAddress readIpv4Address(final ByteBuf message) {
- return new IpAddress(IetfInetUtil.INSTANCE.ipv4AddressFor(message.readInt()));
+ return new IpAddress(IetfInetUtil.ipv4AddressFor(message.readInt()));
}
private static void writeIpv4Address(final ByteBuf outBuffer, final IpAddress ipAddress) {
if (ipAddress != null) {
- outBuffer.writeBytes(IetfInetUtil.INSTANCE.ipv4AddressBytes(ipAddress.getIpv4Address()));
+ outBuffer.writeBytes(IetfInetUtil.ipv4AddressBytes(ipAddress.getIpv4Address()));
}
}
public void serialize(final MatchEntry input, final ByteBuf outBuffer) {
serializeHeader(input, outBuffer);
ArpShaCaseValue value = (ArpShaCaseValue) input.getMatchEntryValue();
- outBuffer.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(value.getArpShaValues().getMacAddress()));
+ outBuffer.writeBytes(IetfYangUtil.macAddressBytes(value.getArpShaValues().getMacAddress()));
}
@Override
message.readBytes(address);
ArpShaCaseValueBuilder caseBuilder = new ArpShaCaseValueBuilder();
caseBuilder.setArpShaValues(new ArpShaValuesBuilder()
- .setMacAddress(IetfYangUtil.INSTANCE.macAddressFor(address))
+ .setMacAddress(IetfYangUtil.macAddressFor(address))
.build());
matchEntriesBuilder.setMatchEntryValue(caseBuilder.build());
return matchEntriesBuilder.build();
public void serialize(final MatchEntry input, final ByteBuf outBuffer) {
serializeHeader(input, outBuffer);
ArpThaCaseValue arpThaCase = (ArpThaCaseValue) input.getMatchEntryValue();
- outBuffer.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(arpThaCase.getArpThaValues().getMacAddress()));
+ outBuffer.writeBytes(IetfYangUtil.macAddressBytes(arpThaCase.getArpThaValues().getMacAddress()));
}
@Override
message.readBytes(address);
ArpThaCaseValueBuilder caseBuilder = new ArpThaCaseValueBuilder();
caseBuilder.setArpThaValues(new ArpThaValuesBuilder()
- .setMacAddress(IetfYangUtil.INSTANCE.macAddressFor(address))
+ .setMacAddress(IetfYangUtil.macAddressFor(address))
.build());
matchEntryBuilder.setMatchEntryValue(caseBuilder.build());
return matchEntryBuilder.build();
public void serialize(final MatchEntry input, final ByteBuf outBuffer) {
serializeHeader(input, outBuffer);
EthDstCaseValue ethDstCase = (EthDstCaseValue) input.getMatchEntryValue();
- outBuffer.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(ethDstCase.getEthDstValues().getMacAddress()));
+ outBuffer.writeBytes(IetfYangUtil.macAddressBytes(ethDstCase.getEthDstValues().getMacAddress()));
}
@Override
message.readBytes(address);
EthDstCaseValueBuilder caseBuilder = new EthDstCaseValueBuilder();
caseBuilder.setEthDstValues(new EthDstValuesBuilder()
- .setMacAddress(IetfYangUtil.INSTANCE.macAddressFor(address))
+ .setMacAddress(IetfYangUtil.macAddressFor(address))
.build());
matchEntryBuilder.setMatchEntryValue(caseBuilder.build());
return matchEntryBuilder.build();
public void serialize(final MatchEntry input, final ByteBuf outBuffer) {
serializeHeader(input, outBuffer);
EthSrcCaseValue ethSrcCase = (EthSrcCaseValue) input.getMatchEntryValue();
- outBuffer.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(ethSrcCase.getEthSrcValues().getMacAddress()));
+ outBuffer.writeBytes(IetfYangUtil.macAddressBytes(ethSrcCase.getEthSrcValues().getMacAddress()));
}
@Override
message.readBytes(address);
EthSrcCaseValueBuilder caseBuilder = new EthSrcCaseValueBuilder();
caseBuilder.setEthSrcValues(new EthSrcValuesBuilder()
- .setMacAddress(IetfYangUtil.INSTANCE.macAddressFor(address))
+ .setMacAddress(IetfYangUtil.macAddressFor(address))
.build());
matchEntryBuilder.setMatchEntryValue(caseBuilder.build());
matchEntryBuilder.setHasMask(false);
//RANGE PRESENT
message.writeShort(0x3F);
//IP ADDRESS MIN
- message.writeBytes(IetfInetUtil.INSTANCE.ipv4AddressBytes(new Ipv4Address("192.168.0.0")));
+ message.writeBytes(IetfInetUtil.ipv4AddressBytes(new Ipv4Address("192.168.0.0")));
//IP ADDRESS MAX
- message.writeBytes(IetfInetUtil.INSTANCE.ipv4AddressBytes(new Ipv4Address("192.168.10.0")));
+ message.writeBytes(IetfInetUtil.ipv4AddressBytes(new Ipv4Address("192.168.10.0")));
//PORT MIN
message.writeShort(3000);
//PORT MAX
//RANGE PRESENT
message.writeShort(0x21);
//IP ADDRESS MIN
- message.writeBytes(IetfInetUtil.INSTANCE.ipv4AddressBytes(new Ipv4Address("192.168.0.0")));
+ message.writeBytes(IetfInetUtil.ipv4AddressBytes(new Ipv4Address("192.168.0.0")));
//PORT MAX
message.writeShort(4000);
message.writeZero(2);
private static final int NXM_FIELD_CODE = 17;
private static byte[] resAddress = new byte[VALUE_LENGTH];
- private static final MacAddress RESULT_ADDRESS = IetfYangUtil.INSTANCE.macAddressFor(resAddress);
+ private static final MacAddress RESULT_ADDRESS = IetfYangUtil.macAddressFor(resAddress);
@Before
public void setUp() {
matchEntryBuilder.setHasMask(false);
- valuesBuilder.setMacAddress(IetfYangUtil.INSTANCE.macAddressFor(new byte[VALUE_LENGTH]));
+ valuesBuilder.setMacAddress(IetfYangUtil.macAddressFor(new byte[VALUE_LENGTH]));
caseBuilder.setArpShaValues(valuesBuilder.build());
matchEntryBuilder.setMatchEntryValue(caseBuilder.build());
private static final int NXM_FIELD_CODE = 18;
private static final byte[] TEST_ADDR = new byte[VALUE_LENGTH];
- private static final MacAddress TEST_ADDRESS = IetfYangUtil.INSTANCE.macAddressFor(TEST_ADDR);
+ private static final MacAddress TEST_ADDRESS = IetfYangUtil.macAddressFor(TEST_ADDR);
@Before
public void setUp() {
matchEntryBuilder.setOxmMatchField(NxmNxArpTha.VALUE);
matchEntryBuilder.setHasMask(false);
- valuesBuilder.setMacAddress(IetfYangUtil.INSTANCE.macAddressFor(new byte[VALUE_LENGTH]));
+ valuesBuilder.setMacAddress(IetfYangUtil.macAddressFor(new byte[VALUE_LENGTH]));
caseBuilder.setArpThaValues(valuesBuilder.build());
matchEntryBuilder.setMatchEntryValue(caseBuilder.build());
private static final int NXM_FIELD_CODE = 1;
private static final byte[] TEST_ADDR = new byte[VALUE_LENGTH];
- private static final MacAddress TEST_ADDRESS = IetfYangUtil.INSTANCE.macAddressFor(TEST_ADDR);
+ private static final MacAddress TEST_ADDRESS = IetfYangUtil.macAddressFor(TEST_ADDR);
@Test
public void serializeTest() {
matchEntryBuilder.setOxmMatchField(NxmOfEthDst.VALUE);
matchEntryBuilder.setHasMask(false);
- valuesBuilder.setMacAddress(IetfYangUtil.INSTANCE.macAddressFor(new byte[VALUE_LENGTH]));
+ valuesBuilder.setMacAddress(IetfYangUtil.macAddressFor(new byte[VALUE_LENGTH]));
caseBuilder.setEthDstValues(valuesBuilder.build());
matchEntryBuilder.setMatchEntryValue(caseBuilder.build());
private static final int NXM_FIELD_CODE = 2;
private static final byte[] TEST_ADDR = new byte[VALUE_LENGTH];
- private static final MacAddress TEST_ADDRESS = IetfYangUtil.INSTANCE.macAddressFor(TEST_ADDR);
+ private static final MacAddress TEST_ADDRESS = IetfYangUtil.macAddressFor(TEST_ADDR);
@Test
public void serializeTest() {
matchEntryBuilder.setHasMask(false);
- valuesBuilder.setMacAddress(IetfYangUtil.INSTANCE.macAddressFor(new byte[VALUE_LENGTH]));
+ valuesBuilder.setMacAddress(IetfYangUtil.macAddressFor(new byte[VALUE_LENGTH]));
caseBuilder.setEthSrcValues(valuesBuilder.build());
matchEntryBuilder.setMatchEntryValue(caseBuilder.build());
}
public static Uint32 ipv4ToUint32(final Ipv4Address ipv4) {
- return Uint32.fromIntBits(IetfInetUtil.INSTANCE.ipv4AddressBits(ipv4));
+ return Uint32.fromIntBits(IetfInetUtil.ipv4AddressBits(ipv4));
}
public static Ipv4Address uint32ToIpv4Address(final Uint32 value) {
- return IetfInetUtil.INSTANCE.ipv4AddressFor(value.intValue());
+ return IetfInetUtil.ipv4AddressFor(value.intValue());
}
}
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-common-netty</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-annotations</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
-
</project>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-artifacts</artifactId>
- <version>5.0.4</version>
+ <version>6.0.0</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-openflowplugin-libraries">
<feature name="odl-openflowplugin-libraries">
- <feature version="[12,13)">odl-apache-commons-lang3</feature>
- <feature version="[12,13)">odl-guava</feature>
+ <feature version="[13,14)">odl-apache-commons-lang3</feature>
+ <feature version="[13,14)">odl-guava</feature>
</feature>
</features>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>11.0.7</version>
+ <version>12.0.0</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>controller-artifacts</artifactId>
- <version>7.0.4</version>
+ <version>8.0.0</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<?xml version="1.0" encoding="UTF-8"?>
<features name="odl-openflowplugin-nsf-model-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
<feature name="odl-openflowplugin-nsf-model" version="${project.version}">
- <feature version="[11,12)">odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal</feature>
- <feature version="[11,12)">odl-mdsal-model-odl-l2-types</feature>
+ <feature version="[12,13)">odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal</feature>
+ <feature version="[12,13)">odl-mdsal-model-odl-l2-types</feature>
</feature>
</features>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>controller-artifacts</artifactId>
- <version>7.0.4</version>
+ <version>8.0.0</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.opendaylight.infrautils</groupId>
<artifactId>infrautils-artifacts</artifactId>
- <version>5.0.3</version>
+ <version>6.0.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<features name="openflowplugin-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
<feature name="odl-openflowplugin-southbound" version="${project.version}">
<configfile finalname="etc/org.opendaylight.openflowplugin.cfg">mvn:org.opendaylight.openflowplugin/openflowplugin-blueprint-config/${project.version}/cfg/config</configfile>
- <feature version="[7,8)">odl-mdsal-broker</feature>
- <feature version="[5,6)">odl-infrautils-diagstatus</feature>
+ <feature version="[8,9)">odl-mdsal-broker</feature>
+ <feature version="[6,7)">odl-infrautils-diagstatus</feature>
</feature>
</features>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<packaging>bundle</packaging>
<dependencies>
+ <dependency>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-annotations</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.annotation</artifactId>
</dependency>
</dependencies>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<dependency>
<groupId>org.opendaylight.infrautils</groupId>
<artifactId>infrautils-artifacts</artifactId>
- <version>5.0.3</version>
+ <version>6.0.1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yangtools-artifacts</artifactId>
- <version>10.0.4</version>
+ <version>11.0.0</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>11.0.7</version>
+ <version>12.0.0</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<feature name='odl-openflowjava-protocol' version='${project.version}'>
<configfile finalname="etc/opendaylight/datastore/initial/config/default-openflow-connection-config.xml">mvn:org.opendaylight.openflowplugin.openflowjava/openflowjava-blueprint-config/${project.version}/xml/config</configfile>
<configfile finalname="etc/opendaylight/datastore/initial/config/legacy-openflow-connection-config.xml">mvn:org.opendaylight.openflowplugin.openflowjava/openflowjava-blueprint-config/${project.version}/xml/legacyConfig</configfile>
- <feature version="[10,11)">odl-yangtools-netty</feature>
- <feature version="[11,12)">odl-mdsal-model-rfc6991</feature>
- <feature version="[5,6)">odl-infrautils-diagstatus</feature>
+ <feature version="[11,12)">odl-yangtools-netty</feature>
+ <feature version="[12,13)">odl-mdsal-model-rfc6991</feature>
+ <feature version="[6,7)">odl-infrautils-diagstatus</feature>
</feature>
</features>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
<groupId>org.kohsuke.metainf-services</groupId>
<artifactId>metainf-services</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-annotations</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>com.guicedee.services</groupId>
<artifactId>javax.inject</artifactId>
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
-
package org.opendaylight.openflowjava.protocol.impl.core;
import static com.google.common.base.Preconditions.checkState;
-import static java.util.Objects.requireNonNull;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
private final DeserializerRegistry deserializerRegistry;
private final DeserializationFactory deserializationFactory;
private final ListeningExecutorService listeningExecutorService;
- private final DiagStatusService diagStatus;
private final String diagStatusIdentifier;
private final String threadName;
final @Nullable ConnectionConfiguration connConfig) {
this.connConfig = connConfig;
String connectionSuffix = createConnectionSuffix(connConfig);
- this.diagStatus = requireNonNull(diagStatus);
diagStatusIdentifier = OPENFLOW_JAVA_SERVICE_NAME_PREFIX + connectionSuffix;
diagReg = diagStatus.register(diagStatusIdentifier);
Futures.addCallback(listeningExecutorService.submit(serverFacade), new FutureCallback<Object>() {
@Override
public void onFailure(final Throwable throwable) {
- diagStatus.report(new ServiceDescriptor(diagStatusIdentifier, throwable));
+ diagReg.report(new ServiceDescriptor(diagStatusIdentifier, throwable));
}
@Override
public void onSuccess(final Object result) {
- diagStatus.report(new ServiceDescriptor(diagStatusIdentifier, ServiceState.ERROR,
+ diagReg.report(new ServiceDescriptor(diagStatusIdentifier, ServiceState.ERROR,
threadName + " terminated"));
}
}, MoreExecutors.directExecutor());
if (TransportProtocol.TCP.equals(transportProtocol) || TransportProtocol.TLS.equals(transportProtocol)) {
server = new TcpHandler(connConfig.getAddress(), connConfig.getPort(),
- () -> diagStatus.report(new ServiceDescriptor(diagStatusIdentifier, ServiceState.OPERATIONAL)));
+ () -> diagReg.report(new ServiceDescriptor(diagStatusIdentifier, ServiceState.OPERATIONAL)));
final TcpChannelInitializer channelInitializer = factory.createPublishingChannelInitializer();
((TcpHandler) server).setChannelInitializer(channelInitializer);
((TcpHandler) server).initiateEventLoopGroups(connConfig.getThreadConfiguration(), isEpollEnabled);
connectionInitializer.run();
} else if (TransportProtocol.UDP.equals(transportProtocol)) {
server = new UdpHandler(connConfig.getAddress(), connConfig.getPort(),
- () -> diagStatus.report(new ServiceDescriptor(diagStatusIdentifier, ServiceState.OPERATIONAL)));
+ () -> diagReg.report(new ServiceDescriptor(diagStatusIdentifier, ServiceState.OPERATIONAL)));
((UdpHandler) server).initiateEventLoopGroups(connConfig.getThreadConfiguration(), isEpollEnabled);
((UdpHandler) server).setChannelInitializer(factory.createUdpChannelInitializer());
} else {
public static MacAddress convertMacAddress(final ByteBuf input) {
byte[] address = new byte[EncodeConstants.MAC_ADDRESS_LENGTH];
input.readBytes(address);
- return IetfYangUtil.INSTANCE.macAddressFor(address);
+ return IetfYangUtil.macAddressFor(address);
}
}
@Override
protected void serializeBody(final Action action, final ByteBuf outBuffer) {
- outBuffer.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(((SetDlDstCase) action.getActionChoice())
+ outBuffer.writeBytes(IetfYangUtil.macAddressBytes(((SetDlDstCase) action.getActionChoice())
.getSetDlDstAction().getDlDstAddress()));
outBuffer.writeZero(ActionConstants.PADDING_IN_DL_ADDRESS_ACTION);
}
@Override
protected void serializeBody(final Action action, final ByteBuf outBuffer) {
- outBuffer.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(((SetDlSrcCase) action.getActionChoice())
+ outBuffer.writeBytes(IetfYangUtil.macAddressBytes(((SetDlSrcCase) action.getActionChoice())
.getSetDlSrcAction().getDlSrcAddress()));
outBuffer.writeZero(ActionConstants.PADDING_IN_DL_ADDRESS_ACTION);
}
@Override
protected void serializeBody(final Action action, final ByteBuf outBuffer) {
- outBuffer.writeBytes(IetfInetUtil.INSTANCE.ipv4AddressBytes(
+ outBuffer.writeBytes(IetfInetUtil.ipv4AddressBytes(
((SetNwDstCase) action.getActionChoice()).getSetNwDstAction().getIpAddress()));
}
}
@Override
protected void serializeBody(final Action action, final ByteBuf outBuffer) {
- outBuffer.writeBytes(IetfInetUtil.INSTANCE.ipv4AddressBytes(
+ outBuffer.writeBytes(IetfInetUtil.ipv4AddressBytes(
((SetNwSrcCase) action.getActionChoice()).getSetNwSrcAction().getIpAddress()));
}
}
outBuffer.writeInt(port.getPortNo().intValue()); // Assuming PortNo
// = PortId
outBuffer.writeZero(PORT_DESC_PADDING_1);
- outBuffer.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(port.getHwAddr()));
+ outBuffer.writeBytes(IetfYangUtil.macAddressBytes(port.getHwAddr()));
outBuffer.writeZero(PORT_DESC_PADDING_2);
writeName(port.getName(), outBuffer);
writePortConfig(port.getConfig(), outBuffer);
outBuffer.writeInt(createActionsV10(message.getActionsV10()));
for (PhyPort port : message.getPhyPort()) {
outBuffer.writeShort(port.getPortNo().intValue());
- outBuffer.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(port.getHwAddr()));
+ outBuffer.writeBytes(IetfYangUtil.macAddressBytes(port.getHwAddr()));
writeName(port.getName(), outBuffer);
writePortConfig(port.getConfigV10(), outBuffer);
writePortState(port.getStateV10(), outBuffer);
public void serialize(final PortModInput message, final ByteBuf outBuffer) {
ByteBufUtils.writeOFHeader(MESSAGE_TYPE, message, outBuffer, EncodeConstants.EMPTY_LENGTH);
outBuffer.writeShort(message.getPortNo().getValue().intValue());
- outBuffer.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(message.getHwAddress()));
+ outBuffer.writeBytes(IetfYangUtil.macAddressBytes(message.getHwAddress()));
outBuffer.writeInt(createPortConfigBitmask(message.getConfigV10()));
outBuffer.writeInt(createPortConfigBitmask(message.getMaskV10()));
outBuffer.writeInt(createPortFeaturesBitmask(message.getAdvertiseV10()));
outBuffer.writeByte(message.getReason().getIntValue());
outBuffer.writeZero(PADDING);
outBuffer.writeShort(message.getPortNo().intValue());
- outBuffer.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(message.getHwAddr()));
+ outBuffer.writeBytes(IetfYangUtil.macAddressBytes(message.getHwAddr()));
writeName(message.getName(), outBuffer);
writePortConfig(message.getConfigV10(), outBuffer);
writePortState(message.getStateV10(), outBuffer);
ByteBufUtils.writeOFHeader(MESSAGE_TYPE, message, outBuffer, EncodeConstants.EMPTY_LENGTH);
outBuffer.writeInt(message.getPortNo().getValue().intValue());
outBuffer.writeZero(PADDING_IN_PORT_MOD_MESSAGE_01);
- outBuffer.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(message.getHwAddress()));
+ outBuffer.writeBytes(IetfYangUtil.macAddressBytes(message.getHwAddress()));
outBuffer.writeZero(PADDING_IN_PORT_MOD_MESSAGE_02);
outBuffer.writeInt(createPortConfigBitmask(message.getConfig()));
outBuffer.writeInt(createPortConfigBitmask(message.getMask()));
outBuffer.writeZero(PADDING);
outBuffer.writeInt(message.getPortNo().intValue());
outBuffer.writeZero(PORT_PADDING_1);
- outBuffer.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(message.getHwAddr()));
+ outBuffer.writeBytes(IetfYangUtil.macAddressBytes(message.getHwAddr()));
outBuffer.writeZero(PORT_PADDING_2);
writeName(message.getName(), outBuffer);
writePortConfig(message.getConfig(), outBuffer);
}
protected static void writeIpv4Address(final Ipv4Address address, final ByteBuf out) {
- out.writeBytes(IetfInetUtil.INSTANCE.ipv4AddressBytes(address));
+ out.writeBytes(IetfInetUtil.ipv4AddressBytes(address));
}
}
public abstract class AbstractOxmMacAddressSerializer extends AbstractOxmMatchEntrySerializer {
protected void writeMacAddress(final MacAddress address, final ByteBuf outBuffer) {
- outBuffer.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(address)); // 48 b + mask [OF 1.3.2 spec]
+ outBuffer.writeBytes(IetfYangUtil.macAddressBytes(address)); // 48 b + mask [OF 1.3.2 spec]
}
}
outBuffer.writeInt(encodeWildcards(match.getWildcards(), match.getNwSrcMask().toJava(),
match.getNwDstMask().toJava()));
outBuffer.writeShort(match.getInPort().toJava());
- outBuffer.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(match.getDlSrc()));
- outBuffer.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(match.getDlDst()));
+ outBuffer.writeBytes(IetfYangUtil.macAddressBytes(match.getDlSrc()));
+ outBuffer.writeBytes(IetfYangUtil.macAddressBytes(match.getDlDst()));
outBuffer.writeShort(match.getDlVlan().toJava());
outBuffer.writeByte(match.getDlVlanPcp().toJava());
outBuffer.writeZero(PADDING_IN_MATCH);
outBuffer.writeByte(match.getNwTos().toJava());
outBuffer.writeByte(match.getNwProto().toJava());
outBuffer.writeZero(PADDING_IN_MATCH_2);
- outBuffer.writeBytes(IetfInetUtil.INSTANCE.ipv4AddressBytes(match.getNwSrc()));
- outBuffer.writeBytes(IetfInetUtil.INSTANCE.ipv4AddressBytes(match.getNwDst()));
+ outBuffer.writeBytes(IetfInetUtil.ipv4AddressBytes(match.getNwSrc()));
+ outBuffer.writeBytes(IetfInetUtil.ipv4AddressBytes(match.getNwDst()));
outBuffer.writeShort(match.getTpSrc().toJava());
outBuffer.writeShort(match.getTpDst().toJava());
}
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
import com.google.common.util.concurrent.ListenableFuture;
import java.net.InetAddress;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.opendaylight.infrautils.diagstatus.DiagStatusService;
+import org.opendaylight.infrautils.diagstatus.ServiceRegistration;
import org.opendaylight.openflowjava.protocol.api.connection.SwitchConnectionHandler;
import org.opendaylight.openflowjava.protocol.api.connection.TlsConfiguration;
import org.opendaylight.openflowjava.protocol.api.connection.TlsConfigurationImpl;
private SwitchConnectionProviderImpl provider;
private ConnectionConfigurationImpl config;
+ @Before
+ public void before() {
+ doReturn(mock(ServiceRegistration.class)).when(diagStatus).register(any());
+ }
+
/**
* Creates new {@link SwitchConnectionProvider} instance for each test.
* @param protocol communication protocol
*/
-
public void startUp(final TransportProtocol protocol) throws UnknownHostException {
config = null;
if (protocol != null) {
byte[] address = new byte[6];
serializedBuffer.readBytes(address);
Assert.assertEquals("Wrong MacAddress", port.getHwAddr().getValue().toLowerCase(),
- IetfYangUtil.INSTANCE.macAddressFor(address).getValue().toLowerCase());
+ IetfYangUtil.macAddressFor(address).getValue().toLowerCase());
serializedBuffer.skipBytes(2);
byte[] name = new byte[16];
serializedBuffer.readBytes(name);
byte[] address = new byte[6];
serializedBuffer.readBytes(address);
Assert.assertEquals("Wrong MacAddress", port.getHwAddr().getValue().toLowerCase(),
- IetfYangUtil.INSTANCE.macAddressFor(address).getValue().toLowerCase());
+ IetfYangUtil.macAddressFor(address).getValue().toLowerCase());
byte[] name = new byte[16];
serializedBuffer.readBytes(name);
Assert.assertEquals("Wrong name", port.getName(), new String(name).trim());
Assert.assertEquals("Wrong PortNo", message.getPortNo().getValue().longValue(), out.readUnsignedShort());
byte[] address = new byte[6];
out.readBytes(address);
- Assert.assertEquals("Wrong MacAddress", message.getHwAddress(), IetfYangUtil.INSTANCE.macAddressFor(address));
+ Assert.assertEquals("Wrong MacAddress", message.getHwAddress(), IetfYangUtil.macAddressFor(address));
Assert.assertEquals("Wrong config", 21, out.readUnsignedInt());
Assert.assertEquals("Wrong mask", 98, out.readUnsignedInt());
Assert.assertEquals("Wrong advertise", 652, out.readUnsignedInt());
byte[] address = new byte[6];
serializedBuffer.readBytes(address);
Assert.assertEquals("Wrong MacAddress", message.getHwAddr().getValue().toLowerCase(),
- IetfYangUtil.INSTANCE.macAddressFor(address).getValue().toLowerCase());
+ IetfYangUtil.macAddressFor(address).getValue().toLowerCase());
byte[] name = new byte[16];
serializedBuffer.readBytes(name);
Assert.assertEquals("Wrong name", message.getName(), new String(name).trim());
out.skipBytes(PADDING_IN_PORT_MOD_MESSAGE_01);
byte[] address = new byte[6];
out.readBytes(address);
- Assert.assertEquals("Wrong MacAddress", message.getHwAddress(), IetfYangUtil.INSTANCE.macAddressFor(address));
+ Assert.assertEquals("Wrong MacAddress", message.getHwAddress(), IetfYangUtil.macAddressFor(address));
out.skipBytes(PADDING_IN_PORT_MOD_MESSAGE_02);
Assert.assertEquals("Wrong config", message.getConfig(), createPortConfig(out.readInt()));
Assert.assertEquals("Wrong mask", message.getMask(), createPortConfig(out.readInt()));
byte[] address = new byte[6];
serializedBuffer.readBytes(address);
Assert.assertEquals("Wrong MacAddress", message.getHwAddr().getValue().toLowerCase(),
- IetfYangUtil.INSTANCE.macAddressFor(address).getValue().toLowerCase());
+ IetfYangUtil.macAddressFor(address).getValue().toLowerCase());
serializedBuffer.skipBytes(PORT_PADDING_2);
byte[] name = new byte[16];
serializedBuffer.readBytes(name);
*/
package org.opendaylight.openflowjava.protocol.it.integration;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+
import java.net.InetAddress;
import java.util.ArrayList;
import java.util.Deque;
import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
-import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.opendaylight.infrautils.diagstatus.DiagStatusService;
+import org.opendaylight.infrautils.diagstatus.ServiceRegistration;
import org.opendaylight.openflowjava.protocol.api.connection.TlsConfiguration;
import org.opendaylight.openflowjava.protocol.api.connection.TlsConfigurationImpl;
import org.opendaylight.openflowjava.protocol.impl.clients.ClientEvent;
public void setUp(final TransportProtocol protocol) throws Exception {
LOGGER.debug("\n starting test -------------------------------");
- Mockito.doAnswer(invocation -> {
- ((Runnable)invocation.getArguments()[0]).run();
+ doAnswer(invocation -> {
+ invocation.getArgument(0, Runnable.class).run();
return null;
}).when(executorService).execute(ArgumentMatchers.any());
connConfig.setTransferProtocol(protocol);
mockPlugin = new MockPlugin(executorService);
- switchConnectionProvider = new SwitchConnectionProviderImpl(Mockito.mock(DiagStatusService.class), connConfig);
+ final var diagStatusService = mock(DiagStatusService.class);
+ doReturn(mock(ServiceRegistration.class)).when(diagStatusService).register(any());
+
+ switchConnectionProvider = new SwitchConnectionProviderImpl(diagStatusService, connConfig);
switchConnectionProvider.setSwitchConnectionHandler(mockPlugin);
switchConnectionProvider.startup().get(CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS);
if (protocol.equals(TransportProtocol.TCP) || protocol.equals(TransportProtocol.TLS)) {
}
public static Ipv4Address readIetfIpv4Address(final ByteBuf buf) {
- return IetfInetUtil.INSTANCE.ipv4AddressFor(buf.readInt());
+ return IetfInetUtil.ipv4AddressFor(buf.readInt());
}
public static Ipv6Address readIetfIpv6Address(final ByteBuf buf) {
final byte[] tmp = new byte[16];
buf.readBytes(tmp);
- return IetfInetUtil.INSTANCE.ipv6AddressFor(tmp);
+ return IetfInetUtil.ipv6AddressFor(tmp);
}
public static MacAddress readIetfMacAddress(final ByteBuf buf) {
final byte[] tmp = new byte[EncodeConstants.MAC_ADDRESS_LENGTH];
buf.readBytes(tmp);
- return IetfYangUtil.INSTANCE.macAddressFor(tmp);
+ return IetfYangUtil.macAddressFor(tmp);
}
public static byte[] serializeList(final List<Short> list) {
<artifactId>jakarta.annotation-api</artifactId>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-annotations</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>com.guicedee.services</groupId>
<artifactId>javax.inject</artifactId>
*/
package org.opendaylight.openflowplugin.impl;
-import static java.util.Objects.requireNonNull;
-
import javax.annotation.PreDestroy;
import javax.inject.Inject;
import javax.inject.Singleton;
private static final Logger LOG = LoggerFactory.getLogger(DefaultDiagStatusProvider.class);
private static final String OPENFLOW_SERVICE_NAME = "OPENFLOW";
- private final DiagStatusService diagStatusService;
-
private ServiceRegistration reg;
@Inject
@Activate
public DefaultDiagStatusProvider(@Reference final DiagStatusService diagStatusService) {
- this.diagStatusService = requireNonNull(diagStatusService);
reg = diagStatusService.register(OPENFLOW_SERVICE_NAME);
}
@Deactivate
public void close() {
if (reg != null) {
- reg.unregister();
+ reg.close();
reg = null;
}
}
@Override
- public void reportStatus(ServiceState serviceState) {
+ public void reportStatus(final ServiceState serviceState) {
LOG.debug("reporting status as {} for {}", serviceState, OPENFLOW_SERVICE_NAME);
- diagStatusService.report(new ServiceDescriptor(OPENFLOW_SERVICE_NAME, serviceState));
+ reg.report(new ServiceDescriptor(OPENFLOW_SERVICE_NAME, serviceState));
}
@Override
- public void reportStatus(ServiceState serviceState, Throwable throwable) {
+ public void reportStatus(final ServiceState serviceState, final Throwable throwable) {
LOG.debug("reporting status as {} for {}", serviceState, OPENFLOW_SERVICE_NAME);
- diagStatusService.report(new ServiceDescriptor(OPENFLOW_SERVICE_NAME, throwable));
+ reg.report(new ServiceDescriptor(OPENFLOW_SERVICE_NAME, throwable));
}
@Override
- public void reportStatus(ServiceState serviceState, String description) {
+ public void reportStatus(final ServiceState serviceState, final String description) {
LOG.debug("reporting status as {} for {}", serviceState, OPENFLOW_SERVICE_NAME);
- diagStatusService.report(new ServiceDescriptor(OPENFLOW_SERVICE_NAME, serviceState, description));
+ reg.report(new ServiceDescriptor(OPENFLOW_SERVICE_NAME, serviceState, description));
}
}
protected final void serializeEntry(final E entry, final MacAddress mask, final ByteBuf outBuffer) {
writeMacAddress(entry.getAddress(), outBuffer);
if (mask != null) {
- writeMask(IetfYangUtil.INSTANCE.macAddressBytes(mask), outBuffer, EncodeConstants.MAC_ADDRESS_LENGTH);
+ writeMask(IetfYangUtil.macAddressBytes(mask), outBuffer, EncodeConstants.MAC_ADDRESS_LENGTH);
}
}
}
* @param outBuffer output buffer
*/
protected static void writeIpv4Address(final Ipv4Address address, final ByteBuf outBuffer) {
- outBuffer.writeBytes(IetfInetUtil.INSTANCE.ipv4AddressBytes(address));
+ outBuffer.writeBytes(IetfInetUtil.ipv4AddressBytes(address));
}
/**
* @param outBuffer output buffer
*/
protected static void writeIpv6Address(final Ipv6Address address, final ByteBuf outBuffer) {
- outBuffer.writeBytes(IetfInetUtil.INSTANCE.ipv6AddressBytes(address));
+ outBuffer.writeBytes(IetfInetUtil.ipv6AddressBytes(address));
}
/**
*/
protected static void writeMacAddress(final MacAddress address, final ByteBuf outBuffer) {
// 48 b + mask [OF 1.3.2 spec]
- outBuffer.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(address));
+ outBuffer.writeBytes(IetfYangUtil.macAddressBytes(address));
}
/**
protected static void writeIpv4Prefix(final @NonNull Ipv4Prefix prefix, final @Nullable Integer mask,
final @NonNull ByteBuf outBuffer) {
// Write address part of prefix
- writeIpv4Address(IetfInetUtil.INSTANCE.ipv4AddressFrom(prefix), outBuffer);
+ writeIpv4Address(IetfInetUtil.ipv4AddressFrom(prefix), outBuffer);
// If prefix had mask, also write prefix
if (mask != null) {
outBuffer.writeInt(OpenflowPortsUtil
.getProtocolPortNumber(OpenflowVersion.OF13, message.getPortNumber()).intValue());
outBuffer.writeZero(PADDING_IN_PORT_MOD_MESSAGE_01);
- outBuffer.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(message.getHardwareAddress()));
+ outBuffer.writeBytes(IetfYangUtil.macAddressBytes(message.getHardwareAddress()));
outBuffer.writeZero(PADDING_IN_PORT_MOD_MESSAGE_02);
outBuffer.writeInt(createPortConfigBitMask(message.getConfiguration()));
outBuffer.writeInt(requireNonNullElse(createPortConfigBitMask(message.getMask()), DEFAULT_PORT_CONFIG_MASK));
return null;
}
- final byte[] address = IetfInetUtil.INSTANCE.ipv6AddressBytes(IpConversionUtil.extractIpv6Address(ipv6Prefix));
+ final byte[] address = IetfInetUtil.ipv6AddressBytes(IpConversionUtil.extractIpv6Address(ipv6Prefix));
final byte[] mask =
IpConversionUtil.convertIpv6PrefixToByteArray(IpConversionUtil.extractIpv6Prefix(ipv6Prefix));
return normalizeIpv6Address(address, mask);
return null;
}
- final byte[] address = IetfInetUtil.INSTANCE.ipv6AddressBytes(ipv6Address);
+ final byte[] address = IetfInetUtil.ipv6AddressBytes(ipv6Address);
final byte[] mask = IpConversionUtil.convertIpv6ArbitraryMaskToByteArray(ipv4Mask);
return normalizeIpv6Address(address, mask);
}
return null;
}
- final byte[] address = IetfInetUtil.INSTANCE.ipv4AddressBytes(IpConversionUtil.extractIpv4Address(ipv4Prefix));
+ final byte[] address = IetfInetUtil.ipv4AddressBytes(IpConversionUtil.extractIpv4Address(ipv4Prefix));
final byte[] mask =
IpConversionUtil.convertArbitraryMaskToByteArray(IpConversionUtil.extractIpv4AddressMask(ipv4Prefix));
return normalizeIpv4Address(address, mask);
return null;
}
- final byte[] address = IetfInetUtil.INSTANCE.ipv4AddressBytes(ipv4Address);
+ final byte[] address = IetfInetUtil.ipv4AddressBytes(ipv4Address);
final byte[] mask = IpConversionUtil.convertArbitraryMaskToByteArray(ipv4Mask);
return normalizeIpv4Address(address, mask);
}
if (address == null) {
return null;
}
- final IpAddress ipAddress = IetfInetUtil.INSTANCE.ipAddressFor(address.getAddress());
+ final IpAddress ipAddress = IetfInetUtil.ipAddressFor(address.getAddress());
LOG.info("IP address of the node {} is: {}", node, ipAddress);
return ipAddress;
}
import com.google.common.base.Preconditions;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flows.service.rev160314.batch.flow.output.list.grouping.BatchFailedFlowsOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flows.service.rev160314.batch.flow.output.list.grouping.BatchFailedFlowsOutputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
-import org.opendaylight.yangtools.yang.binding.Identifiable;
-import org.opendaylight.yangtools.yang.binding.Identifier;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.Key;
+import org.opendaylight.yangtools.yang.binding.KeyAware;
import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
import org.opendaylight.yangtools.yang.binding.util.BindingMap;
import org.opendaylight.yangtools.yang.common.RpcError;
public final class FlowUtil {
private static final RpcResultBuilder<List<BatchFailedFlowsOutput>> SUCCESSFUL_FLOW_OUTPUT_RPC_RESULT =
- RpcResultBuilder.success(Collections.emptyList());
+ RpcResultBuilder.success(List.of());
/**
* Attach barrier response to given {@link RpcResult}<RemoveFlowsBatchOutput>.
// Hidden on purpose
}
- static <K extends Identifier<V>, V extends Identifiable<K>> Map<K, V> index(final List<V> list) {
+ static <K extends Key<V>, V extends KeyAware<K>> Map<K, V> index(final List<V> list) {
return list == null ? null : BindingMap.ordered(list);
}
final MacAddress arpSourceHardwareAddressMask = new MacAddress("00:00:00:00:00:00");
writeHeader(in, false);
- in.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(arpSourceHardwareAddress));
+ in.writeBytes(IetfYangUtil.macAddressBytes(arpSourceHardwareAddress));
assertEquals(arpSourceHardwareAddress.getValue(),
((ArpMatch) deserialize(in).getLayer3Match()).getArpSourceHardwareAddress().getAddress()
assertEquals(0, in.readableBytes());
writeHeader(in, true);
- in.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(arpSourceHardwareAddress));
- in.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(arpSourceHardwareAddressMask));
+ in.writeBytes(IetfYangUtil.macAddressBytes(arpSourceHardwareAddress));
+ in.writeBytes(IetfYangUtil.macAddressBytes(arpSourceHardwareAddressMask));
final ArpSourceHardwareAddress desAddress =
((ArpMatch) deserialize(in).getLayer3Match()).getArpSourceHardwareAddress();
writeHeader(in, false);
Iterator<String> addressParts = IpConversionUtil.splitToParts(arpSourceTransportAddressNoMask);
- in.writeBytes(IetfInetUtil.INSTANCE.ipv4AddressBytes(new Ipv4Address(addressParts.next())));
+ in.writeBytes(IetfInetUtil.ipv4AddressBytes(new Ipv4Address(addressParts.next())));
assertEquals(arpSourceTransportAddressNoMask.getValue(),
((ArpMatch) deserialize(in).getLayer3Match()).getArpSourceTransportAddress().getValue());
writeHeader(in, true);
addressParts = IpConversionUtil.splitToParts(arpSourceTransportAddress);
- in.writeBytes(IetfInetUtil.INSTANCE.ipv4AddressBytes(new Ipv4Address(addressParts.next())));
+ in.writeBytes(IetfInetUtil.ipv4AddressBytes(new Ipv4Address(addressParts.next())));
in.writeBytes(MatchConvertorUtil.extractIpv4Mask(addressParts));
final Ipv4Prefix desAddress =
final MacAddress arpTargetHardwareAddressMask = new MacAddress("00:00:00:00:00:00");
writeHeader(in, false);
- in.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(arpTargetHardwareAddress));
+ in.writeBytes(IetfYangUtil.macAddressBytes(arpTargetHardwareAddress));
assertEquals(arpTargetHardwareAddress.getValue(),
((ArpMatch) deserialize(in).getLayer3Match()).getArpTargetHardwareAddress().getAddress()
assertEquals(0, in.readableBytes());
writeHeader(in, true);
- in.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(arpTargetHardwareAddress));
- in.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(arpTargetHardwareAddressMask));
+ in.writeBytes(IetfYangUtil.macAddressBytes(arpTargetHardwareAddress));
+ in.writeBytes(IetfYangUtil.macAddressBytes(arpTargetHardwareAddressMask));
final ArpTargetHardwareAddress desAddress =
((ArpMatch) deserialize(in).getLayer3Match()).getArpTargetHardwareAddress();
writeHeader(in, false);
Iterator<String> addressParts = IpConversionUtil.splitToParts(arpTargetTransportAddressNoMask);
- in.writeBytes(IetfInetUtil.INSTANCE.ipv4AddressBytes(new Ipv4Address(addressParts.next())));
+ in.writeBytes(IetfInetUtil.ipv4AddressBytes(new Ipv4Address(addressParts.next())));
assertEquals(arpTargetTransportAddressNoMask.getValue(),
((ArpMatch) deserialize(in).getLayer3Match()).getArpTargetTransportAddress().getValue());
writeHeader(in, true);
addressParts = IpConversionUtil.splitToParts(arpTargetTransportAddress);
- in.writeBytes(IetfInetUtil.INSTANCE.ipv4AddressBytes(new Ipv4Address(addressParts.next())));
+ in.writeBytes(IetfInetUtil.ipv4AddressBytes(new Ipv4Address(addressParts.next())));
in.writeBytes(MatchConvertorUtil.extractIpv4Mask(addressParts));
final Ipv4Prefix desAddress =
final MacAddress ethernetDestinationAddressMask = new MacAddress("00:00:00:00:00:00");
writeHeader(in, false);
- in.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(ethernetDestinationAddress));
+ in.writeBytes(IetfYangUtil.macAddressBytes(ethernetDestinationAddress));
assertEquals(ethernetDestinationAddress.getValue(), deserialize(in).getEthernetMatch().getEthernetDestination()
.getAddress().getValue());
assertEquals(0, in.readableBytes());
writeHeader(in, true);
- in.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(ethernetDestinationAddress));
- in.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(ethernetDestinationAddressMask));
+ in.writeBytes(IetfYangUtil.macAddressBytes(ethernetDestinationAddress));
+ in.writeBytes(IetfYangUtil.macAddressBytes(ethernetDestinationAddressMask));
final EthernetDestination desAddress = deserialize(in).getEthernetMatch().getEthernetDestination();
assertEquals(ethernetDestinationAddress.getValue(), desAddress.getAddress().getValue());
final MacAddress ethernetSourceAddressMask = new MacAddress("00:00:00:00:00:00");
writeHeader(in, false);
- in.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(ethernetSourceAddress));
+ in.writeBytes(IetfYangUtil.macAddressBytes(ethernetSourceAddress));
assertEquals(ethernetSourceAddress.getValue(),
deserialize(in).getEthernetMatch().getEthernetSource().getAddress().getValue());
assertEquals(0, in.readableBytes());
writeHeader(in, true);
- in.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(ethernetSourceAddress));
- in.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(ethernetSourceAddressMask));
+ in.writeBytes(IetfYangUtil.macAddressBytes(ethernetSourceAddress));
+ in.writeBytes(IetfYangUtil.macAddressBytes(ethernetSourceAddressMask));
final EthernetSource desAddress = deserialize(in).getEthernetMatch().getEthernetSource();
assertEquals(ethernetSourceAddress.getValue(), desAddress.getAddress().getValue());
final Iterator<String> addressParts = IpConversionUtil.splitToParts(address);
writeHeader(in, true);
- in.writeBytes(IetfInetUtil.INSTANCE.ipv4AddressBytes(new Ipv4Address(addressParts.next())));
+ in.writeBytes(IetfInetUtil.ipv4AddressBytes(new Ipv4Address(addressParts.next())));
in.writeBytes(MatchConvertorUtil.extractIpv4Mask(addressParts));
final Ipv4Match match = (Ipv4Match) deserialize(in).getLayer3Match();
final Iterator<String> addressParts = IpConversionUtil.splitToParts(address);
writeHeader(in, true);
- in.writeBytes(IetfInetUtil.INSTANCE.ipv4AddressBytes(new Ipv4Address(addressParts.next())));
+ in.writeBytes(IetfInetUtil.ipv4AddressBytes(new Ipv4Address(addressParts.next())));
in.writeBytes(MatchConvertorUtil.extractIpv4Mask(addressParts));
final Ipv4Match match = (Ipv4Match) deserialize(in).getLayer3Match();
final Ipv6Prefix address = new Ipv6Prefix("fe80::200:f8ff:fe21:67cf/30");
writeHeader(in, true);
- in.writeBytes(IetfInetUtil.INSTANCE.ipv6AddressBytes(IpConversionUtil.extractIpv6Address(address)));
+ in.writeBytes(IetfInetUtil.ipv6AddressBytes(IpConversionUtil.extractIpv6Address(address)));
in.writeBytes(IpConversionUtil.convertIpv6PrefixToByteArray(IpConversionUtil.extractIpv6Prefix(address)));
final Ipv6Match match = (Ipv6Match) deserialize(in).getLayer3Match();
final MacAddress address = new MacAddress("00:01:02:03:04:05");
writeHeader(in, false);
- in.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(address));
+ in.writeBytes(IetfYangUtil.macAddressBytes(address));
Ipv6Match match = (Ipv6Match) deserialize(in).getLayer3Match();
assertEquals(address.getValue(), match.getIpv6NdSll().getValue());
final Ipv6Address address = new Ipv6Address("2001:db8::");
writeHeader(in, false);
- in.writeBytes(IetfInetUtil.INSTANCE.ipv6AddressBytes(address));
+ in.writeBytes(IetfInetUtil.ipv6AddressBytes(address));
Ipv6Match match = (Ipv6Match) deserialize(in).getLayer3Match();
assertArrayEquals(
- IetfInetUtil.INSTANCE.ipv6AddressBytes(address),
- IetfInetUtil.INSTANCE.ipv6AddressBytes(match.getIpv6NdTarget()));
+ IetfInetUtil.ipv6AddressBytes(address),
+ IetfInetUtil.ipv6AddressBytes(match.getIpv6NdTarget()));
assertEquals(0, in.readableBytes());
}
final MacAddress address = new MacAddress("00:01:02:03:04:05");
writeHeader(in, false);
- in.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(address));
+ in.writeBytes(IetfYangUtil.macAddressBytes(address));
Ipv6Match match = (Ipv6Match) deserialize(in).getLayer3Match();
assertEquals(address.getValue(), match.getIpv6NdTll().getValue());
final Ipv6Prefix address = new Ipv6Prefix("fe80::200:f8ff:fe21:67cf/30");
writeHeader(in, true);
- in.writeBytes(IetfInetUtil.INSTANCE.ipv6AddressBytes(IpConversionUtil.extractIpv6Address(address)));
+ in.writeBytes(IetfInetUtil.ipv6AddressBytes(IpConversionUtil.extractIpv6Address(address)));
in.writeBytes(IpConversionUtil.convertIpv6PrefixToByteArray(IpConversionUtil.extractIpv6Prefix(address)));
final Ipv6Match match = (Ipv6Match) deserialize(in).getLayer3Match();
buffer.writeInt(XID);
buffer.writeInt(PORT);
buffer.writeZero(PADDING_IN_PORT_MOD_MESSAGE_1);
- buffer.writeBytes(IetfYangUtil.INSTANCE.macAddressBytes(ADDRESS));
+ buffer.writeBytes(IetfYangUtil.macAddressBytes(ADDRESS));
final int config = ByteBufUtils.fillBitMaskFromMap(ImmutableMap
.<Integer, Boolean>builder()
assertAction(action, out -> {
byte[] addressBytes = new byte[6];
out.readBytes(addressBytes);
- assertEquals(address, IetfYangUtil.INSTANCE.macAddressFor(addressBytes));
+ assertEquals(address, IetfYangUtil.macAddressFor(addressBytes));
});
}
assertAction(action, out -> {
byte[] addressBytes = new byte[6];
out.readBytes(addressBytes);
- assertEquals(address, IetfYangUtil.INSTANCE.macAddressFor(addressBytes));
+ assertEquals(address, IetfYangUtil.macAddressFor(addressBytes));
});
}
assertMatch(arpShaMatch, true, (out) -> {
byte[] addressBytes = new byte[6];
out.readBytes(addressBytes);
- assertEquals(address, IetfYangUtil.INSTANCE.macAddressFor(addressBytes));
+ assertEquals(address, IetfYangUtil.macAddressFor(addressBytes));
byte[] maskBytes = new byte[6];
out.readBytes(maskBytes);
- assertEquals(mask, IetfYangUtil.INSTANCE.macAddressFor(maskBytes));
+ assertEquals(mask, IetfYangUtil.macAddressFor(maskBytes));
});
final Match arpShaMatchNoMask = new MatchBuilder()
assertMatch(arpShaMatchNoMask, false, (out) -> {
byte[] addressBytes = new byte[6];
out.readBytes(addressBytes);
- assertEquals(address, IetfYangUtil.INSTANCE.macAddressFor(addressBytes));
+ assertEquals(address, IetfYangUtil.macAddressFor(addressBytes));
});
}
assertMatch(arpShaMatch, true, (out) -> {
byte[] addressBytes = new byte[6];
out.readBytes(addressBytes);
- assertEquals(address, IetfYangUtil.INSTANCE.macAddressFor(addressBytes));
+ assertEquals(address, IetfYangUtil.macAddressFor(addressBytes));
byte[] maskBytes = new byte[6];
out.readBytes(maskBytes);
- assertEquals(mask, IetfYangUtil.INSTANCE.macAddressFor(maskBytes));
+ assertEquals(mask, IetfYangUtil.macAddressFor(maskBytes));
});
final Match arpShaMatchNoMask = new MatchBuilder()
assertMatch(arpShaMatchNoMask, false, (out) -> {
byte[] addressBytes = new byte[6];
out.readBytes(addressBytes);
- assertEquals(address, IetfYangUtil.INSTANCE.macAddressFor(addressBytes));
+ assertEquals(address, IetfYangUtil.macAddressFor(addressBytes));
});
}
assertMatch(match, true, (out) -> {
final byte[] addressBytes = new byte[6];
out.readBytes(addressBytes);
- assertEquals(address, IetfYangUtil.INSTANCE.macAddressFor(addressBytes));
+ assertEquals(address, IetfYangUtil.macAddressFor(addressBytes));
final byte[] maskBytes = new byte[6];
out.readBytes(maskBytes);
- assertEquals(mask, IetfYangUtil.INSTANCE.macAddressFor(maskBytes));
+ assertEquals(mask, IetfYangUtil.macAddressFor(maskBytes));
});
final Match matchNoMask = new MatchBuilder()
assertMatch(matchNoMask, false, (out) -> {
final byte[] addressBytes = new byte[6];
out.readBytes(addressBytes);
- assertEquals(address, IetfYangUtil.INSTANCE.macAddressFor(addressBytes));
+ assertEquals(address, IetfYangUtil.macAddressFor(addressBytes));
});
}
assertMatch(match, true, (out) -> {
final byte[] addressBytes = new byte[6];
out.readBytes(addressBytes);
- assertEquals(address, IetfYangUtil.INSTANCE.macAddressFor(addressBytes));
+ assertEquals(address, IetfYangUtil.macAddressFor(addressBytes));
final byte[] maskBytes = new byte[6];
out.readBytes(maskBytes);
- assertEquals(mask, IetfYangUtil.INSTANCE.macAddressFor(maskBytes));
+ assertEquals(mask, IetfYangUtil.macAddressFor(maskBytes));
});
final Match matchNoMask = new MatchBuilder()
assertMatch(matchNoMask, false, (out) -> {
final byte[] addressBytes = new byte[6];
out.readBytes(addressBytes);
- assertEquals(address, IetfYangUtil.INSTANCE.macAddressFor(addressBytes));
+ assertEquals(address, IetfYangUtil.macAddressFor(addressBytes));
});
}
assertMatch(ipv6abmMatch, true, (out) -> {
byte[] address = new byte[16];
out.readBytes(address);
- assertArrayEquals(address, IetfInetUtil.INSTANCE.ipv6AddressBytes(ipv6Address));
+ assertArrayEquals(address, IetfInetUtil.ipv6AddressBytes(ipv6Address));
byte[] mask = new byte[16];
out.readBytes(mask);
assertMatch(ipv6abmMatchNoMask, false, (out) -> {
byte[] address = new byte[16];
out.readBytes(address);
- assertArrayEquals(address, IetfInetUtil.INSTANCE.ipv6AddressBytes(ipv6Address));
+ assertArrayEquals(address, IetfInetUtil.ipv6AddressBytes(ipv6Address));
});
}
assertMatch(ipv6abmMatch, true, (out) -> {
byte[] address = new byte[16];
out.readBytes(address);
- assertArrayEquals(address, IetfInetUtil.INSTANCE.ipv6AddressBytes(ipv6Address));
+ assertArrayEquals(address, IetfInetUtil.ipv6AddressBytes(ipv6Address));
byte[] mask = new byte[16];
out.readBytes(mask);
assertMatch(ipv6abmMatchNoMask, false, (out) -> {
byte[] address = new byte[16];
out.readBytes(address);
- assertArrayEquals(address, IetfInetUtil.INSTANCE.ipv6AddressBytes(ipv6Address));
+ assertArrayEquals(address, IetfInetUtil.ipv6AddressBytes(ipv6Address));
});
}
byte[] address = new byte[16];
out.readBytes(address);
assertArrayEquals(address,
- IetfInetUtil.INSTANCE.ipv6AddressBytes(IpConversionUtil.extractIpv6Address(ipv6Address)));
+ IetfInetUtil.ipv6AddressBytes(IpConversionUtil.extractIpv6Address(ipv6Address)));
byte[] mask = new byte[16];
out.readBytes(mask);
byte[] address = new byte[16];
out.readBytes(address);
assertArrayEquals(address,
- IetfInetUtil.INSTANCE.ipv6AddressBytes(IpConversionUtil.extractIpv6Address(ipv6Address)));
+ IetfInetUtil.ipv6AddressBytes(IpConversionUtil.extractIpv6Address(ipv6Address)));
});
}
assertMatch(ipv6NdSllMatch, false, (out) -> {
byte[] addressBytes = new byte[6];
out.readBytes(addressBytes);
- assertEquals(ipv6NdSll, IetfYangUtil.INSTANCE.macAddressFor(addressBytes));
+ assertEquals(ipv6NdSll, IetfYangUtil.macAddressFor(addressBytes));
});
}
assertMatch(ipv6NdTargetMatch, false, (out) -> {
byte[] addressBytes = new byte[16];
out.readBytes(addressBytes);
- assertArrayEquals(addressBytes, IetfInetUtil.INSTANCE.ipv6AddressBytes(ipv6NdTarget));
+ assertArrayEquals(addressBytes, IetfInetUtil.ipv6AddressBytes(ipv6NdTarget));
});
}
assertMatch(ipv6NdTllMatch, false, (out) -> {
byte[] addressBytes = new byte[6];
out.readBytes(addressBytes);
- assertEquals(ipv6NdTll, IetfYangUtil.INSTANCE.macAddressFor(addressBytes));
+ assertEquals(ipv6NdTll, IetfYangUtil.macAddressFor(addressBytes));
});
}
byte[] address = new byte[16];
out.readBytes(address);
assertArrayEquals(address,
- IetfInetUtil.INSTANCE.ipv6AddressBytes(IpConversionUtil.extractIpv6Address(ipv6Address)));
+ IetfInetUtil.ipv6AddressBytes(IpConversionUtil.extractIpv6Address(ipv6Address)));
byte[] mask = new byte[16];
out.readBytes(mask);
byte[] address = new byte[16];
out.readBytes(address);
assertArrayEquals(address,
- IetfInetUtil.INSTANCE.ipv6AddressBytes(IpConversionUtil.extractIpv6Address(ipv6Address)));
+ IetfInetUtil.ipv6AddressBytes(IpConversionUtil.extractIpv6Address(ipv6Address)));
});
}
out.skipBytes(PADDING_IN_PORT_MOD_MESSAGE_01);
byte[] address = new byte[6];
out.readBytes(address);
- assertEquals(new MacAddress(MAC_ADDRESS), IetfYangUtil.INSTANCE.macAddressFor(address));
+ assertEquals(new MacAddress(MAC_ADDRESS), IetfYangUtil.macAddressFor(address));
out.skipBytes(PADDING_IN_PORT_MOD_MESSAGE_02);
// Port config
@Test
public void getIpAddress() {
final IpAddress ipAddress = DeviceInitializationUtil.getIpAddress(connectionContext, NODE_II);
- assertEquals(ipAddress, IetfInetUtil.INSTANCE.ipAddressFor(INET_SOCKET_ADDRESS.getAddress()));
+ assertEquals(ipAddress, IetfInetUtil.ipAddressFor(INET_SOCKET_ADDRESS.getAddress()));
}
@Test
<artifactId>openflowplugin</artifactId>
<packaging>bundle</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openflow-protocol-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-annotations</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>${project.groupId}.openflowjava</groupId>
<artifactId>openflowjava-util</artifactId>
*/
public static Ipv4Prefix createPrefix(final Ipv4Address ipv4Address) {
- return IetfInetUtil.INSTANCE.ipv4PrefixFor(ipv4Address);
+ return IetfInetUtil.ipv4PrefixFor(ipv4Address);
}
public static Ipv4Prefix createPrefix(final Ipv4Address ipv4Address, final String mask) {
}
public static Ipv4Prefix createPrefix(final Ipv4Address ipv4Address, final int intmask) {
- return IetfInetUtil.INSTANCE.ipv4PrefixFor(ipv4Address, intmask);
+ return IetfInetUtil.ipv4PrefixFor(ipv4Address, intmask);
}
public static Ipv4Prefix createPrefix(final Ipv4Address ipv4Address, final byte [] bytemask) {
return createPrefix(ipv4Address);
}
- return IetfInetUtil.INSTANCE.ipv4PrefixFor(ipv4Address, countBits(bytemask));
+ return IetfInetUtil.ipv4PrefixFor(ipv4Address, countBits(bytemask));
}
public static Ipv6Prefix createPrefix(final Ipv6Address ipv6Address) {
- return IetfInetUtil.INSTANCE.ipv6PrefixFor(ipv6Address);
+ return IetfInetUtil.ipv6PrefixFor(ipv6Address);
}
public static Ipv6Prefix createPrefix(final Ipv6Address ipv6Address, final String mask) {
}
public static Ipv6Prefix createPrefix(final Ipv6Address ipv6Address, final int intmask) {
- return IetfInetUtil.INSTANCE.ipv6PrefixFor(ipv6Address, intmask);
+ return IetfInetUtil.ipv6PrefixFor(ipv6Address, intmask);
}
public static Ipv6Prefix createPrefix(final Ipv6Address ipv6Address, final byte [] bytemask) {
return createPrefix(ipv6Address);
}
- return IetfInetUtil.INSTANCE.ipv6PrefixFor(ipv6Address, countBits(bytemask));
+ return IetfInetUtil.ipv6PrefixFor(ipv6Address, countBits(bytemask));
}
public static DottedQuad createArbitraryBitMask(final byte[] bitmask) {
}
public static Integer extractPrefix(final Ipv4Prefix ipv4Prefix) {
- return IetfInetUtil.INSTANCE.splitIpv4Prefix(ipv4Prefix).getValue();
+ return IetfInetUtil.splitIpv4Prefix(ipv4Prefix).getValue();
}
public static Integer extractPrefix(final Ipv6Prefix ipv6Prefix) {
- return IetfInetUtil.INSTANCE.splitIpv6Prefix(ipv6Prefix).getValue();
+ return IetfInetUtil.splitIpv6Prefix(ipv6Prefix).getValue();
}
public static Integer extractPrefix(final Ipv4Address ipv4Prefix) {
}
public static Ipv6Address extractIpv6Address(final Ipv6Prefix ipv6Prefix) {
- return IetfInetUtil.INSTANCE.ipv6AddressFrom(ipv6Prefix);
+ return IetfInetUtil.ipv6AddressFrom(ipv6Prefix);
}
public static Ipv4Address extractIpv4Address(final Ipv4Prefix ipv4Prefix) {
- return IetfInetUtil.INSTANCE.ipv4AddressFrom(ipv4Prefix);
+ return IetfInetUtil.ipv4AddressFrom(ipv4Prefix);
}
public static DottedQuad extractIpv4AddressMask(final Ipv4Prefix ipv4Prefix) {
}
public static Integer extractIpv6Prefix(final Ipv6Prefix ipv6Prefix) {
- return IetfInetUtil.INSTANCE.splitIpv6Prefix(ipv6Prefix).getValue();
+ return IetfInetUtil.splitIpv6Prefix(ipv6Prefix).getValue();
}
public static int countBits(final byte[] mask) {
boolean hasMask = ethernetDestination.getMask() != null;
if (hasMask) {
- ethDstBuilder.setMask(IetfYangUtil.INSTANCE.macAddressBytes(ethernetDestination.getMask()));
+ ethDstBuilder.setMask(IetfYangUtil.macAddressBytes(ethernetDestination.getMask()));
}
ethDstCaseBuilder.setEthDst(ethDstBuilder.build());
boolean hasMask = ethernetSource.getMask() != null;
if (hasMask) {
- ethDstBuilder.setMask(IetfYangUtil.INSTANCE.macAddressBytes(ethernetSource.getMask()));
+ ethDstBuilder.setMask(IetfYangUtil.macAddressBytes(ethernetSource.getMask()));
}
ethSrcCaseBuilder.setEthSrc(ethDstBuilder.build());
if (!source.getWildcards().getDLTYPE() && source.getNwSrc() != null) {
final Ipv4Prefix prefix;
if (source.getNwSrcMask() != null) {
- prefix = IetfInetUtil.INSTANCE.ipv4PrefixFor(source.getNwSrc(), source.getNwSrcMask().toJava());
+ prefix = IetfInetUtil.ipv4PrefixFor(source.getNwSrc(), source.getNwSrcMask().toJava());
} else {
//Openflow Spec : 1.3.2
//An all-one-bits oxm_mask is equivalent to specifying 0 for oxm_hasmask and omitting oxm_mask.
// So when user specify 32 as a mast, switch omit that mast and we get null as a mask in flow
// statistics response.
- prefix = IetfInetUtil.INSTANCE.ipv4PrefixFor(source.getNwSrc());
+ prefix = IetfInetUtil.ipv4PrefixFor(source.getNwSrc());
}
if (!NO_IP.equals(prefix.getValue())) {
ipv4MatchBuilder.setIpv4Source(prefix);
if (!source.getWildcards().getDLTYPE() && source.getNwDst() != null) {
final Ipv4Prefix prefix;
if (source.getNwDstMask() != null) {
- prefix = IetfInetUtil.INSTANCE.ipv4PrefixFor(source.getNwDst(), source.getNwDstMask().toJava());
+ prefix = IetfInetUtil.ipv4PrefixFor(source.getNwDst(), source.getNwDstMask().toJava());
} else {
//Openflow Spec : 1.3.2
//An all-one-bits oxm_mask is equivalent to specifying 0 for oxm_hasmask and omitting oxm_mask.
// So when user specify 32 as a mast, switch omit that mast and we get null as a mask in flow
// statistics response.
- prefix = IetfInetUtil.INSTANCE.ipv4PrefixFor(source.getNwDst());
+ prefix = IetfInetUtil.ipv4PrefixFor(source.getNwDst());
}
if (!NO_IP.equals(prefix.getValue())) {
ipv4MatchBuilder.setIpv4Destination(prefix);
byte[] mask = arpSha.getMask();
if (mask != null) {
- arpSourceHardwareAddressBuilder.setMask(IetfYangUtil.INSTANCE.macAddressFor(mask));
+ arpSourceHardwareAddressBuilder.setMask(IetfYangUtil.macAddressFor(mask));
}
arpMatchBuilder.setArpSourceHardwareAddress(arpSourceHardwareAddressBuilder.build());
byte[] mask = arpTha.getMask();
if (mask != null) {
- arpTargetHardwareAddressBuilder.setMask(IetfYangUtil.INSTANCE.macAddressFor(mask));
+ arpTargetHardwareAddressBuilder.setMask(IetfYangUtil.macAddressFor(mask));
}
arpMatchBuilder.setArpTargetHardwareAddress(arpTargetHardwareAddressBuilder.build());
byte[] destinationMask = ethDstCase.getMask();
if (destinationMask != null) {
- ethDestinationBuilder.setMask(IetfYangUtil.INSTANCE.macAddressFor(destinationMask));
+ ethDestinationBuilder.setMask(IetfYangUtil.macAddressFor(destinationMask));
}
ethMatchBuilder.setEthernetDestination(ethDestinationBuilder.build());
byte[] mask = ethSrcCase.getMask();
if (mask != null) {
- ethSourceBuilder.setMask(IetfYangUtil.INSTANCE.macAddressFor(mask));
+ ethSourceBuilder.setMask(IetfYangUtil.macAddressFor(mask));
}
ethMatchBuilder.setEthernetSource(ethSourceBuilder.build());
arpShaBuilder.setMacAddress(arpSourceHardwareAddress.getAddress());
boolean hasMask = false;
if (null != arpSourceHardwareAddress.getMask()) {
- arpShaBuilder.setMask(IetfYangUtil.INSTANCE.macAddressBytes(arpSourceHardwareAddress.getMask()));
+ arpShaBuilder.setMask(IetfYangUtil.macAddressBytes(arpSourceHardwareAddress.getMask()));
hasMask = true;
}
arpShaCaseBuilder.setArpSha(arpShaBuilder.build());
arpThaBuilder.setMacAddress(arpTargetHardwareAddress.getAddress());
boolean hasMask = false;
if (null != arpTargetHardwareAddress.getMask()) {
- arpThaBuilder.setMask(IetfYangUtil.INSTANCE.macAddressBytes(arpTargetHardwareAddress.getMask()));
+ arpThaBuilder.setMask(IetfYangUtil.macAddressBytes(arpTargetHardwareAddress.getMask()));
hasMask = true;
}
arpThaCaseBuilder.setArpTha(arpThaBuilder.build());
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>11.0.7</version>
+ <version>12.0.0</version>
<relativePath/>
</parent>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>controller-artifacts</artifactId>
- <version>7.0.4</version>
+ <version>8.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.infrautils</groupId>
<artifactId>infrautils-artifacts</artifactId>
- <version>5.0.3</version>
+ <version>6.0.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>12.0.3</version>
+ <version>13.0.3</version>
<relativePath/>
</parent>
//TODO: use HEX, use binary form
//Hex.decodeHex("000000000001".toCharArray());
- ethSourceBuilder.setAddress(IetfYangUtil.INSTANCE.macAddressFor(srcMac));
+ ethSourceBuilder.setAddress(IetfYangUtil.macAddressFor(srcMac));
ethernetMatch.setEthernetSource(ethSourceBuilder.build());
match.setEthernetMatch(ethernetMatch.build());
<developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</developerConnection>
</scm>
<dependencies>
+ <dependency>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-annotations</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
Code Review / openflowplugin.git / commitdiff