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

#1008 Adapt virtual disk setup JSON format 

Previous commits updates ogClient and ogServer to support several disks
in Linux (ogLive) mode. This changes disk setup JSON format from an
object to an array. ogClient in virtual mode also need to satisfy this
new format, although it not support several disks.

Adapt ogClient virtual mode to satisfy new disk setup JSON format.

Old format:

    "disk_setup": {
        "disk": 1,
        "partition": 0,
        "code": "0",
        "filesystem": "",
        "os": "",
        "size": 32685957,
        "used_size": 6
    },

New format:

    "disk_setup": [
        {
            "disk": 1,
            "partition": 0,
            "code": "0",
            "filesystem": "",
            "os": "",
            "size": 32685957,
            "used_size": 6
        }
    ],
more_events
Javier Sánchez Parra 2020-11-19 12:44:40 +01:00 committed by OpenGnSys Support Team
parent 91f034e371
commit 0411d2bf94
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/virtual/ogOperations.py
View File

@ -252,7 +252,9 @@ class OgVirtualOperations:
part.pop('virt-drive')
for k, v in part.items():
part[k] = str(v)
data['disk_setup'] = {k: str(v) for k, v in data['disk_setup'].items()}
for disk in data['disk_setup']:
for k, v in disk.items():
disk[k] = str(v)
return data
def refresh(self, ogRest):
@ -318,13 +320,13 @@ class OgVirtualOperations:
total_disk, used_disk, free_disk = shutil.disk_usage("/")
free_disk = int(free_disk * self.USABLE_DISK)
data = {'serial_number': '',
'disk_setup': {'disk': 1,
'disk_setup': [{'disk': 1,
'partition': 0,
'code': '0',
'filesystem': '',
'os': '',
'size': int(free_disk / 1024),
'used_size': int(100 * used_disk / total_disk)},
'used_size': int(100 * used_disk / total_disk)}],
'partition_setup': []}
for i in range(4):
part_json = {'disk': 1,