diff options
| author | Benjamin Fair <benjaminfair@google.com> | 2019-11-14 13:12:49 -0800 |
|---|---|---|
| committer | Benjamin Fair <benjaminfair@google.com> | 2019-11-15 16:20:06 -0800 |
| commit | 060be01fee2b63104921ea6a5b2901b75fb63f2e (patch) | |
| tree | abace5f864dff3ab6f4558f765429f2b33daac06 /tools | |
| parent | 4e2a143fd12d55cea70e8d9dcc911668e1541961 (diff) | |
| download | phosphor-ipmi-flash-060be01fee2b63104921ea6a5b2901b75fb63f2e.tar.gz phosphor-ipmi-flash-060be01fee2b63104921ea6a5b2901b75fb63f2e.zip | |
tools: remove stat() check for supported interface
If an unsupported interface is requested, the open() call will simply
fail.
Signed-off-by: Benjamin Fair <benjaminfair@google.com>
Change-Id: Iefd11657d957931873a4d20246d9ccdd791ba0e5
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/handler.cpp | 22 | ||||
| -rw-r--r-- | tools/test/tools_updater_unittest.cpp | 10 | ||||
| -rw-r--r-- | tools/updater.cpp | 4 |
3 files changed, 2 insertions, 34 deletions
diff --git a/tools/handler.cpp b/tools/handler.cpp index 711e2f3..dbaa53f 100644 --- a/tools/handler.cpp +++ b/tools/handler.cpp @@ -51,28 +51,6 @@ bool UpdateHandler::checkAvailable(const std::string& goalFirmware) return false; } - /* Call stat on /flash/image (or /flash/tarball) and check if data interface - * is supported. - */ - ipmiblob::StatResponse stat; - - try - { - stat = blob->getStat(goalFirmware); - } - catch (const ipmiblob::BlobException& b) - { - std::fprintf(stderr, "Received exception '%s' on getStat\n", b.what()); - return false; - } - - auto supported = handler->supportedType(); - if ((stat.blob_state & supported) == 0) - { - std::fprintf(stderr, "data interface selected not supported.\n"); - return false; - } - return true; } diff --git a/tools/test/tools_updater_unittest.cpp b/tools/test/tools_updater_unittest.cpp index 706a4c3..b9f80ad 100644 --- a/tools/test/tools_updater_unittest.cpp +++ b/tools/test/tools_updater_unittest.cpp @@ -31,19 +31,9 @@ class UpdateHandlerTest : public ::testing::Test TEST_F(UpdateHandlerTest, CheckAvailableSuccess) { - ipmiblob::StatResponse statObj = {}; - statObj.blob_state = ipmi_flash::FirmwareFlags::UpdateFlags::ipmi | - ipmi_flash::FirmwareFlags::UpdateFlags::lpc; - EXPECT_CALL(blobMock, getBlobList()) .WillOnce( Return(std::vector<std::string>({ipmi_flash::staticLayoutBlobId}))); - EXPECT_CALL(blobMock, getStat(TypedEq<const std::string&>( - ipmi_flash::staticLayoutBlobId))) - .WillOnce(Return(statObj)); - - EXPECT_CALL(handlerMock, supportedType()) - .WillOnce(Return(ipmi_flash::FirmwareFlags::UpdateFlags::lpc)); EXPECT_TRUE(updater.checkAvailable(ipmi_flash::staticLayoutBlobId)); } diff --git a/tools/updater.cpp b/tools/updater.cpp index 25f7dab..8639edd 100644 --- a/tools/updater.cpp +++ b/tools/updater.cpp @@ -46,10 +46,10 @@ void updaterMain(UpdateHandlerInterface* updater, const std::string& imagePath, bool goalSupported = updater->checkAvailable(layout); if (!goalSupported) { - throw ToolException("Goal firmware or interface not supported"); + throw ToolException("Goal firmware not supported"); } - /* Yay, our data handler is supported. */ + /* Yay, our layout type is supported. */ try { /* Send over the firmware image. */ |

