USHIFT-7019: C2CC - Increase amount of interconnected VMs in from 2 to 3

test/resources/c2cc.resource

@@ -22,6 +22,13 @@ ${HOST2_IP}                 ${EMPTY}
 ${HOST2_SSH_PORT}           ${EMPTY}
 ${HOST2_API_PORT}           ${EMPTY}
 ${KUBECONFIG_B}             ${EMPTY}
+${CLUSTER_C_POD_CIDR}       ${EMPTY}
+${CLUSTER_C_SVC_CIDR}       ${EMPTY}
+${CLUSTER_C_DOMAIN}         ${EMPTY}
+${HOST3_IP}                 ${EMPTY}
+${HOST3_SSH_PORT}           ${EMPTY}
+${HOST3_API_PORT}           ${EMPTY}
+${KUBECONFIG_C}             ${EMPTY}
 &{C2CC_KUBECONFIGS}         &{EMPTY}
 &{C2CC_SSH_IDS}             &{EMPTY}
 @{C2CC_REMOTE_ALIASES}      @{EMPTY}

test/scenarios-bootc/el10/presubmits/el102-src@c2cc.sh

@@ -13,10 +13,15 @@ CLUSTER_B_POD_CIDR="10.45.0.0/16"
 CLUSTER_B_SVC_CIDR="10.46.0.0/16"
 CLUSTER_B_DOMAIN="cluster-b.remote"
 
