From 19e85c3d7d88f2eff73cae8b17d42812e1b43dcb Mon Sep 17 00:00:00 2001 From: Ivan Hrasko Date: Tue, 4 Jun 2024 13:04:14 +0200 Subject: [PATCH 1/2] Bump upstreams Adopt: odlparent-13.1.3 infrautils-6.0.9 yangtools-13.0.6 mdsal-13.0.4 JIRA: LIGHTY-309 Signed-off-by: Ivan Hrasko --- lighty-core/dependency-versions/pom.xml | 8 ++++---- lighty-core/lighty-binding-parent/pom.xml | 4 ++-- lighty-core/lighty-parent/pom.xml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lighty-core/dependency-versions/pom.xml b/lighty-core/dependency-versions/pom.xml index 94bcbc090a..ee218f62c5 100644 --- a/lighty-core/dependency-versions/pom.xml +++ b/lighty-core/dependency-versions/pom.xml @@ -25,7 +25,7 @@ org.opendaylight.odlparent odlparent - 13.1.2 + 13.1.3 pom import @@ -48,14 +48,14 @@ org.opendaylight.infrautils infrautils-artifacts - 6.0.8 + 6.0.9 pom import org.opendaylight.mdsal mdsal-artifacts - 13.0.3 + 13.0.4 pom import @@ -69,7 +69,7 @@ org.opendaylight.yangtools yangtools-artifacts - 13.0.5 + 13.0.6 pom import diff --git a/lighty-core/lighty-binding-parent/pom.xml b/lighty-core/lighty-binding-parent/pom.xml index 0bb90f7eab..88b648ea3d 100644 --- a/lighty-core/lighty-binding-parent/pom.xml +++ b/lighty-core/lighty-binding-parent/pom.xml @@ -49,12 +49,12 @@ org.opendaylight.yangtools yang-maven-plugin - 13.0.5 + 13.0.6 org.opendaylight.mdsal mdsal-binding-java-api-generator - 13.0.3 + 13.0.4 diff --git a/lighty-core/lighty-parent/pom.xml b/lighty-core/lighty-parent/pom.xml index f79c743436..116c4b3f6b 100644 --- a/lighty-core/lighty-parent/pom.xml +++ b/lighty-core/lighty-parent/pom.xml @@ -203,7 +203,7 @@ org.opendaylight.odlparent checkstyle - 13.1.2 + 13.1.3 @@ -220,7 +220,7 @@ org.opendaylight.odlparent spotbugs - 13.1.2 + 13.1.3 From 048eaf18e202ad5c9dadb344863c0ef5be574297 Mon Sep 17 00:00:00 2001 From: Ivan Hrasko Date: Tue, 4 Jun 2024 13:06:38 +0200 Subject: [PATCH 2/2] Revert "Create a workaround for YANGTOOLS-1575" This reverts commit de17d386c1ae8a893cde27232d5a9f711379104c. --- .../codecs/YangInstanceNormToGnmiUpdateCodecTest.java | 2 -- .../io/lighty/modules/gnmi/test/gnmi/SimulatorCrudTest.java | 3 +-- .../lighty/modules/gnmi/test/gnmi/rcgnmi/GnmiGetITTest.java | 2 -- .../lighty/modules/gnmi/test/gnmi/rcgnmi/GnmiSetITTest.java | 4 ---- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/lighty-modules/lighty-gnmi/lighty-gnmi-sb/src/test/java/io/lighty/gnmi/southbound/mountpoint/codecs/YangInstanceNormToGnmiUpdateCodecTest.java b/lighty-modules/lighty-gnmi/lighty-gnmi-sb/src/test/java/io/lighty/gnmi/southbound/mountpoint/codecs/YangInstanceNormToGnmiUpdateCodecTest.java index 0b27be03ea..acf01c15ba 100644 --- a/lighty-modules/lighty-gnmi/lighty-gnmi-sb/src/test/java/io/lighty/gnmi/southbound/mountpoint/codecs/YangInstanceNormToGnmiUpdateCodecTest.java +++ b/lighty-modules/lighty-gnmi/lighty-gnmi-sb/src/test/java/io/lighty/gnmi/southbound/mountpoint/codecs/YangInstanceNormToGnmiUpdateCodecTest.java @@ -19,7 +19,6 @@ import org.apache.commons.lang3.tuple.ImmutablePair; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -48,7 +47,6 @@ public void topLevelElementTest() throws Exception { assertUpdateEquals(prepared.getValue(), result); } - @Disabled("Disabled until YANGTOOLS-1575 is resolved") @Test public void listEntryCase() throws Exception { final Map.Entry, Gnmi.Update> prepared = diff --git a/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/SimulatorCrudTest.java b/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/SimulatorCrudTest.java index bdc9cfd74c..626e50964c 100644 --- a/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/SimulatorCrudTest.java +++ b/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/SimulatorCrudTest.java @@ -32,7 +32,6 @@ import org.json.JSONException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.skyscreamer.jsonassert.JSONAssert; import org.slf4j.Logger; @@ -639,7 +638,7 @@ public void crudComplexAugmentedValue() throws ExecutionException, InterruptedEx assertThrows(ExecutionException.class, () -> sessionProvider.getGnmiSession().get(getRequest).get()); } - @Disabled("Disabled until YANGTOOLS-1575 is resolved") + @Test public void getListEntryTest() throws ExecutionException, InterruptedException, IOException, JSONException { final Gnmi.Path path = Gnmi.Path.newBuilder() diff --git a/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/rcgnmi/GnmiGetITTest.java b/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/rcgnmi/GnmiGetITTest.java index b065d20bd3..742938ac82 100644 --- a/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/rcgnmi/GnmiGetITTest.java +++ b/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/rcgnmi/GnmiGetITTest.java @@ -31,7 +31,6 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.skyscreamer.jsonassert.JSONAssert; import org.slf4j.Logger; @@ -163,7 +162,6 @@ public void getLeafIdentityRefTest() throws InterruptedException, IOException, J assertEquals(OC_INTERFACE_ETH3_CONFIG_TYPE_EXPECTED, ocInterfaceEth3ConfigType); } - @Disabled("Disabled until YANGTOOLS-1575 is resolved") @Test public void getListEntryTest() throws InterruptedException, IOException, JSONException { //assert list entry in openconfig-interfaces - interface - eth3, and also if it is only one with that key diff --git a/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/rcgnmi/GnmiSetITTest.java b/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/rcgnmi/GnmiSetITTest.java index ed2724dad2..b41b2a3efd 100644 --- a/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/rcgnmi/GnmiSetITTest.java +++ b/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/rcgnmi/GnmiSetITTest.java @@ -29,7 +29,6 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.skyscreamer.jsonassert.JSONAssert; import org.slf4j.Logger; @@ -153,7 +152,6 @@ public void setContainerTest() throws InterruptedException, IOException, JSONExc restoreDeviceToOriginalState(); } - @Disabled("Disabled until YANGTOOLS-1575 is resolved") @Test public void setAugmentedInterfaceListFromOuterModelTest() throws Exception { final String payload = getAugmentedTestInterfaceBody(); @@ -271,7 +269,6 @@ public void deleteLeafTest() throws InterruptedException, IOException, JSONExcep restoreDeviceToOriginalState(); } - @Disabled("Disabled until YANGTOOLS-1575 is resolved") @Test public void setSimpleListEntryTest() throws IOException, InterruptedException, JSONException { // Set simple list with @@ -358,7 +355,6 @@ public void setNestedListInWrongWayTest() throws IOException, InterruptedExcepti assertEquals(HttpURLConnection.HTTP_INTERNAL_ERROR, nestedListResponse.statusCode()); } - @Disabled("Disabled until YANGTOOLS-1575 is resolved") @Test public void setNestedListTest() throws IOException, InterruptedException, JSONException { // Create data in base list