Merge pull request #20174 from lilyeyes/rename-cluster_connector

Rename ensa modules, remove connector form ERS
os-autoinst · Sep 18, 2024 · 9340d3e · 9340d3e
2 parents ce50f9e + 889cdb1
commit 9340d3e
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/schedule/sles4sap/ensa/ensa_nodes.yaml b/schedule/sles4sap/ensa/ensa_nodes.yaml
@@ -46,10 +46,10 @@ schedule:
   - sles4sap/netweaver_nfs_setup
   - sles4sap/ensa/ensa_filesystems
   - sles4sap/ensa/netweaver_swpm_installation
-  - sles4sap/ensa/netweaver_ensa2_cluster
-  - sles4sap/ensa/netweaver_ensa2_cluster_connector
-  - sles4sap/ensa/netweaver_ensa2_web_methods
-  - sles4sap/sap_suse_cluster_connector
+  - sles4sap/ensa/ensa2_cluster_setup
+  - sles4sap/ensa/ensa2_cluster_connector_setup
+  - sles4sap/ensa/ensa2_web_methods_checks
+  - '{{sap_suse_cluster_connector}}'
   - ha/check_logs
 conditional_schedule:
   cluster_setup:
@@ -58,3 +58,7 @@ conditional_schedule:
         - ha/ha_cluster_init
       no:
         - ha/ha_cluster_join
+  sap_suse_cluster_connector:
+    INSTANCE_TYPE:
+      ASCS:
+        - sles4sap/sap_suse_cluster_connector
diff --git a/...ensa/netweaver_ensa2_cluster_connector.pm → ...sap/ensa/ensa2_cluster_connector_setup.pm b/...ensa/netweaver_ensa2_cluster_connector.pm → ...sap/ensa/ensa2_cluster_connector_setup.pm
diff --git a/.../sles4sap/ensa/netweaver_ensa2_cluster.pm → tests/sles4sap/ensa/ensa2_cluster_setup.pm b/.../sles4sap/ensa/netweaver_ensa2_cluster.pm → tests/sles4sap/ensa/ensa2_cluster_setup.pm
diff --git a/...s4sap/ensa/netweaver_ensa2_web_methods.pm → ...sles4sap/ensa/ensa2_web_methods_checks.pm b/...s4sap/ensa/netweaver_ensa2_web_methods.pm → ...sles4sap/ensa/ensa2_web_methods_checks.pm
diff --git a/tests/sles4sap/sap_suse_cluster_connector.pm b/tests/sles4sap/sap_suse_cluster_connector.pm
@@ -77,11 +77,21 @@ sub run {
         my $rsc = "rsc_${rsc_type}_${instance_sid}_$instance_type$instance_id";
         wait_for_idle_cluster;
         exec_conn_cmd(binary => $binary, cmd => "lsn --res $rsc", log_file => $log_file);
-        validate_script_output("cat $log_file 2>&1", sub { m/$rsc/ });
+        # Check the "node list" contains localhost
+        my $hostname = get_required_var('HOSTNAME');
+        validate_script_output("cat $log_file | cut -d : -f 4", sub { m/$hostname/ });
+        record_info("Found $hostname in lsn output");
+        # Check the "node list" contains remote node
+        my $remote_node = script_output("crm status bynode | grep -Po '(?<=\\* Node )(.*)(?=: online:\$)' | grep -v $hostname");
+        validate_script_output("cat $log_file | cut -d : -f 4", sub { m/$remote_node/ });
+        record_info("Found $remote_node in lsn output");
     }
 
     # Test Stop/Start of SAP resource
-    my $hana_resource_name = get_var('USE_SAP_HANA_SR_ANGI') ? "rsc_SAPHanaCtl_${instance_sid}_$instance_type$instance_id" : "rsc_SAPHana_${instance_sid}_$instance_type$instance_id";
+    my $hana_resource_name
+      = get_var('USE_SAP_HANA_SR_ANGI')
+      ? "rsc_SAPHanaCtl_${instance_sid}_$instance_type$instance_id"
+      : "rsc_SAPHana_${instance_sid}_$instance_type$instance_id";
     my $rsc = get_var('NW') ? "rsc_sap_${instance_sid}_$instance_type$instance_id" : $hana_resource_name;
     wait_for_idle_cluster;
     exec_conn_cmd(binary => $binary, cmd => "$_ --res $rsc --act stop", timeout => 120) foreach qw(fra cpa);