afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

core-cli: add position output for querying nodes

Browse source
This commit is contained in:
Blake Harnden 2021-06-03 21:37:56 -07:00
parent 7fcedf527f
commit 425a2ee141
1 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
daemon/scripts/core-cli
View file

@ -210,22 +210,27 @@ def query_session(core: CoreGrpcClient, args: Namespace) -> None:
def query_node(core: CoreGrpcClient, args: Namespace) -> None: def query_node(core: CoreGrpcClient, args: Namespace) -> None:
session = core.get_session(args.id) session = core.get_session(args.id)
node, ifaces, _ = core.get_node(args.id, args.node) node, ifaces, _ = core.get_node(args.id, args.node)
print("ID | Name | Type") print("ID | Name | Type | XY")
print(f"{node.id:<4} | {node.name:<7} | {node.type.name}") xy_pos = f"{int(node.position.x)},{int(node.position.y)}"
print("Interfaces") print(f"{node.id:<4} | {node.name[:7]:<7} | {node.type.name[:7]:<7} | {xy_pos}")
print("Connected To | ", end="") if node.geo:
print_iface_header() print("Geo")
for iface in ifaces: print(f"{node.geo.lon:.7f},{node.geo.lat:.7f},{node.geo.alt:f}")
if iface.net_id == node.id: if ifaces:
if iface.node_id: print("Interfaces")
name = session.nodes[iface.node_id].name print("Connected To | ", end="")
print_iface_header()
for iface in ifaces:
if iface.net_id == node.id:
if iface.node_id:
name = session.nodes[iface.node_id].name
else:
name = session.nodes[iface.net2_id].name
else: else:
name = session.nodes[iface.net2_id].name net_node = session.nodes.get(iface.net_id)
else: name = net_node.name if net_node else ""
net_node = session.nodes.get(iface.net_id) print(f"{name:<12} | ", end="")
name = net_node.name if net_node else "" print_iface(iface)
print(f"{name:<12} | ", end="")
print_iface(iface)
@coreclient @coreclient