From 7679f70d71c4de924824af56184a2c272ca9c082 Mon Sep 17 00:00:00 2001 From: "Andrey V.Kosteltsev" Date: Sat, 16 Jul 2022 22:24:46 +0300 Subject: IBS: silaProducts --- agent/sila/sila_oid.hpp | 2 +- mibs/SILA-MIB.txt | 6 ++---- tests/emit-added-opfw.sh | 17 +---------------- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/agent/sila/sila_oid.hpp b/agent/sila/sila_oid.hpp index 033a7e7..54d6d37 100644 --- a/agent/sila/sila_oid.hpp +++ b/agent/sila/sila_oid.hpp @@ -1,7 +1,7 @@ /** * @brief SILA OID helper * - * This file is part of yadro-snmp project. + * This file is part of sila-snmp project. * * Copyright (c) 2022 SILA * diff --git a/mibs/SILA-MIB.txt b/mibs/SILA-MIB.txt index 8b77ae1..2d0dcfc 100644 --- a/mibs/SILA-MIB.txt +++ b/mibs/SILA-MIB.txt @@ -52,14 +52,12 @@ silaSensors OBJECT IDENTIFIER ::= { sila 1 } silaConformance OBJECT IDENTIFIER ::= { sila 2 } silaCompliances OBJECT IDENTIFIER ::= { silaConformance 1 } silaGroups OBJECT IDENTIFIER ::= { silaConformance 2 } -silaProducts OBJECT IDENTIFIER ::= { sila 3 } +silaProducts OBJECT IDENTIFIER ::= { sila 1 } -- silaInventoryTable takes { sila 4 } -- silaSoftwareTable takes { sila 5 } -- OIDs for SNMPv2-MIB::sysObjectID field -vesninBmc OBJECT IDENTIFIER ::= { silaProducts 1 } -vegmanBmc OBJECT IDENTIFIER ::= { silaProducts 20 } -tatlinArchiveSBmc OBJECT IDENTIFIER ::= { silaProducts 21 } +silaBmc OBJECT IDENTIFIER ::= { silaProducts 1 } -- diff --git a/tests/emit-added-opfw.sh b/tests/emit-added-opfw.sh index b2ef3dd..4dc98d8 100755 --- a/tests/emit-added-opfw.sh +++ b/tests/emit-added-opfw.sh @@ -6,21 +6,6 @@ gdbus emit --system --object-path '/xyz/openbmc_project/inventory' \ "{ \ 'org.freedesktop.DBus.Peer': @a{sv} {}, \ 'org.freedesktop.DBus.Introspectable': @a{sv} {}, \ - 'org.freedesktop.DBus.Properties': @a{sv} {}, \ - 'xyz.openbmc_project.Inventory.Opfw': { \ - 'BuildrootVersion':<'buildroot-2018.02.2-7-gcb36c6d'>, \ - 'SkibootVersion': <'skiboot-v6.0.1-27-g34e9c3c1edb3-p13e1584'>, \ - 'HostbootVersion': <'hostboot-p8-d3025f5-pe7d78e0'>, \ - 'LinuxVersion': <'occ-p8-28f2cec-pf0b771d'>, \ - 'PetitbootVersion':<'linux-4.16.13-openpower1-p908fb4b'>, \ - 'MachinexmlVersion':<'petitboot-1.8.0'> \ - }, \ - 'xyz.openbmc_project.Inventory.Item': { \ - 'PrettyName':<'OpenPOWER Firmware'>, \ - 'Present': \ - }, \ - 'xyz.openbmc_project.Inventory.Decorator.Revision': { \ - 'Version':<'open-power-vesnin-v2.0-45-g16f9312'> \ - } \ + 'org.freedesktop.DBus.Properties': @a{sv} {} \ }" -- cgit v1.2.3