Merge pull request #222 from fmherschel/angi-ScaleOut-newComparators

Angi scale out new comparators

Author: angelabriel

00_files_to_osc

@@ -1,3 +1,6 @@
 make copy REL=15 OBSPROJ=./osc/SAPHanaSR-angi
 make -f Makefile-tester copy REL=15 OBSPROJ=./osc/SAPHanaSR-tester
 
+make -f Makefile-tester copy REL=15 OBSPROJ='./ibs/home:fmherschel/SAPHanaSR-tester'
+
+

SAPHanaSR-angi.spec

@@ -116,11 +116,6 @@ install -m 0555 tools/SAPHanaSR-manageProvider %{buildroot}/usr/bin
 install -m 0444 tools/SAPHanaSRTools.pm %{buildroot}/usr/lib/%{name}
 install -m 0444 tools/saphana_sr_tools.py %{buildroot}/usr/lib/%{name}
 
-# wizard files for hawk2
-install -D -m 0644 wizard/hawk2/saphanasr.yaml %{buildroot}%{crmscr_path}/saphanasr/main.yml
-install -D -m 0644 wizard/hawk2/saphanasr_su_po.yaml %{buildroot}%{crmscr_path}/saphanasr-su-po/main.yml
-install -D -m 0644 wizard/hawk2/saphanasr_su_co.yaml %{buildroot}%{crmscr_path}/saphanasr-su-co/main.yml
-
 %files
 %defattr(-,root,root)
 %dir /usr/lib/ocf
@@ -141,14 +136,6 @@ install -D -m 0644 wizard/hawk2/saphanasr_su_co.yaml %{buildroot}%{crmscr_path}/
 /usr/bin/SAPHanaSR-hookHelper
 /usr/bin/SAPHanaSR-manageProvider
 
-## HAWK2 wizard
-%dir %{crmscr_path}/saphanasr/
-%dir %{crmscr_path}/saphanasr-su-po/
-%dir %{crmscr_path}/saphanasr-su-co/
-%{crmscr_path}/saphanasr/main.yml
-%{crmscr_path}/saphanasr-su-po/main.yml
-%{crmscr_path}/saphanasr-su-co/main.yml
-
 %license LICENSE
 %dir %{_docdir}/%{name}
 %doc README.md

SAPHanaSR-tester.spec

@@ -19,7 +19,7 @@ License:        GPL-2.0
 Group:          Productivity/Clustering/HA
 AutoReqProv:    on
 Summary:        Test suite for SAPHanaSR clusters
-Version:        1.2.4
+Version:        1.2.7
 Release:        0
 Url:            https://www.suse.com/c/fail-safe-operation-of-sap-hana-suse-extends-its-high-availability-solution/
 
@@ -56,8 +56,9 @@ mkdir -p %{buildroot}/usr/bin
 #mkdir -p %{buildroot}%{_docdir}/%{name}
 mkdir -p %{buildroot}/usr/share/%{name}
 mkdir -p %{buildroot}/usr/lib/%{name}
+mkdir -p %{buildroot}%{_mandir}/man5
 mkdir -p %{buildroot}%{_mandir}/man7
-#mkdir -p %{buildroot}%{_mandir}/man8
+mkdir -p %{buildroot}%{_mandir}/man8
 
 # test engine itself
 mkdir -p %{buildroot}/usr/lib/%{name}
@@ -66,18 +67,20 @@ install -m 0644 test/saphana_sr_test.py %{buildroot}/usr/lib/%{name}
 
 # test help programs, test loops and test calls
 install -m 0755 test/cs_* %{buildroot}/usr/bin
-install -m 0755 test/test_* %{buildroot}/usr/bin
 install -m 0755 test/callTest* %{buildroot}/usr/bin
 install -m 0755 test/loopTests* %{buildroot}/usr/bin
+install -m 0755 test/sct_* %{buildroot}/usr/bin
 
 # test definitions
 pwd
 ls test/json
 cp -va test/json %{buildroot}/usr/share/%{name}
+cp -va test/www %{buildroot}/usr/share/%{name}
 
 # manual pages
+install -m 0444 man-tester/*.5.gz %{buildroot}%{_mandir}/man5
 install -m 0444 man-tester/*.7.gz %{buildroot}%{_mandir}/man7
-#install -m 0444 man/*.8.gz %{buildroot}%{_mandir}/man8
+install -m 0444 man-tester/*.8.gz %{buildroot}%{_mandir}/man8
 
 %files
 %defattr(-,root,root)
@@ -90,6 +93,5 @@ install -m 0444 man-tester/*.7.gz %{buildroot}%{_mandir}/man7
 #%dir %{_docdir}/%{name}
 %doc README.md
 %doc %{_mandir}/man*/*
-#%doc %{_mandir}/man8/*
 
 %changelog

man-tester/SAPHanaSR-testCluster.8

@@ -1,6 +1,6 @@
 .\" Version: 1.001
 .\"
