Update HANA resource ID retrieval for clone and primitive resources in pre-validation tasks

Author: devanshjainms

src/roles/misc/tasks/pre-validations-db.yml

@@ -21,11 +21,11 @@
     - name:                         "Pre validation: Get HANA resource id for saphanasr_angi"
       when:                         saphanasr_provider | default('SAPHanaSR') == "SAPHanaSR-angi"
       block:
-        - name:                     "Pre validation: Get HANA resource id for saphanasr_angi"
+        - name:                     "Pre validation: Get HANA clone resource id for saphanasr_angi"
           become:                   true
           ansible.builtin.shell: >-
                                     set -o pipefail && {{ commands
-                                      | selectattr('name','equalto','get_hana_resource_id_saphanasr_angi')
+                                      | selectattr('name','equalto','get_hana_clone_resource_id_saphanasr_angi')
                                       | map(attribute=(ansible_os_family|upper))
                                       | first
                                     }}
@@ -35,9 +35,24 @@
           register:                 hana_clone_resource_id
           failed_when:              hana_clone_resource_id.rc != 0
 
+        - name:                     "Pre validation: Get HANA primitive resource id for saphanasr_angi"
+          become:                   true
+          ansible.builtin.shell: >-
+                                    set -o pipefail && {{ commands
+                                      | selectattr('name','equalto','get_hana_primitive_resource_id_saphanasr_angi')
+                                      | map(attribute=(ansible_os_family|upper))
+                                      | first
+                                    }}
+          args:
+            executable:             /bin/bash
+          changed_when:             false
+          register:                 hana_primitive_resource_id
+          failed_when:              hana_primitive_resource_id.rc != 0
+
         - name:                     "Pre validation: Set fact the hana_clone_resource_name"
           ansible.builtin.set_fact:
-            hana_clone_resource_name:     "{{ hana_clone_resource_id.stdout }}"
+            hana_clone_resource_name: "{{ hana_clone_resource_id.stdout }}"
+            hana_primitive_resource_name: "{{ hana_primitive_resource_id.stdout }}"
 
     - name:                         "Pre validation: Get HANA Clone resource id"
       when:                         saphanasr_provider | default('SAPHanaSR') == "SAPHanaSR"

src/vars/input-api.yaml

@@ -290,12 +290,15 @@ commands:
     SUSE:                           "cibadmin --query --xpath \"//primitive[@type='SAPHana']\" --node-path | grep -oP \"master\\[@id='\\K[^']+\""
     REDHAT:                         "cibadmin --query --xpath \"//primitive[@type='SAPHana']\" --node-path | grep -oP \"clone\\[@id='\\K[^']+\""
 
-  - name:                           get_hana_resource_id_saphanasr_angi
+  - name:                           get_hana_clone_resource_id_saphanasr_angi
     SUSE:                           "cibadmin --query --xpath \"//primitive[@type='SAPHanaController']\" --node-path | grep -oP \"clone\\[@id='\\K[^']+\""
 
+  - name:                           get_hana_primitive_resource_id_saphanasr_angi
+    SUSE:                           "cibadmin --query --xpath \"//primitive[@type='SAPHanaController']\" --node-path | grep -oP \"primitive\\[@id='\\K[^']+\""
+
   - name:                           resource_migration_cmd
-    SUSE:                           "crm resource move {{ hana_resource_name | default('msl_SAPHana_' ~ (db_sid | upper) ~ '_HDB' ~ db_instance_number) }} {{ cluster_status_pre.secondary_node | default('') }} force"
-    REDHAT:                         "pcs resource move {{ hana_resource_name | default('SAPHana_' ~ (db_sid | upper) ~ '_' ~ db_instance_number ~ '-clone') }} --master"
+    SUSE:                           "crm resource move {{ hana_clone_resource_name | default('msl_SAPHana_' ~ (db_sid | upper) ~ '_HDB' ~ db_instance_number) }} {{ cluster_status_pre.secondary_node | default('') }} force"
+    REDHAT:                         "pcs resource move {{ hana_clone_resource_name | default('SAPHana_' ~ (db_sid | upper) ~ '_' ~ db_instance_number ~ '-clone') }} --master"
 
   - name:                           crm_report_cmd
     SUSE:                           "crm_report -f '{{ test_group_start_time }}' /tmp/{{ test_group_invocation_id }}"