Merge pull request #35 from varkoly/SLE-15-SP4

Remove superfluously BuildRequires: HANA-Firewall
yast · Nov 20, 2023 · de5ea32 · de5ea32
2 parents 0e4adbd + 4fa7df7
commit de5ea32
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 7 deletions.
diff --git a/package/yast2-sap-ha.changes b/package/yast2-sap-ha.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Aug  7 05:13:47 UTC 2023 - Peter Varkoly <varkoly@suse.com>
+
+- Set default value for global_alloc_limit to "0"
+- Fix evaluation CustOpt settings. (bsc#1209204)
+- Remove superfluously BuildRequires: HANA-Firewall
+- 4.4.5
+
 -------------------------------------------------------------------
 Fri Jun  9 05:47:22 UTC 2023 - Peter Varkoly <varkoly@suse.com>
 

diff --git a/package/yast2-sap-ha.spec b/package/yast2-sap-ha.spec
@@ -17,11 +17,9 @@
 
 
 Name:           yast2-sap-ha
-Version:        4.4.4
+Version:        4.4.5
 Release:        0
-
 BuildArch:      noarch
-
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        yast2-sap-ha-rpmlintrc
 
@@ -42,14 +40,15 @@ Requires:       xdg-utils
 Requires:       expect
 Requires:       firewalld
 Requires:       openssh
+%ifarch x86_64 ppc64le
 Requires:       HANA-Firewall >= 2.0.3
+%endif
 Requires:       util-linux
 Requires:       SAPHanaSR
 Requires:       kmod
 # for pidof
 Requires:       sysvinit-tools
 
-BuildRequires:  HANA-Firewall >= 2.0.3
 BuildRequires:  csync2
 BuildRequires:  firewalld
 BuildRequires:  kmod

diff --git a/src/data/sap_ha/GLOBAL_INI_SUS_COSTOPT.erb b/src/data/sap_ha/GLOBAL_INI_SUS_COSTOPT.erb
@@ -1,8 +1,8 @@
 [memorymanager]
-global_allocation_limit = <%= @size_in_mb_for_secondary_hana -%>
+global_allocation_limit = <%= @production_constraints[:global_alloc_limit] -%>
 
 [system_replication]
-preload_column_tables = false
+preload_column_tables = <%= @production_constraints[:preload_column_tables] -%>
 
 [ha_dr_provider_suscostopt]
 provider = susCostOpt

diff --git a/src/lib/sap_ha/configuration/hana.rb b/src/lib/sap_ha/configuration/hana.rb
@@ -96,7 +96,7 @@ def additional_instance=(value)
         @additional_instance = value
         return unless value
         @production_constraints = {
-          global_alloc_limit:    65_536.to_s,
+          global_alloc_limit:    "0",
           preload_column_tables: "false"
         }
       end

diff --git a/test/semantic_checks_test.rb b/test/semantic_checks_test.rb
@@ -201,4 +201,37 @@
       expect(subject.sap_instance_number("999")).to eq false
     end
   end
+
+  describe 'SAP naming tests' do
+    it 'reports if valid SID and site names will be allowed' do
+      subject.silent = true
+      expect(subject.identifier('1Nuremberg')).to eq true
+      expect(subject.identifier('1Nuremberg-A')).to eq true
+      expect(subject.identifier('1Nuremberg_BA')).to eq true
+      expect(subject.identifier('SuSE-1_2')).to eq true
+      expect(subject.sap_sid('X12')).to eq true
+    end
+    it 'reports if invalid SID and site names will be found' do
+      subject.silent = true
+      expect(subject.identifier('Nürnberg')).to eq false
+      expect(subject.identifier('-Nuremberg')).to eq false
+      expect(subject.identifier('_Nuremberg')).to eq false
+      expect(subject.identifier('*WalDorf-1_2/')).to eq false
+      expect(subject.sap_sid('123')).to eq false
+      expect(subject.sap_sid('NOT')).to eq false
+    end
+    it 'reports if valid instance number will be allowed' do
+      subject.silent = true
+      expect(subject.sap_instance_number('05')).to eq true
+      expect(subject.sap_instance_number('09')).to eq true
+      expect(subject.sap_instance_number('10')).to eq true
+      expect(subject.sap_instance_number('99')).to eq true
+    end
+    it 'reports if invalid instance number will be found' do
+      subject.silent = true
+      expect(subject.sap_instance_number('1')).to eq false
+      expect(subject.sap_instance_number('1A')).to eq false
+      expect(subject.sap_instance_number('999')).to eq false
+    end
+  end
 end