+# Cluster C (host3): non-overlapping CIDRs
+CLUSTER_C_POD_CIDR="10.48.0.0/16"
+CLUSTER_C_SVC_CIDR="10.49.0.0/16"
+CLUSTER_C_DOMAIN="cluster-c.remote"
+
 wait_for_greenboot_on_hosts() {
     local junit_label=$1
     local host
-    for host in host1 host2; do
+    for host in host1 host2 host3; do
         local host_ip full_host
         host_ip=$(get_vm_property "${host}" ip)
         full_host=$(full_vm_name "${host}")
@@ -29,45 +34,74 @@ wait_for_greenboot_on_hosts() {
 }
 
 configure_c2cc_host() {
-    local host=$1 remote_ip=$2 remote_pod_cidr=$3 remote_svc_cidr=$4 remote_domain=$5
+    local host=$1
+    shift
+    # Remaining args are sets of 4: remote_ip remote_pod_cidr remote_svc_cidr remote_domain (repeat)
 
     run_command_on_vm "${host}" "sudo mkdir -p /etc/microshift/config.d"
-    run_command_on_vm "${host}" "sudo tee /etc/microshift/config.d/50-c2cc.yaml > /dev/null << EOF
-clusterToCluster:
-  remoteClusters:
-  - nextHop: ${remote_ip}
-    clusterNetwork:
-    - ${remote_pod_cidr}
-    serviceNetwork:
-    - ${remote_svc_cidr}
-    domain: ${remote_domain}
+
+    # Build the YAML config with all remote clusters
+    local yaml_content
+    yaml_content="clusterToCluster:"$'\n'"  remoteClusters:"
+    local firewall_cidrs=()
+
+    while [ $# -gt 0 ]; do
+        local remote_ip=$1
+        local remote_pod_cidr=$2
+        local remote_svc_cidr=$3
+        local remote_domain=$4
+        shift 4
+
+        yaml_content+=$'\n'"  - nextHop: ${remote_ip}"
+        yaml_content+=$'\n'"    clusterNetwork:"
+        yaml_content+=$'\n'"    - ${remote_pod_cidr}"
+        yaml_content+=$'\n'"    serviceNetwork:"
+        yaml_content+=$'\n'"    - ${remote_svc_cidr}"
+        yaml_content+=$'\n'"    domain: ${remote_domain}"
+
+        firewall_cidrs+=("${remote_pod_cidr}" "${remote_svc_cidr}")
+    done
+
+    run_command_on_vm "${host}" "sudo tee /etc/microshift/config.d/50-c2cc.yaml > /dev/null <<EOF
+${yaml_content}
 EOF"
 
     configure_vm_firewall "${host}"
-    run_command_on_vm "${host}" "sudo firewall-cmd --permanent --zone=trusted --add-source=${remote_pod_cidr}"
-    run_command_on_vm "${host}" "sudo firewall-cmd --permanent --zone=trusted --add-source=${remote_svc_cidr}"
+    for cidr in "${firewall_cidrs[@]}"; do
+        run_command_on_vm "${host}" "sudo firewall-cmd --permanent --zone=trusted --add-source=${cidr}"
+    done
     run_command_on_vm "${host}" "sudo firewall-cmd --reload"
-
     run_command_on_vm "${host}" "sudo systemctl restart microshift"
 }
 
 configure_c2cc_hosts() {
     local -r host1_ip=$(get_vm_property host1 ip)
     local -r host2_ip=$(get_vm_property host2 ip)
+    local -r host3_ip=$(get_vm_property host3 ip)
 
     wait_for_greenboot_on_hosts "c2cc_pre_greenboot"
 
-    configure_c2cc_host host1 "${host2_ip}" "${CLUSTER_B_POD_CIDR}" "${CLUSTER_B_SVC_CIDR}" "${CLUSTER_B_DOMAIN}"
-    configure_c2cc_host host2 "${host1_ip}" "${CLUSTER_A_POD_CIDR}" "${CLUSTER_A_SVC_CIDR}" "${CLUSTER_A_DOMAIN}"
+    configure_c2cc_host host1 \
+        "${host2_ip}" "${CLUSTER_B_POD_CIDR}" "${CLUSTER_B_SVC_CIDR}" "${CLUSTER_B_DOMAIN}" \
+        "${host3_ip}" "${CLUSTER_C_POD_CIDR}" "${CLUSTER_C_SVC_CIDR}" "${CLUSTER_C_DOMAIN}"
+
+    configure_c2cc_host host2 \
+        "${host1_ip}" "${CLUSTER_A_POD_CIDR}" "${CLUSTER_A_SVC_CIDR}" "${CLUSTER_A_DOMAIN}" \
+        "${host3_ip}" "${CLUSTER_C_POD_CIDR}" "${CLUSTER_C_SVC_CIDR}" "${CLUSTER_C_DOMAIN}"
+
+    configure_c2cc_host host3 \
+        "${host1_ip}" "${CLUSTER_A_POD_CIDR}" "${CLUSTER_A_SVC_CIDR}" "${CLUSTER_A_DOMAIN}" \
+        "${host2_ip}" "${CLUSTER_B_POD_CIDR}" "${CLUSTER_B_SVC_CIDR}" "${CLUSTER_B_DOMAIN}"
 
     wait_for_greenboot_on_hosts "c2cc_greenboot"
 }
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template rhel102-bootc-source
     prepare_kickstart host2 kickstart-bootc.ks.template rhel102-bootc-source
+    prepare_kickstart host3 kickstart-bootc.ks.template rhel102-bootc-source
 
-    # Inject host2's non-default CIDRs into its kickstart config so MicroShift
+    # Inject host2's and host3's non-default CIDRs into its kickstart config so MicroShift
     # boots with the correct network from the start (no cleanup-data needed).
     local -r host2_ks_dir="${SCENARIO_INFO_DIR}/${SCENARIO}/vms/host2"
     cat >> "${host2_ks_dir}/post-microshift.cfg" <<EOF
@@ -78,15 +112,27 @@ network:
   serviceNetwork:
   - ${CLUSTER_B_SVC_CIDR}
 IEOF
+EOF
+    local -r host3_ks_dir="${SCENARIO_INFO_DIR}/${SCENARIO}/vms/host3"
+    cat >> "${host3_ks_dir}/post-microshift.cfg" <<EOF
+cat - >>/etc/microshift/config.yaml <<IEOF
+network:
+  clusterNetwork:
+  - ${CLUSTER_C_POD_CIDR}
+  serviceNetwork:
+  - ${CLUSTER_C_SVC_CIDR}
+IEOF
 EOF
 
     launch_vm rhel102-bootc --vmname host1
     launch_vm rhel102-bootc --vmname host2
+    launch_vm rhel102-bootc --vmname host3
 }
 
 scenario_remove_vms() {
     remove_vm host1
     remove_vm host2
+    remove_vm host3
 }
 
 scenario_run_tests() {
@@ -97,12 +143,19 @@ scenario_run_tests() {
     # Retrieve host2's kubeconfig
     local -r host2_ip=$(get_vm_property host2 ip)
     local -r kubeconfig_b="${SCENARIO_INFO_DIR}/${SCENARIO}/kubeconfig-b"
+
+    # Retrieve host3's kubeconfig
+    local -r host3_ip=$(get_vm_property host3 ip)
+    local -r kubeconfig_c="${SCENARIO_INFO_DIR}/${SCENARIO}/kubeconfig-c"
 
-    # Wait for host2 to be fully ready (run_tests only waits for host1)
+    # Wait for host2 and host3 to be fully ready (run_tests only waits for host1)
     wait_for_microshift_to_be_ready host2
+    wait_for_microshift_to_be_ready host3
 
     run_command_on_vm host2 "sudo cp /var/lib/microshift/resources/kubeadmin/${host2_ip}/kubeconfig /tmp/kubeconfig-b && sudo chmod 644 /tmp/kubeconfig-b"
+    run_command_on_vm host3 "sudo cp /var/lib/microshift/resources/kubeadmin/${host3_ip}/kubeconfig /tmp/kubeconfig-c && sudo chmod 644 /tmp/kubeconfig-c"
     copy_file_from_vm host2 "/tmp/kubeconfig-b" "${kubeconfig_b}"
+    copy_file_from_vm host3 "/tmp/kubeconfig-c" "${kubeconfig_c}"
 
     run_tests host1 \
         --variable "CLUSTER_A_POD_CIDR:${CLUSTER_A_POD_CIDR}" \
@@ -112,6 +165,10 @@ scenario_run_tests() {
         --variable "CLUSTER_B_SVC_CIDR:${CLUSTER_B_SVC_CIDR}" \
         --variable "CLUSTER_B_DOMAIN:${CLUSTER_B_DOMAIN}" \
         --variable "KUBECONFIG_B:${kubeconfig_b}" \
+        --variable "CLUSTER_C_POD_CIDR:${CLUSTER_C_POD_CIDR}" \
+        --variable "CLUSTER_C_SVC_CIDR:${CLUSTER_C_SVC_CIDR}" \
+        --variable "CLUSTER_C_DOMAIN:${CLUSTER_C_DOMAIN}" \
+        --variable "KUBECONFIG_C:${kubeconfig_c}" \
         suites/c2cc/sanity.robot \
         suites/c2cc/infrastructure.robot \
         suites/c2cc/connectivity.robot \

test/scenarios-bootc/el9/presubmits/el98-src@c2cc.sh

@@ -13,10 +13,15 @@ CLUSTER_B_POD_CIDR="10.45.0.0/16"
 CLUSTER_B_SVC_CIDR="10.46.0.0/16"
 CLUSTER_B_DOMAIN="cluster-b.remote"
 
+# Cluster C (host3): non-overlapping CIDRs
+CLUSTER_C_POD_CIDR="10.48.0.0/16"
+CLUSTER_C_SVC_CIDR="10.49.0.0/16"
+CLUSTER_C_DOMAIN="cluster-c.remote"
+
 wait_for_greenboot_on_hosts() {
     local junit_label=$1
     local host
-    for host in host1 host2; do
+    for host in host1 host2 host3; do
         local host_ip full_host
         host_ip=$(get_vm_property "${host}" ip)
         full_host=$(full_vm_name "${host}")
@@ -29,45 +34,74 @@ wait_for_greenboot_on_hosts() {
 }
 
 configure_c2cc_host() {
-    local host=$1 remote_ip=$2 remote_pod_cidr=$3 remote_svc_cidr=$4 remote_domain=$5
+    local host=$1
+    shift
+    # Remaining args are sets of 4: remote_ip remote_pod_cidr remote_svc_cidr remote_domain (repeat)
 
     run_command_on_vm "${host}" "sudo mkdir -p /etc/microshift/config.d"
-    run_command_on_vm "${host}" "sudo tee /etc/microshift/config.d/50-c2cc.yaml > /dev/null << EOF
-clusterToCluster:
-  remoteClusters:
-  - nextHop: ${remote_ip}
-    clusterNetwork:
-    - ${remote_pod_cidr}
-    serviceNetwork:
-    - ${remote_svc_cidr}
-    domain: ${remote_domain}
+
+    # Build the YAML config with all remote clusters
+    local yaml_content
+    yaml_content="clusterToCluster:"$'\n'"  remoteClusters:"
+    local firewall_cidrs=()
+
+    while [ $# -gt 0 ]; do
+        local remote_ip=$1
+        local remote_pod_cidr=$2
+        local remote_svc_cidr=$3
+        local remote_domain=$4
+        shift 4
+
+        yaml_content+=$'\n'"  - nextHop: ${remote_ip}"
+        yaml_content+=$'\n'"    clusterNetwork:"
+        yaml_content+=$'\n'"    - ${remote_pod_cidr}"
+        yaml_content+=$'\n'"    serviceNetwork:"
+        yaml_content+=$'\n'"    - ${remote_svc_cidr}"
+        yaml_content+=$'\n'"    domain: ${remote_domain}"
+
+        firewall_cidrs+=("${remote_pod_cidr}" "${remote_svc_cidr}")
+    done
+
+    run_command_on_vm "${host}" "sudo tee /etc/microshift/config.d/50-c2cc.yaml > /dev/null <<EOF
+${yaml_content}
 EOF"
 
     configure_vm_firewall "${host}"
-    run_command_on_vm "${host}" "sudo firewall-cmd --permanent --zone=trusted --add-source=${remote_pod_cidr}"
-    run_command_on_vm "${host}" "sudo firewall-cmd --permanent --zone=trusted --add-source=${remote_svc_cidr}"
+    for cidr in "${firewall_cidrs[@]}"; do
+        run_command_on_vm "${host}" "sudo firewall-cmd --permanent --zone=trusted --add-source=${cidr}"
+    done
     run_command_on_vm "${host}" "sudo firewall-cmd --reload"
-
     run_command_on_vm "${host}" "sudo systemctl restart microshift"
 }
 
 configure_c2cc_hosts() {
     local -r host1_ip=$(get_vm_property host1 ip)
     local -r host2_ip=$(get_vm_property host2 ip)
+    local -r host3_ip=$(get_vm_property host3 ip)
 
     wait_for_greenboot_on_hosts "c2cc_pre_greenboot"
 
-    configure_c2cc_host host1 "${host2_ip}" "${CLUSTER_B_POD_CIDR}" "${CLUSTER_B_SVC_CIDR}" "${CLUSTER_B_DOMAIN}"
-    configure_c2cc_host host2 "${host1_ip}" "${CLUSTER_A_POD_CIDR}" "${CLUSTER_A_SVC_CIDR}" "${CLUSTER_A_DOMAIN}"
+    configure_c2cc_host host1 \
+        "${host2_ip}" "${CLUSTER_B_POD_CIDR}" "${CLUSTER_B_SVC_CIDR}" "${CLUSTER_B_DOMAIN}" \
+        "${host3_ip}" "${CLUSTER_C_POD_CIDR}" "${CLUSTER_C_SVC_CIDR}" "${CLUSTER_C_DOMAIN}"
+
+    configure_c2cc_host host2 \
+        "${host1_ip}" "${CLUSTER_A_POD_CIDR}" "${CLUSTER_A_SVC_CIDR}" "${CLUSTER_A_DOMAIN}" \
+        "${host3_ip}" "${CLUSTER_C_POD_CIDR}" "${CLUSTER_C_SVC_CIDR}" "${CLUSTER_C_DOMAIN}"
+
+    configure_c2cc_host host3 \
+        "${host1_ip}" "${CLUSTER_A_POD_CIDR}" "${CLUSTER_A_SVC_CIDR}" "${CLUSTER_A_DOMAIN}" \
+        "${host2_ip}" "${CLUSTER_B_POD_CIDR}" "${CLUSTER_B_SVC_CIDR}" "${CLUSTER_B_DOMAIN}"
 
     wait_for_greenboot_on_hosts "c2cc_greenboot"
 }
 
 scenario_create_vms() {
     prepare_kickstart host1 kickstart-bootc.ks.template rhel98-bootc-source
     prepare_kickstart host2 kickstart-bootc.ks.template rhel98-bootc-source
+    prepare_kickstart host3 kickstart-bootc.ks.template rhel98-bootc-source
 
-    # Inject host2's non-default CIDRs into its kickstart config so MicroShift
+    # Inject host2's and host3's non-default CIDRs into its kickstart config so MicroShift
     # boots with the correct network from the start (no cleanup-data needed).
     local -r host2_ks_dir="${SCENARIO_INFO_DIR}/${SCENARIO}/vms/host2"
     cat >> "${host2_ks_dir}/post-microshift.cfg" <<EOF
@@ -78,15 +112,27 @@ network:
   serviceNetwork:
   - ${CLUSTER_B_SVC_CIDR}
 IEOF
+EOF
+    local -r host3_ks_dir="${SCENARIO_INFO_DIR}/${SCENARIO}/vms/host3"
+    cat >> "${host3_ks_dir}/post-microshift.cfg" <<EOF
+cat - >>/etc/microshift/config.yaml <<IEOF
+network:
+  clusterNetwork:
+  - ${CLUSTER_C_POD_CIDR}
+  serviceNetwork:
+  - ${CLUSTER_C_SVC_CIDR}
+IEOF
 EOF
 
     launch_vm rhel98-bootc --vmname host1
     launch_vm rhel98-bootc --vmname host2
+    launch_vm rhel98-bootc --vmname host3
 }
 
 scenario_remove_vms() {
     remove_vm host1
     remove_vm host2
+    remove_vm host3
 }
 
 scenario_run_tests() {
@@ -97,12 +143,19 @@ scenario_run_tests() {
     # Retrieve host2's kubeconfig
     local -r host2_ip=$(get_vm_property host2 ip)
     local -r kubeconfig_b="${SCENARIO_INFO_DIR}/${SCENARIO}/kubeconfig-b"
+
+    # Retrieve host3's kubeconfig
+    local -r host3_ip=$(get_vm_property host3 ip)
+    local -r kubeconfig_c="${SCENARIO_INFO_DIR}/${SCENARIO}/kubeconfig-c"
 
-    # Wait for host2 to be fully ready (run_tests only waits for host1)
+    # Wait for host2 and host3 to be fully ready (run_tests only waits for host1)
     wait_for_microshift_to_be_ready host2
+    wait_for_microshift_to_be_ready host3
 
     run_command_on_vm host2 "sudo cp /var/lib/microshift/resources/kubeadmin/${host2_ip}/kubeconfig /tmp/kubeconfig-b && sudo chmod 644 /tmp/kubeconfig-b"
+    run_command_on_vm host3 "sudo cp /var/lib/microshift/resources/kubeadmin/${host3_ip}/kubeconfig /tmp/kubeconfig-c && sudo chmod 644 /tmp/kubeconfig-c"
     copy_file_from_vm host2 "/tmp/kubeconfig-b" "${kubeconfig_b}"
+    copy_file_from_vm host3 "/tmp/kubeconfig-c" "${kubeconfig_c}"
 
     run_tests host1 \
         --variable "CLUSTER_A_POD_CIDR:${CLUSTER_A_POD_CIDR}" \
@@ -112,6 +165,10 @@ scenario_run_tests() {
         --variable "CLUSTER_B_SVC_CIDR:${CLUSTER_B_SVC_CIDR}" \
         --variable "CLUSTER_B_DOMAIN:${CLUSTER_B_DOMAIN}" \
         --variable "KUBECONFIG_B:${kubeconfig_b}" \
+        --variable "CLUSTER_C_POD_CIDR:${CLUSTER_C_POD_CIDR}" \
+        --variable "CLUSTER_C_SVC_CIDR:${CLUSTER_C_SVC_CIDR}" \
+        --variable "CLUSTER_C_DOMAIN:${CLUSTER_C_DOMAIN}" \
+        --variable "KUBECONFIG_C:${kubeconfig_c}" \
         suites/c2cc/sanity.robot \
         suites/c2cc/infrastructure.robot \
         suites/c2cc/connectivity.robot \