Revert "Create workaround for NETCONF-1285"

This reverts commit fb343f7. Signed-off-by: tobias.pobocik <[email protected]>
Tobianas · Apr 30, 2024 · 7c42f98 · 7c42f98
1 parent 9196e54
commit 7c42f98
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/.github/workflows/lighty-rcgnmi-app/tests-lighty-rcgnmi-app.sh b/.github/workflows/lighty-rcgnmi-app/tests-lighty-rcgnmi-app.sh
@@ -89,7 +89,7 @@ do \
   assertHttpStatusCode $(curl -o /dev/null -s -w "%{http_code} GET %{url_effective}\n" --user admin:admin -H "Content-Type: application/json" --insecure http://$pod_controller_ip:8558/cluster/members) \
 ;done
 sleep 1
-: ' FIXME uncomment this after NETCONF-1285 is resolved
+
 #Pods healthcheck (:8888/restconf/operations)
 
 for pod_controller_ip in $POD_CONTROLLER_IPS; \
@@ -100,7 +100,7 @@ sleep 1
 
 #Service healthcheck (:30888/restconf/operations)
 assertHttpStatusCode $(curl -o /dev/null -s -w "%{http_code} GET %{url_effective}\n" --user admin:admin -H "Content-Type: application/json" --insecure http://$MINIKUBE_IP:$CONTROLLER_PORT/restconf/operations)
-'
+
 # add gNMI node into gNMI topology
 assertHttpStatusCode $(curl -X PUT -o /dev/null -s -w "%{http_code} PUT %{url_effective}\n" \
   http://"$MINIKUBE_IP":$CONTROLLER_PORT/restconf/data/network-topology:network-topology/topology=gnmi-topology/node=node-"${MINIKUBE_IP//.}" \

diff --git a/.github/workflows/lighty-rnc-app/test-lighty-rnc-app-cluster.sh b/.github/workflows/lighty-rnc-app/test-lighty-rnc-app-cluster.sh
@@ -182,15 +182,15 @@ do \
    "http://$pod_controller_ip:8558/cluster/members")" \
 ;done
 validateTestStatus
-: ' FIXME uncomment this after NETCONF-1285 is resolved
+
 # Pods health check (:8888/restconf/operations)
 for pod_controller_ip in $POD_CONTROLLER_IPS; \
 do \
   assertHttpStatusCode "$(curl -o /dev/null -s -w "%{http_code} GET %{url_effective}\n" \
    -H "Content-Type: application/json" \
    "http://$pod_controller_ip:$CONTROLLER_PORT/restconf/operations")" \
 ;done
-'
+
 # Add node into topology
   assertHttpStatusCode "$(curl -X PUT -o /dev/null -s -w "%{http_code} PUT %{url_effective}\n" \
   "http://$CTRL0_IP:$CONTROLLER_PORT/restconf/data/network-topology:network-topology/topology=topology-netconf/node=node-${SIMULATOR_IP//.}" \

diff --git a/.github/workflows/lighty-rnc-app/tests-lighty-rnc-app.sh b/.github/workflows/lighty-rnc-app/tests-lighty-rnc-app.sh
@@ -80,7 +80,7 @@ do \
   assertHttpStatusCode $(curl -o /dev/null -s -w "%{http_code} GET %{url_effective}\n"  --user admin:admin -H "Content-Type: application/json" --insecure http://$pod_controller_ip:8558/cluster/members) \
 ;done
 sleep 1
-: ' FIXME uncomment this after NETCONF-1285 is resolved
+
 # Pods healthcheck (:8888/restconf/operations)
 
 for pod_controller_ip in $POD_CONTROLLER_IPS; \
@@ -92,7 +92,7 @@ sleep 1
 # Service healthcheck (:30888/restconf/operations)
 assertHttpStatusCode $(curl -o /dev/null -s -w "%{http_code} GET %{url_effective}\n" --user admin:admin -H "Content-Type: application/json" --insecure http://$MINIKUBE_IP:$CONTROLLER_PORT/restconf/operations)
 sleep 1
-'
+
 # add node into topology
   assertHttpStatusCode $(curl -X PUT -o /dev/null -s -w "%{http_code} PUT %{url_effective}\n" http://"$MINIKUBE_IP":$CONTROLLER_PORT/restconf/data/network-topology:network-topology/topology=topology-netconf/node=node-"${SIMULATOR_IP//.}" \
   -H 'Content-Type: application/json' \

diff --git a/...tions-app/src/test/java/io/lighty/examples/controller/actions/RestconfActionsAppTest.java b/...tions-app/src/test/java/io/lighty/examples/controller/actions/RestconfActionsAppTest.java
@@ -63,10 +63,8 @@ public void simpleApplicationTest() throws Exception {
                             }
                         ]
                     }""");
-        /* FIXME uncomment this after NETCONF-1285 is resolved
         operations = restClient.GET("restconf/operations");
         assertEquals(operations.statusCode(), 200);
-        */
         operations = restClient.GET("restconf/data/network-topology:network-topology?content=config");
         assertEquals(operations.statusCode(), 200);
         operations = restClient.GET("restconf/data/network-topology:network-topology?content=nonconfig");

diff --git a/...f-app/src/test/java/io/lighty/examples/controllers/restconfapp/tests/RestconfAppTest.java b/...f-app/src/test/java/io/lighty/examples/controllers/restconfapp/tests/RestconfAppTest.java
@@ -56,10 +56,8 @@ public void simpleApplicationTest() throws IOException, InterruptedException {
                         ]
                     }""");
 
-        /* FIXME uncomment this after NETCONF-1285 is resolved
         operations = restClient.GET("rests/operations");
         Assert.assertEquals(operations.statusCode(), 200);
-         */
         operations = restClient.GET("rests/data/network-topology:network-topology?content=config");
         Assert.assertEquals(operations.statusCode(), 200);
         operations = restClient.GET("rests/data/network-topology:network-topology?content=nonconfig");