Bug 1265527

Description of problem:


Version-Release number of selected component (if applicable):
Red Hat Enterprise Linux Server release 7.1 (Maipo)
pacemaker-1.1.12-22.el7_1.2.x86_64
resource-agents-sap-3.9.5-40.el7_1.6.x86_64

How reproducible:
The virtual name of the SAP instance must contain a "-"

Steps to Reproduce:
Install RHEL 7 with pacemaker cluster and resource-agents-sap to manage SAP

Profile name for SAP are :
  - PE1_ASCS00_pe1-ascs  
  - PE1_D02_pe1-d02  
  - PE1_DVEBMGS01_pe1-d01  
  - PE1_ERS11_pe1-aers

Actual results:
/usr/sbin/sap_redhat_cluster_connector lsr --out /root/mfa.txt --sid PE1 --ino 11
Aug 24 17:32:42 frbsluxc07 sap_redhat_cluster_connector[9129]: lsr call (out=/tmp/sapha-tmp-mlAz6p,sid=PE1,ino=11)
Aug 24 17:32:42 frbsluxc07 sap_redhat_cluster_connector[9129]: lsr result: empty
Aug 24 17:32:42 frbsluxc07 sap_redhat_cluster_connector[9129]: TEST END

Expected results:
/usr/sbin/sap_redhat_cluster_connector lsr --out /root/mfa.txt --sid PE1 --ino 11
Aug 24 17:46:21 frbsluxc07 sap_redhat_cluster_connector[28388]: lsr call (out=/root/mfa.txt,sid=PE1,ino=11)
Aug 24 17:46:21 frbsluxc07 sap_redhat_cluster_connector[28388]: lsr result: PE1:11:p_SAP_ascs00:ms_PE1_ASCS_AERS:-
Aug 24 17:46:21 frbsluxc07 sap_redhat_cluster_connector[28388]: TEST END


Additional info:

I apply this patch, and now it works for me :

--- /usr/sbin/sap_redhat_cluster_connector.orig	2015-08-24 17:26:10.000000000 +0200
+++ /usr/sbin/sap_redhat_cluster_connector	2015-08-24 17:26:28.000000000 +0200
@@ -242,7 +242,7 @@ sub list_sap_resources {

 	$ENV{'PATH'} = $ENV{'PATH'} . ":/usr/sbin:/sbin";
 	#printf "LSR\n";
-	printf "PARAMS: (out, sid, ino) = ( %s, %s, %s)\n", $out, $sid, $ino ;
+	#printf "PARAMS: (out, sid, ino) = ( %s, %s, %s)\n", $out, $sid, $ino ;
 	#printf "ARGV: %s", join(" ", @ARGV);

 	my ($fclass, $fprovider, $fra, $fname, $fgname) = ("","","","","");
@@ -251,13 +251,13 @@ sub list_sap_resources {
 	open CRMOUT, "$cmd_cibadmin --local -Q --xpath '//primitive[\@type=\"$sra\"]' --node-path 2>/dev/null |" || die "could not open cibadmin output";
 	while (<CRMOUT>) {
 		my $line = $_;
-		if ($line =~ /primitive..id='([a-zA-Z0-9_]+)'/) {
+		if ($line =~ /primitive..id='([a-zA-Z0-9_-]+)'/) {
 			($fname) = ($1);
 		} else {
 			next;
 		}

-		if ( $line =~ /[group|master|clone]..id='([a-zA-Z0-9_]+)'/) {
+		if ( $line =~ /[group|master|clone]..id='([a-zA-Z0-9_-]+)'/) {
 			($fgname) = ($1);
 		}

@@ -265,7 +265,7 @@ sub list_sap_resources {
 			open RESOURCE1_OUT, "$cmd_cibadmin -Q --xpath \"//primitive[\@id='$fname']//nvpair[\@name='$sparam']\"  2>/dev/null |" || die "could not open cibadmin output";
 			while (<RESOURCE1_OUT>) {
 				my $result = $_;
-				if ($result =~ /value="([a-zA-Z0-9_]+)"/) {
+				if ($result =~ /value="([a-zA-Z0-9_-]+)"/) {
 					my $finstance=$1;
 					if ( $1 =~ /^${sid}_[a-zA-Z0-9]+${ino}_[a-zA-Z0-9_-]+$/ ) {
 						$foundRes=1;
@@ -279,7 +279,7 @@ sub list_sap_resources {
 			open RESOURCE2_OUT, "$cmd_cibadmin -Q --xpath \"//primitive[\@id='$fname']//nvpair[\@name='$sparam2']\"  2>/dev/null |" || die "could not open cibadmin output";
 			while (<RESOURCE2_OUT>) {
 				my $result = $_;
-				if ($result =~ /value="([a-zA-Z0-9_]+)"/) {
+				if ($result =~ /value="([a-zA-Z0-9_-]+)"/) {
 					my $finstance=$1;
 					if ( $1 =~ /^${sid}_[a-zA-Z0-9]+${ino}_[a-zA-Z0-9_-]+$/ ) {
 						$foundRes=1;
@@ -306,6 +306,7 @@ sub list_sap_resources {
 		}
 	}

+	printf $foundRes;
 	if ($foundRes==1) {
 		if ($out eq "") {
 			printf "%s:%s:%s\n", $fname, $fgname, "-";
@@ -488,7 +489,6 @@ if  ($cmd eq "init")  {
 	                   "ino=s" => \$ino,
 	                   "out=s" => \$out,
 		 ) &&
-
 	checkavail(($sid, $ino, $out)) || paramproblem();
 	syslog("LOG_INFO", "lsr call (out=%s,sid=%s,ino=%s)", $out, $sid, $ino);
 	$return_code=list_sap_resources($out, $sid, $ino);