Fix CLI to handle Timestamp (#323)

* Fix CLI to handle Timestamp

* More cli fixes

Author: macpie

src/cli/hpr_cli_config.erl

@@ -208,7 +208,7 @@ config_list(_, _, _) ->
 config_oui_list(["config", "oui", OUIString], [], Flags) ->
     Options = maps:from_list(Flags),
     OUI = erlang:list_to_integer(OUIString),
-    RoutesETS = hpr_route_storage:oui_routes(OUI),
+    RoutesETS = hpr_route_storage:oui_routes_ets(OUI),
 
     %% OUI 4
     %% ========================================================
@@ -882,7 +882,7 @@ sync_routes([], [Route | LeftoverRoutes], #{removed := RemovedRoutes} = Updates)
 sync_routes([Route | Routes], ExistingRoutes, #{added := AddedRoutes} = Updates) ->
     RouteID = hpr_route:id(Route),
     case hpr_route_storage:lookup(RouteID) of
-        {ok, _Route} ->
+        {ok, _RouteETS} ->
             lager:info([{route_id, RouteID}], "doing nothing, route already exists"),
             sync_routes(
                 Routes,

src/cli/hpr_cli_info.erl

@@ -80,21 +80,30 @@ info_ips(_, _, _) ->
     usage.
 
 info_netids(["info", "netids"], [], []) ->
+    NowMs = erlang:system_time(millisecond),
     List = lists:map(
-        fun({NetID, Count}) ->
+        fun({NetID, Count, Timestamp}) ->
+            TsISO = erlang:list_to_binary(
+                calendar:system_time_to_rfc3339(
+                    Timestamp, [{unit, millisecond}, {offset, "Z"}]
+                )
+            ),
+            ElapsedMs = max(1, NowMs - Timestamp),
+            Hours = ElapsedMs / 3600000.0,
+            CountPerHour = math:ceil(Count / Hours * 10) / 10.0,
             #{
                 net_id_str => erlang:list_to_binary(hpr_utils:net_id_display(NetID)),
                 net_id_int => NetID,
-                count => Count
+                count => Count,
+                timestamp => TsISO,
+                count_per_hour => CountPerHour
             }
         end,
         hpr_netid_stats:export()
     ),
     Json = jsx:encode(List, [{indent, 2}]),
-    case file:open("/tmp/net_ids.json", [write]) of
-        {ok, File} ->
-            file:write(File, Json),
-            file:close(File),
+    case file:write_file("/tmp/net_ids.json", Json) of
+        ok ->
             c_text("Exported to /tmp/net_ids.json");
         {error, Reason} ->
             c_text("Failed to export ~p", [Reason])

src/grpc/iot_config/hpr_route_storage.erl

@@ -13,6 +13,7 @@
     all_routes/0,
     all_route_ets/0,
     oui_routes/1,
+    oui_routes_ets/1,
 
     delete_all/0
 ]).
@@ -148,14 +149,21 @@ test_size() ->
 
 -spec all_routes() -> list(hpr_route:route()).
 all_routes() ->
-    [hpr_route_ets:route(R) || R <- ets:tab2list(?ETS)].
+    [hpr_route_ets:route(RouteETS) || RouteETS <- ets:tab2list(?ETS)].
 
 -spec all_route_ets() -> list(hpr_route_ets:route()).
 all_route_ets() ->
     ets:tab2list(?ETS).
 
--spec oui_routes(OUI :: non_neg_integer()) -> list(hpr_route_ets:route()).
+-spec oui_routes(OUI :: non_neg_integer()) -> list(hpr_route:route()).
 oui_routes(OUI) ->
+    [
+        hpr_route_ets:route(RouteETS)
+     || RouteETS <- ets:tab2list(?ETS), OUI == hpr_route:oui(hpr_route_ets:route(RouteETS))
+    ].
+
+-spec oui_routes_ets(OUI :: non_neg_integer()) -> list(hpr_route_ets:route()).
+oui_routes_ets(OUI) ->
     [
         RouteETS
      || RouteETS <- ets:tab2list(?ETS), OUI == hpr_route:oui(hpr_route_ets:route(RouteETS))