-.TH SAPHanaSR-testCluster 8 "11 Nov 2023" "" "SAPHanaSR-angi"
+.TH SAPHanaSR-testCluster 8 "20 Nov 2023" "" "SAPHanaSR-angi"
 .\"
 .SH NAME
 SAPHanaSR-testCluster \- Run functional testing for SAPHanaSR clusters.
@@ -10,39 +10,55 @@ SAPHanaSR-testCluster \- Run functional testing for SAPHanaSR clusters.
 .\"
 \fBSAPHanaSR-testCluster\fR [ --help | --version ]
 .br
-\fBSAPHanaSR-testCluster\fR 
-
+\fBSAPHanaSR-testCluster\fR \fIOPTION\fR [ \fIOPTION\fR ... ]
+.PP
 .\"
 .SH DESCRIPTION
 .\"
-SAPHanaSR-testCluster TODO
-
+SAPHanaSR-testCluster is a tool to run one of the predefined test cases on a
+given test cluster. For that purpose it is called with options specifying the
+test case and the properties of the cluster to be tested.
+SAPHanaSR-testCluster can be seen as low-level command to be used in scripts
+and test automation frameworks.
 .PP
 .\"
 .SH OPTIONS
 .TP
---testFile
-path to testcase description file
+--help
+print help message and exit.
 .TP
---defaultChecksFile
-
+--defaultsFile \fIFILE\fP
+path to defaults file.
 .TP
---properties
-
+--dumpFailures
+print failed checks per loop.
 .TP
---remoteNode
-
+--debug
+print and log debug messages.
 .TP
---simulate
-
+--logFile \fIFILE\fP
+path to defaults file.
 .TP
---repeat
-
+--printTestProperties
+print test properties and exit.
 .TP
---dumpFailures
-
+--properties \fIFILE\fP
+path to poperties file.
+.TP
+--remoteNode \fINODE\fP [ \fINODE\fP ... ]
+cluster nodes to use for ssh connection, must not be last option in cmdline.
+.TP
+--repeat \fIINTEGER\fP
+how often to repeat the test.
 .TP
---logFile
+--simulate
+only simulate, dont call actions.
+.TP
+--testFile \fIFILE\fP
+path to testcase description file.
+.TP
+--version
+print version and exit.
 
 .PP
 .\"
@@ -56,11 +72,55 @@ Usage, syntax or execution errors.
 .\"
 .SH EXAMPLES
 .\"
-
+.PP
+\fB*\fR Running a very basic functional test.
+.PP
+The functional test "nop" is performed on the Linux cluster defined in
+properties_q42.json, nodes are node1 and node2.
+A dedicated working directory and logfile for this test is used.
+See also manual page SAPHanaSR-tester(7) and SAPHanaSR-tests-syntax(7).
+.PP
+.RS 2
+# mkdir ~/test_nop; cd ~/test_nop
+.br
+# export TROOT=/usr/share/SAPHanaSR-tester/json/angi-ScaleUp/
+.br
+# SAPHanaSR-testCluster \\
+.br
+--testFile $TROOT/nop.json \\
+.br
+--remoteNodes node1 node2 \\
+.br
+--defaultsFile $TROOT/defaults.json \\
+.br
+--properties ~/properties_q42.json \\
+.br
+--logFile test.log
+.RE
+.PP
+\fB*\fR Showing failed tests from logfile.
+.PP
+Logfile is test.log, shown are time, test ID, test case.
+.PP
+.RS 2
+# grep "TEST:.*FAILED" test.log | awk '{print $2,$3,$5}'
+.RE
+.PP
+\fB*\fR Showing details for a single test.
+.PP
+Test ID is 8585, logfile is test.log, debug output is omitted.
+.PP
+.RS 2
+# grep "\\[8585\\]" test.log | grep -v "DEBUG:"
+.RE
 .PP
 .\"
 .SH FILES
 .\"
+.TP
+/usr/bin/SAPHanaSR-testCluster
+the program itself.
+.TP
 /usr/share/SAPHanaSR-tester/json/angi-ScaleUp/
 functional tests for SAPHanaSR-angi scale-up scenarios.
 .TP
@@ -98,9 +158,10 @@ Please report any other feedback and suggestions to feedback@suse.com.
 .PP
 .\"
 .SH SEE ALSO
-\fBSAPHanaSR-tester\fP(7) ,
+\fBSAPHanaSR-tester\fP(7) , \fBSAPHanaSR-tests-syntax\fP(7) ,
 \fBSAPHanaSR-tests-angi-ScaleUp\fP(7) , \fBSAPHanaSR-tests-angi-ScaleOut\fP(7) ,
-\fBSAPHanaSR-angi\fP(7) , \fBSAPHanaSR-showAttr\fP(8) , \fBcrm_mon\fP(8)
+\fBSAPHanaSR-angi\fP(7) , \fBSAPHanaSR-showAttr\fP(8) ,
+\fBcrm_mon\fP(8) , \fBcrm\fP(8) , \fBcs_clusterstate\fP(8)
 .PP
 .\"
 .SH AUTHORS