Adopt 2023.03 Argon upstreams

Adopt:
- odlparent-12.0.1
- infrautils-5.0.1
- yangtools-10.0.2
- mdsal-11.0.4
- controller-7.0.2
- aaa-0.17.3
- netconf-5.0.1

Deal with:
- yang.binding.Enumeration becoming EnumTypeObject
- BitsTypeObject components being primitive booleans
  - this implies that PortState has its fields set to false, unlike
    previously, when they could have been null
- DataBroker not allowing combined transactions
- Unions no longer accepting null member

Change-Id: I26c98ee1b0ae8eed3a6dacefb3c6ed8a34ff7b15
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/applications/arbitratorreconciliation/pom.xml b/applications/arbitratorreconciliation/pom.xml
index 0060bfe118779e894d56c43a6d7be50e674e808c..fc45fc5e0b4f34047ce48ea39daf3f0a74200586 100644 (file)
--- a/applications/arbitratorreconciliation/pom.xml
+++ b/applications/arbitratorreconciliation/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractFRMTest.java b/applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractFRMTest.java
index 4d791e815eeed1b028e4d86c6859700887e2af62..5796c24cde1adbc935391177af82092113316e00 100644 (file)
--- a/applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractFRMTest.java
+++ b/applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractFRMTest.java
@@ -7,8 +7,8 @@
  */
 package test.mock.util;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -35,7 +35,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.Sal
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.SalMeterService;
@@ -45,6 +44,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.app.forwardingrules.manager.config.rev160511.ForwardingRulesManagerConfigBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.service.rev131026.SalTableService;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.opendaylight.yangtools.yang.common.Uint16;
 
 public abstract class AbstractFRMTest extends AbstractDataBrokerTest {
@@ -101,19 +101,19 @@ public abstract class AbstractFRMTest extends AbstractDataBrokerTest {
     }
 
     protected void addFlowCapableNode(final NodeKey nodeKey) {
-        Nodes nodes = new NodesBuilder().build();
-
-        NodeBuilder nodeBuilder = new NodeBuilder();
-        nodeBuilder.withKey(nodeKey);
-        nodeBuilder.addAugmentation(new FlowCapableNodeBuilder().build());
+        Nodes nodes = new NodesBuilder()
+            .setNode(BindingMap.of(new NodeBuilder()
+                .withKey(nodeKey)
+                .addAugmentation(new FlowCapableNodeBuilder().build())
+                .build()))
+            .build();
 
         WriteTransaction writeTx = getDataBroker().newWriteOnlyTransaction();
         writeTx.put(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(Nodes.class), nodes);
+        assertCommit(writeTx.commit());
 
-        InstanceIdentifier<Node> flowNodeIdentifier = InstanceIdentifier.create(Nodes.class).child(Node.class, nodeKey);
-        writeTx.put(LogicalDatastoreType.OPERATIONAL, flowNodeIdentifier, nodeBuilder.build());
+        writeTx = getDataBroker().newWriteOnlyTransaction();
         writeTx.put(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(Nodes.class), nodes);
-        writeTx.put(LogicalDatastoreType.CONFIGURATION, flowNodeIdentifier, nodeBuilder.build());
         assertCommit(writeTx.commit());
     }
 

diff --git a/applications/pom.xml b/applications/pom.xml
index 69b93df968c90b47915cc2600e625228fbc07e70..6fe4fbd48e69b50306a7ec1388144110d7e9a98f 100644 (file)
--- a/applications/pom.xml
+++ b/applications/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 2817855a3b583ca6b3c104f21d5dc40bde7e47df..81bb3037e8b0c1c0bd792d4a765b2697fd9a10ac 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>11.0.1</version>
+    <version>12.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/distribution/karaf/pom.xml b/distribution/karaf/pom.xml
index c30b0f0ebdff9a2f04b4d62cc5c76a83c93f06d8..07cfa883569182457c6f560194d45856ff049fe6 100644 (file)
--- a/distribution/karaf/pom.xml
+++ b/distribution/karaf/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>11.0.1</version>
+    <version>12.0.1</version>
   </parent>
   <groupId>org.opendaylight.openflowplugin</groupId>
   <artifactId>openflowplugin-karaf</artifactId>

diff --git a/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml b/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml
index 908e50fba243f62b28fb9830a9ec742cbcfe50ab..38cdfb15f3b170bde6f8af68116004b2142a94a9 100644 (file)
--- a/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml
+++ b/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml b/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml
index 181cafaa60a530e1631c9a1d68434009a6d254c5..ca9c284ef94065830e7a0ca37f647a1f87a42437 100644 (file)
--- a/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml
+++ b/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml b/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml
index 78d5f621bcd90d0a53c43e80580df6e44403dbe3..aecdd9f53c53756a6afaedf0c514bf1ca7955636 100644 (file)
--- a/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml
+++ b/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml b/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml
index 0aa119ab0f27f8c22617d4e260cd1c99ae7805b0..f4f8a06acd0215e408989e94deb11f8341378f4d 100644 (file)
--- a/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml
+++ b/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/extension/features-extension-aggregator/pom.xml b/extension/features-extension-aggregator/pom.xml
index 5225a3f7f0300842a6804c1ba79acd48fcb3e8ab..cb8ca14b7a35b3c38beae06625d9fb7784944bf8 100644 (file)
--- a/extension/features-extension-aggregator/pom.xml
+++ b/extension/features-extension-aggregator/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/extension/pom.xml b/extension/pom.xml
index 7b29e8b855c1a166b4e443e1597c796c337ebed4..a6131246c290919c014b39e6274cfd37b165ea64 100644 (file)
--- a/extension/pom.xml
+++ b/extension/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/features-openflowplugin/pom.xml b/features-aggregator/features-openflowplugin/pom.xml
index 6f2344c41090e33c89eea833c5057582e63286c8..7a30ec29eb11fad07ab215fb9791c18189b8b8b0 100644 (file)
--- a/features-aggregator/features-openflowplugin/pom.xml
+++ b/features-aggregator/features-openflowplugin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml b/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml
index 8f2c0e8cf8b9442073fc0c108c5ab523ff64109f..865fe9840479a5f0ee9ff0b3f0cb6e7c86a40f65 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml b/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml
index dab088e1656dc0f1b7edd0b562719023046146e2..3e3fee0a6d309d9deab645bda7c0964ec2c65941 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml b/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml
index 73106c7ecaea596ec184466c60011beb81a40b06..e1cda09ba6a2ff0cd2378c0d404fe51212c63c51 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml b/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml
index 8050d7e491f37f4cfbb1ff4d31eafbd3551da73b..6561e4556a677397653711918227d19577220e87 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml b/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml
index 88cf791dea9cb6f0a384fc78c923e333d1757546..e420a4ee900c1a47a8e8debe1b113af68c97e504 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml b/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml
index eae28d1698ecba1ecb40b1c03d9f83756ec69744..5505b0bea7c66162035d3374a35b0dad9178f91e 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml b/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml
index 6d2b11f5540661f781dfa815df01ef236a75c96b..430e9d1ccf9291b11bd3d608c8226e8201c93444 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml
@@ -4,7 +4,7 @@
 <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>11.0.1</version>
+    <version>12.0.1</version>
     <relativePath/>
 </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml b/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml
index 2b9e2185e5d671cd1f77494720e55b0041e9ceb3..9b051b6c64410bdf4ee6afdc058e8089cb731009 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml b/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml
index f974442350a3e1485f5eee8dc41cbc99b608e464..41a9d353429281550a815b193017e037fb53f2bf 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml b/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml
index 1b83eb01d8ddecabf8262a3eef88f65f9e6e1d9c..fa7b1b3fdeb698f250959eb75ac3c26dc7ce90ff 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml b/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml
index adc8869fbedf83a0aab4194cd893601707c1389c..f1363a914ca5c74c40380db8f73b2a575d8cc22d 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-topology/pom.xml b/features-aggregator/odl-openflowplugin-app-topology/pom.xml
index b1a982db94b40842d6cb020bba13ed7adbe9f66e..3af60911035e018541051a53130902ba7591b694 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-topology/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-topology/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-drop-test/pom.xml b/features-aggregator/odl-openflowplugin-drop-test/pom.xml
index 36e07ccd17ecb4509502f678120ccc0a0b5cff2f..d21362a5218951524465e3f44b9bd23944b9a500 100644 (file)
--- a/features-aggregator/odl-openflowplugin-drop-test/pom.xml
+++ b/features-aggregator/odl-openflowplugin-drop-test/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml b/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml
index ec9193004876e0caf7a8923933189f655277b5ad..f933ba72f8a3a538c4168998023c34ac9c4300ff 100644 (file)
--- a/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml
+++ b/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 
@@ -21,7 +21,7 @@
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>netconf-artifacts</artifactId>
-                <version>4.0.2</version>
+                <version>5.0.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/features-aggregator/odl-openflowplugin-flow-services/pom.xml b/features-aggregator/odl-openflowplugin-flow-services/pom.xml
index b0b324e9eb14435b7f3fb44383a38ec6c1d602ae..ea6cd80218e0412387fd69c76bd207e66ca6b6f2 100644 (file)
--- a/features-aggregator/odl-openflowplugin-flow-services/pom.xml
+++ b/features-aggregator/odl-openflowplugin-flow-services/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-libraries/pom.xml b/features-aggregator/odl-openflowplugin-libraries/pom.xml
index 67ef051c7cd3dce6a85490e1a59680a1906e2bd8..209c957f73ed29b571df658414a9a7f3da0968bf 100644 (file)
--- a/features-aggregator/odl-openflowplugin-libraries/pom.xml
+++ b/features-aggregator/odl-openflowplugin-libraries/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-libraries/src/main/feature/feature.xml b/features-aggregator/odl-openflowplugin-libraries/src/main/feature/feature.xml
index 7ac31b39af16fada9a5af320da06a9e32002882e..a53fc7f3f7bed33ff8fb6312352344a27b5557bb 100644 (file)
--- a/features-aggregator/odl-openflowplugin-libraries/src/main/feature/feature.xml
+++ b/features-aggregator/odl-openflowplugin-libraries/src/main/feature/feature.xml
@@ -1,7 +1,7 @@
 <?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="[11,12)">odl-apache-commons-lang3</feature>
-        <feature version="[11,12)">odl-guava</feature>
+        <feature version="[12,13)">odl-apache-commons-lang3</feature>
+        <feature version="[12,13)">odl-guava</feature>
     </feature>
 </features>

diff --git a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
index 9d0b38d7632085271377f3212c279db7d60a09c0..8597797e4e84455706d8c3c97d601a563b1eaec2 100644 (file)
--- a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
+++ b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 
@@ -21,7 +21,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>10.0.2</version>
+                <version>11.0.4</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -30,7 +30,7 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>6.0.2</version>
+                <version>7.0.2</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/features-aggregator/odl-openflowplugin-nsf-model/src/main/feature/feature.xml b/features-aggregator/odl-openflowplugin-nsf-model/src/main/feature/feature.xml
index 1c2d125c4ee68eb552bb4bccefdf0c77c5ef7a4b..55968b81c8b21195c619d0e3cd1615ac9ba80e46 100644 (file)
--- a/features-aggregator/odl-openflowplugin-nsf-model/src/main/feature/feature.xml
+++ b/features-aggregator/odl-openflowplugin-nsf-model/src/main/feature/feature.xml
@@ -1,7 +1,7 @@
 <?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="[10,11)">odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal</feature>
-        <feature version="[10,11)">odl-mdsal-model-odl-l2-types</feature>
+        <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>
 </features>

diff --git a/features-aggregator/odl-openflowplugin-southbound/pom.xml b/features-aggregator/odl-openflowplugin-southbound/pom.xml
index 582a2e7f66d48b5c83994d34812baa64ba49bf1b..1494f715c1cface9dafc253b53b2eed47e355015 100644 (file)
--- a/features-aggregator/odl-openflowplugin-southbound/pom.xml
+++ b/features-aggregator/odl-openflowplugin-southbound/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 
@@ -29,14 +29,14 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>6.0.2</version>
+                <version>7.0.2</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.infrautils</groupId>
                 <artifactId>infrautils-artifacts</artifactId>
-                <version>4.0.1</version>
+                <version>5.0.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/features-aggregator/odl-openflowplugin-southbound/src/main/feature/feature.xml b/features-aggregator/odl-openflowplugin-southbound/src/main/feature/feature.xml
index be63940ab68c1f332ad713b97a56d7a936744f33..376e47685acd6986c231e783c3d1b8bc152015e8 100644 (file)
--- a/features-aggregator/odl-openflowplugin-southbound/src/main/feature/feature.xml
+++ b/features-aggregator/odl-openflowplugin-southbound/src/main/feature/feature.xml
@@ -2,7 +2,7 @@
 <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="[6,7)">odl-mdsal-broker</feature>
-        <feature version="[4,5)">odl-infrautils-diagstatus</feature>
+        <feature version="[7,8)">odl-mdsal-broker</feature>
+        <feature version="[5,6)">odl-infrautils-diagstatus</feature>
     </feature>
 </features>

diff --git a/features-aggregator/pom.xml b/features-aggregator/pom.xml
index ac3b8b2e57f3c3a1e40ee4126d9afb91f39ba28f..e071e7e21f7a51a3be0dadb5caba382c4f5c8e87 100644 (file)
--- a/features-aggregator/pom.xml
+++ b/features-aggregator/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/libraries/pom.xml b/libraries/pom.xml
index 52664c89556d601ab3a7d5175d607e083d630c4e..359cfc022092121f320ed847b123e00e5afc5911 100644 (file)
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/model/pom.xml b/model/pom.xml
index 237c02aafd4816f10ded5e8dcecc681c9c4ed0f4..991b35d0cf7729b3b2f370ff5d10db046e4c3aed 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>11.0.1</version>
+    <version>12.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml b/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml
index 32f0c682c10dbcd607563df7f6e5bede44eb2df9..f75ca00d1b28f09b22f128b0c3503f599e6a2cde 100644 (file)
--- a/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml
+++ b/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>11.0.1</version>
+    <version>12.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
index 5464b9430ef1b49eb53f528545cbeab0528407ce..11cb131f54bed09bf1983a98726112dcd0c4cd3d 100644 (file)
--- a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
+++ b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>
 
@@ -33,7 +33,7 @@
             <dependency>
                 <groupId>org.opendaylight.infrautils</groupId>
                 <artifactId>infrautils-artifacts</artifactId>
-                <version>4.0.1</version>
+                <version>5.0.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -42,7 +42,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>9.0.1</version>
+                <version>10.0.2</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -51,7 +51,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>10.0.2</version>
+                <version>11.0.4</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/src/main/feature/feature.xml b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/src/main/feature/feature.xml
index 92e8c860aee972560a8559cbc4c4db34268662fd..fdfd14f9d41ecb907d7f0fa842073908e7b8d3d9 100644 (file)
--- a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/src/main/feature/feature.xml
+++ b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/src/main/feature/feature.xml
@@ -4,8 +4,8 @@
     <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="[9,10)">odl-yangtools-netty</feature>
-        <feature version="[10,11)">odl-mdsal-model-rfc6991</feature>
-        <feature version="[4,5)">odl-infrautils-diagstatus</feature>
+        <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>
 </features>

diff --git a/openflowjava/features-openflowjava-aggregator/pom.xml b/openflowjava/features-openflowjava-aggregator/pom.xml
index fbbf2896a75b2cccb702214ab3add43c3fb4c84b..36340f1768c0080a00350ef2cde6a38b92ee74d7 100644 (file)
--- a/openflowjava/features-openflowjava-aggregator/pom.xml
+++ b/openflowjava/features-openflowjava-aggregator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>11.0.1</version>
+    <version>12.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetAsyncReplyMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetAsyncReplyMessageFactory.java
index b5dfc76a4fbe1e3a52652ef0b2ed4a8cdc49bccd..2bb285e0a6cf01dbf614b36f35884f3c8fcc6458 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetAsyncReplyMessageFactory.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetAsyncReplyMessageFactory.java
@@ -17,7 +17,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.async.body.grouping.FlowRemovedMask;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.async.body.grouping.PacketInMask;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.async.body.grouping.PortStatusMask;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
+import org.opendaylight.yangtools.yang.binding.EnumTypeObject;
 
 /**
  * Translates GetAsyncOutput messages.
@@ -60,10 +60,10 @@ public class GetAsyncReplyMessageFactory implements OFSerializer<GetAsyncOutput>
         }
     }
 
-    private static void serializeReasons(final Collection<? extends Enumeration> reasons, final ByteBuf outBuffer) {
+    private static void serializeReasons(final Collection<? extends EnumTypeObject> reasons, final ByteBuf outBuffer) {
         if (reasons != null) {
             int bitmap = 0;
-            for (Enumeration reason : reasons) {
+            for (var reason : reasons) {
                 bitmap |= 1 << reason.getIntValue();
             }
             outBuffer.writeInt(bitmap);

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetAsyncInputMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetAsyncInputMessageFactory.java
index 064ea27adb62b9c0bea7ce52ea3ca6c47905650b..a19c2ea0cd2ed385a27621f6ccc9d5f054d62f15 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetAsyncInputMessageFactory.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetAsyncInputMessageFactory.java
@@ -18,7 +18,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.async.body.grouping.FlowRemovedMask;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.async.body.grouping.PacketInMask;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.async.body.grouping.PortStatusMask;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
+import org.opendaylight.yangtools.yang.binding.EnumTypeObject;
 
 /**
  * Translates SetAsync messages.
@@ -63,10 +63,10 @@ public class SetAsyncInputMessageFactory implements OFSerializer<SetAsyncInput>
         }
     }
 
-    private static void serializeReasons(final Collection<? extends Enumeration> reasons, final ByteBuf outBuffer) {
+    private static void serializeReasons(final Collection<? extends EnumTypeObject> reasons, final ByteBuf outBuffer) {
         if (reasons != null) {
             int bitmap = 0;
-            for (Enumeration reason : reasons) {
+            for (var reason : reasons) {
                 bitmap |= 1 << reason.getIntValue();
             }
             outBuffer.writeInt(bitmap);

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsReplyMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsReplyMessageFactoryTest.java
index 6671b0bc414d0d7201bb9940bbe486d4fa1600f4..9ac1fec9b067a16b68a91b756e23d4ef9bc7fe59 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsReplyMessageFactoryTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsReplyMessageFactoryTest.java
@@ -99,7 +99,7 @@ public class OF10StatsReplyMessageFactoryTest {
 
         BufferHelper.checkHeaderV10(builtByFactory);
         Assert.assertEquals("Wrong type", 0, builtByFactory.getType().getIntValue());
-        Assert.assertEquals("Wrong flag", false, builtByFactory.getFlags().getOFPMPFREQMORE().booleanValue());
+        Assert.assertFalse("Wrong flag", builtByFactory.getFlags().getOFPMPFREQMORE());
         MultipartReplyDescCase messageCase = (MultipartReplyDescCase) builtByFactory.getMultipartReplyBody();
         MultipartReplyDesc message = messageCase.getMultipartReplyDesc();
         Assert.assertEquals("Wrong mfrDesc", "Manufacturer description", message.getMfrDesc());
@@ -126,7 +126,7 @@ public class OF10StatsReplyMessageFactoryTest {
 
         BufferHelper.checkHeaderV10(builtByFactory);
         Assert.assertEquals("Wrong type", 0x01, builtByFactory.getType().getIntValue());
-        Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().getOFPMPFREQMORE().booleanValue());
+        Assert.assertTrue("Wrong flag", builtByFactory.getFlags().getOFPMPFREQMORE());
         MultipartReplyFlowCase messageCase = (MultipartReplyFlowCase) builtByFactory.getMultipartReplyBody();
         MultipartReplyFlow message = messageCase.getMultipartReplyFlow();
         Assert.assertEquals("Wrong tableId", 1, message.getFlowStats().get(0).getTableId().intValue());
@@ -166,7 +166,7 @@ public class OF10StatsReplyMessageFactoryTest {
 
         BufferHelper.checkHeaderV10(builtByFactory);
         Assert.assertEquals("Wrong type", 0x02, builtByFactory.getType().getIntValue());
-        Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().getOFPMPFREQMORE().booleanValue());
+        Assert.assertTrue("Wrong flag", builtByFactory.getFlags().getOFPMPFREQMORE());
         MultipartReplyAggregateCase messageCase = (MultipartReplyAggregateCase) builtByFactory.getMultipartReplyBody();
         MultipartReplyAggregate message = messageCase.getMultipartReplyAggregate();
         Assert.assertEquals("Wrong packet-count", Uint64.valueOf("FF01020304050607", 16), message.getPacketCount());

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/FlowCreatorUtil.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/FlowCreatorUtil.java
index 78b6b432eb402beda336adb0e2ac677aaf906082..6dfdfc323bd31b754e2a5d67ade5499e18a3803e 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/FlowCreatorUtil.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/FlowCreatorUtil.java
@@ -165,11 +165,11 @@ public final class FlowCreatorUtil {
             f2 = flags2 == null ? DEFAULT_FLOW_MOD_FLAGS : flags2;
         }
 
-        return equalsWithDefault(f1.getCHECKOVERLAP(), f2.getCHECKOVERLAP(), Boolean.FALSE)
-            && equalsWithDefault(f1.getNOBYTCOUNTS(), f2.getNOBYTCOUNTS(), Boolean.FALSE)
-            && equalsWithDefault(f1.getNOPKTCOUNTS(), f2.getNOPKTCOUNTS(), Boolean.FALSE)
-            && equalsWithDefault(f1.getRESETCOUNTS(), f2.getRESETCOUNTS(), Boolean.FALSE)
-            && equalsWithDefault(f1.getSENDFLOWREM(), f2.getSENDFLOWREM(), Boolean.FALSE);
+        return f1.getCHECKOVERLAP() == f2.getCHECKOVERLAP()
+            && f1.getNOBYTCOUNTS() == f2.getNOBYTCOUNTS()
+            && f1.getNOPKTCOUNTS() == f2.getNOPKTCOUNTS()
+            && f1.getRESETCOUNTS() == f2.getRESETCOUNTS()
+            && f1.getSENDFLOWREM() == f2.getSENDFLOWREM();
     }
 
     /**

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/SwitchFeaturesUtilTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/SwitchFeaturesUtilTest.java
index 07fdccf01bab7e7e947e00e99bd6946037e0246b..faa7dd4a49ba5ba0fd9519c02ac7a6b0493ce6d2 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/SwitchFeaturesUtilTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/SwitchFeaturesUtilTest.java
@@ -70,20 +70,6 @@ public class SwitchFeaturesUtilTest {
         assertNotNull(SwitchFeaturesUtil.buildSwitchFeatures(featuresOutputBuilder.build()));
     }
 
-    /**
-     * Test method for
-     * {@link SwitchFeaturesUtil#buildSwitchFeatures} for malformed switch feature capabilities
-     * - at least one feature is null
-     * .
-     */
-    //@Test TODO:do we need to check if capability is null?
-    public void testSwFeaturesCapabilitiesMalformed() {
-        CapabilitiesV10 capabilities = new CapabilitiesV10(true, false, true, false, true, false, true, null);
-        featuresOutputBuilder.setCapabilitiesV10(capabilities).setCapabilities(null).setVersion(Uint8.ONE);
-
-        assertNull(SwitchFeaturesUtil.buildSwitchFeatures(featuresOutputBuilder.build()));
-    }
-
     /**
      * Test method for
      * {@link SwitchFeaturesUtil#buildSwitchFeatures} for mismatch between

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/translator/PortUpdateTranslatorTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/translator/PortUpdateTranslatorTest.java
index 5e90ff8fb3d43acfbdffe92a8b7cf82dfb39b49c..23ecb871451bf07ab4f18cf472cb6a5f5c8ad0c0 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/translator/PortUpdateTranslatorTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/translator/PortUpdateTranslatorTest.java
@@ -19,6 +19,7 @@ import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.flow.capable.port.State;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.flow.capable.port.StateBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortConfigV10;
@@ -43,14 +44,14 @@ public class PortUpdateTranslatorTest {
     private DeviceInfo deviceInfo;
 
     private org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.PortConfig portConfig;
-    private StateBuilder portStateBld;
+    private State portState;
     private PortStatusMessageBuilder portBld;
 
     @Before
     public void setUp() {
         portUpdateTranslator = new PortUpdateTranslator();
 
-        portStateBld = new StateBuilder().setLive(true);
+        portState = new StateBuilder().setLive(true).setBlocked(false).setLinkDown(false).build();
         portConfig = org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.PortConfig
                 .getDefaultInstance("nOFWD");
         portBld = assemblePortStatusMessage(21L, 84L);
@@ -75,7 +76,7 @@ public class PortUpdateTranslatorTest {
         Assert.assertEquals(portFeatures, nodeConnector.getAdvertisedFeatures());
         Assert.assertEquals(portFeatures, nodeConnector.getPeerFeatures());
         Assert.assertEquals(portFeatures, nodeConnector.getSupported());
-        Assert.assertEquals(portStateBld.build(), nodeConnector.getState());
+        Assert.assertEquals(portState, nodeConnector.getState());
         Assert.assertNull(nodeConnector.getQueue());
     }
 
@@ -92,8 +93,8 @@ public class PortUpdateTranslatorTest {
         Mockito.when(deviceInfo.getVersion()).thenReturn(OFConstants.OFP_VERSION_1_0);
         final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.PortFeatures portFeatures =
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.PortFeatures(
-                        null, null, null, false, false, true, null, null,
-                        null, false, false, null, null, null, null, null
+                        false, false, false, false, false, true,  false, false,
+                        false, false, false, false, false, false, false, false
                 );
 
         final FlowCapableNodeConnector nodeConnector =
@@ -106,7 +107,7 @@ public class PortUpdateTranslatorTest {
         Assert.assertEquals(portFeatures, nodeConnector.getAdvertisedFeatures());
         Assert.assertEquals(portFeatures, nodeConnector.getPeerFeatures());
         Assert.assertEquals(portFeatures, nodeConnector.getSupported());
-        Assert.assertEquals(portStateBld.build(), nodeConnector.getState());
+        Assert.assertEquals(portState, nodeConnector.getState());
         Assert.assertNull(nodeConnector.getQueue());
     }
 

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlowCreatorUtilTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlowCreatorUtilTest.java
index 90ecfc28e9fadcfa0de8f7d758e9e60da63c6e2d..29d1fcd443be313cbf9ec9f17b2f7dff389728e3 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlowCreatorUtilTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlowCreatorUtilTest.java
@@ -188,10 +188,13 @@ public class FlowCreatorUtilTest {
      */
     @Test
     public void testEqualsFlowModFlags() {
-        final FlowModFlags[] defaults = {null, new FlowModFlags(false, false, false, false, false), new FlowModFlags(
-                false, null, false, null, Boolean.FALSE),};
+        final FlowModFlags[] defaults = {
+            null,
+            new FlowModFlags(false, false, false, false, false),
+            new FlowModFlags(false, false, false, false, false)
+        };
         final FlowModFlags all = new FlowModFlags(true, true, true, true, true);
-        final FlowModFlags none = new FlowModFlags(null, null, null, null, null);
+        final FlowModFlags none = new FlowModFlags(false, false, false, false, false);
 
         for (final FlowModFlags f : defaults) {
             assertTrue(FlowCreatorUtil.equalsFlowModFlags(f, null));

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PortConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PortConvertorTest.java
index 683456d0f72440993ffa0a304603fd798dcf99ef..da594e33289b310cb6b45931441f40be3d121f18 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PortConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PortConvertorTest.java
@@ -35,14 +35,16 @@ public class PortConvertorTest {
 
     private static final String DEFAULT_MAC_ADDRESS = "01:02:03:04:05:06";
 
-    private final PortFeatures features = new PortFeatures(true, null, null, null, null, null, null, null, null, null,
-            null, null, null, null, null, null);
+    private final PortFeatures features = new PortFeatures(
+        true,  false, false, false, false, false, false, false,
+        false, false, false, false, false, false, false, false);
 
     private final PortConfig config = new PortConfig(false, false, false, false);
 
     private final org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortFeatures portf31 =
-            new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortFeatures(
-                    null, null, null, null, null, null, null, null, null, null, true, null, null, null, null, null);
+        new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortFeatures(
+            false, false, false, false, false, false, false, false,
+            false, false, true,  false, false, false, false, false);
 
     private final org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortConfig config31 =
             new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortConfig(
@@ -85,8 +87,9 @@ public class PortConvertorTest {
 
         portModInputBld.setConfigV10(portConfV10);
         portModInputBld.setMaskV10(portConfMaskV10);
-        portModInputBld.setAdvertiseV10(
-                new PortFeaturesV10(null, null, null, null, null, null, null, true, null, null, null, null));
+        portModInputBld.setAdvertiseV10(new PortFeaturesV10(
+            false, false, false, false, false, false,
+            false, true,  false, false, false, false));
 
         portModInputBld.setVersion(EncodeConstants.OF_VERSION_1_3);
 

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertorTest.java
index 43effe89f89dabfc713f243732cae5bbb5b70a0f..69dfe10e8e5ac1958ae5653369c957a3b4a00ddf 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertorTest.java
@@ -13,6 +13,7 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import org.junit.Before;
 import org.junit.Test;
@@ -397,5 +398,15 @@ public class FlowConvertorTest {
         public Uri getTransactionUri() {
             return null;
         }
+
+        @Override
+        public Match nonnullMatch() {
+            return Objects.requireNonNullElse(getMatch(), MatchBuilder.empty());
+        }
+
+        @Override
+        public Instructions nonnullInstructions() {
+            return Objects.requireNonNullElse(getInstructions(), InstructionsBuilder.empty());
+        }
     }
 }

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorUtilTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorUtilTest.java
index 21cf44596264ab816ea52b6ee0e8a934463ba3f2..d133122eb1fca9b60421d89045ee971c97734f97 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorUtilTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorUtilTest.java
@@ -24,8 +24,8 @@ public class MatchConvertorUtilTest {
     public void testIpv6ExthdrFlagsToInt() throws Exception {
         Ipv6ExthdrFlags flags;
         Constructor<Ipv6ExthdrFlags> ctor = Ipv6ExthdrFlags.class.getConstructor(
-                Boolean.class, Boolean.class, Boolean.class, Boolean.class,
-                Boolean.class, Boolean.class, Boolean.class, Boolean.class, Boolean.class);
+                boolean.class, boolean.class, boolean.class, boolean.class,
+                boolean.class, boolean.class, boolean.class, boolean.class, boolean.class);
 
         int[] expectedFlagCumulants = new int[] { 4, 8, 2, 16, 64, 1, 32, 128, 256 };
 

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/util/OpenflowPortsUtilTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/util/OpenflowPortsUtilTest.java
index 6ca95db31272add2735dbcb3b4c86b1f466ea5af..99db54aea13546d2949f454cd49c4946b9c2494f 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/util/OpenflowPortsUtilTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/util/OpenflowPortsUtilTest.java
@@ -195,9 +195,5 @@ public class OpenflowPortsUtilTest {
 
         portNumber = new PortNumberUni(OutputPortValues.FLOOD.toString());
         Assert.assertEquals("FLOOD", OpenflowPortsUtil.portNumberToString(portNumber));
-
-
-        portNumber = new PortNumberUni((String) null);
-        Assert.assertNotNull(portNumber);
     }
 }

diff --git a/parent/pom.xml b/parent/pom.xml
index 426aa28181ac33612b0ad31e1c71cf710d230623..dd74411d8ab081b4f37bec4c63840a809274c04d 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>10.0.2</version>
+        <version>11.0.4</version>
         <relativePath/>
     </parent>
 
@@ -41,14 +41,14 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>6.0.2</version>
+                <version>7.0.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.infrautils</groupId>
                 <artifactId>infrautils-artifacts</artifactId>
-                <version>4.0.1</version>
+                <version>5.0.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/samples/pom.xml b/samples/pom.xml
index 9bde2c6c9803415e5892bb23c1bf820a752859b3..abf43d11c807bcf562e5f5aa26746581480d5b1b 100644 (file)
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.1</version>
         <relativePath/>
     </parent>