e2e: qm-nodes: move NodeName logic to a function

Fixes: #316 Signed-off-by: Douglas Schilling Landgraf <[email protected]>
containers · Jan 19, 2024 · 7c1e4e7 · 7c1e4e7
1 parent d2e1843
commit 7c1e4e7
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/tests/e2e/lib/container b/tests/e2e/lib/container
@@ -89,6 +89,26 @@ setup_node() {
         if_error_exit "failed to sed ContainerFile node template!"
 }
 
+qm_set_nodename_all_nodes() {
+    for nodeID in $(seq 1 "${NUMBER_OF_NODES}") ;
+    do
+        qm_node_name="qm-node${nodeID}"
+        eval "$(podman exec node"${nodeID}" \
+                podman exec qm \
+                sed -i 's/^#NodeName=/NodeName='"${qm_node_name}"'/g' \
+                /etc/bluechi/agent.conf.d/agent.conf
+        )"
+        if_error_exit "qm node: unable to sed NodeName in bluechi agent.conf"
+
+        # restarting the qm bluechi-agent
+        eval "$(podman exec node"${nodeID}" \
+                podman exec qm \
+                systemctl restart bluechi-agent
+        )"
+        if_error_exit "qm node: unable to restart bluechi-agent service"
+    done
+}
+
 create_qm_node() {
     # Generates 'N' containers QM nodes as required for the test scale
 
@@ -180,20 +200,6 @@ create_qm_node() {
         )"
         if_error_exit "qm node: unable to sed ControllerHost in bluechi agent.conf"
 
-        eval "$(podman exec node"${nodeID}" \
-                podman exec qm \
-                sed -i 's/^#NodeName=/NodeName='"${qm_node_name}"'/g' \
-                /etc/bluechi/agent.conf.d/agent.conf
-        )"
-        if_error_exit "qm node: unable to sed NodeName in bluechi agent.conf"
-
-        # restarting the qm bluechi-agent
-        eval "$(podman exec node"${nodeID}" \
-                podman exec qm \
-                systemctl restart bluechi-agent
-        )"
-        if_error_exit "qm node: unable to restart bluechi-agent service"
-
         AllowedNodeNames="${AllowedNodeNames}\n  ${qm_node_name},\n  node${nodeID},"
     done
 

diff --git a/tests/e2e/run-test-e2e b/tests/e2e/run-test-e2e
@@ -236,6 +236,8 @@ for ((i=1;i<=NUMBER_OF_NODES;i++)); do
     echo
 done
 
+qm_set_nodename_all_nodes
+
 # Tests
 info_message "Starting tests"
 info_message "=============================="
-Original file line number
+Diff line change
@@ Expand Up / @@ -236,6 +236,8 @@ for ((i=1;i<=NUMBER_OF_NODES;i++)); do @@
         echo
     done
+    qm_set_nodename_all_nodes
     # Tests
     info_message "Starting tests"
     info_message "=============================="
@@ Expand Down @@