Adding separate variables for clusters crud and expanding

nutanix · Dec 11, 2024 · e3a3dfe · e3a3dfe
1 parent f4ca0ab
commit e3a3dfe
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/tests/integration/targets/ntnx_clusters_and_hosts_v2/tasks/cluster_crud.yml b/tests/integration/targets/ntnx_clusters_and_hosts_v2/tasks/cluster_crud.yml
@@ -261,10 +261,10 @@
       authorized_public_key_list:
         - name: "{{ clusters[0].config.auth_public_keys[0].name }}"
           key: "{{ clusters[0].config.auth_public_keys[0].key }}"
-      redundancy_factor: "{{ clusters[0].config.redundancy_factor }}"
+      redundancy_factor: "{{ clusters[0].config.redundancy_factor_cluster_crud }}"
       cluster_arch: "{{ clusters[0].config.cluster_arch }}"
       fault_tolerance_state:
-        domain_awareness_level: "{{ clusters[0].config.fault_tolerance_state.domain_awareness_level }}"
+        domain_awareness_level: "{{ clusters[0].config.fault_tolerance_state.domain_awareness_level_cluster_crud }}"
     network:
       external_address:
         ipv4:
@@ -339,10 +339,10 @@
               value: "{{ clusters[0].nodes[0].cvm_ip }}"
     config:
       cluster_function: "{{ clusters[0].config.cluster_functions }}"
-      redundancy_factor: "{{ clusters[0].config.redundancy_factor }}"
+      redundancy_factor: "{{ clusters[0].config.redundancy_factor_cluster_crud }}"
       cluster_arch: "{{ clusters[0].config.cluster_arch }}"
       fault_tolerance_state:
-        domain_awareness_level: "{{ clusters[0].config.fault_tolerance_state.domain_awareness_level }}"
+        domain_awareness_level: "{{ clusters[0].config.fault_tolerance_state.domain_awareness_level_cluster_crud }}"
     timeout: 1800
   register: result
   ignore_errors: true
@@ -501,9 +501,9 @@
       - result.response.name == "{{ cluster_name }}"
       - result.response.nodes.node_list[0].controller_vm_ip.ipv4.value == "{{ clusters[0].nodes[0].cvm_ip }}"
       - '"{{ clusters[0].config.cluster_functions[0] }}" in "{{result.response.config.cluster_function}}"'
-      - result.response.config.redundancy_factor == clusters[0].config.redundancy_factor
+      - result.response.config.redundancy_factor == clusters[0].config.redundancy_factor_cluster_crud
       - result.response.config.cluster_arch == "{{ clusters[0].config.cluster_arch }}"
-      - result.response.config.fault_tolerance_state.domain_awareness_level == "{{ clusters[0].config.fault_tolerance_state.domain_awareness_level }}"
+      - result.response.config.fault_tolerance_state.domain_awareness_level == "{{ clusters[0].config.fault_tolerance_state.domain_awareness_level_cluster_crud }}"
     fail_msg: Failed verifying cluster creation
     success_msg: Cluster creation passed successfully
 
@@ -557,10 +557,10 @@
       authorized_public_key_list:
         - name: "{{ clusters[0].config.auth_public_keys[0].name }}"
           key: "{{ clusters[0].config.auth_public_keys[0].key }}"
-      redundancy_factor: "{{ clusters[0].config.redundancy_factor }}"
+      redundancy_factor: "{{ clusters[0].config.redundancy_factor_cluster_crud }}"
       cluster_arch: "{{ clusters[0].config.cluster_arch }}"
       fault_tolerance_state:
-        domain_awareness_level: "{{ clusters[0].config.fault_tolerance_state.domain_awareness_level }}"
+        domain_awareness_level: "{{ clusters[0].config.fault_tolerance_state.domain_awareness_level_cluster_crud }}"
     network:
       external_address:
         ipv4:
