diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-31 21:07:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-31 21:07:17 +0000 |
| commit | a85d5687d15e26fc53ef7539a6f11cdfbf914bfe (patch) | |
| tree | 8179df91d926a55a195ccbfae7231a629156d7e8 | |
| parent | 164d233371fa1acbe695136df30366c4547604d0 (diff) | |
| parent | be4afe4b86ab1cdfd9839dd175d67ff74226f547 (diff) | |
| download | nova-a85d5687d15e26fc53ef7539a6f11cdfbf914bfe.tar.gz nova-a85d5687d15e26fc53ef7539a6f11cdfbf914bfe.tar.xz nova-a85d5687d15e26fc53ef7539a6f11cdfbf914bfe.zip | |
Merge "Remove resize function from virt driver."
| -rw-r--r-- | nova/tests/test_virt_drivers.py | 5 | ||||
| -rw-r--r-- | nova/virt/driver.py | 9 | ||||
| -rw-r--r-- | nova/virt/fake.py | 3 |
3 files changed, 0 insertions, 17 deletions
diff --git a/nova/tests/test_virt_drivers.py b/nova/tests/test_virt_drivers.py index 249ed012d..95990cee5 100644 --- a/nova/tests/test_virt_drivers.py +++ b/nova/tests/test_virt_drivers.py @@ -120,11 +120,6 @@ class _VirtDriverTestCase(test.TestCase): self.assertEquals(ip.version, 4) @catch_notimplementederror - def test_resize_running(self): - instance_ref, network_info = self._get_running_instance() - self.connection.resize(instance_ref, 7) - - @catch_notimplementederror def test_set_admin_password(self): instance_ref, network_info = self._get_running_instance() self.connection.set_admin_password(instance_ref, 'p4ssw0rd') diff --git a/nova/virt/driver.py b/nova/virt/driver.py index 561e62b82..895a32ed3 100644 --- a/nova/virt/driver.py +++ b/nova/virt/driver.py @@ -561,15 +561,6 @@ class ComputeDriver(object): """Return currently known host stats""" raise NotImplementedError() - def resize(self, instance, flavor): - """ - Resizes/Migrates the specified instance. - - The flavor parameter determines whether or not the instance RAM and - disk space are modified, and if so, to what size. - """ - raise NotImplementedError() - def block_stats(self, instance_name, disk_id): """ Return performance counters associated with the given disk_id on the diff --git a/nova/virt/fake.py b/nova/virt/fake.py index cb29cf567..57c358521 100644 --- a/nova/virt/fake.py +++ b/nova/virt/fake.py @@ -119,9 +119,6 @@ class FakeConnection(driver.ComputeDriver): def get_host_ip_addr(): return '192.168.0.1' - def resize(self, instance, flavor): - pass - def set_admin_password(self, instance, new_pass): pass |