ARCHIVE/sashimono
1
0
Fork 0
mirror of https://github.com/EvernodeXRPL/sashimono.git synced 2026-04-29 15:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Addition of lease info to the instance list (#120)

Browse Source 
Co-authored-by: ravinsp <33562092+ravinsp@users.noreply.github.com>
This commit is contained in:
Kithmini Gunawardhana
2022-04-25 09:41:22 +05:30
committed by GitHub
parent 3daa1126f6
commit bbc6edc238
12 changed files with 3269 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/msg/json/msg_json.cpp
View File

@@ -9,7 +9,8 @@ namespace msg::json
constexpr const char *SEP_COMMA_NOQUOTE = ",\"";
constexpr const char *SEP_COLON_NOQUOTE = "\":";
constexpr const char *DOUBLE_QUOTE = "\"";
constexpr uint16_t MOMENT_SIZE = 900; // XRP ledgers per Moment.
constexpr uint16_t LEDGER_TIME_APPROX = 4000; // Approx. milliseconds per XRP ledger.
/**
* Parses a json message sent by the message board.
* @param d Jsoncons document to which the parsed json should be loaded.
@@ -438,7 +439,7 @@ namespace msg::json
* {
* "type": "destroy",
* "owner_pubkey": "<pubkey of the owner>",
* "container_name": "<container_name>",
* "container_name": "<container_name>",
* }
* @return 0 on successful extraction. -1 for failure.
*/
@@ -471,7 +472,7 @@ namespace msg::json
* {
* "type": "start",
* "owner_pubkey": "<pubkey of the owner>",
* "container_name": "<container_name>",
* "container_name": "<container_name>",
* }
* @return 0 on successful extraction. -1 for failure.
*/
@@ -504,7 +505,7 @@ namespace msg::json
* {
* "type": "stop",
* "owner_pubkey": "<pubkey of the owner>",
* "container_name": "<container_name>",
* "container_name": "<container_name>",
* }
* @return 0 on successful extraction. -1 for failure.
*/
@@ -536,7 +537,7 @@ namespace msg::json
* Accepted signed input container format:
* {
* "type": "inspect",
* "container_name": "<container_name>",
* "container_name": "<container_name>",
* }
* @return 0 on successful extraction. -1 for failure.
*/
@@ -648,19 +649,26 @@ namespace msg::json
* "image": "<docker image name>",
* "status": "<status of the instance>",
* "peer_port": "<peer port of the instance>",
* "user_port": "<user port of the instance>"
* "user_port": "<user port of the instance>",
* "created_timestamp": <created on UNIX timestamp>,
* "contract_id": "<evernode contract id>",
* "expiry_approx_timestamp": <approx UNIX timestamp for expiration>,
* "created_ledger": <created on xrpl ledger>,
* "expiry_ledger": <expires upon xrpl ledger>,
* "tenant": "<tenant xrp account address>",
* }
* ]
* @param instances Instance list.
*
*
*/
void build_list_response(std::string &msg, const std::vector<hp::instance_info> &instances)
void build_list_response(std::string &msg, const std::vector<hp::instance_info> &instances, const std::vector<hp::lease_info> &leases)
{
msg.reserve(1024);
msg += "[";
for (size_t i = 0; i < instances.size(); i++)
{
const hp::instance_info &instance = instances[i];
msg += "{\"";
msg += "name";
msg += SEP_COLON;
@@ -674,6 +682,10 @@ namespace msg::json
msg += SEP_COLON;
msg += instance.image_name;
msg += SEP_COMMA;
msg += "contract_id";
msg += SEP_COLON;
msg += instance.contract_id;
msg += SEP_COMMA;
msg += "status";
msg += SEP_COLON;
msg += instance.status;
@@ -685,11 +697,38 @@ namespace msg::json
msg += "user_port";
msg += SEP_COLON_NOQUOTE;
msg += std::to_string(instance.assigned_ports.user_port);
// Include matching lease information.
const auto lease = std::find_if(leases.begin(), leases.end(), [&](const hp::lease_info &l)
{ return l.container_name == instance.container_name; });
if (lease != leases.end())
{
msg += SEP_COMMA_NOQUOTE;
msg += "created_timestamp";
msg += SEP_COLON_NOQUOTE;
msg += std::to_string(lease->timestamp);
msg += SEP_COMMA_NOQUOTE;
msg += "created_ledger";
msg += SEP_COLON_NOQUOTE;
msg += std::to_string(lease->created_on_ledger);
msg += SEP_COMMA_NOQUOTE;
msg += "expiry_ledger";
msg += SEP_COLON_NOQUOTE;
msg += std::to_string(lease->created_on_ledger + (lease->life_moments * MOMENT_SIZE));
msg += SEP_COMMA_NOQUOTE;
msg += "tenant";
msg += SEP_COLON;
msg += lease->tenant_xrp_address;
msg += "\"";
}
msg += "}";
if (i < instances.size() - 1)
msg += ",";
}
msg += "]";
std::cout << msg << "\n";
}
/**
@@ -705,7 +744,7 @@ namespace msg::json
* "user_port": "<user port of the instance>"
* }
* @param instance Instance info.
*
*
*/
void build_inspect_response(std::string &msg, const hp::instance_info &instance)
{