Skip to content

Commit f398968

Browse files
committed
Update cloudbolt_admin.py
mods to convert cpu_cnt and mem_size to int and Decimal
1 parent 9bdc7ef commit f398968

1 file changed

Lines changed: 12 additions & 7 deletions

File tree

onefuse/cloudbolt_admin.py

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from decimal import Decimal
2+
13
from infrastructure.models import CustomField, Server
24

35
if __name__ == '__main__':
@@ -171,10 +173,14 @@ def render_and_apply_properties(self, properties: dict, resource,
171173
resource.environment = Environment.objects.filter(
172174
name=rendered_value).first()
173175
elif rendered_key == 'cpu_cnt':
174-
resource.cpu_cnt = rendered_value
176+
self.logger.info(f'Setting cpu_cnt to: '
177+
f'{rendered_value}')
178+
resource.cpu_cnt = int(rendered_value)
175179
resource.save()
176180
elif rendered_key == 'mem_size':
177-
resource.mem_size = rendered_value
181+
self.logger.info(f'Setting mem_size to: '
182+
f'{rendered_value}')
183+
resource.mem_size = Decimal(rendered_value)
178184
resource.save()
179185
else:
180186
try:
@@ -503,11 +509,10 @@ def get_hardware_info(self, resource: Server):
503509
except Exception:
504510
pass
505511
try:
506-
hardware_info[index_prop]["memoryMB"] = resource.mem_size * 1024
507-
except Exception:
508-
pass
509-
try:
510-
hardware_info[index_prop]["memoryGB"] = resource.mem_size
512+
mem_gb = int(resource.mem_size)
513+
mem_mb = mem_gb * 1024
514+
hardware_info[index_prop]["memoryGB"] = mem_gb
515+
hardware_info[index_prop]["memoryMB"] = mem_mb
511516
except Exception:
512517
pass
513518
try:

0 commit comments

Comments
 (0)