48k.eu-mirror
/
ogcli
mirror of https://git.48k.eu/ogcli/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make client and center params more specific 

Non specific parameter names like '--center' or '--client' should not be
used to specify an ip or id, only a literal name.

Rename --client to --client-ip and --center to --center-id to leave
unspecific parameters free to later implement --center or --client using
names.
master
Jose M. Guisado 2021-03-03 10:17:11 +01:00 committed by OpenGnSys Support Team
parent 1be7f3f8a8
commit c80f27c98c
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cli/objects/client.py
View File

@ -18,26 +18,26 @@ class OgClient():
@staticmethod
def list_client_hardware(rest, args):
parser = argparse.ArgumentParser()
parser.add_argument('--client',
parser.add_argument('--client-ip',
nargs=1,
type=str,
required=True,
help='client IP')
parsed_args = parser.parse_args(args)
payload = {'client': parsed_args.client}
payload = {'client': parsed_args.client_ip}
r = rest.get('/hardware', payload=payload)
print(r.json())
@staticmethod
def get_client_properties(rest, args):
parser = argparse.ArgumentParser()
parser.add_argument('--client',
parser.add_argument('--client-ip',
nargs=1,
required=True,
help='client IP')
parsed_args = parser.parse_args(args)
payload = {'client': parsed_args.client}
payload = {'client': parsed_args.client_ip}
r = rest.get('/client/info', payload=payload)
print(r.json())

10
cli/objects/modes.py
View File

@ -19,19 +19,19 @@ class OgModes():
def set_modes(rest, args):
parser = argparse.ArgumentParser()
group = parser.add_argument_group('clients', 'Client selection args')
group.add_argument('--center',
group.add_argument('--center-id',
type=int,
action='append',
default=[],
required=False,
help='Clients from given center')
help='Clients from given center id')
group.add_argument('--room-id',
type=int,
action='append',
default=[],
required=False,
help='Clients from given room id')
group.add_argument('--client',
group.add_argument('--client-ip',
action='append',
default=[],
required=False,
@ -66,13 +66,13 @@ class OgModes():
scopes = r.json()
ips = set()
for center in parsed_args.center:
for center in parsed_args.center_id:
center_scope = scope_lookup(center, 'center', scopes)
ips.update(ips_in_scope(center_scope))
for room in parsed_args.room_id:
room_scope = scope_lookup(room, 'room', scopes)
ips.update(ips_in_scope(room_scope))
for l in parsed_args.client:
for l in parsed_args.client_ip:
ips.add(l)
if not ips: