diff --git a/src/lib/admire.cpp b/src/lib/admire.cpp index 76c294766ca1ed1ca0b3db1f3290e7beba53c65e..73aa60ac6d2bcc6915bbfc7bc435cf68d25dd1b1 100644 --- a/src/lib/admire.cpp +++ b/src/lib/admire.cpp @@ -76,6 +76,14 @@ rpc_registration_cb(scord::network::rpc_client* client) { ADM_deploy_adhoc_storage_in_t, ADM_deploy_adhoc_storage_out_t, NULL, true); + REGISTER_RPC(client, "ADM_register_pfs_storage", + ADM_register_pfs_storage_in_t, ADM_register_pfs_storage_out_t, + NULL, true); + REGISTER_RPC(client, "ADM_update_pfs_storage", ADM_update_pfs_storage_in_t, + ADM_update_pfs_storage_out_t, NULL, true); + REGISTER_RPC(client, "ADM_remove_pfs_storage", ADM_remove_pfs_storage_in_t, + ADM_remove_pfs_storage_out_t, NULL, true); + REGISTER_RPC(client, "ADM_input", ADM_input_in_t, ADM_input_out_t, NULL, true); diff --git a/src/lib/detail/impl.cpp b/src/lib/detail/impl.cpp index b6e7d15a40d48098ee72da2c3a02112ce38bcbd7..85dbd05691f1136820fd88b901619e87147f3e6f 100644 --- a/src/lib/detail/impl.cpp +++ b/src/lib/detail/impl.cpp @@ -54,6 +54,14 @@ rpc_registration_cb(scord::network::rpc_client* client) { ADM_deploy_adhoc_storage_in_t, ADM_deploy_adhoc_storage_out_t, NULL, true); + REGISTER_RPC(client, "ADM_register_pfs_storage", + ADM_register_pfs_storage_in_t, ADM_register_pfs_storage_out_t, + NULL, true); + REGISTER_RPC(client, "ADM_update_pfs_storage", ADM_update_pfs_storage_in_t, + ADM_update_pfs_storage_out_t, NULL, true); + REGISTER_RPC(client, "ADM_remove_pfs_storage", ADM_remove_pfs_storage_in_t, + ADM_remove_pfs_storage_out_t, NULL, true); + REGISTER_RPC(client, "ADM_input", ADM_input_in_t, ADM_input_out_t, NULL, true); @@ -213,8 +221,7 @@ update_job(const server& srv, const job& job, const job_requirements& reqs) { if(out.retval < 0) { const auto retval = static_cast(out.retval); - LOGGER_ERROR("RPC (ADM_{}) <= {{retval: {}}}", __FUNCTION__, - retval); + LOGGER_ERROR("RPC (ADM_{}) <= {{retval: {}}}", __FUNCTION__, retval); return retval; } @@ -240,9 +247,8 @@ remove_job(const server& srv, const job& job) { if(out.retval < 0) { const auto retval = static_cast(out.retval); - LOGGER_ERROR("RPC (ADM_{}) <= {{retval: {}}}", __FUNCTION__, - retval); -return retval; + LOGGER_ERROR("RPC (ADM_{}) <= {{retval: {}}}", __FUNCTION__, retval); + return retval; } LOGGER_INFO("RPC (ADM_{}) <= {{retval: {}}}", __FUNCTION__, ADM_SUCCESS); diff --git a/src/scord/scord.cpp b/src/scord/scord.cpp index b317923bb420bd9b664808b7bcfc37530b21eb3b..44e8f7aca7dc523c7551fed6732ac81a9137727e 100644 --- a/src/scord/scord.cpp +++ b/src/scord/scord.cpp @@ -185,6 +185,17 @@ main(int argc, char* argv[]) { ADM_deploy_adhoc_storage_out_t, ADM_deploy_adhoc_storage, true); + REGISTER_RPC(ctx, "ADM_register_pfs_storage", + ADM_register_pfs_storage_in_t, + ADM_register_pfs_storage_out_t, + ADM_register_pfs_storage, true); + REGISTER_RPC( + ctx, "ADM_update_pfs_storage", ADM_update_pfs_storage_in_t, + ADM_update_pfs_storage_out_t, ADM_update_pfs_storage, true); + REGISTER_RPC( + ctx, "ADM_remove_pfs_storage", ADM_remove_pfs_storage_in_t, + ADM_remove_pfs_storage_out_t, ADM_remove_pfs_storage, true); + REGISTER_RPC(ctx, "ADM_input", ADM_input_in_t, ADM_input_out_t, ADM_input, true);