From a018b4d571be537fea1cfbe0e882c4c55a0a9e9d Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 28 Sep 2017 17:40:31 +1000 Subject: [PATCH] Bump netconf to use yangtools 1.2.0 Also reverts I1914426b96029d7d2377f77b9f7df8beb14e607a to downgrade yangtools properly. Jira: releng-485 Change-Id: Ie344af870af6a85e859b1e35ca268f5bf988b00b Signed-off-by: Anil Belur Signed-off-by: Thanh Ha Signed-off-by: Robert Varga --- features/netconf-connector/pom.xml | 2 +- features/netconf/odl-netconf-api/pom.xml | 2 +- features/netconf/odl-netconf-util/pom.xml | 4 ++-- features/restconf/odl-restconf-nb-rfc8040-noauth/pom.xml | 2 +- features/restconf/odl-restconf-noauth/pom.xml | 2 +- features/yanglib/odl-yanglib/pom.xml | 2 +- netconf/config-netconf-connector/pom.xml | 2 +- .../netconf/confignetconfconnector/NetconfMappingTest.java | 7 ++++--- netconf/mdsal-netconf-connector/pom.xml | 2 +- .../mdsal/connector/ops/NetconfMDSalMappingTest.java | 7 ++----- netconf/mdsal-netconf-monitoring/pom.xml | 2 +- netconf/mdsal-netconf-notification/pom.xml | 2 +- netconf/mdsal-netconf-yang-library/pom.xml | 2 +- netconf/messagebus-netconf/pom.xml | 2 +- netconf/netconf-api/pom.xml | 2 +- netconf/netconf-client/pom.xml | 2 +- netconf/netconf-console/pom.xml | 2 +- netconf/netconf-impl/pom.xml | 2 +- .../opendaylight/netconf/it/AbstractNetconfConfigTest.java | 3 ++- netconf/netconf-monitoring/pom.xml | 2 +- netconf/netconf-netty-util/pom.xml | 2 +- netconf/netconf-notifications-impl/pom.xml | 2 +- netconf/netconf-ssh/pom.xml | 2 +- netconf/netconf-tcp/pom.xml | 2 +- netconf/netconf-topology/pom.xml | 2 +- netconf/netconf-util/pom.xml | 2 +- netconf/tools/netconf-cli/pom.xml | 2 +- netconf/tools/netconf-testtool/pom.xml | 2 +- .../netconf/test/tool/NetconfDeviceSimulator.java | 4 ++-- protocol-framework/pom.xml | 2 +- .../sal/restconf/impl/json/to/nn/test/JsonToNnTest.java | 6 +++--- .../sal/restconf/impl/test/ExpressionParserTest.java | 2 +- .../impl/test/RestconfImplNotificationSubscribingTest.java | 4 ++-- .../sal/restconf/impl/test/RestconfImplTest.java | 2 +- restconf/sal-rest-docgen-maven/pom.xml | 2 +- restconf/sal-rest-docgen/pom.xml | 2 +- 36 files changed, 46 insertions(+), 47 deletions(-) diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml index 3d88ae1908..6be8817e19 100644 --- a/features/netconf-connector/pom.xml +++ b/features/netconf-connector/pom.xml @@ -28,7 +28,7 @@ 0.12.0-SNAPSHOT 1.4.0-SNAPSHOT 1.7.0-SNAPSHOT - 2.0.0-SNAPSHOT + 1.2.0 diff --git a/features/netconf/odl-netconf-api/pom.xml b/features/netconf/odl-netconf-api/pom.xml index 0523dc1dfb..7aa7c49bb9 100644 --- a/features/netconf/odl-netconf-api/pom.xml +++ b/features/netconf/odl-netconf-api/pom.xml @@ -37,7 +37,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0-SNAPSHOT + 1.2.0 pom import diff --git a/features/netconf/odl-netconf-util/pom.xml b/features/netconf/odl-netconf-util/pom.xml index f62068a95e..a1dbac9835 100644 --- a/features/netconf/odl-netconf-util/pom.xml +++ b/features/netconf/odl-netconf-util/pom.xml @@ -34,7 +34,7 @@ org.opendaylight.yangtools odl-yangtools-yang-data - 2.0.0-SNAPSHOT + 1.2.0 xml features @@ -52,4 +52,4 @@ config - \ No newline at end of file + diff --git a/features/restconf/odl-restconf-nb-rfc8040-noauth/pom.xml b/features/restconf/odl-restconf-nb-rfc8040-noauth/pom.xml index 70429fcfa6..038ff05e2c 100644 --- a/features/restconf/odl-restconf-nb-rfc8040-noauth/pom.xml +++ b/features/restconf/odl-restconf-nb-rfc8040-noauth/pom.xml @@ -37,7 +37,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0-SNAPSHOT + 1.2.0 pom import diff --git a/features/restconf/odl-restconf-noauth/pom.xml b/features/restconf/odl-restconf-noauth/pom.xml index ad8ad1837b..9eba8e2c40 100644 --- a/features/restconf/odl-restconf-noauth/pom.xml +++ b/features/restconf/odl-restconf-noauth/pom.xml @@ -37,7 +37,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0-SNAPSHOT + 1.2.0 pom import diff --git a/features/yanglib/odl-yanglib/pom.xml b/features/yanglib/odl-yanglib/pom.xml index 49c10e138a..0b5b46a365 100644 --- a/features/yanglib/odl-yanglib/pom.xml +++ b/features/yanglib/odl-yanglib/pom.xml @@ -34,7 +34,7 @@ org.opendaylight.yangtools odl-yangtools-yang-data - 2.0.0-SNAPSHOT + 1.2.0 xml features diff --git a/netconf/config-netconf-connector/pom.xml b/netconf/config-netconf-connector/pom.xml index fd8f2879a3..f298f1313e 100644 --- a/netconf/config-netconf-connector/pom.xml +++ b/netconf/config-netconf-connector/pom.xml @@ -48,7 +48,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0-SNAPSHOT + 1.2.0 pom import diff --git a/netconf/config-netconf-connector/src/test/java/org/opendaylight/netconf/confignetconfconnector/NetconfMappingTest.java b/netconf/config-netconf-connector/src/test/java/org/opendaylight/netconf/confignetconfconnector/NetconfMappingTest.java index deebb5d019..fe79771724 100644 --- a/netconf/config-netconf-connector/src/test/java/org/opendaylight/netconf/confignetconfconnector/NetconfMappingTest.java +++ b/netconf/config-netconf-connector/src/test/java/org/opendaylight/netconf/confignetconfconnector/NetconfMappingTest.java @@ -867,9 +867,10 @@ public class NetconfMappingTest extends AbstractConfigTest { private List getYangs() { final List paths = Arrays.asList("/META-INF/yang/config@2013-04-05.yang", - "/META-INF/yang/rpc-context@2013-06-17.yang", "/META-INF/yang/config-test@2013-06-13.yang", - "/META-INF/yang/config-test-impl@2013-04-03.yang", "/META-INF/yang/test-types@2013-11-27.yang", - "/META-INF/yang/test-groups@2014-12-08.yang", "/META-INF/yang/ietf-inet-types@2013-07-15.yang"); + "/META-INF/yang/rpc-context@2013-06-17.yang", + "/META-INF/yang/config-test.yang", "/META-INF/yang/config-test-impl.yang", + "/META-INF/yang/test-types.yang", "/META-INF/yang/test-groups.yang", + "/META-INF/yang/ietf-inet-types@2013-07-15.yang"); final Collection yangDependencies = new ArrayList<>(); for (final String path : paths) { final InputStream is = Preconditions diff --git a/netconf/mdsal-netconf-connector/pom.xml b/netconf/mdsal-netconf-connector/pom.xml index 71175ee250..79396475ca 100644 --- a/netconf/mdsal-netconf-connector/pom.xml +++ b/netconf/mdsal-netconf-connector/pom.xml @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0-SNAPSHOT + 1.2.0 pom import diff --git a/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/NetconfMDSalMappingTest.java b/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/NetconfMDSalMappingTest.java index 8415d7a5dd..c23155a2b3 100644 --- a/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/NetconfMDSalMappingTest.java +++ b/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/NetconfMDSalMappingTest.java @@ -15,7 +15,6 @@ import static org.junit.Assert.fail; import static org.mockito.Matchers.any; import static org.mockito.Mockito.doAnswer; -import com.google.common.base.Preconditions; import com.google.common.io.ByteSource; import com.google.common.util.concurrent.Futures; import java.io.InputStream; @@ -831,9 +830,7 @@ public class NetconfMDSalMappingTest { final List schemas = new ArrayList<>(); for (final String schemaPath : schemaPaths) { - final InputStream resourceAsStream = - Preconditions.checkNotNull( - getClass().getResourceAsStream(schemaPath), "Resource " + schemaPath + " not found."); + final InputStream resourceAsStream = getClass().getResourceAsStream(schemaPath); schemas.add(resourceAsStream); } @@ -880,4 +877,4 @@ public class NetconfMDSalMappingTest { } }; } -} \ No newline at end of file +} diff --git a/netconf/mdsal-netconf-monitoring/pom.xml b/netconf/mdsal-netconf-monitoring/pom.xml index 69fab6e614..6d430e7da2 100644 --- a/netconf/mdsal-netconf-monitoring/pom.xml +++ b/netconf/mdsal-netconf-monitoring/pom.xml @@ -40,7 +40,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0-SNAPSHOT + 1.2.0 pom import diff --git a/netconf/mdsal-netconf-notification/pom.xml b/netconf/mdsal-netconf-notification/pom.xml index 67d02b5579..accf63fae6 100644 --- a/netconf/mdsal-netconf-notification/pom.xml +++ b/netconf/mdsal-netconf-notification/pom.xml @@ -40,7 +40,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0-SNAPSHOT + 1.2.0 pom import diff --git a/netconf/mdsal-netconf-yang-library/pom.xml b/netconf/mdsal-netconf-yang-library/pom.xml index 2b01030b9a..65da147e30 100644 --- a/netconf/mdsal-netconf-yang-library/pom.xml +++ b/netconf/mdsal-netconf-yang-library/pom.xml @@ -48,7 +48,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0-SNAPSHOT + 1.2.0 pom import diff --git a/netconf/messagebus-netconf/pom.xml b/netconf/messagebus-netconf/pom.xml index c22909da38..1f2c4956a1 100644 --- a/netconf/messagebus-netconf/pom.xml +++ b/netconf/messagebus-netconf/pom.xml @@ -43,7 +43,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.yangtools yangtools-artifacts - 2.0.0-SNAPSHOT + 1.2.0 pom import diff --git a/netconf/netconf-api/pom.xml b/netconf/netconf-api/pom.xml index 973b980568..776d920226 100644 --- a/netconf/netconf-api/pom.xml +++ b/netconf/netconf-api/pom.xml @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0-SNAPSHOT + 1.2.0 pom import diff --git a/netconf/netconf-client/pom.xml b/netconf/netconf-client/pom.xml index 09bdc6e78f..e739da2e1d 100644 --- a/netconf/netconf-client/pom.xml +++ b/netconf/netconf-client/pom.xml @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0-SNAPSHOT + 1.2.0 pom import diff --git a/netconf/netconf-console/pom.xml b/netconf/netconf-console/pom.xml index 34f0116891..3c2a3e9fba 100644 --- a/netconf/netconf-console/pom.xml +++ b/netconf/netconf-console/pom.xml @@ -40,7 +40,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.yangtools yangtools-artifacts - 2.0.0-SNAPSHOT + 1.2.0 pom import diff --git a/netconf/netconf-impl/pom.xml b/netconf/netconf-impl/pom.xml index 5496167352..5e88716d51 100644 --- a/netconf/netconf-impl/pom.xml +++ b/netconf/netconf-impl/pom.xml @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0-SNAPSHOT + 1.2.0 pom import diff --git a/netconf/netconf-it/src/test/java/org/opendaylight/netconf/it/AbstractNetconfConfigTest.java b/netconf/netconf-it/src/test/java/org/opendaylight/netconf/it/AbstractNetconfConfigTest.java index 3d3cd6d104..cd1b9ce81e 100644 --- a/netconf/netconf-it/src/test/java/org/opendaylight/netconf/it/AbstractNetconfConfigTest.java +++ b/netconf/netconf-it/src/test/java/org/opendaylight/netconf/it/AbstractNetconfConfigTest.java @@ -184,7 +184,8 @@ public abstract class AbstractNetconfConfigTest extends AbstractConfigTest { static Collection getBasicYangs() throws IOException { - final List paths = Arrays.asList("/META-INF/yang/config.yang", "/META-INF/yang/rpc-context.yang", + final List paths = Arrays.asList("/META-INF/yang/config@2013-04-05.yang", + "/META-INF/yang/rpc-context@2013-06-17.yang", "/META-INF/yang/config-test.yang", "/META-INF/yang/config-test-impl.yang", "/META-INF/yang/test-types.yang", "/META-INF/yang/test-groups.yang", "/META-INF/yang/ietf-inet-types@2013-07-15.yang"); diff --git a/netconf/netconf-monitoring/pom.xml b/netconf/netconf-monitoring/pom.xml index b8fb47c482..e13f121f61 100644 --- a/netconf/netconf-monitoring/pom.xml +++ b/netconf/netconf-monitoring/pom.xml @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0-SNAPSHOT + 1.2.0 pom import diff --git a/netconf/netconf-netty-util/pom.xml b/netconf/netconf-netty-util/pom.xml index b387ef3890..0a1252a8c6 100644 --- a/netconf/netconf-netty-util/pom.xml +++ b/netconf/netconf-netty-util/pom.xml @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0-SNAPSHOT + 1.2.0 pom import diff --git a/netconf/netconf-notifications-impl/pom.xml b/netconf/netconf-notifications-impl/pom.xml index 505fc1a85c..c490fe6383 100644 --- a/netconf/netconf-notifications-impl/pom.xml +++ b/netconf/netconf-notifications-impl/pom.xml @@ -49,7 +49,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0-SNAPSHOT + 1.2.0 pom import diff --git a/netconf/netconf-ssh/pom.xml b/netconf/netconf-ssh/pom.xml index 58c9ab4f00..d7ac0e380a 100644 --- a/netconf/netconf-ssh/pom.xml +++ b/netconf/netconf-ssh/pom.xml @@ -33,7 +33,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0-SNAPSHOT + 1.2.0 pom import diff --git a/netconf/netconf-tcp/pom.xml b/netconf/netconf-tcp/pom.xml index a2f98647ae..174f5b1573 100644 --- a/netconf/netconf-tcp/pom.xml +++ b/netconf/netconf-tcp/pom.xml @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0-SNAPSHOT + 1.2.0 pom import diff --git a/netconf/netconf-topology/pom.xml b/netconf/netconf-topology/pom.xml index 5468dd00ba..6520c36d6c 100644 --- a/netconf/netconf-topology/pom.xml +++ b/netconf/netconf-topology/pom.xml @@ -41,7 +41,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0-SNAPSHOT + 1.2.0 pom import diff --git a/netconf/netconf-util/pom.xml b/netconf/netconf-util/pom.xml index c5c94ada29..059d788086 100644 --- a/netconf/netconf-util/pom.xml +++ b/netconf/netconf-util/pom.xml @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0-SNAPSHOT + 1.2.0 pom import diff --git a/netconf/tools/netconf-cli/pom.xml b/netconf/tools/netconf-cli/pom.xml index 67284e0e4b..4d9ee44aa1 100644 --- a/netconf/tools/netconf-cli/pom.xml +++ b/netconf/tools/netconf-cli/pom.xml @@ -45,7 +45,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0-SNAPSHOT + 1.2.0 pom import diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml index 63a7605bf2..d2d81be4f6 100644 --- a/netconf/tools/netconf-testtool/pom.xml +++ b/netconf/tools/netconf-testtool/pom.xml @@ -40,7 +40,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0-SNAPSHOT + 1.2.0 pom import diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java index 7a922f7439..53ca53ab70 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java @@ -345,10 +345,10 @@ public class NetconfDeviceSimulator implements Closeable { private void addDefaultSchemas(final SharedSchemaRepository consumer) { SourceIdentifier srcId = RevisionSourceIdentifier.create("ietf-netconf-monitoring", "2010-10-04"); - registerSource(consumer, "/META-INF/yang/ietf-netconf-monitoring@2010-10-04.yang", srcId); + registerSource(consumer, "/META-INF/yang/ietf-netconf-monitoring.yang", srcId); srcId = RevisionSourceIdentifier.create("ietf-netconf-monitoring-extension", "2013-12-10"); - registerSource(consumer, "/META-INF/yang/ietf-netconf-monitoring-extension@2013-12-10.yang", srcId); + registerSource(consumer, "/META-INF/yang/ietf-netconf-monitoring-extension.yang", srcId); srcId = RevisionSourceIdentifier.create("ietf-yang-types", "2013-07-15"); registerSource(consumer, "/META-INF/yang/ietf-yang-types@2013-07-15.yang", srcId); diff --git a/protocol-framework/pom.xml b/protocol-framework/pom.xml index ffa1c688c7..ab0f407224 100644 --- a/protocol-framework/pom.xml +++ b/protocol-framework/pom.xml @@ -48,7 +48,7 @@ org.opendaylight.yangtools mockito-configuration - 2.0.0-SNAPSHOT + 1.2.0 test diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/nn/test/JsonToNnTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/nn/test/JsonToNnTest.java index 6fdc6fc4a4..7bb7276277 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/nn/test/JsonToNnTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/nn/test/JsonToNnTest.java @@ -127,7 +127,7 @@ public class JsonToNnTest extends AbstractBodyReaderTest { } assertNotNull(exception); assertEquals( - "Error parsing input: Schema node with name cont was not found under " + "Error parsing input: Schema node with name cont wasn't found under " + "(urn:ietf:params:xml:ns:netconf:base:1.0)data.", exception.getErrors().get(0).getErrorMessage()); @@ -143,7 +143,7 @@ public class JsonToNnTest extends AbstractBodyReaderTest { } assertNotNull(exception); assertEquals( - "Error parsing input: Schema node with name lst1 was not found under " + "Error parsing input: Schema node with name lst1 wasn't found under " + "(urn:ietf:params:xml:ns:netconf:base:1.0)data.", exception.getErrors().get(0).getErrorMessage()); @@ -159,7 +159,7 @@ public class JsonToNnTest extends AbstractBodyReaderTest { } assertNotNull(exception); assertEquals( - "Error parsing input: Schema node with name lf was not found under " + "Error parsing input: Schema node with name lf wasn't found under " + "(urn:ietf:params:xml:ns:netconf:base:1.0)data.", exception.getErrors().get(0).getErrorMessage()); assertEquals(3, countExceptions); diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/ExpressionParserTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/ExpressionParserTest.java index 434304da21..63666c78a9 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/ExpressionParserTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/ExpressionParserTest.java @@ -132,7 +132,7 @@ public class ExpressionParserTest { } } final YangInstanceIdentifier path = Mockito.mock(YangInstanceIdentifier.class); - final PathArgument pathValue = NodeIdentifier.create(QName.create("module", "2016-12-14", "localName")); + final PathArgument pathValue = NodeIdentifier.create(QName.create("module", "2016-14-12", "localName")); Mockito.when(path.getLastPathArgument()).thenReturn(pathValue); final ListenerAdapter listener = Notificator.createListener(path, "streamName", NotificationOutputType.JSON); listener.setQueryParams(Instant.now(), Optional.empty(), Optional.ofNullable(filter), false); diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplNotificationSubscribingTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplNotificationSubscribingTest.java index 3d66eb1157..e34f9dbda1 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplNotificationSubscribingTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplNotificationSubscribingTest.java @@ -63,7 +63,7 @@ public class RestconfImplNotificationSubscribingTest { .setGlobalSchema(YangParserTestUtils.parseYangSources(TestRestconfUtils.loadFiles("/notifications"))); final YangInstanceIdentifier path = Mockito.mock(YangInstanceIdentifier.class); - final PathArgument pathValue = NodeIdentifier.create(QName.create("module", "2016-12-14", "localName")); + final PathArgument pathValue = NodeIdentifier.create(QName.create("module", "2016-14-12", "localName")); Mockito.when(path.getLastPathArgument()).thenReturn(pathValue); Notificator.createListener(path, this.identifier, NotificationOutputType.XML); } @@ -197,7 +197,7 @@ public class RestconfImplNotificationSubscribingTest { @Test public void onNotifiTest() throws Exception { final YangInstanceIdentifier path = Mockito.mock(YangInstanceIdentifier.class); - final PathArgument pathValue = NodeIdentifier.create(QName.create("module", "2016-12-14", "localName")); + final PathArgument pathValue = NodeIdentifier.create(QName.create("module", "2016-14-12", "localName")); Mockito.when(path.getLastPathArgument()).thenReturn(pathValue); final ListenerAdapter listener = Notificator.createListener(path, this.identifier, NotificationOutputType.XML); diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java index 433684041f..f55a97ad7b 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java @@ -102,7 +102,7 @@ public class RestconfImplTest { private void binaryKeyTest(final List al, final List al2) { - final QName keyDef = QName.create("test:key:binary", "2017-08-14", "b1"); + final QName keyDef = QName.create("test:key:binary", "2017-14-08", "b1"); final Map uriKeyValues = new HashMap<>(); uriKeyValues.put(keyDef, al.toArray()); diff --git a/restconf/sal-rest-docgen-maven/pom.xml b/restconf/sal-rest-docgen-maven/pom.xml index e302f3820b..3fcc5ee024 100644 --- a/restconf/sal-rest-docgen-maven/pom.xml +++ b/restconf/sal-rest-docgen-maven/pom.xml @@ -33,7 +33,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0-SNAPSHOT + 1.2.0 pom import diff --git a/restconf/sal-rest-docgen/pom.xml b/restconf/sal-rest-docgen/pom.xml index 8e422a7f48..6d8643ca0f 100644 --- a/restconf/sal-rest-docgen/pom.xml +++ b/restconf/sal-rest-docgen/pom.xml @@ -25,7 +25,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0-SNAPSHOT + 1.2.0 pom import -- 2.36.6