commit 9158dcf80d6b21d1d5318bcd1ed87f3a8a2766ad
author Patrick Venture <venture@google.com> Thu Nov 08 09:44:28 2018 -0800
committer Patrick Venture <venture@google.com> Thu Nov 08 09:50:45 2018 -0800
tree 9e271a1cd871fb1fae02a1de2bfa9f4a0f680988
parent 2d3a254b5b65cc200b17449dd0985bfc76b1da33

s/::bt/::ipmi/g to be more correct

The code references bt everywhere for blocktransfer, to mean, inside the
IPMI packet itself.  However, those packets could be KCS and come in
through the same IPMI daemon.  Therefore, rename bt to ipmi for the data
handler type.

Change-Id: I5a460609fc09905b911b534ef6a1a13faa9cef29
Signed-off-by: Patrick Venture <venture@google.com>

test/firmware_canhandle_unittest.cpp

diff --git a/test/firmware_canhandle_unittest.cpp b/test/firmware_canhandle_unittest.cpp
index 4f00d50..600be4b 100644
--- a/test/firmware_canhandle_unittest.cpp
+++ b/test/firmware_canhandle_unittest.cpp
@@ -27,7 +27,7 @@
         {"bcdf", &imageMock},
     };
     std::vector<DataHandlerPack> data = {
-        {FirmwareBlobHandler::FirmwareUpdateFlags::bt, nullptr},
+        {FirmwareBlobHandler::FirmwareUpdateFlags::ipmi, nullptr},
     };
 
     auto handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(blobs, data);

test/firmware_handler_unittest.cpp

diff --git a/test/firmware_handler_unittest.cpp b/test/firmware_handler_unittest.cpp
index bae6cab..6a1ffe6 100644
--- a/test/firmware_handler_unittest.cpp
+++ b/test/firmware_handler_unittest.cpp
@@ -13,7 +13,7 @@
 TEST(FirmwareHandlerTest, CreateEmptyListVerifyFails)
 {
     std::vector<DataHandlerPack> data = {
-        {FirmwareBlobHandler::FirmwareUpdateFlags::bt, nullptr},
+        {FirmwareBlobHandler::FirmwareUpdateFlags::ipmi, nullptr},
     };
 
     auto handler = FirmwareBlobHandler::CreateFirmwareBlobHandler({}, data);
@@ -38,7 +38,7 @@
         {"asdf", &imageMock},
     };
     std::vector<DataHandlerPack> data = {
-        {FirmwareBlobHandler::FirmwareUpdateFlags::bt, nullptr},
+        {FirmwareBlobHandler::FirmwareUpdateFlags::ipmi, nullptr},
     };
 
     auto handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(blobs, data);

test/firmware_open_unittest.cpp

diff --git a/test/firmware_open_unittest.cpp b/test/firmware_open_unittest.cpp
index d77bafc..bc6ece2 100644
--- a/test/firmware_open_unittest.cpp
+++ b/test/firmware_open_unittest.cpp
@@ -23,7 +23,7 @@
         {"asdf", &imageMock},
     };
     std::vector<DataHandlerPack> data = {
-        {FirmwareBlobHandler::FirmwareUpdateFlags::bt, nullptr},
+        {FirmwareBlobHandler::FirmwareUpdateFlags::ipmi, nullptr},
     };
 
     auto handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(blobs, data);
@@ -31,7 +31,7 @@
     EXPECT_CALL(imageMock, open("asdf")).WillOnce(Return(true));
 
     EXPECT_TRUE(handler->open(
-        0, OpenFlags::write | FirmwareBlobHandler::FirmwareUpdateFlags::bt,
+        0, OpenFlags::write | FirmwareBlobHandler::FirmwareUpdateFlags::ipmi,
         "asdf"));
 }
 
@@ -46,7 +46,7 @@
         {"asdf", &imageMock},
     };
     std::vector<DataHandlerPack> data = {
-        {FirmwareBlobHandler::FirmwareUpdateFlags::bt, nullptr},
+        {FirmwareBlobHandler::FirmwareUpdateFlags::ipmi, nullptr},
     };
 
     auto handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(blobs, data);
@@ -54,7 +54,7 @@
     EXPECT_CALL(imageMock, open("asdf")).WillOnce(Return(false));
 
     EXPECT_FALSE(handler->open(
-        0, OpenFlags::write | FirmwareBlobHandler::FirmwareUpdateFlags::bt,
+        0, OpenFlags::write | FirmwareBlobHandler::FirmwareUpdateFlags::ipmi,
         "asdf"));
 }
 
@@ -68,13 +68,13 @@
         {"asdf", &imageMock},
     };
     std::vector<DataHandlerPack> data = {
-        {FirmwareBlobHandler::FirmwareUpdateFlags::bt, nullptr},
+        {FirmwareBlobHandler::FirmwareUpdateFlags::ipmi, nullptr},
     };
 
     auto handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(blobs, data);
 
-    EXPECT_FALSE(
-        handler->open(0, FirmwareBlobHandler::FirmwareUpdateFlags::bt, "asdf"));
+    EXPECT_FALSE(handler->open(
+        0, FirmwareBlobHandler::FirmwareUpdateFlags::ipmi, "asdf"));
 }
 
 TEST(FirmwareHandlerOpenTest, OpenWithInvalidTransportBit)
@@ -87,7 +87,7 @@
         {"asdf", &imageMock},
     };
     std::vector<DataHandlerPack> data = {
-        {FirmwareBlobHandler::FirmwareUpdateFlags::bt, nullptr},
+        {FirmwareBlobHandler::FirmwareUpdateFlags::ipmi, nullptr},
     };
 
     auto handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(blobs, data);
@@ -106,13 +106,13 @@
         {"asdf", &imageMock},
     };
     std::vector<DataHandlerPack> data = {
-        {FirmwareBlobHandler::FirmwareUpdateFlags::bt, nullptr},
+        {FirmwareBlobHandler::FirmwareUpdateFlags::ipmi, nullptr},
     };
 
     auto handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(blobs, data);
 
     EXPECT_FALSE(handler->open(
-        0, OpenFlags::write | FirmwareBlobHandler::FirmwareUpdateFlags::bt,
+        0, OpenFlags::write | FirmwareBlobHandler::FirmwareUpdateFlags::ipmi,
         "bcdf"));
 }
 

test/firmware_stat_unittest.cpp

diff --git a/test/firmware_stat_unittest.cpp b/test/firmware_stat_unittest.cpp
index e52ce86..e4b09bc 100644
--- a/test/firmware_stat_unittest.cpp
+++ b/test/firmware_stat_unittest.cpp
@@ -23,13 +23,13 @@
         {"asdf", &imageMock},
     };
     std::vector<DataHandlerPack> data = {
-        {FirmwareBlobHandler::FirmwareUpdateFlags::bt, nullptr},
+        {FirmwareBlobHandler::FirmwareUpdateFlags::ipmi, nullptr},
     };
 
     auto handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(blobs, data);
     struct BlobMeta meta;
     EXPECT_TRUE(handler->stat("asdf", &meta));
-    EXPECT_EQ(FirmwareBlobHandler::FirmwareUpdateFlags::bt, meta.blobState);
+    EXPECT_EQ(FirmwareBlobHandler::FirmwareUpdateFlags::ipmi, meta.blobState);
 }
 
 } // namespace blobs