From f3592eb6a96074ce82d7088152e4e2b79927ea91 Mon Sep 17 00:00:00 2001 From: stephb9959 Date: Sat, 23 Jan 2021 00:47:49 -0800 Subject: [PATCH] Refactor inventory module --- include/inventory.hrl | 2 ++ include/simengine.hrl | 2 +- include/statistics.hrl | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/inventory.hrl b/include/inventory.hrl index da1a58e..5fae947 100644 --- a/include/inventory.hrl +++ b/include/inventory.hrl @@ -42,6 +42,7 @@ -record( client_info, { name = <<>> :: binary(), ca = <<>> :: binary(), + sim_name = <<>> :: binary(), cap = [] :: [client_role()], wan_mac0 = <<>> :: binary(), %% MAC is XX:XX:XX:XX:XX:XX lowercase lan_mac0 = <<>> :: binary(), %% MAC is XX:XX:XX:XX:XX:XX lowercase @@ -66,6 +67,7 @@ name = <<>> :: binary(), service = none :: service_role(), ca = <<>> :: binary(), + sim_name = <<>> :: binary(), description = <<>> :: binary(), type = <<>> :: binary(), version = <<>> :: binary(), diff --git a/include/simengine.hrl b/include/simengine.hrl index 36365d5..ffbe3a5 100644 --- a/include/simengine.hrl +++ b/include/simengine.hrl @@ -41,7 +41,7 @@ current_op_pid = none :: none | pid(), current_op = none :: none | preparing | pushing | starting | pausing | stopping | restarting | cancelling , state = created :: created | prepared | pushed | started | paused | stopped | restarted | cancelled , - start = none :: none | erlang:timestamp(), + start = 0 :: non_neg_integer(), current_cb = none :: none | notification_cb(), outstanding_nodes = [] :: [node()], sim_info :: simulation() diff --git a/include/statistics.hrl b/include/statistics.hrl index 1142073..935430b 100644 --- a/include/statistics.hrl +++ b/include/statistics.hrl @@ -43,7 +43,9 @@ }). -type stat_report() :: #stat_report{}. +-type generic_stat_report()::#{atom()=>term()}. + +-export_type([stat_report/0,generic_stat_report/0]). --export_type([stat_report/0]). -endif. \ No newline at end of file