x
/
nova-lxd
Code Issues Proposed changes

Update output to match our specs 

python 2.x matched these correctly without the casts but a version
bump to python 3.x (identified in 3.5.3) changes the output, this
change casts to int when we expect an integer output

Change-Id: Id6010b95a3c90d5538497c9936a6484400436ca6
This commit is contained in:
Chris MacNaughton 2017-04-27 11:26:10 +02:00
parent 02ce341738
commit ff1c8cd12c
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nova/virt/lxd/driver.py
View File

@ -897,10 +897,10 @@ class LXDDriver(driver.ComputeDriver):
data = {
'vcpus': vcpus,
'memory_mb': local_memory_info['total'] / units.Mi,
'memory_mb_used': local_memory_info['used'] / units.Mi,
'local_gb': local_disk_info['total'] / units.Gi,
'local_gb_used': local_disk_info['used'] / units.Gi,
'memory_mb': local_memory_info['total'] // units.Mi,
'memory_mb_used': local_memory_info['used'] // units.Mi,
'local_gb': local_disk_info['total'] // units.Gi,
'local_gb_used': local_disk_info['used'] // units.Gi,
'vcpus_used': 0,
'hypervisor_type': 'lxd',
'hypervisor_version': '011',

10
nova/virt/lxd/flavor.py
View File

@ -99,10 +99,10 @@ def _root(instance, client, *_):
if specs.get('quota:disk_read_bytes_sec'):
device['limits.read'] = '{}MB'.format(
int(specs['quota:disk_read_bytes_sec']) / units.Mi)
int(specs['quota:disk_read_bytes_sec']) // units.Mi)
if specs.get('quota:disk_write_bytes_sec'):
device['limits.write'] = '{}MB'.format(
int(specs['quota:disk_write_bytes_sec']) / units.Mi)
int(specs['quota:disk_write_bytes_sec']) // units.Mi)
minor_quota_defined = 'limits.write' in device or 'limits.read' in device
if specs.get('quota:disk_total_iops_sec') and not minor_quota_defined:
@ -110,7 +110,7 @@ def _root(instance, client, *_):
specs['quota:disk_total_iops_sec'])
if specs.get('quota:disk_total_bytes_sec') and not minor_quota_defined:
device['limits.max'] = '{}MB'.format(
int(specs['quota:disk_total_bytes_sec']) / units.Mi)
int(specs['quota:disk_total_bytes_sec']) // units.Mi)
return {'root': device}
@ -169,7 +169,7 @@ def _network(instance, _, network_info, __):
)
if vif_inbound_limit:
devices[key]['limits.ingress'] = '{}Mbit'.format(
vif_inbound_limit * units.k * 8 / units.M)
vif_inbound_limit * units.k * 8 // units.M)
vif_outbound_limit = max(
int(specs.get('quota:vif_outbound_average', 0)),
@ -177,7 +177,7 @@ def _network(instance, _, network_info, __):
)
if vif_outbound_limit:
devices[key]['limits.egress'] = '{}Mbit'.format(
vif_outbound_limit * units.k * 8 / units.M)
vif_outbound_limit * units.k * 8 // units.M)
return devices