Handle systems that model portions as distinct 'Systems' members.

Particularly with HGX systems, it's common to have the GPU subsystem modeled as a somewhat independent entity.

There may be duplication but there's no way to tell, programatically, what things are duplicate or not.

Change-Id: I1b7678800982e012371a004d15bbe9f3b79ac00d

pyghmi/redfish/command.py

@@ -188,6 +188,7 @@ class Command(object):
         self._varsensormap = {}
         self.powerurl = None
         self.sysurl = None
+        self._initsysurl = sysurl
         tmpoem = oem.get_oem_handler({}, sysurl, self.wc, self._urlcache, self,
                                     rootinfo=overview)
         self._varbmcurl = tmpoem.get_default_mgrurl()
@@ -1228,7 +1229,7 @@ class Command(object):
             elif self._varbmcurl:
                 self._do_web_request(self._varbmcurl, cache=False)  # This is to trigger token validation and renewel
             self._oem = oem.get_oem_handler(
-                self.sysinfo, self.sysurl, self.wc, self._urlcache, self)
+                self.sysinfo, self._initsysurl, self.wc, self._urlcache, self)
             self._oem.set_credentials(self.username, self.password)
         return self._oem
 

pyghmi/redfish/oem/ami/main.py

@@ -12,17 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import pyghmi.redfish.oem.generic as generic
+import pyghmi.redfish.oem.ami.megarac as megarac
 
 
 def get_handler(sysinfo, sysurl, webclient, cache, cmd, rootinfo={}):
-    if not sysinfo:
-        systems, status = webclient.grab_json_response_with_status('/redfish/v1/Systems')
-        if status == 200:
-            for system in systems.get('Members', []):
-                if system.get('@odata.id', '').endswith('/Self'):
-                    sysurl = system['@odata.id']
-                    sysinfo, status = webclient.grab_json_response_with_status(sysurl)
-                    break
-    return generic.OEMHandler(sysinfo, sysurl, webclient, cache,
-                            gpool=cmd._gpool)
+    return megarac.OEMHandler(sysinfo, sysurl, webclient, cache,
+                            gpool=cmd._gpool)

pyghmi/redfish/oem/ami/megarac.py

@@ -0,0 +1,30 @@
+# Copyright 2025 Lenovo Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import pyghmi.redfish.oem.generic as generic
+
+
+class OEMHandler(generic.OEMHandler):
+
+    def __init__(self, sysinfo, sysurl, webclient, cache, gpool=None):
+        super(OEMHandler, self).__init__(sysinfo, sysurl, webclient, cache,
+                                         gpool)
+        if sysurl is None:
+            systems, status = webclient.grab_json_response_with_status('/redfish/v1/Systems')
+            if status == 200:
+                for system in systems.get('Members', []):
+                    if system.get('@odata.id', '').endswith('/Self'):
+                        sysurl = system['@odata.id']
+                        break
+            self._varsysurl = sysurl

pyghmi/redfish/oem/generic.py

@@ -235,6 +235,18 @@ class OEMHandler(object):
                 '/redfish/v1/')
         self._varbmcurl = None
         self._varsysurl = sysurl
+        self._allsysurls = []
+        if sysurl is None:  # generic means we need to gather all systems
+            if 'Systems' in self._rootinfo:
+                systems = self._rootinfo['Systems']['@odata.id']
+                res = self.webclient.grab_json_response_with_status(systems)
+                if res[1] == 200:
+                    members = res[0]['Members']
+                    for system in members:
+                        if system['@odata.id'] != sysurl:
+                            self._allsysurls.append(system['@odata.id'])
+        else:
+            self._allsysurls = [sysurl]
 
     def get_screenshot(self, outfile):
         raise exc.UnsupportedFunctionality(
@@ -656,7 +668,7 @@ class OEMHandler(object):
             if memsumstatus != 'OK':
                 dimmfound = False
                 dimmdata = self._get_mem_data()
-                for dimminfo in dimmdata['Members']:
+                for dimminfo in dimmdata:
                     if dimminfo.get('Status', {}).get(
                             'State', None) == 'Absent':
                         continue
@@ -1240,8 +1252,7 @@ class OEMHandler(object):
         return urls
 
     def _get_cpu_inventory(self, onlynames=False, withids=False, urls=None):
-        for currcpuinfo in self._get_cpu_data().get(
-                'Members', []):
+        for currcpuinfo in self._get_cpu_data():
             url = currcpuinfo['@odata.id']
             name = currcpuinfo.get('Name', 'CPU')
             if name in self._hwnamemap:
@@ -1268,18 +1279,21 @@ class OEMHandler(object):
 
     def _get_cpu_urls(self):
         md = self._get_cpu_data(False)
-        return [x['@odata.id'] for x in md.get('Members', [])]
+        return [x['@odata.id'] for x in md]
 
     def _get_cpu_data(self, expand='.'):
-        cpurl = self._varsysinfo.get('Processors', {}).get('@odata.id', None)
-        if not cpurl:
-            return {}
-        return self._get_expanded_data(cpurl, expand)
-
+        cpumembers = []
+        for sysurl in self._allsysurls:
+            currsysdata = self._do_web_request(sysurl)
+            currcpuurl = currsysdata.get('Processors', {}).get('@odata.id', None)
+            if currcpuurl:
+                currcpudata = self._get_expanded_data(currcpuurl, expand)
+                cpumembers.extend(currcpudata.get('Members', []))
+        return cpumembers
 
     def _get_mem_inventory(self, onlyname=False, withids=False, urls=None):
         memdata = self._get_mem_data()
-        for currmeminfo in memdata.get('Members', []): # self._do_bulk_requests(urls):
+        for currmeminfo in memdata:
             url = currmeminfo['@odata.id']
             name = currmeminfo.get('Name', 'Memory')
             if name in self._hwnamemap:
@@ -1310,13 +1324,17 @@ class OEMHandler(object):
 
     def _get_mem_urls(self):
         md = self._get_mem_data(False)
-        return [x['@odata.id'] for x in md.get('Members', [])]
+        return [x['@odata.id'] for x in md]
 
     def _get_mem_data(self, expand='.'):
-        memurl = self._varsysinfo.get('Memory', {}).get('@odata.id', None)
-        if not memurl:
-            return {}
-        return self._get_expanded_data(memurl, expand)
+        memmembers = []
+        for sysurl in self._allsysurls:
+            currsysdata = self._do_web_request(sysurl)
+            currmemurl = currsysdata.get('Memory', {}).get('@odata.id', None)
+            if currmemurl:
+                currmemdata = self._get_expanded_data(currmemurl, expand)
+                memmembers.extend(currmemdata.get('Members', []))
+        return memmembers
 
     def _get_expanded_data(self, url, expand='.'):
         topdata = []

pyghmi/redfish/oem/lookup.py

@@ -21,6 +21,7 @@ OEMMAP = {
     'Lenovo': lenovo,
     'Dell': dell,
     'AMI': ami,
+    'Ami': ami,
 }