Skip to content

Commit 4a77005

Browse files
Mykola Soliankoal1img
Mykola Solianko
authored and
al1img
committed
Move NodeInfo convert to common lib
Signed-off-by: Mykola Solianko <mykola_solianko@epam.com>
1 parent 55b7b7d commit 4a77005

7 files changed

+58
-200
lines changed

‎src/iamclient/CMakeLists.txt

+10-1
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,13 @@ add_library(${TARGET} STATIC ${SOURCES})
2929
# Libraries
3030
# ######################################################################################################################
3131

32-
target_link_libraries(${TARGET} PUBLIC aoscommon aosiam aosutils aoscoreapi-gen-iam Poco::Util utils)
32+
target_link_libraries(
33+
${TARGET}
34+
PUBLIC aoscommon
35+
aosiam
36+
aosutils
37+
aospbconvert
38+
aoscoreapi-gen-iam
39+
Poco::Util
40+
utils
41+
)

‎src/iamclient/iamclient.cpp

+19-18
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <Poco/Process.h>
1111
#include <Poco/StreamCopier.h>
1212

13+
#include <pbconvert/common.hpp>
1314
#include <utils/exception.hpp>
1415
#include <utils/grpchelper.hpp>
1516

@@ -278,13 +279,13 @@ bool IAMClient::ProcessStartProvisioning(const iamanager::v5::StartProvisioningR
278279
if (!err.IsNone()) {
279280
LOG_ERR() << "Can't start provisioning: wrong node status";
280281

281-
utils::SetErrorInfo(err, response);
282+
aos::common::pbconvert::SetErrorInfo(err, response);
282283

283284
return mStream->Write(outgoingMsg);
284285
}
285286

286287
err = mProvisionManager->StartProvisioning(request.password().c_str());
287-
utils::SetErrorInfo(err, response);
288+
aos::common::pbconvert::SetErrorInfo(err, response);
288289

289290
return mStream->Write(outgoingMsg);
290291
}
@@ -300,26 +301,26 @@ bool IAMClient::ProcessFinishProvisioning(const iamanager::v5::FinishProvisionin
300301
if (!err.IsNone()) {
301302
LOG_ERR() << "Can't finish provisioning: wrong node status";
302303

303-
utils::SetErrorInfo(err, response);
304+
aos::common::pbconvert::SetErrorInfo(err, response);
304305

305306
return mStream->Write(outgoingMsg);
306307
}
307308

308309
err = mProvisionManager->FinishProvisioning(request.password().c_str());
309310
if (!err.IsNone()) {
310-
utils::SetErrorInfo(err, response);
311+
aos::common::pbconvert::SetErrorInfo(err, response);
311312

312313
return mStream->Write(outgoingMsg);
313314
}
314315

315316
err = mNodeInfoProvider->SetNodeStatus(aos::NodeStatusEnum::eProvisioned);
316317
if (!err.IsNone()) {
317-
utils::SetErrorInfo(err, response);
318+
aos::common::pbconvert::SetErrorInfo(err, response);
318319

319320
return mStream->Write(outgoingMsg);
320321
}
321322

322-
utils::SetErrorInfo(err, response);
323+
aos::common::pbconvert::SetErrorInfo(err, response);
323324

324325
return mStream->Write(outgoingMsg);
325326
}
@@ -335,26 +336,26 @@ bool IAMClient::ProcessDeprovision(const iamanager::v5::DeprovisionRequest& requ
335336
if (!err.IsNone()) {
336337
LOG_ERR() << "Can't deprovision: wrong node status";
337338

338-
utils::SetErrorInfo(err, response);
339+
aos::common::pbconvert::SetErrorInfo(err, response);
339340

340341
return mStream->Write(outgoingMsg);
341342
}
342343

343344
err = mProvisionManager->Deprovision(request.password().c_str());
344345
if (!err.IsNone()) {
345-
utils::SetErrorInfo(err, response);
346+
aos::common::pbconvert::SetErrorInfo(err, response);
346347

347348
return mStream->Write(outgoingMsg);
348349
}
349350

350351
err = mNodeInfoProvider->SetNodeStatus(aos::NodeStatusEnum::eUnprovisioned);
351352
if (!err.IsNone()) {
352-
utils::SetErrorInfo(err, response);
353+
aos::common::pbconvert::SetErrorInfo(err, response);
353354

354355
return mStream->Write(outgoingMsg);
355356
}
356357

357-
utils::SetErrorInfo(err, response);
358+
aos::common::pbconvert::SetErrorInfo(err, response);
358359

359360
return mStream->Write(outgoingMsg);
360361
}
@@ -372,19 +373,19 @@ bool IAMClient::ProcessPauseNode(const iamanager::v5::PauseNodeRequest& request)
372373
if (!err.IsNone()) {
373374
LOG_ERR() << "Can't pause node: wrong node status";
374375

375-
utils::SetErrorInfo(err, response);
376+
aos::common::pbconvert::SetErrorInfo(err, response);
376377

377378
return mStream->Write(outgoingMsg);
378379
}
379380

