diff options
| author | George Kraft <george.kraft@calxeda.com> | 2013-08-20 17:33:28 -0500 |
|---|---|---|
| committer | George Kraft <george.kraft@calxeda.com> | 2013-08-20 17:33:28 -0500 |
| commit | a9c26d21065275a1a53b917e64685c50a8a20f61 (patch) | |
| tree | c49c4a0ee232efa23e8f4e706662b41fbc6e1690 | |
| parent | d30d2716c97b8836cc139edcc387988d2be93df8 (diff) | |
| download | cxmanage-a9c26d21065275a1a53b917e64685c50a8a20f61.tar.gz | |
CXMAN-218: Remove FRU versions from node.get_versions()
FRU reads on SB12 are pretty slow -- the whole process can take up
to 30 minutes on a 24-node fabric. Oiy.
| -rw-r--r-- | cxmanage/__init__.py | 2 | ||||
| -rw-r--r-- | cxmanage_api/node.py | 14 | ||||
| -rw-r--r-- | cxmanage_test/node_test.py | 3 |
3 files changed, 1 insertions, 18 deletions
diff --git a/cxmanage/__init__.py b/cxmanage/__init__.py index 5bcf6e4..9491581 100644 --- a/cxmanage/__init__.py +++ b/cxmanage/__init__.py @@ -335,7 +335,5 @@ COMPONENTS = [ ("uboot_version", "Uboot version"), ("ubootenv_version", "Ubootenv version"), ("dtb_version", "DTB version"), - ("node_fru_version", "Node FRU version"), - ("slot_fru_version", "Slot FRU version") ] diff --git a/cxmanage_api/node.py b/cxmanage_api/node.py index 049ab36..e379f97 100644 --- a/cxmanage_api/node.py +++ b/cxmanage_api/node.py @@ -964,20 +964,6 @@ class Node(object): components.append(("ubootenv_version", "UBOOTENV")) components.append(("dtb_version", "DTB")) - # Get the node FRU version - try: - node_fru_version = self.get_node_fru_version() - setattr(result, "node_fru_version", node_fru_version) - except NoFRUVersionError: - setattr(result, "node_fru_version", "No node FRU detected") - - # Get the slot FRU version - try: - slot_fru_version = self.get_slot_fru_version() - setattr(result, "slot_fru_version", slot_fru_version) - except NoFRUVersionError: - setattr(result, "slot_fru_version", "No slot FRU detected") - for var, ptype in components: try: partition = self._get_partition(fwinfo, ptype, "ACTIVE") diff --git a/cxmanage_test/node_test.py b/cxmanage_test/node_test.py index 8b905a7..fe3d3f2 100644 --- a/cxmanage_test/node_test.py +++ b/cxmanage_test/node_test.py @@ -326,8 +326,7 @@ class NodeTest(unittest.TestCase): result = node.get_versions() self.assertEqual(node.bmc.executed, ["get_info_basic", - "get_firmware_info", "node_fru_read", "slot_fru_read", - "info_card"]) + "get_firmware_info", "info_card"]) for attr in ["iana", "firmware_version", "ecme_version", "ecme_timestamp"]: self.assertTrue(hasattr(result, attr)) |