[DNM] RHINENG-2286: Remove standalone SAP-related fields

Do not merge this one until RHINENG-2450 (puptoo) is completed. Signed-off-by: Gael Chamoulaud (Strider) <gchamoul@redhat.com>
RedHatInsights · Oct 9, 2023 · 3ea2797 · 3ea2797
1 parent bd64f47
commit 3ea2797
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 41 deletions.
diff --git a/schemas/system_profile/v1.yaml b/schemas/system_profile/v1.yaml
@@ -508,30 +508,6 @@ $defs:
             example:  '1.00.122.04.1478575636, 2.00.122.04.1478575636, 3.00.122.04.1478575636'
             maxLength: 22
             pattern: '^[0-9]\.[0-9]{2}\.[0-9]{3}\.[0-9]{2}\.[0-9]{10}$'
-      sap_system:
-        type: boolean
-        description: Indicates if SAP is installed on the system
-      sap_sids:
-        type: array
-        uniqueItems: true
-        items:
-          description: The SAP system ID (SID)
-          type: string
-          example: "H2O, ABC, XYZ"
-          maxLength: 3
-          pattern: '^[A-Z][A-Z0-9]{2}$'
-      sap_instance_number:
-        type: string
-        description: The instance number of the SAP HANA system (a two-digit number between 00 and 99)
-        example: '03, 05, 99'
-        maxLength: 2
-        pattern: '^[0-9]{2}$'
-      sap_version:
-        type: string
-        description: The version of the SAP HANA lifecycle management program
-        example:  '1.00.122.04.1478575636, 2.00.122.04.1478575636, 3.00.122.04.1478575636'
-        maxLength: 22
-        pattern: '^[0-9]\.[0-9]{2}\.[0-9]{3}\.[0-9]{2}\.[0-9]{10}$'
       tuned_profile:
         type: string
         maxLength: 256

diff --git a/tests/utils/invalids.py b/tests/utils/invalids.py
@@ -98,15 +98,6 @@
         "version": "1.00.122.04.1478575636",
         "sids": ["ABC", "ABC"]
     }},
-    {"sap_sids": ["XXXX"]},
-    {"sap_sids": ["XX"]},
-    {"sap_sids": ["123"]},
-    {"sap_sids": ["abc"]},
-    {"sap_sids": ["ABC", "ABC"]},
-    {"sap_system": "x"},
-    {"sap_instance_number": "300"},
-    {"sap_version": "1.00.122.04.147857563665464"},
-    {"sap_version": "1-00v122=04a1478575636"},
     {"tuned_profile": "x"*257},
     {"selinux_current_mode": "random"},
     {"selinux_config_file": "x"*129},

diff --git a/tests/utils/valids.py b/tests/utils/valids.py
@@ -55,14 +55,7 @@
         "sap_system": True,
         "instance_number": "03",
         "version": "1.00.122.04.1478575636",
-        "sids": ["H2O", "ABC", "C12"]
-    }},
-    {"sap_sids": ["H2O"]},
-    {"sap_sids": ["ABC"]},
-    {"sap_sids": ["C12"]},
-    {"sap_system": True},
-    {"sap_instance_number": "03"},
-    {"sap_version": "1.00.122.04.1478575636"},
+        "sids": ["H2O", "ABC", "C12"]}},
     {"tuned_profile": "x"*256},
     {"selinux_current_mode": "enforcing"},
     {"selinux_config_file": "permissive"},