Revert "Create a workaround for YANGTOOLS-1575"

This reverts commit de17d38. (cherry picked from commit 048eaf1)
PANTHEONtech · Jun 4, 2024 · 96ff6de · 96ff6de
1 parent 4cc7955
commit 96ff6de
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 10 deletions.
diff --git a/...va/io/lighty/gnmi/southbound/mountpoint/codecs/YangInstanceNormToGnmiUpdateCodecTest.java b/...va/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<ImmutablePair<YangInstanceIdentifier, NormalizedNode>, Gnmi.Update> prepared =

diff --git a/...mi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/SimulatorCrudTest.java b/...mi/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-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/rcgnmi/GnmiGetITTest.java b/...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-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/rcgnmi/GnmiSetITTest.java b/...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