Skip to content
Snippets Groups Projects
Commit cda0ab9a authored by Michael Davis's avatar Michael Davis
Browse files

[checksum] Adds method to convert hex strings to bytestrings

parent 27fca53e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
common/checksum/ChecksumBlob.cpp
+ 19
− 2
View file @ cda0ab9a
......@@ -93,7 +93,24 @@ void ChecksumBlob::deserialize(const std::string &bytearray) {
ProtobufToChecksumBlob(p_csb, *this);
}
static std::string ChecksumValueHex(const std::string &bytearray) {
std::string ChecksumBlob::HexToByteArray(std::string hexString) {
std::string bytearray;
if(hexString.substr(0,2) == "0x" || hexString.substr(0,2) == "0X") {
hexString.erase(0,2);
}
// ensure we have an even number of hex digits
if(hexString.length() % 2 == 1) hexString.insert(0, "0");
for(unsigned int i = 0; i < hexString.length(); i += 2) {
uint8_t byte = strtol(hexString.substr(i,2).c_str(), nullptr, 16);
bytearray.push_back(byte);
}
return bytearray;
}
std::string ChecksumBlob::ByteArrayToHex(const std::string &bytearray) {
if(bytearray.empty()) return "0";
std::stringstream value;
......@@ -110,7 +127,7 @@ std::ostream &operator<<(std::ostream &os, const ChecksumBlob &csb) {
auto num_els = csb.m_cs.size();
for(auto &cs : csb.m_cs) {
bool is_last_el = --num_els > 0;
os << "{ \"" << ChecksumTypeName.at(cs.first) << "\",0x" << ChecksumValueHex(cs.second)
os << "{ \"" << ChecksumTypeName.at(cs.first) << "\",0x" << ChecksumBlob::ByteArrayToHex(cs.second)
<< (is_last_el ? " }," : " }");
}
os << " ]";
......
common/checksum/ChecksumBlob.hpp
+ 6
− 1
View file @ cda0ab9a
......@@ -153,10 +153,15 @@ public:
return true;
}
/*!
* Convert hexadecimal string to little-endian byte array
*/
static std::string HexToByteArray(std::string hexString);
/*!
* Convert little-endian byte array to hexadecimal string
*/
static std::string ChecksumValueHex(const std::string &bytearray);
static std::string ByteArrayToHex(const std::string &bytearray);
private:
friend std::ostream &operator<<(std::ostream &os, const ChecksumBlob &csb);
......
tapeserver/castor/tape/tapeserver/daemon/MigrationReportPackerTest.cpp
+ 26
− 26
View file @ cda0ab9a
......@@ -40,7 +40,7 @@ const uint32_t TEST_USER_1 = 9751;
const uint32_t TEST_GROUP_1 = 9752;
const uint32_t TEST_USER_2 = 9753;
const uint32_t TEST_GROUP_2 = 9754;
class castor_tape_tapeserver_daemon_MigrationReportPackerTest: public ::testing::Test {
public:
castor_tape_tapeserver_daemon_MigrationReportPackerTest():
......@@ -69,13 +69,13 @@ const uint32_t TEST_GROUP_2 = 9754;
std::unique_ptr<cta::catalogue::Catalogue> m_catalogue;
}; // class castor_tape_tapeserver_daemon_MigrationReportPackerTest
class MockArchiveJobExternalStats: public cta::MockArchiveJob {
public:
MockArchiveJobExternalStats(cta::ArchiveMount & am, cta::catalogue::Catalogue & catalogue,
int & completes, int &failures):
MockArchiveJob(&am, catalogue), completesRef(completes), failuresRef(failures) {}
virtual void validate() override {}
virtual cta::catalogue::TapeItemWrittenPointer validateAndGetTapeFileWritten() override {
auto fileReportUP=cta::make_unique<cta::catalogue::TapeFileWritten>();
......@@ -96,12 +96,12 @@ const uint32_t TEST_GROUP_2 = 9754;
fileReport.vid = tapeFile.vid;
return cta::catalogue::TapeItemWrittenPointer(fileReportUP.release());
}
void transferFailed(const std::string& failureReason, cta::log::LogContext& lc) override {
failuresRef++;
}
void reportJobSucceeded() override {
completesRef++;
}
......@@ -110,10 +110,10 @@ const uint32_t TEST_GROUP_2 = 9754;
int & completesRef;
int & failuresRef;
};
TEST_F(castor_tape_tapeserver_daemon_MigrationReportPackerTest, MigrationReportPackerNominal) {
cta::MockArchiveMount tam(*m_catalogue);
const std::string vid1 = "VTEST001";
const std::string vid2 = "VTEST002";
const std::string mediaType = "media_type";
......@@ -140,7 +140,7 @@ const uint32_t TEST_GROUP_2 = 9754;
storageClass.nbCopies = 1;
storageClass.comment = "Create storage class";
m_catalogue->createStorageClass(admin, storageClass);
::testing::InSequence dummy;
std::unique_ptr<cta::ArchiveJob> job1;
int job1completes(0), job1failures(0);
......@@ -156,15 +156,15 @@ const uint32_t TEST_GROUP_2 = 9754;
job1->archiveFile.diskFileInfo.owner_uid=TEST_USER_1;
job1->archiveFile.diskFileInfo.gid=TEST_GROUP_1;
job1->archiveFile.fileSize=1024;
job1->archiveFile.checksumBlob.insert(cta::checksum::MD5, "b170288bf1f61b26a648358866f4d6c6");
job1->archiveFile.checksumBlob.insert(cta::checksum::MD5, HexToByteString("b170288bf1f61b26a648358866f4d6c6"));
job1->archiveFile.storageClass="storage_class";
job1->tapeFile.vid="VTEST001";
job1->tapeFile.fSeq=1;
job1->tapeFile.blockId=256;
job1->tapeFile.fileSize=768;
job1->tapeFile.copyNb=1;
job1->tapeFile.checksumBlob.insert(cta::checksum::MD5, "b170288bf1f61b26a648358866f4d6c6");
job1->tapeFile.checksumBlob.insert(cta::checksum::MD5, HexToByteString("b170288bf1f61b26a648358866f4d6c6"));
std::unique_ptr<cta::ArchiveJob> job2;
int job2completes(0), job2failures(0);
{
......@@ -179,15 +179,15 @@ const uint32_t TEST_GROUP_2 = 9754;
job2->archiveFile.diskFileInfo.owner_uid=TEST_USER_2;
job2->archiveFile.diskFileInfo.gid=TEST_GROUP_2;
job2->archiveFile.fileSize=1024;
job2->archiveFile.checksumBlob.insert(cta::checksum::MD5, "b170288bf1f61b26a648358866f4d6c6");
job2->archiveFile.checksumBlob.insert(cta::checksum::MD5, HexToByteString("b170288bf1f61b26a648358866f4d6c6"));
job2->archiveFile.storageClass="storage_class";
job2->tapeFile.vid="VTEST001";
job2->tapeFile.fSeq=2;
job2->tapeFile.blockId=512;
job2->tapeFile.fileSize=768;
job2->tapeFile.copyNb=1;
job2->tapeFile.checksumBlob.insert(cta::checksum::MD5, "b170288bf1f61b26a648358866f4d6c6");
job2->tapeFile.checksumBlob.insert(cta::checksum::MD5, HexToByteString("b170288bf1f61b26a648358866f4d6c6"));
cta::log::StringLogger log("dummy","castor_tape_tapeserver_daemon_MigrationReportPackerNominal",cta::log::DEBUG);
cta::log::LogContext lc(log);
tapeserver::daemon::MigrationReportPacker mrp(&tam,lc);
......@@ -230,7 +230,7 @@ const uint32_t TEST_GROUP_2 = 9754;
new MockArchiveJobExternalStats(tam, *m_catalogue, job3completes, job3failures));
job3.reset(mockJob.release());
}
cta::log::StringLogger log("dummy","castor_tape_tapeserver_daemon_MigrationReportPackerFailure",cta::log::DEBUG);
cta::log::LogContext lc(log);
tapeserver::daemon::MigrationReportPacker mrp(&tam,lc);
......@@ -257,7 +257,7 @@ const uint32_t TEST_GROUP_2 = 9754;
TEST_F(castor_tape_tapeserver_daemon_MigrationReportPackerTest, MigrationReportPackerBadFile) {
cta::MockArchiveMount tam(*m_catalogue);
const std::string vid1 = "VTEST001";
const std::string vid2 = "VTEST002";
const std::string mediaType = "media_type";
......@@ -286,7 +286,7 @@ const uint32_t TEST_GROUP_2 = 9754;
storageClass.nbCopies = 1;
storageClass.comment = "Create storage class";
m_catalogue->createStorageClass(admin, storageClass);
::testing::InSequence dummy;
std::unique_ptr<cta::ArchiveJob> migratedBigFile;
int migratedBigFileCompletes(0), migratedBigFileFailures(0);
......@@ -317,15 +317,15 @@ const uint32_t TEST_GROUP_2 = 9754;
migratedBigFile->archiveFile.diskFileInfo.owner_uid=TEST_USER_2;
migratedBigFile->archiveFile.diskFileInfo.gid=TEST_GROUP_2;
migratedBigFile->archiveFile.fileSize=100000;
migratedBigFile->archiveFile.checksumBlob.insert(cta::checksum::MD5, "b170288bf1f61b26a648358866f4d6c6");
migratedBigFile->archiveFile.checksumBlob.insert(cta::checksum::MD5, HexToByteString("b170288bf1f61b26a648358866f4d6c6"));
migratedBigFile->archiveFile.storageClass="storage_class";
migratedBigFile->tapeFile.vid="VTEST001";
migratedBigFile->tapeFile.fSeq=1;
migratedBigFile->tapeFile.blockId=256;
migratedBigFile->tapeFile.fileSize=768;
migratedBigFile->tapeFile.copyNb=1;
migratedBigFile->tapeFile.checksumBlob.insert(cta::checksum::MD5, "b170288bf1f61b26a648358866f4d6c6");
migratedBigFile->tapeFile.checksumBlob.insert(cta::checksum::MD5, HexToByteString("b170288bf1f61b26a648358866f4d6c6"));
migratedFileSmall->archiveFile.archiveFileID=5;
migratedFileSmall->archiveFile.diskInstance="disk_instance";
migratedFileSmall->archiveFile.diskFileId="diskFileId3";
......@@ -333,15 +333,15 @@ const uint32_t TEST_GROUP_2 = 9754;
migratedFileSmall->archiveFile.diskFileInfo.owner_uid=TEST_USER_2;
migratedFileSmall->archiveFile.diskFileInfo.gid=TEST_GROUP_2;
migratedFileSmall->archiveFile.fileSize=1;
migratedFileSmall->archiveFile.checksumBlob.insert(cta::checksum::MD5, "b170288bf1f61b26a648358866f4d6c6");
migratedFileSmall->archiveFile.checksumBlob.insert(cta::checksum::MD5, HexToByteString("b170288bf1f61b26a648358866f4d6c6"));
migratedFileSmall->archiveFile.storageClass="storage_class";
migratedFileSmall->tapeFile.vid="VTEST001";
migratedFileSmall->tapeFile.fSeq=2;
migratedFileSmall->tapeFile.blockId=512;
migratedFileSmall->tapeFile.fileSize=1;
migratedFileSmall->tapeFile.copyNb=1;
migratedFileSmall->tapeFile.checksumBlob.insert(cta::checksum::MD5, "b170288bf1f61b26a648358866f4d6c6");
migratedFileSmall->tapeFile.checksumBlob.insert(cta::checksum::MD5, HexToByteString("b170288bf1f61b26a648358866f4d6c6"));
migratedNullFile->archiveFile.archiveFileID=6;
migratedNullFile->archiveFile.diskInstance="disk_instance";
migratedNullFile->archiveFile.diskFileId="diskFileId4";
......@@ -349,15 +349,15 @@ const uint32_t TEST_GROUP_2 = 9754;
migratedNullFile->archiveFile.diskFileInfo.owner_uid=TEST_USER_2;
migratedNullFile->archiveFile.diskFileInfo.gid=TEST_GROUP_2;
migratedNullFile->archiveFile.fileSize=0;
migratedNullFile->archiveFile.checksumBlob.insert(cta::checksum::MD5, "b170288bf1f61b26a648358866f4d6c6");
migratedNullFile->archiveFile.checksumBlob.insert(cta::checksum::MD5, HexToByteString("b170288bf1f61b26a648358866f4d6c6"));
migratedNullFile->archiveFile.storageClass="storage_class";
migratedNullFile->tapeFile.vid="VTEST001";
migratedNullFile->tapeFile.fSeq=3;
migratedNullFile->tapeFile.blockId=768;
migratedNullFile->tapeFile.fileSize=0;
migratedNullFile->tapeFile.copyNb=1;
migratedNullFile->tapeFile.checksumBlob.insert(cta::checksum::MD5, "b170288bf1f61b26a648358866f4d6c6");
migratedNullFile->tapeFile.checksumBlob.insert(cta::checksum::MD5, HexToByteString("b170288bf1f61b26a648358866f4d6c6"));
cta::log::StringLogger log("dummy","castor_tape_tapeserver_daemon_MigrationReportPackerOneByteFile",cta::log::DEBUG);
cta::log::LogContext lc(log);
tapeserver::daemon::MigrationReportPacker mrp(&tam,lc);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

imprint | privacy | Conditions of Use