tests: Refactor existing tests to work with no custom encapsulation I…

…P (default)

/canonical/self-hosted-runners/run-workflows 6b00c91

Signed-off-by: Gabriel Mougard <gabriel.mougard@canonical.com>

tests/scaleup_cluster.bats

@@ -39,13 +39,13 @@ teardown() {
                   $container \
                   "$(test_is_ipv6_test && echo inet6 || echo inet)")
         if [ $i -eq 1 ]; then
-            microovn_init_create_cluster "$container" "$addr"
+            microovn_init_create_cluster "$container" "$addr" ""
         else
             local token
             token=$(microovn_cluster_get_join_token \
                         "${containers[0]}" \
                         "$container")
-            microovn_init_join_cluster "$container" "$addr" "$token"
+            microovn_init_join_cluster "$container" "$addr" "$token" ""
         fi
         starttimes_ovn_controller[$container]=$(\
             microovn_wait_for_service_starttime $container ovn-controller)

tests/test_helper/microovn.bash

@@ -107,6 +107,28 @@ function wait_ovn_services() {
 function microovn_init_create_cluster() {
     local container=$1; shift
     local address=$1; shift
+    local custom_encapsulation_ip=$1; shift
+
+    custom_encapsulation_ip_dialog=""
+    if [ -n "$custom_encapsulation_ip" ]; then
+        custom_encapsulation_ip_dialog=$(cat <<EOF
+expect "Would you like to define a custom encapsulation IP address for $container?" {
+    send "yes\n"
+}
+
+expect "Please enter the custom encapsulation IP address for $container" {
+    send "$custom_encapsulation_ip\n"
+}
+EOF
+)
+    else
+        custom_encapsulation_ip_dialog=$(cat <<EOF
+expect "Would you like to define a custom encapsulation IP address for $container?" {
+    send "\n"
+}
+EOF
+)
+    fi
 
     cat << EOF | lxc_exec "$container" "expect -"
 spawn "sudo" "microovn" "init"
@@ -120,9 +142,11 @@ expect "Would you like to create a new MicroOVN cluster?" {
 }
 
 expect "Please choose a name for this system" {
-    send "\n"
+    send "$container\n"
 }
 
+$custom_encapsulation_ip_dialog
+
 expect "Would you like to add additional servers to the cluster?" {
     send "no\n"
 }
@@ -135,6 +159,29 @@ function microovn_init_join_cluster() {
     local container=$1; shift
     local address=$1; shift
     local token=$1; shift
+    local custom_encapsulation_ip=$1; shift
+
+    custom_encapsulation_ip_dialog=""
+    if [ -n "$custom_encapsulation_ip" ]; then
+        custom_encapsulation_ip_dialog=$(cat <<EOF
+expect "Would you like to define a custom encapsulation IP address for $container?" {
+    send "yes\n"
+}
+
+expect "Please enter the custom encapsulation IP address for $container" {
+    send "$custom_encapsulation_ip\n"
+}
+EOF
+)
+    else
+        custom_encapsulation_ip_dialog=$(cat <<EOF
+expect "Would you like to define a custom encapsulation IP address for $container?" {
+    send "\n"
+}
+EOF
+)
+    fi
+
     cat << EOF | lxc_exec "$container" "expect -"
 spawn "sudo" "microovn" "init"
 
@@ -150,6 +197,8 @@ expect "Please enter your join token:" {
     send "$token\n"
 }
 
+$custom_encapsulation_ip_dialog
+
 expect eof
 EOF
 }

tests/test_helper/setup_teardown/init_cluster.bash

@@ -18,12 +18,12 @@ setup_file() {
                "$(test_is_ipv6_test && echo inet6 || echo inet)")
         assert [ -n "$addr" ]
         if [ -z "$leader" ]; then
-            microovn_init_create_cluster "$container" "$addr"
+            microovn_init_create_cluster "$container" "$addr" ""
             leader="$container"
         else
             local token
             token=$(microovn_cluster_get_join_token "$leader" "$container")
-            microovn_init_join_cluster "$container" "$addr" "$token"
+            microovn_init_join_cluster "$container" "$addr" "$token" ""
         fi
     done
 }