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

Extend use of OG_PARTITIONS_CFG_PATH for /setup and /refresh 

This is a refactor to consolidate the use of this single variable across all
virtual operations.
more_events
Roberto Hueso Gómez 2020-05-11 12:13:39 +02:00
parent 6ca16dd200
commit 404b8c79d0
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/virtual/ogOperations.py
View File

@ -215,13 +215,11 @@ class OgVirtualOperations:
return data return data
def refresh(self, ogRest): def refresh(self, ogRest):
path = f'{self.OG_PATH}/partitions.json'
try: try:
# Return last partitions setup in case VM is running. # Return last partitions setup in case VM is running.
qmp = OgQMP(self.IP, self.VIRTUAL_PORT) qmp = OgQMP(self.IP, self.VIRTUAL_PORT)
qmp.disconnect() qmp.disconnect()
with open(path, 'r') as f: with open(self.OG_PARTITIONS_CFG_PATH, 'r') as f:
data = json.loads(f.read()) data = json.loads(f.read())
data = self.partitions_cfg_to_json(data) data = self.partitions_cfg_to_json(data)
return data return data
@ -229,7 +227,7 @@ class OgVirtualOperations:
pass pass
try: try:
with open(path, 'r+') as f: with open(self.OG_PARTITIONS_CFG_PATH, 'r+') as f:
data = json.loads(f.read()) data = json.loads(f.read())
for part in data['partition_setup']: for part in data['partition_setup']:
if len(part['virt-drive']) > 0: if len(part['virt-drive']) > 0:
@ -288,7 +286,7 @@ class OgVirtualOperations:
'used_size': 0, 'used_size': 0,
'virt-drive': ''} 'virt-drive': ''}
data['partition_setup'].append(part_json) data['partition_setup'].append(part_json)
with open(path, 'w+') as f: with open(self.OG_PARTITIONS_CFG_PATH, 'w+') as f:
f.write(json.dumps(data, indent=4)) f.write(json.dumps(data, indent=4))
data = self.partitions_cfg_to_json(data) data = self.partitions_cfg_to_json(data)
@ -296,7 +294,6 @@ class OgVirtualOperations:
return data return data
def setup(self, request, ogRest): def setup(self, request, ogRest):
path = f'{self.OG_PATH}/partitions.json'
self.poweroff_guest() self.poweroff_guest()
self.refresh(ogRest) self.refresh(ogRest)
@ -320,7 +317,7 @@ class OgVirtualOperations:
g.mkfs(part["filesystem"].lower(), partitions[0]) g.mkfs(part["filesystem"].lower(), partitions[0])
g.close() g.close()
with open(path, 'r+') as f: with open(self.OG_PARTITIONS_CFG_PATH, 'r+') as f:
data = json.loads(f.read()) data = json.loads(f.read())
if part['code'] == 'LINUX': if part['code'] == 'LINUX':
data['partition_setup'][i]['code'] = '0083' data['partition_setup'][i]['code'] = '0083'