diff options
| author | Russell Bryant <rbryant@redhat.com> | 2012-05-30 14:57:03 -0400 |
|---|---|---|
| committer | Russell Bryant <rbryant@redhat.com> | 2012-06-01 14:05:51 -0400 |
| commit | cf2b87347cd801112f89552a78efabb92a63bac6 (patch) | |
| tree | 35bcaa64760c89737c8992e46730e6a9f6f0b70f /nova/scheduler | |
| parent | b7744f8f7e345928df016a04b6d8a5935470b254 (diff) | |
Add shared_storage_test methods to compute rpcapi.
Part of bug 1006467.
This patch adds 3 methods used to check if shared storage works between
two compute hosts to the compute rpcapi. These methods are used by the
scheduler.
This also cuts down on some duplicated code in test_scheduler.
Change-Id: If0bf7f7fdd2beb0e5280ae52daf049372f8bc9e2
Diffstat (limited to 'nova/scheduler')
| -rw-r--r-- | nova/scheduler/driver.py | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/nova/scheduler/driver.py b/nova/scheduler/driver.py index 94c3395fe..bcdc6ce10 100644 --- a/nova/scheduler/driver.py +++ b/nova/scheduler/driver.py @@ -489,21 +489,17 @@ class Scheduler(object): """ src = instance_ref['host'] - dst_t = rpc.queue_get_for(context, FLAGS.compute_topic, dest) - src_t = rpc.queue_get_for(context, FLAGS.compute_topic, src) - filename = rpc.call(context, dst_t, - {"method": 'create_shared_storage_test_file'}) + filename = self.compute_rpcapi.create_shared_storage_test_file(context, + dest) try: # make sure existence at src host. - ret = rpc.call(context, src_t, - {"method": 'check_shared_storage_test_file', - "args": {'filename': filename}}) + ret = self.compute_rpcapi.check_shared_storage_test_file(context, + filename, src) finally: - rpc.cast(context, dst_t, - {"method": 'cleanup_shared_storage_test_file', - "args": {'filename': filename}}) + self.compute_rpcapi.cleanup_shared_storage_test_file(context, + filename, dest) return ret |
