summaryrefslogtreecommitdiffstats
path: root/nova/tests/conductor
diff options
context:
space:
mode:
authorAndrew Laski <andrew.laski@rackspace.com>2013-06-17 10:36:46 -0400
committerAndrew Laski <andrew.laski@rackspace.com>2013-06-28 09:48:14 -0400
commit4f3c5411d92d488b78f06212912fc7ae6d225b79 (patch)
tree2265977f9567fec74f96b34ec965a1666df57259 /nova/tests/conductor
parent7a241e5f8be927ff87c6ee6a478a7757a4a55813 (diff)
downloadnova-4f3c5411d92d488b78f06212912fc7ae6d225b79.tar.gz
nova-4f3c5411d92d488b78f06212912fc7ae6d225b79.tar.xz
nova-4f3c5411d92d488b78f06212912fc7ae6d225b79.zip
New select_destinations scheduler call
select_destinations returns a list of (host, node) tuples that satisfy the request_spec and filter_properties passed to it. This will allow the conductor to get a list of destinations for workflows such as creating or resizing an instance and then handle the orchestration itself. part of bp query-scheduler Change-Id: I1a42cea64dbad67562d7efe8d759e6efb5ec8121
Diffstat (limited to 'nova/tests/conductor')
-rw-r--r--nova/tests/conductor/test_conductor.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py
index 609c2164c..9d8725f66 100644
--- a/nova/tests/conductor/test_conductor.py
+++ b/nova/tests/conductor/test_conductor.py
@@ -1251,7 +1251,8 @@ class _BaseTaskTestCase(object):
'instance_type': expected_instance_type,
'instance_uuids': ['fakeuuid', 'fakeuuid2'],
'block_device_mapping': 'block_device_mapping',
- 'security_group': 'security_groups'},
+ 'security_group': 'security_groups',
+ 'num_instances': 2},
admin_password='admin_password',
injected_files='injected_files',
requested_networks='requested_networks', is_first_time=True,