380381
err = mNodeInfoProvider->SetNodeStatus(aos::NodeStatusEnum::ePaused);
381382
if (!err.IsNone()) {
382-
utils::SetErrorInfo(err, response);
383+
aos::common::pbconvert::SetErrorInfo(err, response);
383384

384385
return mStream->Write(outgoingMsg);
385386
}
386387

387-
utils::SetErrorInfo(err, response);
388+
aos::common::pbconvert::SetErrorInfo(err, response);
388389

389390
return SendNodeInfo() && mStream->Write(outgoingMsg);
390391
}
@@ -402,19 +403,19 @@ bool IAMClient::ProcessResumeNode(const iamanager::v5::ResumeNodeRequest& reques
402403
if (!err.IsNone()) {
403404
LOG_ERR() << "Can't resume node: wrong node status";
404405

405-
utils::SetErrorInfo(err, response);
406+
aos::common::pbconvert::SetErrorInfo(err, response);
406407

407408
return mStream->Write(outgoingMsg);
408409
}
409410

410411
err = mNodeInfoProvider->SetNodeStatus(aos::NodeStatusEnum::eProvisioned);
411412
if (!err.IsNone()) {
412-
utils::SetErrorInfo(err, response);
413+
aos::common::pbconvert::SetErrorInfo(err, response);
413414

414415
return mStream->Write(outgoingMsg);
415416
}
416417

417-
utils::SetErrorInfo(err, response);
418+
aos::common::pbconvert::SetErrorInfo(err, response);
418419

419420
return SendNodeInfo() && mStream->Write(outgoingMsg);
420421
}
@@ -505,7 +506,7 @@ bool IAMClient::SendCreateKeyResponse(
505506
response.set_type(type.CStr());
506507
response.set_csr(csr.CStr());
507508

508-
utils::SetErrorInfo(error, response);
509+
aos::common::pbconvert::SetErrorInfo(error, response);
509510

510511
return mStream->Write(outgoingMsg);
511512
}
@@ -532,7 +533,7 @@ bool IAMClient::SendApplyCertResponse(const aos::String& nodeID, const aos::Stri
532533
response.set_cert_url(certURL.CStr());
533534
response.set_serial(protoSerial);
534535

535-
utils::SetErrorInfo(error, response);
536+
aos::common::pbconvert::SetErrorInfo(error, response);
536537

537538
return mStream->Write(outgoingMsg);
538539
}

‎src/iamserver/CMakeLists.txt

+10-1
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,13 @@ add_library(${TARGET} STATIC ${SOURCES})
2929
# Libraries
3030
# ######################################################################################################################
3131

32-
target_link_libraries(${TARGET} PUBLIC aoscommon aosiam aosutils aoscoreapi-gen-iam Poco::Util utils)
32+
target_link_libraries(
33+
${TARGET}
34+
PUBLIC aoscommon
35+
aosiam
36+
aosutils
37+
aospbconvert
38+
aoscoreapi-gen-iam
39+
Poco::Util
40+
utils
41+
)

‎src/iamserver/nodecontroller.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
#include <thread>
99

10+
#include <pbconvert/common.hpp>
11+
1012
#include "logger/logmodule.hpp"
1113
#include "nodecontroller.hpp"
1214
#include "utils/convert.hpp"
@@ -319,7 +321,7 @@ aos::Error NodeStreamHandler::HandleNodeInfo(const iamproto::NodeInfo& info)
319321

