diff options
| -rwxr-xr-x | nova/compute/manager.py | 8 | ||||
| -rw-r--r-- | nova/tests/compute/test_virtapi.py | 6 | ||||
| -rwxr-xr-x | nova/virt/fake.py | 6 | ||||
| -rw-r--r-- | nova/virt/virtapi.py | 14 |
4 files changed, 0 insertions, 34 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 6d4835e0b..5da58c1aa 100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -304,14 +304,6 @@ class ComputeVirtAPI(virtapi.VirtAPI): instance_uuid, **updates) - def instance_get_by_uuid(self, context, instance_uuid): - return self._compute.conductor_api.instance_get_by_uuid( - context, instance_uuid) - - def instance_get_all_by_host(self, context, host): - return self._compute.conductor_api.instance_get_all_by_host( - context, host) - def aggregate_get_by_host(self, context, host, key=None): return self._compute.conductor_api.aggregate_get_by_host(context, host, key=key) diff --git a/nova/tests/compute/test_virtapi.py b/nova/tests/compute/test_virtapi.py index e3887d033..81e09bf52 100644 --- a/nova/tests/compute/test_virtapi.py +++ b/nova/tests/compute/test_virtapi.py @@ -45,12 +45,6 @@ class VirtAPIBaseTest(test.TestCase, test.APICoverage): self.assertExpected('instance_update', 'fake-uuid', dict(host='foohost')) - def test_instance_get_by_uuid(self): - self.assertExpected('instance_get_by_uuid', 'fake-uuid') - - def test_instance_get_all_by_host(self): - self.assertExpected('instance_get_all_by_host', 'fake-host') - def test_aggregate_get_by_host(self): self.assertExpected('aggregate_get_by_host', 'fake-host', key=None) diff --git a/nova/virt/fake.py b/nova/virt/fake.py index 1b65571a5..3331dc105 100755 --- a/nova/virt/fake.py +++ b/nova/virt/fake.py @@ -444,12 +444,6 @@ class FakeVirtAPI(virtapi.VirtAPI): instance_uuid, updates) - def instance_get_by_uuid(self, context, instance_uuid): - return db.instance_get_by_uuid(context, instance_uuid) - - def instance_get_all_by_host(self, context, host): - return db.instance_get_all_by_host(context, host) - def aggregate_get_by_host(self, context, host, key=None): return db.aggregate_get_by_host(context, host, key=key) diff --git a/nova/virt/virtapi.py b/nova/virt/virtapi.py index 963b3c788..5b0a31826 100644 --- a/nova/virt/virtapi.py +++ b/nova/virt/virtapi.py @@ -26,20 +26,6 @@ class VirtAPI(object): """ raise NotImplementedError() - def instance_get_by_uuid(self, context, instance_uuid): - """Look up an instance by uuid - :param context: security context - :param instance_uuid: uuid of the instance to be fetched - """ - raise NotImplementedError() - - def instance_get_all_by_host(self, context, host): - """Find all instances on a given host - :param context: security context - :param host: host running instances to be returned - """ - raise NotImplementedError() - def aggregate_get_by_host(self, context, host, key=None): """Get a list of aggregates to which the specified host belongs :param context: security context |