RHINENG-2450 Remove logic about the old SAP-related fields

The old SAP-related fields[1] will be removed in favor of the "sap"
object[2]. Thus, this PR addresses RHINENG-2450.

For information, the pull request removing these old fields is [3][RHINENG-2286].

[1] - https://github.com/RedHatInsights/inventory-schemas/blob/master/schemas/system_profile/v1.yaml#L511-L534
[2] - https://github.com/RedHatInsights/inventory-schemas/blob/master/schemas/system_profile/v1.yaml#L483-L510
[3] - RedHatInsights/inventory-schemas#119

Signed-off-by: Gael Chamoulaud (Strider) <gchamoul@redhat.com>

src/puptoo/process/profile.py

@@ -278,30 +278,23 @@ def system_profile(
 
     if sap:
         try:
-            profile["sap_system"] = True
+            profile["sap"] = {}
+            profile["sap"]["sap_system"] = True
             sids = {sap.sid(instance) for instance in sap.local_instances}
-            profile["sap_sids"] = sorted(list(sids))
+            profile["sap"]["sids"] = sorted(list(sids))
             if sap.local_instances:
                 inst = sap.local_instances[0]
-                profile["sap_instance_number"] = sap[inst].number
-            profile["sap"] = {}
-            profile["sap"]["sap_system"] = profile.get("sap_system")
-            if profile.get("sap_sids"): 
-                profile["sap"]["sids"] = profile.get("sap_sids")
-            if profile.get("sap_instance_number"):
-                profile["sap"]["instance_number"] = profile.get("sap_instance_number")
+                profile["sap"]["instance_number"] = sap[inst].number
         except Exception as e:
             catch_error("sap", e)
             raise
 
     if hdb_version:
         try:
             if type(hdb_version) == list:
-                profile["sap_version"] = hdb_version[0].version
+                profile["sap"]["version"] = hdb_version[0].version
             else:
-                profile["sap_version"] = hdb_version.version
-            if profile.get("sap"):
-                profile["sap"]["version"] = profile["sap_version"]
+                profile["sap"]["version"] = hdb_version.version
         except Exception as e:
             catch_error("hdb_version", e)
             raise

tests/test_sap.py

@@ -46,11 +46,8 @@ def test_sap():
     input_data.add(Specs.saphostctl_getcimobject_sapinstance, SAP_DATA)
     input_data.add(Specs.hostname, HOSTNAME)
     result = run_test(system_profile, input_data)
-    
+
     expected_sap_object = {'instance_number': '88', 'sap_system': True, 'sids': ['D89']}
-    assert result["sap_system"] == True
-    assert result["sap_instance_number"] == '88'
-    assert result["sap_sids"] == ['D89']
     assert result["sap"] == expected_sap_object
 
 
@@ -60,10 +57,4 @@ def test_sap():
     result = run_test(system_profile, input_data)
 
     expected_sap_object = {'sap_system': True}
-    assert result["sap_system"] == True
-    assert result.get("sap_instance_number") == None
-    assert result.get("sap_sids") == None
     assert result["sap"] == expected_sap_object
-
-
-