x/python-ganttclient
Code Issues Proposed changes

This just fixes a bunch of pep8 issues that have been lingering around for a while and bothering me :)

Browse Source
This commit is contained in:
William Wolf
2011-06-01 19:00:43 +00:00
committed by Tarmac
parent 9dc4619f20 72126d1aa8
commit 91c7e13cee
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/scheduler/host_filter.py
View File

@@ -226,7 +226,7 @@ class JsonFilter(HostFilter):
required_disk = instance_type['local_gb'] required_disk = instance_type['local_gb']
query = ['and', query = ['and',
['>=', '$compute.host_memory_free', required_ram], ['>=', '$compute.host_memory_free', required_ram],
['>=', '$compute.disk_available', required_disk] ['>=', '$compute.disk_available', required_disk],
] ]
return (self._full_name(), json.dumps(query)) return (self._full_name(), json.dumps(query))

13
nova/tests/test_host_filter.py
View File

@@ -133,13 +133,14 @@ class HostFilterTestCase(test.TestCase):
raw = ['or', raw = ['or',
['and', ['and',
['<', '$compute.host_memory_free', 30], ['<', '$compute.host_memory_free', 30],
['<', '$compute.disk_available', 300] ['<', '$compute.disk_available', 300],
], ],
['and', ['and',
['>', '$compute.host_memory_free', 70], ['>', '$compute.host_memory_free', 70],
['>', '$compute.disk_available', 700] ['>', '$compute.disk_available', 700],
] ],
] ]
cooked = json.dumps(raw) cooked = json.dumps(raw)
hosts = hf.filter_hosts(self.zone_manager, cooked) hosts = hf.filter_hosts(self.zone_manager, cooked)
@@ -183,13 +184,11 @@ class HostFilterTestCase(test.TestCase):
self.assertTrue(hf.filter_hosts(self.zone_manager, json.dumps([]))) self.assertTrue(hf.filter_hosts(self.zone_manager, json.dumps([])))
self.assertTrue(hf.filter_hosts(self.zone_manager, json.dumps({}))) self.assertTrue(hf.filter_hosts(self.zone_manager, json.dumps({})))
self.assertTrue(hf.filter_hosts(self.zone_manager, json.dumps( self.assertTrue(hf.filter_hosts(self.zone_manager, json.dumps(
['not', True, False, True, False] ['not', True, False, True, False])))
)))
try: try:
hf.filter_hosts(self.zone_manager, json.dumps( hf.filter_hosts(self.zone_manager, json.dumps(
'not', True, False, True, False 'not', True, False, True, False))
))
self.fail("Should give KeyError") self.fail("Should give KeyError")
except KeyError, e: except KeyError, e:
pass pass

20
nova/tests/test_zone_aware_scheduler.py
View File

@@ -38,16 +38,16 @@ class FakeZoneAwareScheduler(zone_aware_scheduler.ZoneAwareScheduler):
class FakeZoneManager(zone_manager.ZoneManager): class FakeZoneManager(zone_manager.ZoneManager):
def __init__(self): def __init__(self):
self.service_states = { self.service_states = {
'host1': { 'host1': {
'compute': {'ram': 1000} 'compute': {'ram': 1000},
}, },
'host2': { 'host2': {
'compute': {'ram': 2000} 'compute': {'ram': 2000},
}, },
'host3': { 'host3': {
'compute': {'ram': 3000} 'compute': {'ram': 3000},
} },
} }
class FakeEmptyZoneManager(zone_manager.ZoneManager): class FakeEmptyZoneManager(zone_manager.ZoneManager):