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

core-cli: cleaned up core client usage by way of a decorator, helps provide convenient grpc error catching

Browse source
This commit is contained in:
Blake Harnden 2020-07-01 11:01:44 -07:00
parent 3477e84e9d
commit 7a6c602369
1 changed files with 170 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

100
daemon/scripts/core-cli
View file

@ -7,6 +7,7 @@ from argparse import (
Namespace, Namespace,
_SubParsersAction, _SubParsersAction,
) )
from functools import wraps
from pathlib import Path from pathlib import Path
from typing import Any, Optional, Tuple from typing import Any, Optional, Tuple
@ -29,6 +30,19 @@ from core.api.grpc.core_pb2 import (
NODE_TYPES = [k for k, v in NodeType.Enum.items() if v != NodeType.PEER_TO_PEER] NODE_TYPES = [k for k, v in NodeType.Enum.items() if v != NodeType.PEER_TO_PEER]
def coreclient(func):
@wraps(func)
def wrapper(*args, **kwargs):
core = CoreGrpcClient()
try:
with core.context_connect():
return func(core, *args, **kwargs)
except grpc.RpcError as e:
print(f"grpc error: {e.details()}")
return wrapper
def mac_type(value: str) -> str: def mac_type(value: str) -> str:
try: try:
mac = EUI(value, dialect=netaddr.mac_unix_expanded) mac = EUI(value, dialect=netaddr.mac_unix_expanded)
@ -88,11 +102,9 @@ def file_type(value: str) -> str:
return str(path.absolute()) return str(path.absolute())
def get_current_session(session_id: Optional[int]) -> int: def get_current_session(core: CoreGrpcClient, session_id: Optional[int]) -> int:
if session_id: if session_id:
return session_id return session_id
core = CoreGrpcClient()
with core.context_connect():
response = core.get_sessions() response = core.get_sessions()
if not response.sessions: if not response.sessions:
print("no current session to interact with") print("no current session to interact with")
@ -130,11 +142,9 @@ def print_json(message: Any) -> None:
print(json) print(json)
def get_wlan_config(args: Namespace) -> None: @coreclient
session_id = get_current_session(args.session) def get_wlan_config(core: CoreGrpcClient, args: Namespace) -> None:
core = CoreGrpcClient() session_id = get_current_session(core, args.session)
try:
with core.context_connect():
response = core.get_wlan_config(session_id, args.node) response = core.get_wlan_config(session_id, args.node)
if args.json: if args.json:
print_json(response) print_json(response)
@ -145,12 +155,11 @@ def get_wlan_config(args: Namespace) -> None:
print(f"{'Name':<{size}.{size}} | Value") print(f"{'Name':<{size}.{size}} | Value")
for option in response.config.values(): for option in response.config.values():
print(f"{option.name:<{size}.{size}} | {option.value}") print(f"{option.name:<{size}.{size}} | {option.value}")
except grpc.RpcError as e:
print(f"grpc error: {e.details()}")
def set_wlan_config(args: Namespace) -> None: @coreclient
session_id = get_current_session(args.session) def set_wlan_config(core: CoreGrpcClient, args: Namespace) -> None:
session_id = get_current_session(core, args.session)
config = {} config = {}
if args.bandwidth: if args.bandwidth:
config["bandwidth"] = str(args.bandwidth) config["bandwidth"] = str(args.bandwidth)
@ -162,21 +171,15 @@ def set_wlan_config(args: Namespace) -> None:
config["jitter"] = str(args.jitter) config["jitter"] = str(args.jitter)
if args.range: if args.range:
config["range"] = str(args.range) config["range"] = str(args.range)
core = CoreGrpcClient()
try:
with core.context_connect():
response = core.set_wlan_config(session_id, args.node, config) response = core.set_wlan_config(session_id, args.node, config)
if args.json: if args.json:
print_json(response) print_json(response)
else: else:
print(f"set wlan config: {response.result}") print(f"set wlan config: {response.result}")
except grpc.RpcError as e:
print(f"grpc error: {e.details()}")
def open_xml(args: Namespace) -> None: @coreclient
core = CoreGrpcClient() def open_xml(core: CoreGrpcClient, args: Namespace) -> None:
with core.context_connect():
response = core.open_xml(args.file, args.start) response = core.open_xml(args.file, args.start)
if args.json: if args.json:
print_json(response) print_json(response)
@ -184,9 +187,8 @@ def open_xml(args: Namespace) -> None:
print(f"opened xml: {response.result}") print(f"opened xml: {response.result}")
def query_sessions(args: Namespace) -> None: @coreclient
core = CoreGrpcClient() def query_sessions(core: CoreGrpcClient, args: Namespace) -> None:
with core.context_connect():
response = core.get_sessions() response = core.get_sessions()
if args.json: if args.json:
print_json(response) print_json(response)
@ -197,9 +199,8 @@ def query_sessions(args: Namespace) -> None:
print(f"{s.id:<10} | {state:<13} | {s.nodes}") print(f"{s.id:<10} | {state:<13} | {s.nodes}")
def query_session(args: Namespace) -> None: @coreclient
core = CoreGrpcClient() def query_session(core: CoreGrpcClient, args: Namespace) -> None:
with core.context_connect():
response = core.get_session(args.id) response = core.get_session(args.id)
if args.json: if args.json:
print_json(response) print_json(response)
@ -231,9 +232,8 @@ def query_session(args: Namespace) -> None:
print() print()
def query_node(args: Namespace) -> None: @coreclient
core = CoreGrpcClient() def query_node(core: CoreGrpcClient, args: Namespace) -> None:
with core.context_connect():
names = {} names = {}
response = core.get_session(args.id) response = core.get_session(args.id)
for node in response.session.nodes: for node in response.session.nodes:
@ -262,8 +262,9 @@ def query_node(args: Namespace) -> None:
print_iface(iface) print_iface(iface)
def add_node(args: Namespace) -> None: @coreclient
session_id = get_current_session(args.session) def add_node(core: CoreGrpcClient, args: Namespace) -> None:
session_id = get_current_session(core, args.session)
node_type = NodeType.Enum.Value(args.type) node_type = NodeType.Enum.Value(args.type)
pos = None pos = None
if args.pos: if args.pos:
@ -273,8 +274,6 @@ def add_node(args: Namespace) -> None:
if args.geo: if args.geo:
lon, lat, alt = args.geo lon, lat, alt = args.geo
geo = Geo(lon=lon, lat=lat, alt=alt) geo = Geo(lon=lon, lat=lat, alt=alt)
core = CoreGrpcClient()
with core.context_connect():
node = Node( node = Node(
id=args.id, id=args.id,
name=args.name, name=args.name,
@ -293,8 +292,9 @@ def add_node(args: Namespace) -> None:
print(f"created node: {response.node_id}") print(f"created node: {response.node_id}")
def edit_node(args: Namespace) -> None: @coreclient
session_id = get_current_session(args.session) def edit_node(core: CoreGrpcClient, args: Namespace) -> None:
session_id = get_current_session(core, args.session)
pos = None pos = None
if args.pos: if args.pos:
x, y = args.pos x, y = args.pos
@ -303,8 +303,6 @@ def edit_node(args: Namespace) -> None:
if args.geo: if args.geo:
lon, lat, alt = args.geo lon, lat, alt = args.geo
geo = Geo(lon=lon, lat=lat, alt=alt) geo = Geo(lon=lon, lat=lat, alt=alt)
core = CoreGrpcClient()
with core.context_connect():
response = core.edit_node(session_id, args.id, pos, args.icon, geo) response = core.edit_node(session_id, args.id, pos, args.icon, geo)
if args.json: if args.json:
print_json(response) print_json(response)
@ -312,10 +310,9 @@ def edit_node(args: Namespace) -> None:
print(f"edit node: {response.result}") print(f"edit node: {response.result}")
def delete_node(args: Namespace) -> None: @coreclient
session_id = get_current_session(args.session) def delete_node(core: CoreGrpcClient, args: Namespace) -> None:
core = CoreGrpcClient() session_id = get_current_session(core, args.session)
with core.context_connect():
response = core.delete_node(session_id, args.id) response = core.delete_node(session_id, args.id)
if args.json: if args.json:
print_json(response) print_json(response)
@ -323,8 +320,9 @@ def delete_node(args: Namespace) -> None:
print(f"deleted node: {response.result}") print(f"deleted node: {response.result}")
def add_link(args: Namespace) -> None: @coreclient
session_id = get_current_session(args.session) def add_link(core: CoreGrpcClient, args: Namespace) -> None:
session_id = get_current_session(core, args.session)
iface1 = None iface1 = None
if args.iface1_id is not None: if args.iface1_id is not None:
iface1 = create_iface(args.iface1_id, args.iface1_mac, args.iface1_ip4, args.iface1_ip6) iface1 = create_iface(args.iface1_id, args.iface1_mac, args.iface1_ip4, args.iface1_ip6)
@ -339,8 +337,6 @@ def add_link(args: Namespace) -> None:
dup=args.duplicate, dup=args.duplicate,
unidirectional=args.uni, unidirectional=args.uni,
) )
core = CoreGrpcClient()
with core.context_connect():
response = core.add_link(session_id, args.node1, args.node2, iface1, iface2, options) response = core.add_link(session_id, args.node1, args.node2, iface1, iface2, options)
if args.json: if args.json:
print_json(response) print_json(response)
@ -348,8 +344,9 @@ def add_link(args: Namespace) -> None:
print(f"add link: {response.result}") print(f"add link: {response.result}")
def edit_link(args: Namespace) -> None: @coreclient
session_id = get_current_session(args.session) def edit_link(core: CoreGrpcClient, args: Namespace) -> None:
session_id = get_current_session(core, args.session)
options = LinkOptions( options = LinkOptions(
bandwidth=args.bandwidth, bandwidth=args.bandwidth,
loss=args.loss, loss=args.loss,
@ -358,8 +355,6 @@ def edit_link(args: Namespace) -> None:
dup=args.duplicate, dup=args.duplicate,
unidirectional=args.uni, unidirectional=args.uni,
) )
core = CoreGrpcClient()
with core.context_connect():
response = core.edit_link( response = core.edit_link(
session_id, args.node1, args.node2, options, args.iface1, args.iface2 session_id, args.node1, args.node2, options, args.iface1, args.iface2
) )
@ -369,10 +364,9 @@ def edit_link(args: Namespace) -> None:
print(f"edit link: {response.result}") print(f"edit link: {response.result}")
def delete_link(args: Namespace) -> None: @coreclient
session_id = get_current_session(args.session) def delete_link(core: CoreGrpcClient, args: Namespace) -> None:
core = CoreGrpcClient() session_id = get_current_session(core, args.session)
with core.context_connect():
response = core.delete_link(session_id, args.node1, args.node2, args.iface1, args.iface2) response = core.delete_link(session_id, args.node1, args.node2, args.iface1, args.iface2)
if args.json: if args.json:
print_json(response) print_json(response)