From 10a8dc3bd65f5836e5257999e7e0cd828c235044 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 10 Dec 2020 13:43:03 +0100 Subject: [PATCH] Bump MRI upstreams Adopt following versions: - odlparent-8.0.2 - infrautils-1.9.3 - yangtools-6.0.2 - mdsal-7.0.3 - controller-3.0.3 Change-Id: I5731acb571b168f984e740441914c7867bd9b4ea Signed-off-by: Robert Varga --- applications/arbitratorreconciliation/pom.xml | 2 +- .../frm/impl/BundleFlowForwarder.java | 3 +- applications/pom.xml | 2 +- .../FlowCapableTopologyExporterTest.java | 4 +-- .../topology/manager/TestUtils.java | 2 +- artifacts/pom.xml | 2 +- distribution/karaf/pom.xml | 2 +- .../features-openflowplugin-extension/pom.xml | 2 +- .../pom.xml | 2 +- .../odl-openflowplugin-nxm-extensions/pom.xml | 2 +- .../odl-openflowplugin-onf-extensions/pom.xml | 2 +- .../features-extension-aggregator/pom.xml | 2 +- .../Icmpv6NDOptionsTypeConvertorTest.java | 8 ++--- .../match/Icmpv6NDReservedConvertorTest.java | 8 ++--- extension/pom.xml | 2 +- .../features-openflowplugin/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../odl-openflowplugin-app-topology/pom.xml | 2 +- .../odl-openflowplugin-drop-test/pom.xml | 2 +- .../pom.xml | 2 +- .../odl-openflowplugin-flow-services/pom.xml | 2 +- .../odl-openflowplugin-libraries/pom.xml | 2 +- .../odl-openflowplugin-nsf-model/pom.xml | 6 ++-- .../odl-openflowplugin-southbound/pom.xml | 6 ++-- features-aggregator/pom.xml | 2 +- libraries/pom.xml | 2 +- model/pom.xml | 2 +- .../features-openflowjava/pom.xml | 2 +- .../odl-openflowjava-protocol/pom.xml | 6 ++-- .../features-openflowjava-aggregator/pom.xml | 2 +- .../OpenFlowProviderConfigImpl.java | 29 ++++++++------- ...ltiLayerAggregateFlowMultipartService.java | 2 +- .../statistics/StatisticsGatheringUtils.java | 2 +- .../AsyncConfigMessageSerializerTest.java | 30 +++++++++------- .../sal/convertor/GroupConvertorTest.java | 36 +++++++++---------- .../sal/convertor/flow/FlowConvertorTest.java | 6 ++-- parent/pom.xml | 6 ++-- samples/pom.xml | 2 +- 49 files changed, 113 insertions(+), 109 deletions(-) diff --git a/applications/arbitratorreconciliation/pom.xml b/applications/arbitratorreconciliation/pom.xml index 18ed94a270..688d3b768b 100644 --- a/applications/arbitratorreconciliation/pom.xml +++ b/applications/arbitratorreconciliation/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/BundleFlowForwarder.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/BundleFlowForwarder.java index 30120f294d..26d02fe6b6 100644 --- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/BundleFlowForwarder.java +++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/BundleFlowForwarder.java @@ -173,8 +173,7 @@ public class BundleFlowForwarder implements BundleMessagesCommiter { BundleInnerMessage bundleInnerMessage = new BundleAddGroupCaseBuilder() .setAddGroupCaseData(new AddGroupCaseDataBuilder(group.get()).build()).build(); Message groupMessage = new MessageBuilder() - .setNode( - new NodeRef(nodeIdent.firstIdentifierOf(Node.class))) + .setNode(new NodeRef(nodeIdent.firstIdentifierOf(Node.class))) .setBundleInnerMessage(bundleInnerMessage) .build(); final List messages = new ArrayList<>(1); diff --git a/applications/pom.xml b/applications/pom.xml index 728e538034..257632444a 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableTopologyExporterTest.java b/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableTopologyExporterTest.java index 34ac9ae806..d404fb285e 100644 --- a/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableTopologyExporterTest.java +++ b/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableTopologyExporterTest.java @@ -149,7 +149,7 @@ public class FlowCapableTopologyExporterTest { exporter.onLinkRemoved(new LinkRemovedBuilder().setSource( new NodeConnectorRef(sourceConnID)).setDestination( - new NodeConnectorRef(destConnID)).build()); + new NodeConnectorRef(destConnID)).build()); waitForSubmit(submitLatch); @@ -181,7 +181,7 @@ public class FlowCapableTopologyExporterTest { exporter.onLinkRemoved(new LinkRemovedBuilder().setSource( new NodeConnectorRef(sourceConnID)).setDestination( - new NodeConnectorRef(destConnID)).build()); + new NodeConnectorRef(destConnID)).build()); waitForSubmit(submitLatch); diff --git a/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/TestUtils.java b/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/TestUtils.java index f7569d28c1..8dadd72a49 100644 --- a/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/TestUtils.java +++ b/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/TestUtils.java @@ -105,7 +105,7 @@ public final class TestUtils { static org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey newInvNodeKey(String id) { org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey nodeKey = new org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey( - new org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId(id)); + new org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId(id)); return nodeKey; } diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 95e4061f81..963c96fde5 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/distribution/karaf/pom.xml b/distribution/karaf/pom.xml index 0fb0a86e75..8cbfe761e4 100644 --- a/distribution/karaf/pom.xml +++ b/distribution/karaf/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent karaf4-parent - 8.0.0 + 8.0.2 org.opendaylight.openflowplugin openflowplugin-karaf diff --git a/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml b/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml index c7e081cfb3..3aeb97181c 100644 --- a/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml +++ b/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent feature-repo-parent - 8.0.0 + 8.0.2 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 3c9348fa8c..edd3891f69 100644 --- 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 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 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 85c93911a9..66d28c03be 100644 --- 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 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 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 10c5f2e38a..ac6006dceb 100644 --- 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 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/extension/features-extension-aggregator/pom.xml b/extension/features-extension-aggregator/pom.xml index 6f70435dca..ada40845e3 100644 --- a/extension/features-extension-aggregator/pom.xml +++ b/extension/features-extension-aggregator/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 4.0.0 diff --git a/extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDOptionsTypeConvertorTest.java b/extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDOptionsTypeConvertorTest.java index ce059e45d3..e98a050347 100644 --- a/extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDOptionsTypeConvertorTest.java +++ b/extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDOptionsTypeConvertorTest.java @@ -119,10 +119,10 @@ public class Icmpv6NDOptionsTypeConvertorTest { new GroupingLooseResolver<>(GeneralExtensionListGrouping.class); eqGroup.add(GeneralAugMatchNodesNodeTableFlowWriteActionsSetField.class); - ExtensionAugment> extensionMatch - = new ExtensionAugment<>(EricAugMatchNodesNodeTableFlow.class, + ExtensionAugment> extensionMatch = + new ExtensionAugment<>(EricAugMatchNodesNodeTableFlow.class, new EricAugMatchNodesNodeTableFlowBuilder().setEricOfIcmpv6NdOptionsType( - new EricOfIcmpv6NdOptionsTypeBuilder().setIcmpv6NdOptionsType(Uint8.ONE).build()).build(), + new EricOfIcmpv6NdOptionsTypeBuilder().setIcmpv6NdOptionsType(Uint8.ONE).build()).build(), Icmpv6NdOptionsTypeKey.class); ExtensionListBuilder extListBld = null; @@ -142,4 +142,4 @@ public class Icmpv6NDOptionsTypeConvertorTest { .values().iterator().next().getExtensionKey()); } -} \ No newline at end of file +} diff --git a/extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDReservedConvertorTest.java b/extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDReservedConvertorTest.java index ed5b916273..b81ba74807 100644 --- a/extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDReservedConvertorTest.java +++ b/extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDReservedConvertorTest.java @@ -118,10 +118,10 @@ public class Icmpv6NDReservedConvertorTest { new GroupingLooseResolver<>(GeneralExtensionListGrouping.class); eqGroup.add(GeneralAugMatchNodesNodeTableFlowWriteActionsSetField.class); - ExtensionAugment> extensionMatch - = new ExtensionAugment<>(EricAugMatchNodesNodeTableFlow.class, + ExtensionAugment> extensionMatch = + new ExtensionAugment<>(EricAugMatchNodesNodeTableFlow.class, new EricAugMatchNodesNodeTableFlowBuilder().setEricOfIcmpv6NdReserved( - new EricOfIcmpv6NdReservedBuilder().setIcmpv6NdReserved(Uint32.ONE).build()).build(), + new EricOfIcmpv6NdReservedBuilder().setIcmpv6NdReserved(Uint32.ONE).build()).build(), Icmpv6NdReservedKey.class); ExtensionListBuilder extListBld = null; @@ -142,4 +142,4 @@ public class Icmpv6NDReservedConvertorTest { .values().iterator().next().getExtensionKey()); } -} \ No newline at end of file +} diff --git a/extension/pom.xml b/extension/pom.xml index 97a1b8e003..510dcd86a6 100644 --- a/extension/pom.xml +++ b/extension/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/features-aggregator/features-openflowplugin/pom.xml b/features-aggregator/features-openflowplugin/pom.xml index 26516917a7..e3b958bdb2 100644 --- a/features-aggregator/features-openflowplugin/pom.xml +++ b/features-aggregator/features-openflowplugin/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent feature-repo-parent - 8.0.0 + 8.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml b/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml index 7fb53fefaf..f48a9be160 100644 --- a/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 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 e8ba0562a6..f21e02937c 100644 --- 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 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml b/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml index 1cd4225f9d..74c5f15737 100644 --- a/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml b/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml index 83f4a6fb23..351be1a725 100644 --- a/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml b/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml index 5ccb7fdc19..37330967ee 100644 --- a/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml b/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml index 595b356ee6..c883d27a63 100644 --- a/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-notifications/pom.xml b/features-aggregator/odl-openflowplugin-app-notifications/pom.xml index cd19f04a28..97de676e0c 100644 --- a/features-aggregator/odl-openflowplugin-app-notifications/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-notifications/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml b/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml index 6f6fac05b2..9d0156506f 100644 --- a/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml b/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml index d629c5cd60..096652489d 100644 --- a/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 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 4e3b863ec9..5265ecd024 100644 --- 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 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 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 ef2960e2ff..f91ea06c0d 100644 --- 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 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml b/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml index a7e9946f09..08d56dc87c 100644 --- a/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features-aggregator/odl-openflowplugin-app-topology/pom.xml b/features-aggregator/odl-openflowplugin-app-topology/pom.xml index 1754c472ed..1c90641f30 100644 --- a/features-aggregator/odl-openflowplugin-app-topology/pom.xml +++ b/features-aggregator/odl-openflowplugin-app-topology/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features-aggregator/odl-openflowplugin-drop-test/pom.xml b/features-aggregator/odl-openflowplugin-drop-test/pom.xml index 16306bccbb..791edc9a0b 100644 --- a/features-aggregator/odl-openflowplugin-drop-test/pom.xml +++ b/features-aggregator/odl-openflowplugin-drop-test/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml b/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml index 91944a461f..58693b84c2 100644 --- a/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml +++ b/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features-aggregator/odl-openflowplugin-flow-services/pom.xml b/features-aggregator/odl-openflowplugin-flow-services/pom.xml index 3d956a5c95..2369988d19 100644 --- a/features-aggregator/odl-openflowplugin-flow-services/pom.xml +++ b/features-aggregator/odl-openflowplugin-flow-services/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features-aggregator/odl-openflowplugin-libraries/pom.xml b/features-aggregator/odl-openflowplugin-libraries/pom.xml index 89e6294642..44523b4f38 100644 --- a/features-aggregator/odl-openflowplugin-libraries/pom.xml +++ b/features-aggregator/odl-openflowplugin-libraries/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 diff --git a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml index 79af43a8e0..8362f10d70 100644 --- a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml +++ b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 @@ -21,7 +21,7 @@ org.opendaylight.mdsal mdsal-artifacts - 7.0.1 + 7.0.3 import pom @@ -30,7 +30,7 @@ org.opendaylight.controller controller-artifacts - 3.0.1 + 3.0.3 import pom diff --git a/features-aggregator/odl-openflowplugin-southbound/pom.xml b/features-aggregator/odl-openflowplugin-southbound/pom.xml index 3248e83f76..0a300e4f86 100644 --- a/features-aggregator/odl-openflowplugin-southbound/pom.xml +++ b/features-aggregator/odl-openflowplugin-southbound/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 @@ -29,14 +29,14 @@ org.opendaylight.controller controller-artifacts - 3.0.1 + 3.0.3 import pom org.opendaylight.infrautils infrautils-artifacts - 1.9.1 + 1.9.3 import pom diff --git a/features-aggregator/pom.xml b/features-aggregator/pom.xml index 8114542fc3..3b2fa97a7d 100644 --- a/features-aggregator/pom.xml +++ b/features-aggregator/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/libraries/pom.xml b/libraries/pom.xml index f6d4989b48..4a5e75a8bb 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/model/pom.xml b/model/pom.xml index a808424b29..17c61eef13 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml b/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml index 46630cb07b..859084ddd0 100644 --- a/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml +++ b/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent feature-repo-parent - 8.0.0 + 8.0.2 diff --git a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml index 97116c7f0f..3f32c84eeb 100644 --- a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml +++ b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent single-feature-parent - 8.0.0 + 8.0.2 @@ -33,7 +33,7 @@ org.opendaylight.infrautils infrautils-artifacts - 1.9.1 + 1.9.3 import pom @@ -42,7 +42,7 @@ org.opendaylight.mdsal mdsal-artifacts - 7.0.1 + 7.0.3 import pom diff --git a/openflowjava/features-openflowjava-aggregator/pom.xml b/openflowjava/features-openflowjava-aggregator/pom.xml index 94a1a78e1a..47b83a8e58 100644 --- a/openflowjava/features-openflowjava-aggregator/pom.xml +++ b/openflowjava/features-openflowjava-aggregator/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/configuration/OpenFlowProviderConfigImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/configuration/OpenFlowProviderConfigImpl.java index 4f32dcdc64..10159837ce 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/configuration/OpenFlowProviderConfigImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/configuration/OpenFlowProviderConfigImpl.java @@ -33,7 +33,7 @@ public class OpenFlowProviderConfigImpl extends AbstractAugmentable messageTranslator = translatorLibrary.lookupTranslator( - new TranslatorKey(getVersion(), + new TranslatorKey(getVersion(), MultipartReplyAggregateCase.class.getName())); return RpcResultBuilder.success( diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsGatheringUtils.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsGatheringUtils.java index 5d62f7209e..c63f3cd307 100755 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsGatheringUtils.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsGatheringUtils.java @@ -72,7 +72,7 @@ public final class StatisticsGatheringUtils { final ConvertorExecutor convertorExecutor, final MultipartWriterProvider statisticsWriterProvider, final ListeningExecutorService executorService) { return Futures.transformAsync(statisticsGatheringService.getStatisticsOfType( - new EventIdentifier(QUEUE2_REQCTX + type.toString(), deviceInfo.getNodeId().toString()), type), + new EventIdentifier(QUEUE2_REQCTX + type.toString(), deviceInfo.getNodeId().toString()), type), rpcResult -> executorService.submit(() -> { final boolean rpcResultIsNull = rpcResult == null; diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/AsyncConfigMessageSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/AsyncConfigMessageSerializerTest.java index 84b95c93ac..f3c0a31cfa 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/AsyncConfigMessageSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/AsyncConfigMessageSerializerTest.java @@ -63,18 +63,24 @@ public class AsyncConfigMessageSerializerTest extends AbstractSerializerTest { private static final Boolean SLAVE_IS_FLOWDELETE = false; private static final Boolean SLAVE_IS_GROUPDELETE = false; - private static final AsyncConfigMessage MESSAGE = new AsyncConfigMessageBuilder().setXid(XID).setVersion(VERSION) - .setPacketInMask(new PacketInMaskBuilder().setMasterMask( - new PacketInMask(MASTER_IS_ACTION, MASTER_IS_INVALID_TTL, MASTER_IS_NOMATCH)).setSlaveMask( - new PacketInMask(SLAVE_IS_ACTION, SLAVE_IS_INVALID_TTL, SLAVE_IS_NOMATCH)).build()) - .setPortStatusMask(new PortStatusMaskBuilder().setMasterMask( - new PortStatusMask(MASTER_IS_ADD, MASTER_IS_DELETE, MASTER_IS_MODIFY)) - .setSlaveMask(new PortStatusMask(SLAVE_IS_ADD, SLAVE_IS_DELETE, SLAVE_IS_MODIFY)) - .build()).setFlowRemovedMask(new FlowRemovedMaskBuilder().setMasterMask( - new FlowRemovedMask(MASTER_IS_FLOWDELETE, MASTER_IS_GROUPDELETE, MASTER_IS_HARDTIMEOUT, - MASTER_IS_IDLETIMEOUT)).setSlaveMask( - new FlowRemovedMask(SLAVE_IS_FLOWDELETE, SLAVE_IS_GROUPDELETE, SLAVE_IS_HARDTIMEOUT, - SLAVE_IS_IDLETIMEOUT)).build()).build(); + private static final AsyncConfigMessage MESSAGE = new AsyncConfigMessageBuilder() + .setXid(XID) + .setVersion(VERSION) + .setPacketInMask(new PacketInMaskBuilder() + .setMasterMask(new PacketInMask(MASTER_IS_ACTION, MASTER_IS_INVALID_TTL, MASTER_IS_NOMATCH)) + .setSlaveMask(new PacketInMask(SLAVE_IS_ACTION, SLAVE_IS_INVALID_TTL, SLAVE_IS_NOMATCH)) + .build()) + .setPortStatusMask(new PortStatusMaskBuilder() + .setMasterMask(new PortStatusMask(MASTER_IS_ADD, MASTER_IS_DELETE, MASTER_IS_MODIFY)) + .setSlaveMask(new PortStatusMask(SLAVE_IS_ADD, SLAVE_IS_DELETE, SLAVE_IS_MODIFY)) + .build()) + .setFlowRemovedMask(new FlowRemovedMaskBuilder() + .setMasterMask(new FlowRemovedMask(MASTER_IS_FLOWDELETE, MASTER_IS_GROUPDELETE, MASTER_IS_HARDTIMEOUT, + MASTER_IS_IDLETIMEOUT)) + .setSlaveMask(new FlowRemovedMask(SLAVE_IS_FLOWDELETE, SLAVE_IS_GROUPDELETE, SLAVE_IS_HARDTIMEOUT, + SLAVE_IS_IDLETIMEOUT)) + .build()) + .build(); private AsyncConfigMessageSerializer serializer; diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupConvertorTest.java index 3c95cf670e..f36be89b77 100644 --- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupConvertorTest.java +++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupConvertorTest.java @@ -163,16 +163,16 @@ public class GroupConvertorTest { final List outActionList = outAddGroupInput.getBucketsList().get(0).getAction(); assertEquals(ImmutableList.of(new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action - .rev150203.actions.grouping.ActionBuilder().setActionChoice(new GroupCaseBuilder().setGroupAction( + .rev150203.actions.grouping.ActionBuilder().setActionChoice(new GroupCaseBuilder().setGroupAction( new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping - .action.choice.group._case.GroupActionBuilder().setGroupId(Uint32.valueOf(5)).build()) - .build()).build(), - new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping - .ActionBuilder().setActionChoice(new GroupCaseBuilder().setGroupAction( - new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action - .grouping.action.choice.group._case.GroupActionBuilder().setGroupId(Uint32.valueOf(5)) - .build()).build()) - .build()), outActionList); + .action.choice.group._case.GroupActionBuilder().setGroupId(Uint32.valueOf(5)).build()) + .build()).build(), + new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping + .ActionBuilder().setActionChoice(new GroupCaseBuilder().setGroupAction( + new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action + .grouping.action.choice.group._case.GroupActionBuilder().setGroupId(Uint32.valueOf(5)) + .build()).build()) + .build()), outActionList); assertEquals(50, outAddGroupInput.getBucketsList().get(1).getWeight().toJava()); assertEquals(60, outAddGroupInput.getBucketsList().get(1).getWatchPort().getValue().toJava()); @@ -180,16 +180,16 @@ public class GroupConvertorTest { final List outActionList1 = outAddGroupInput.getBucketsList().get(1).getAction(); assertEquals(ImmutableList.of(new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action - .rev150203.actions.grouping.ActionBuilder().setActionChoice(new GroupCaseBuilder().setGroupAction( + .rev150203.actions.grouping.ActionBuilder().setActionChoice(new GroupCaseBuilder().setGroupAction( new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping - .action.choice.group._case.GroupActionBuilder().setGroupId(Uint32.valueOf(5)).build()).build()) - .build(), - new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping - .ActionBuilder().setActionChoice(new GroupCaseBuilder().setGroupAction( - new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action - .grouping.action.choice.group._case.GroupActionBuilder().setGroupId(Uint32.valueOf(5)) - .build()).build()) - .build()), outActionList1); + .action.choice.group._case.GroupActionBuilder().setGroupId(Uint32.valueOf(5)).build()).build()) + .build(), + new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping + .ActionBuilder().setActionChoice(new GroupCaseBuilder().setGroupAction( + new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action + .grouping.action.choice.group._case.GroupActionBuilder().setGroupId(Uint32.valueOf(5)) + .build()).build()) + .build()), outActionList1); } /** 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 f9a719cddb..d0c9c855f2 100644 --- 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 @@ -381,17 +381,17 @@ public class FlowConvertorTest { } @Override - public Boolean isInstallHw() { + public Boolean getInstallHw() { return null; } @Override - public Boolean isBarrier() { + public Boolean getBarrier() { return null; } @Override - public Boolean isStrict() { + public Boolean getStrict() { return null; } diff --git a/parent/pom.xml b/parent/pom.xml index 84ed0d21df..11448fef5a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.mdsal binding-parent - 7.0.1 + 7.0.3 @@ -41,14 +41,14 @@ org.opendaylight.controller controller-artifacts - 3.0.1 + 3.0.3 pom import org.opendaylight.infrautils infrautils-artifacts - 1.9.1 + 1.9.3 pom import diff --git a/samples/pom.xml b/samples/pom.xml index 94c83325dc..c4ee243c43 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 8.0.0 + 8.0.2 -- 2.36.6