tests: Update for re-organized internal endpoints

Signed-off-by: Stéphane Graber <[email protected]>

Author: stgraber

test/suites/clustering.sh

@@ -2782,7 +2782,7 @@ test_clustering_image_refresh() {
 
   # Trigger image refresh on all nodes
   for incus_dir in "${INCUS_ONE_DIR}" "${INCUS_TWO_DIR}" "${INCUS_THREE_DIR}"; do
-    INCUS_DIR="${incus_dir}" incus query /internal/testing/image-refresh &
+    INCUS_DIR="${incus_dir}" incus query /internal/debug/image-refresh &
     pids="$! ${pids}"
   done
 
@@ -2820,7 +2820,7 @@ test_clustering_image_refresh() {
   # Trigger image refresh on all nodes. This shouldn't do anything as the image
   # is already up-to-date.
   for incus_dir in "${INCUS_ONE_DIR}" "${INCUS_TWO_DIR}" "${INCUS_THREE_DIR}"; do
-    INCUS_DIR="${incus_dir}" incus query /internal/testing/image-refresh &
+    INCUS_DIR="${incus_dir}" incus query /internal/debug/image-refresh &
     pids="$! ${pids}"
   done
 
@@ -2846,7 +2846,7 @@ test_clustering_image_refresh() {
 
   # Trigger image refresh on all nodes
   for incus_dir in "${INCUS_ONE_DIR}" "${INCUS_TWO_DIR}" "${INCUS_THREE_DIR}"; do
-    INCUS_DIR="${incus_dir}" incus query /internal/testing/image-refresh &
+    INCUS_DIR="${incus_dir}" incus query /internal/debug/image-refresh &
     pids="$! ${pids}"
   done
 

test/suites/fdleak.sh

@@ -22,7 +22,7 @@ test_fdleak() {
     done
 
     incus list
-    incus query /internal/gc
+    incus query /internal/debug/gc
 
     exit 0
   )

test/suites/network_forward.sh

@@ -30,12 +30,12 @@ test_network_forward() {
   incus network forward show "${netName}" 198.51.100.1 | grep -q -F "description: Test network forward"
 
   # Check forward is exported via BGP prefixes.
-  incus query /internal/testing/bgp | grep "198.51.100.1/32"
+  incus query /internal/debug/bgp | grep "198.51.100.1/32"
 
   incus network forward delete "${netName}" 198.51.100.1
 
   # Check deleting network forward removes forward BGP prefix.
-  ! incus query /internal/testing/bgp | grep "198.51.100.1/32" || false
+  ! incus query /internal/debug/bgp | grep "198.51.100.1/32" || false
 
   # Check creating forward with default target creates valid firewall rules.
   incus network forward create "${netName}" 198.51.100.1 target_address=192.0.2.2
@@ -140,13 +140,13 @@ test_network_forward() {
   fi
 
   # Check forward is exported via BGP prefixes before network delete.
-  incus query /internal/testing/bgp | grep "198.51.100.1/32"
+  incus query /internal/debug/bgp | grep "198.51.100.1/32"
 
   # Check deleting the network clears the forward firewall rules.
   incus network delete "${netName}"
 
   # Check deleting network removes forward BGP prefix.
-  ! incus query /internal/testing/bgp | grep "198.51.100.1/32" || false
+  ! incus query /internal/debug/bgp | grep "198.51.100.1/32" || false
 
   if [ "$firewallDriver" = "xtables" ]; then
     ! iptables -w -t nat -S | grep -c "generated for Incus network-forward ${netName}" || false

test/suites/warnings.sh

@@ -3,13 +3,13 @@ test_warnings() {
     incus query --wait /1.0/warnings\?recursion=1 | jq -r '.[].uuid' | xargs -n1 incus warning delete
 
     # Create a global warning (no node and no project)
-    incus query --wait -X POST -d '{\"type_code\": 0, \"message\": \"global warning\"}' /internal/testing/warnings
+    incus query --wait -X POST -d '{\"type_code\": 0, \"message\": \"global warning\"}' /internal/debug/warnings
 
     # More valid queries
-    incus query --wait -X POST -d '{\"type_code\": 0, \"message\": \"global warning\", \"project\": \"default\"}' /internal/testing/warnings
+    incus query --wait -X POST -d '{\"type_code\": 0, \"message\": \"global warning\", \"project\": \"default\"}' /internal/debug/warnings
 
     # Update the last warning. This will not create a new warning.
-    incus query --wait -X POST -d '{\"type_code\": 0, \"message\": \"global warning 2\", \"project\": \"default\"}' /internal/testing/warnings
+    incus query --wait -X POST -d '{\"type_code\": 0, \"message\": \"global warning 2\", \"project\": \"default\"}' /internal/debug/warnings
 
     # There should be two warnings now.
     count=$(incus query --wait /1.0/warnings | jq 'length')
@@ -19,21 +19,21 @@ test_warnings() {
     [ "${count}" -eq 2 ] || false
 
     # Invalid query (unknown project)
-    ! incus query --wait -X POST -d '{\"type_code\": 0, \"message\": \"global warning\", \"project\": \"foo\"}' /internal/testing/warnings || false
+    ! incus query --wait -X POST -d '{\"type_code\": 0, \"message\": \"global warning\", \"project\": \"foo\"}' /internal/debug/warnings || false
 
     # Invalid query (unknown type code)
-    ! incus query --wait -X POST -d '{\"type_code\": 999, \"message\": \"global warning\"}' /internal/testing/warnings || false
+    ! incus query --wait -X POST -d '{\"type_code\": 999, \"message\": \"global warning\"}' /internal/debug/warnings || false
 
     # Both entity type code as entity ID need to be valid otherwise no warning will be created. Note that empty/null values are valid as well.
-    ! incus query --wait -X POST -d '{\"type_code\": 0, \"message\": \"global warning\", \"entity_type_code\": 0, \"entity_id\": 0}' /internal/testing/warnings || false
+    ! incus query --wait -X POST -d '{\"type_code\": 0, \"message\": \"global warning\", \"entity_type_code\": 0, \"entity_id\": 0}' /internal/debug/warnings || false
 
     ensure_import_testimage
 
     # Get image ID from database instead of assuming it
     image_id=$(echo 'select image_id from images_aliases where name="testimage"' | incus admin sql global - | grep -Eo '[[:digit:]]+')
 
     # Create a warning with entity type "image" and entity ID ${image_id} (the imported testimage)
-    incus query --wait -X POST -d "{\\\"type_code\\\": 0, \\\"message\\\": \\\"global warning\\\", \\\"entity_type_code\\\": 1, \\\"entity_id\\\": ${image_id}}" /internal/testing/warnings
+    incus query --wait -X POST -d "{\\\"type_code\\\": 0, \\\"message\\\": \\\"global warning\\\", \\\"entity_type_code\\\": 1, \\\"entity_id\\\": ${image_id}}" /internal/debug/warnings
 
     # There should be three warnings now.
     count=$(incus warning list --format json | jq 'length')