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

images: Remove option to specify repo 

Remove option to specify a repository when creating an image.

Remove option to specify a repository when updating an image.

These features is are not yet supported in ogserver.

With this commit, the image that is created/updated is assigned to the
same repo the client is assigned
master
Javier Hernandez 2023-12-21 13:40:38 +01:00 committed by OpenGnSys Support Team
parent cf4af2a057
commit 717a1021d3
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cli/objects/images.py
View File

@ -118,11 +118,6 @@ class OgImage():
nargs='?', nargs='?',
required=True, required=True,
help='Image description') help='Image description')
parser.add_argument('--repo-id',
nargs='?',
default=1,
type=int,
help='Images repository id (Default: 1)')
group = parser.add_argument_group('clients', 'Client selection args') group = parser.add_argument_group('clients', 'Client selection args')
group.add_argument('--client-ip', group.add_argument('--client-ip',
action='append', action='append',
@ -133,6 +128,7 @@ class OgImage():
r = rest.get('/client/info', payload={'client': parsed_args.client_ip}) r = rest.get('/client/info', payload={'client': parsed_args.client_ip})
center_id = r.json()['center'] center_id = r.json()['center']
repo_id = r.json()['repo_id']
r = rest.get('/client/setup', r = rest.get('/client/setup',
payload={'client': parsed_args.client_ip}) payload={'client': parsed_args.client_ip})
@ -147,10 +143,9 @@ class OgImage():
payload = {'clients': parsed_args.client_ip, 'disk': parsed_args.disk, 'center_id': center_id, payload = {'clients': parsed_args.client_ip, 'disk': parsed_args.disk, 'center_id': center_id,
'partition': parsed_args.part, 'code': str(fs_code), 'name': parsed_args.name, 'partition': parsed_args.part, 'code': str(fs_code), 'name': parsed_args.name,
'id': '0'} 'id': '0', 'repository_id': repo_id}
if parsed_args.desc: if parsed_args.desc:
payload['description'] = parsed_args.desc payload['description'] = parsed_args.desc
payload['repository_id'] = parsed_args.repo_id
rest.post('/image/create', payload=payload) rest.post('/image/create', payload=payload)
@ -174,11 +169,6 @@ class OgImage():
required=False, required=False,
default=False, default=False,
help='Create a backup before updating the image (No backup is created by default)') help='Create a backup before updating the image (No backup is created by default)')
parser.add_argument('--repo-id',
nargs='?',
default=1,
type=int,
help='Images repository id (Default: 1)')
group = parser.add_argument_group('clients', 'Client selection args') group = parser.add_argument_group('clients', 'Client selection args')
group.add_argument('--client-ip', group.add_argument('--client-ip',
action='append', action='append',
@ -189,6 +179,7 @@ class OgImage():
r = rest.get('/client/info', payload={'client': parsed_args.client_ip}) r = rest.get('/client/info', payload={'client': parsed_args.client_ip})
center_id = r.json()['center'] center_id = r.json()['center']
repo_id = int(r.json()['repo_id'])
r = rest.get('/client/setup', r = rest.get('/client/setup',
payload={'client': parsed_args.client_ip}) payload={'client': parsed_args.client_ip})
@ -215,7 +206,7 @@ class OgImage():
else: else:
print(f'Updating {image_name} image') print(f'Updating {image_name} image')
payload = {'repository_id': parsed_args.repo_id, payload = {'repository_id': repo_id,
'clients': parsed_args.client_ip, 'clients': parsed_args.client_ip,
'partition': parsed_args.part, 'partition': parsed_args.part,
'backup': parsed_args.backup, 'backup': parsed_args.backup,