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

repo: server: replace --address with --ip 

Make flag format uniform for all the commands.
master
Alejandro Sirgo Rica 2024-09-12 11:42:30 +02:00
parent 7f09d148b4
commit 175a38606a
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
cli/objects/repo.py
View File

@ -19,16 +19,16 @@ class OgRepo():
@staticmethod @staticmethod
def _add_repo(rest, parsed_args): def _add_repo(rest, parsed_args):
payload = { payload = {
'addr': parsed_args.address, 'addr': parsed_args.ip,
'name': parsed_args.name, 'name': parsed_args.name,
} }
rest.post('/repository/add', payload=payload) rest.post('/repository/add', payload=payload)
@staticmethod @staticmethod
def _add_repo_ip(rest, parsed_args): def _add_repo_ip(rest, parsed_args):
for address in parsed_args.address: for ip in parsed_args.ip:
if not check_address(address): if not check_address(ip):
print(f'Invalid IP address: {address}') print(f'Invalid IP address: {ip}')
return return
r = rest.get('/repositories') r = rest.get('/repositories')
@ -42,14 +42,14 @@ class OgRepo():
print('Invalid repository id specified') print('Invalid repository id specified')
return return
for address in parsed_args.address: for ip in parsed_args.ip:
if address in target_repo['addr']: if ip in target_repo['addr']:
print(f'The repository already contains the address {address}') print(f'The repository already contains the address {ip}')
return return
payload = { payload = {
'id': parsed_args.id, 'id': parsed_args.id,
'addr': target_repo['addr'] + parsed_args.address, 'addr': target_repo['addr'] + parsed_args.ip,
'name': target_repo['name'], 'name': target_repo['name'],
} }
rest.post('/repository/update', payload=payload) rest.post('/repository/update', payload=payload)
@ -66,7 +66,7 @@ class OgRepo():
group.add_argument('--id', group.add_argument('--id',
type=int, type=int,
help='repo id (list repos using "ogcli list repos")') help='repo id (list repos using "ogcli list repos")')
parser.add_argument('--address', parser.add_argument('--ip',
nargs='+', nargs='+',
required=True, required=True,
help='IP list separated by spaces') help='IP list separated by spaces')
@ -86,7 +86,7 @@ class OgRepo():
nargs='?', nargs='?',
required=True, required=True,
help='repo id (list repos using "ogcli list repos")') help='repo id (list repos using "ogcli list repos")')
parser.add_argument('--address', parser.add_argument('--ip',
nargs='+', nargs='+',
required=True, required=True,
help='IP list separated by spaces') help='IP list separated by spaces')
@ -97,7 +97,7 @@ class OgRepo():
parsed_args = parser.parse_args(args) parsed_args = parser.parse_args(args)
payload = { payload = {
'id': parsed_args.id, 'id': parsed_args.id,
'addr': parsed_args.address, 'addr': parsed_args.ip,
'name': parsed_args.name, 'name': parsed_args.name,
} }
@ -105,9 +105,9 @@ class OgRepo():
@staticmethod @staticmethod
def _delete_repo_ip(rest, parsed_args): def _delete_repo_ip(rest, parsed_args):
for address in parsed_args.address: for ip in parsed_args.ip:
if not check_address(address): if not check_address(ip):
print(f'Invalid IP address: {address}') print(f'Invalid IP address: {ip}')
return return
r = rest.get('/repositories') r = rest.get('/repositories')
@ -121,12 +121,12 @@ class OgRepo():
print('Invalid repository id specified') print('Invalid repository id specified')
return return
for address in parsed_args.address: for ip in parsed_args.ip:
if address not in target_repo['addr']: if ip not in target_repo['addr']:
print(f'Invalid address {address}: The repository has the following IPs: {target_repo["addr"]}') print(f'Invalid address {ip}: The repository has the following IPs: {target_repo["addr"]}')
return return
target_repo['addr'].remove(address) target_repo['addr'].remove(ip)
payload = { payload = {
'id': parsed_args.id, 'id': parsed_args.id,
@ -149,15 +149,15 @@ class OgRepo():
required=True, required=True,
help='repo id (list repos using "ogcli list repos")') help='repo id (list repos using "ogcli list repos")')
# --address is optional; if provided, the IP will be removed, otherwise, # --ip is optional; if provided, the IP will be removed, otherwise,
# the repo will be deleted # the repo will be deleted
parser.add_argument('--address', parser.add_argument('--ip',
nargs='+', nargs='+',
help='IP address to remove from the repository') help='IP address to remove from the repository')
parsed_args = parser.parse_args(args) parsed_args = parser.parse_args(args)
if parsed_args.address: if parsed_args.ip:
OgRepo._delete_repo_ip(rest, parsed_args) OgRepo._delete_repo_ip(rest, parsed_args)
else: else:
OgRepo._delete_repo(rest, parsed_args) OgRepo._delete_repo(rest, parsed_args)

8
cli/objects/server.py
View File

@ -19,17 +19,17 @@ class OgServer():
@staticmethod @staticmethod
def add_server(rest, args): def add_server(rest, args):
parser = argparse.ArgumentParser(prog='ogcli add server') parser = argparse.ArgumentParser(prog='ogcli add server')
parser.add_argument('--address', parser.add_argument('--ip',
nargs='?', nargs='?',
required=True, required=True,
help='valid ogserver ip address') help='valid ogserver ip address')
parsed_args = parser.parse_args(args) parsed_args = parser.parse_args(args)
if not check_address(parsed_args.address): if not check_address(parsed_args.ip):
print(f'Invalid IP address: {parsed_args.address}') print(f'Invalid IP address: {parsed_args.ip}')
return return
payload = {'address': parsed_args.address} payload = {'address': parsed_args.ip}
rest.post('/server', payload=payload) rest.post('/server', payload=payload)
@staticmethod @staticmethod