@@ -675,9 +675,9 @@
       - result.response.name == "{{ cluster_name }}"
       - result.response.nodes.node_list[0].controller_vm_ip.ipv4.value == "{{ clusters[0].nodes[0].cvm_ip }}"
       - '"{{ clusters[0].config.cluster_functions[0] }}" in "{{result.response.config.cluster_function}}"'
-      - result.response.config.redundancy_factor == clusters[0].config.redundancy_factor
+      - result.response.config.redundancy_factor == clusters[0].config.redundancy_factor_cluster_crud
       - result.response.config.cluster_arch == "{{ clusters[0].config.cluster_arch }}"
-      - result.response.config.fault_tolerance_state.domain_awareness_level == "{{ clusters[0].config.fault_tolerance_state.domain_awareness_level }}"
+      - result.response.config.fault_tolerance_state.domain_awareness_level == "{{ clusters[0].config.fault_tolerance_state.domain_awareness_level_cluster_crud }}"
       - result.response.network.external_address.ipv4.value == "{{ clusters[0].network.virtual_ip }}"
       - unique_ntp_servers | length == 4
       - unique_dns_servers | length == 2

diff --git a/tests/integration/targets/ntnx_clusters_nodes_v2/tasks/add_remove_nodes.yml b/tests/integration/targets/ntnx_clusters_nodes_v2/tasks/add_remove_nodes.yml
@@ -318,10 +318,10 @@
       authorized_public_key_list:
         - name: "{{ clusters[0].config.auth_public_keys[0].name }}"
           key: "{{ clusters[0].config.auth_public_keys[0].key }}"
-      redundancy_factor: "{{ clusters[0].config.redundancy_factor }}"
+      redundancy_factor: "{{ clusters[0].config.redundancy_factor_cluster_expanding }}"
       cluster_arch: "{{ clusters[0].config.cluster_arch }}"
       fault_tolerance_state:
-        domain_awareness_level: "{{ clusters[0].config.fault_tolerance_state.domain_awareness_level }}"
+        domain_awareness_level: "{{ clusters[0].config.fault_tolerance_state.domain_awareness_level_cluster_expanding }}"
     network:
       external_address:
         ipv4:
@@ -384,10 +384,10 @@
               value: "{{ clusters[0].nodes[2].cvm_ip }}"
     config:
       cluster_function: "{{ clusters[0].config.cluster_functions }}"
-      redundancy_factor: "{{ clusters[0].config.redundancy_factor }}"
+      redundancy_factor: "{{ clusters[0].config.redundancy_factor_cluster_expanding }}"
       cluster_arch: "{{ clusters[0].config.cluster_arch }}"
       fault_tolerance_state:
-        domain_awareness_level: "{{ clusters[0].config.fault_tolerance_state.domain_awareness_level }}"
+        domain_awareness_level: "{{ clusters[0].config.fault_tolerance_state.domain_awareness_level_cluster_expanding }}"
     timeout: 1800
   register: result
   ignore_errors: true
@@ -483,9 +483,9 @@
       - result.response.nodes.node_list[1].controller_vm_ip.ipv4.value == "{{ clusters[0].nodes[1].cvm_ip }}"
       - result.response.nodes.node_list[2].controller_vm_ip.ipv4.value == "{{ clusters[0].nodes[2].cvm_ip }}"
       - result.response.config.cluster_function[0] == "{{ clusters[0].config.cluster_functions[0] }}"
-      - result.response.config.redundancy_factor == clusters[0].config.redundancy_factor
+      - result.response.config.redundancy_factor == clusters[0].config.redundancy_factor_cluster_expanding
       - result.response.config.cluster_arch == "{{ clusters[0].config.cluster_arch }}"
-      - result.response.config.fault_tolerance_state.domain_awareness_level == "{{ clusters[0].config.fault_tolerance_state.domain_awareness_level }}"
+      - result.response.config.fault_tolerance_state.domain_awareness_level == "{{ clusters[0].config.fault_tolerance_state.domain_awareness_level_cluster_expanding }}"
     fail_msg: Failed verifying cluster creation
     success_msg: Cluster creation passed successfully