diff -up sap-hana-ha-87a5781/tools/notes/query_hadr_providers.patch102 sap-hana-ha-87a5781/tools/notes/query_hadr_providers --- sap-hana-ha-87a5781/tools/notes/query_hadr_providers.patch102 2024-07-08 14:39:04.000000000 +0200 +++ sap-hana-ha-87a5781/tools/notes/query_hadr_providers 2024-08-19 12:30:40.049351923 +0200 @@ -1,7 +1,7 @@ hdbsql -U TESTER 'select * from M_HA_DR_PROVIDERS # PROVIDER_NAME,PROVIDER_COMPANY,PROVIDER_DESCRIPTION,PROVIDER_VERSION,PROVIDER_TYPE,PROVIDER_PATH,EXECUTION_ORDER -# "susHanaSR","SUSE","Inform Cluster about SR state","1.0","GENERIC","/usr/share/SAPHanaSR-angi",2 -# "susTkOver","SUSE","Inform Cluster about SR state","1.0","GENERIC","/usr/share/SAPHanaSR-angi",1 +# "HanaSR","SUSE","Inform Cluster about SR state","1.0","GENERIC","/usr/share/sap-hana-ha",2 +# "TkOver","SUSE","Inform Cluster about SR state","1.0","GENERIC","/usr/share/sap-hana-ha",1 # 2 rows selected (overall time 3161 usec; server time 329 usec) diff -up sap-hana-ha-87a5781/tools/SAPHanaSR-monitor-legacy.patch102 sap-hana-ha-87a5781/tools/SAPHanaSR-monitor-legacy --- sap-hana-ha-87a5781/tools/SAPHanaSR-monitor-legacy.patch102 2024-07-08 14:39:04.000000000 +0200 +++ sap-hana-ha-87a5781/tools/SAPHanaSR-monitor-legacy 2024-08-19 12:30:40.048351921 +0200 @@ -14,7 +14,7 @@ use Sys::Syslog; use Sys::Hostname; use File::Path; use Getopt::Long; -use lib '/usr/lib/SAPHanaSR-angi'; +use lib '/usr/lib/sap-hana-ha'; use lib '/usr/lib/SAPHanaSR'; use SAPHanaSRTools; diff -up sap-hana-ha-87a5781/tools/SAPHanaSR-replay-archive-legacy.patch102 sap-hana-ha-87a5781/tools/SAPHanaSR-replay-archive-legacy --- sap-hana-ha-87a5781/tools/SAPHanaSR-replay-archive-legacy.patch102 2024-07-08 14:39:04.000000000 +0200 +++ sap-hana-ha-87a5781/tools/SAPHanaSR-replay-archive-legacy 2024-08-19 12:30:40.048351921 +0200 @@ -179,7 +179,7 @@ if [ -n "$outDir" ]; then mkdir -p "$outDir" case "$format" in book ) - rsync -a /usr/share/SAPHanaSR-angi/icons "$outDir" + rsync -a /usr/share/sap-hana-ha/icons "$outDir" ;; esac outNr=0 diff -up sap-hana-ha-87a5781/tools/SAPHanaSR-replay-archive.patch102 sap-hana-ha-87a5781/tools/SAPHanaSR-replay-archive --- sap-hana-ha-87a5781/tools/SAPHanaSR-replay-archive.patch102 2024-07-08 14:39:04.000000000 +0200 +++ sap-hana-ha-87a5781/tools/SAPHanaSR-replay-archive 2024-08-19 12:30:40.048351921 +0200 @@ -24,7 +24,7 @@ import os import re import sys from dateutil import parser as dateutil_parser -sys.path.insert(1, '/usr/lib/SAPHanaSR-angi') +sys.path.insert(1, '/usr/lib/sap-hana-ha') from saphana_sr_tools import HanaCluster,HanaStatus # pylint: enable=wrong-import-position # pylint: enable=unused-import diff -up sap-hana-ha-87a5781/tools/SAPHanaSR-showAttr-legacy.patch102 sap-hana-ha-87a5781/tools/SAPHanaSR-showAttr-legacy --- sap-hana-ha-87a5781/tools/SAPHanaSR-showAttr-legacy.patch102 2024-07-08 14:39:04.000000000 +0200 +++ sap-hana-ha-87a5781/tools/SAPHanaSR-showAttr-legacy 2024-08-19 12:30:40.049351923 +0200 @@ -17,7 +17,7 @@ use Sys::Syslog; use Sys::Hostname; use File::Path; use Getopt::Long; -use lib '/usr/lib/SAPHanaSR-angi'; +use lib '/usr/lib/sap-hana-ha'; use lib '/usr/lib/SAPHanaSR'; use SAPHanaSRTools; diff -up sap-hana-ha-87a5781/tools/SAPHanaSR-showAttr.patch102 sap-hana-ha-87a5781/tools/SAPHanaSR-showAttr --- sap-hana-ha-87a5781/tools/SAPHanaSR-showAttr.patch102 2024-07-08 14:39:04.000000000 +0200 +++ sap-hana-ha-87a5781/tools/SAPHanaSR-showAttr 2024-08-19 12:30:40.048351921 +0200 @@ -23,7 +23,7 @@ import os import re import sys from dateutil import parser as dateutil_parser -sys.path.insert(1, '/usr/lib/SAPHanaSR-angi') +sys.path.insert(1, '/usr/lib/sap-hana-ha') from saphana_sr_tools import HanaCluster,HanaStatus # pylint: enable=wrong-import-position # pylint: enable=unused-import diff -up sap-hana-ha-87a5781/tools/SAPHanaSR-upgrade-to-angi-demo.patch102 sap-hana-ha-87a5781/tools/SAPHanaSR-upgrade-to-angi-demo --- sap-hana-ha-87a5781/tools/SAPHanaSR-upgrade-to-angi-demo.patch102 2024-07-08 14:39:04.000000000 +0200 +++ sap-hana-ha-87a5781/tools/SAPHanaSR-upgrade-to-angi-demo 2024-08-19 12:30:40.049351923 +0200 @@ -20,7 +20,7 @@ TMP=/run/"$EXE"."$RANDOM" TIMEST=$(date +%s) ALL_RC=0 -# TODO how to use templates from package SAPHanaSR-angi? +# TODO how to use templates from package sap-hana-ha? CIB_MSTTMP_ANG="# primitive rsc_SAPHanaCon_@@sid@@_HDB@@ino@@ ocf:suse:SAPHanaController \ op start interval=0 timeout=3600 \ @@ -80,7 +80,7 @@ function init-variables() { cibadmin -Ql > "$BAKDIR"/cib.xml || exit 1 SCRIPT=/root/bin/"$EXE" RPMOLD="SAPHanaSR" - RPMNEW="SAPHanaSR-angi" + RPMNEW="sap-hana-ha" SID=$(/usr/sap/hostctrl/exe/saphostctrl -function ListInstances |\ awk '{print $4}') INO=$(/usr/sap/hostctrl/exe/saphostctrl -function ListInstances |\ @@ -246,7 +246,7 @@ function del-srhook-local-classic() { [ $DRYRUN = no ] && grep "^\[ha_dr_provider_" $GLBINI echo grep "^\[ha_dr_provider_" $GLBINI | - grep -i -e susChkSrv -e susTkOver -e SAPHanaSR -e susCostOpt | tr -d "\[\]" |\ + grep -i -e ChkSrv -e TkOver -e SAPHanaSR -e susCostOpt | tr -d "\[\]" |\ while read; do P=${REPLY:15} echo "su - $sidadm -c \"/usr/sbin/SAPHanaSR-manageProvider --sid=$SID --show --provider=$P\" > $TMP.global.ini.$P" @@ -284,9 +284,9 @@ function add-srhook-local-angi() { EXE=$(basename $0) source /run/$EXE.variables [ -z $sid ] && sid=${SID,,} - for P in susHanaSR susTkOver susChkSrv; do - echo "su - $sidadm -c \"/usr/bin/SAPHanaSR-manageProvider --sid=$SID --reconfigure --add /usr/share/SAPHanaSR-angi/samples/global.ini_${P}\"" - [ $DRYRUN = no ] && su - $sidadm -c "/usr/bin/SAPHanaSR-manageProvider --sid=$SID --reconfigure --add /usr/share/SAPHanaSR-angi/samples/global.ini_${P}" + for P in HanaSR TkOver ChkSrv; do + echo "su - $sidadm -c \"/usr/bin/SAPHanaSR-manageProvider --sid=$SID --reconfigure --add /usr/share/sap-hana-ha/samples/global.ini_${P}\"" + [ $DRYRUN = no ] && su - $sidadm -c "/usr/bin/SAPHanaSR-manageProvider --sid=$SID --reconfigure --add /usr/share/sap-hana-ha/samples/global.ini_${P}" done echo "su - $sidadm -c \"hdbnsutil -reloadHADRProviders\"" [ $DRYRUN = no ] && su - $sidadm -c "hdbnsutil -reloadHADRProviders" @@ -294,7 +294,7 @@ function add-srhook-local-angi() { [ $DRYRUN = no ] && grep -A2 "^\[ha_dr_provider_" $GLBINI echo grep "^\[ha_dr_provider_" $GLBINI | - grep -i -e susChkSrv -e susTkOver -e SAPHanaSR -e susCostOpt | tr -d "\[\]" |\ + grep -i -e ChkSrv -e TkOver -e SAPHanaSR -e susCostOpt | tr -d "\[\]" |\ while read; do P=${REPLY:15} echo "su - $sidadm -c \"/usr/bin/SAPHanaSR-manageProvider --sid=$SID --show --provider=${P}\"" @@ -452,7 +452,7 @@ function f_install-rpm-angi() { echo "crm cluster run \"zypper --non-interactive in -l -f -y '${RPMNEW}'\"" [ $DRYRUN = no ] && crm cluster run "zypper --non-interactive in \ -l -f -y '${RPMNEW}'" - # TODO [ $DRYRUN = no ] && crm cluster run "rpm -i ~/SAPHanaSR-angi-1.2.5-150600.3.11.1.noarch.rpm" + # TODO [ $DRYRUN = no ] && crm cluster run "rpm -i ~/sap-hana-ha-1.2.5-150600.3.11.1.noarch.rpm" echo "crm cluster run \"rpm -q '${RPMNEW}' --queryformat %{NAME}\"" [ $DRYRUN = no ] && crm cluster run "rpm -q '${RPMNEW}' --queryformat %{NAME}" echo "hash -r"