summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-02-17 18:49:30 -0400
committerSandy Walsh <sandy.walsh@rackspace.com>2011-02-17 18:49:30 -0400
commite5d979596ff8c588c7bbe82b7f1cb90de8af041a (patch)
tree5db44c8e4329389f881455f4df2439f1d428fc5f
parenta845b392fcd46139db9bf5c954f1fee9bcafcba9 (diff)
missing docstring and fixed copyrights
-rw-r--r--nova/scheduler/zone_manager.py3
-rw-r--r--nova/tests/test_zones.py1
2 files changed, 1 insertions, 3 deletions
diff --git a/nova/scheduler/zone_manager.py b/nova/scheduler/zone_manager.py
index 4bf6e36c6..3e7c1eba8 100644
--- a/nova/scheduler/zone_manager.py
+++ b/nova/scheduler/zone_manager.py
@@ -1,6 +1,4 @@
# Copyright (c) 2010 Openstack, LLC.
-# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -109,6 +107,7 @@ class ZoneManager(object):
self.zone_states = {}
def get_zone_list(self):
+ """Return the list of zones we know about."""
return [zone.to_dict() for zone in self.zone_states.values()]
def _refresh_from_db(self, context):
diff --git a/nova/tests/test_zones.py b/nova/tests/test_zones.py
index 7036ebe58..c273230a9 100644
--- a/nova/tests/test_zones.py
+++ b/nova/tests/test_zones.py
@@ -1,5 +1,4 @@
# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may