320322
aos::NodeInfo nodeInfo;
321323

322-
if (auto err = utils::ConvertToAos(info, nodeInfo); !err.IsNone()) {
324+
if (auto err = aos::common::pbconvert::ConvertToAos(info, nodeInfo); !err.IsNone()) {
323325
return err;
324326
}
325327

‎src/iamserver/protectedmessagehandler.cpp

+16-14
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
#include <aos/common/types.hpp>
1414
#include <aos/iam/certhandler.hpp>
1515

16+
#include <pbconvert/common.hpp>
17+
1618
#include "logger/logmodule.hpp"
1719
#include "protectedmessagehandler.hpp"
1820
#include "utils/convert.hpp"
@@ -112,7 +114,7 @@ grpc::Status ProtectedMessageHandler::PauseNode([[maybe_unused]] grpc::ServerCon
112114
if (auto err = SetNodeStatus(nodeID, aos::NodeStatusEnum::ePaused); !err.IsNone()) {
113115
LOG_ERR() << "Set node status failed: error=" << err;
114116

115-
utils::SetErrorInfo(err, *response);
117+
aos::common::pbconvert::SetErrorInfo(err, *response);
116118
}
117119

118120
return grpc::Status::OK;
@@ -142,7 +144,7 @@ grpc::Status ProtectedMessageHandler::ResumeNode([[maybe_unused]] grpc::ServerCo
142144
if (auto err = SetNodeStatus(nodeID, aos::NodeStatusEnum::eProvisioned); !err.IsNone()) {
143145
LOG_ERR() << "Set node status failed: error=" << err;
144146

145-
utils::SetErrorInfo(err, *response);
147+
aos::common::pbconvert::SetErrorInfo(err, *response);
146148
}
147149

148150
return grpc::Status::OK;
@@ -206,7 +208,7 @@ grpc::Status ProtectedMessageHandler::StartProvisioning([[maybe_unused]] grpc::S
206208
if (auto err = mProvisionManager->StartProvisioning(request->password().c_str()); !err.IsNone()) {
207209
LOG_ERR() << "Start provisioning error: error=" << err;
208210

209-
utils::SetErrorInfo(err, *response);
211+
aos::common::pbconvert::SetErrorInfo(err, *response);
210212
}
211213

212214
return grpc::Status::OK;
@@ -235,7 +237,7 @@ grpc::Status ProtectedMessageHandler::FinishProvisioning([[maybe_unused]] grpc::
235237
if (auto err = mProvisionManager->FinishProvisioning(request->password().c_str()); !err.IsNone()) {
236238
LOG_ERR() << "Finish provisioning failed: error=" << err;
237239

238-
utils::SetErrorInfo(err, *response);
240+
aos::common::pbconvert::SetErrorInfo(err, *response);
239241

240242
return grpc::Status::OK;
241243
}
@@ -244,7 +246,7 @@ grpc::Status ProtectedMessageHandler::FinishProvisioning([[maybe_unused]] grpc::
244246
if (auto err = SetNodeStatus(nodeID, aos::NodeStatusEnum::eProvisioned); !err.IsNone()) {
245247
LOG_ERR() << "Set node status failed: error=" << err;
246248

247-
utils::SetErrorInfo(err, *response);
249+
aos::common::pbconvert::SetErrorInfo(err, *response);
248250
}
249251

250252
return grpc::Status::OK;
@@ -273,7 +275,7 @@ grpc::Status ProtectedMessageHandler::Deprovision([[maybe_unused]] grpc::ServerC
273275
if (auto err = mProvisionManager->Deprovision(request->password().c_str()); !err.IsNone()) {
274276
LOG_ERR() << "Deprovision failed: error=" << err;
275277

276-
utils::SetErrorInfo(err, *response);
278+
aos::common::pbconvert::SetErrorInfo(err, *response);
277279

278280
return grpc::Status::OK;
279281
}
@@ -282,7 +284,7 @@ grpc::Status ProtectedMessageHandler::Deprovision([[maybe_unused]] grpc::ServerC
282284
if (auto err = SetNodeStatus(nodeID, aos::NodeStatusEnum::eUnprovisioned); !err.IsNone()) {
283285
LOG_ERR() << "Set node status failed: error=" << err;
284286

285-
utils::SetErrorInfo(err, *response);
287+
aos::common::pbconvert::SetErrorInfo(err, *response);
286288
}
287289

288290
return grpc::Status::OK;
@@ -307,7 +309,7 @@ grpc::Status ProtectedMessageHandler::CreateKey([[maybe_unused]] grpc::ServerCon
307309

308310
LOG_ERR() << "Create key failed: error=" << err;
309311

310-
utils::SetErrorInfo(err, *response);
312+
aos::common::pbconvert::SetErrorInfo(err, *response);
311313

312314
return grpc::Status::OK;
313315
}
@@ -319,7 +321,7 @@ grpc::Status ProtectedMessageHandler::CreateKey([[maybe_unused]] grpc::ServerCon
319321
if (!err.IsNone()) {
320322
LOG_ERR() << "Get system ID failed: error=" << err;
321323

322-
utils::SetErrorInfo(err, *response);
324+
aos::common::pbconvert::SetErrorInfo(err, *response);
323325

324326
return grpc::Status::OK;
325327
}
@@ -346,7 +348,7 @@ grpc::Status ProtectedMessageHandler::CreateKey([[maybe_unused]] grpc::ServerCon
346348
if (err = mProvisionManager->CreateKey(certType, subject, password, csr); !err.IsNone()) {
347349
LOG_ERR() << "Create key failed: error=" << err;
348350

349-
utils::SetErrorInfo(err, *response);
351+
aos::common::pbconvert::SetErrorInfo(err, *response);
350352

351353
return grpc::Status::OK;
352354
}
@@ -387,7 +389,7 @@ grpc::Status ProtectedMessageHandler::ApplyCert([[maybe_unused]] grpc::ServerCon
387389
if (auto err = mProvisionManager->ApplyCert(certType, pemCert, certInfo); !err.IsNone()) {
388390
LOG_ERR() << "Apply cert failed: error=" << err;
389391

390-
utils::SetErrorInfo(err, *response);
392+
aos::common::pbconvert::SetErrorInfo(err, *response);
391393

392394
return grpc::Status::OK;
393395
}
@@ -399,7 +401,7 @@ grpc::Status ProtectedMessageHandler::ApplyCert([[maybe_unused]] grpc::ServerCon
399401
if (!err.IsNone()) {
400402
LOG_ERR() << "Convert serial failed: error=" << err;
401403

402-
utils::SetErrorInfo(err, *response);
404+
aos::common::pbconvert::SetErrorInfo(err, *response);
403405

404406
return grpc::Status::OK;
405407
}
@@ -418,7 +420,7 @@ grpc::Status ProtectedMessageHandler::RegisterInstance([[maybe_unused]] grpc::Se
418420
const iamproto::RegisterInstanceRequest* request, iamproto::RegisterInstanceResponse* response)
419421
{
420422
aos::Error err = aos::ErrorEnum::eNone;
421-
const auto aosInstance = utils::ConvertToAos(request->instance());
423+
const auto aosInstance = aos::common::pbconvert::ConvertToAos(request->instance());
422424

423425
LOG_DBG() << "Process register instance: serviceID=" << aosInstance.mServiceID
424426
<< ", subjectID=" << aosInstance.mSubjectID << ", instance=" << aosInstance.mInstance;
@@ -463,7 +465,7 @@ grpc::Status ProtectedMessageHandler::RegisterInstance([[maybe_unused]] grpc::Se
463465
grpc::Status ProtectedMessageHandler::UnregisterInstance([[maybe_unused]] grpc::ServerContext* context,
464466
const iamproto::UnregisterInstanceRequest* request, [[maybe_unused]] google::protobuf::Empty* response)
465467
{
466-
const auto instance = utils::ConvertToAos(request->instance());
468+
const auto instance = aos::common::pbconvert::ConvertToAos(request->instance());
467469

468470
LOG_DBG() << "Process unregister instance: serviceID=" << instance.mServiceID
469471
<< ", subjectID=" << instance.mSubjectID << ", instance=" << instance.mInstance;

0 commit comments

Comments
 (0)