diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-04 21:40:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-04 21:40:02 +0000 |
| commit | 9cb46a450ca554cd9b430c418df2160ad9fc9840 (patch) | |
| tree | 1b987f6a17fd7b9675ca2097818650e2f8b2fa05 /nova | |
| parent | 88c8c979b9baf5351312ebc9abefb1408efdc364 (diff) | |
| parent | b4e9e3ee3917deddc3ae043645b11740fd1e8b8d (diff) | |
| download | nova-9cb46a450ca554cd9b430c418df2160ad9fc9840.tar.gz nova-9cb46a450ca554cd9b430c418df2160ad9fc9840.tar.xz nova-9cb46a450ca554cd9b430c418df2160ad9fc9840.zip | |
Merge "powervm: remove broken instance filtering"
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/virt/powervm/driver.py | 2 | ||||
| -rw-r--r-- | nova/virt/powervm/operator.py | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/nova/virt/powervm/driver.py b/nova/virt/powervm/driver.py index 06c17447c..3b65b5c45 100644 --- a/nova/virt/powervm/driver.py +++ b/nova/virt/powervm/driver.py @@ -123,7 +123,6 @@ class PowerVMDriver(driver.ComputeDriver): :py:meth:`~nova.network.manager.NetworkManager.get_instance_nw_info` :param reboot_type: Either a HARD or SOFT reboot """ - # TODO(Vek): Need to pass context in for access to auth_token pass def get_host_ip_addr(self): @@ -168,7 +167,6 @@ class PowerVMDriver(driver.ComputeDriver): """ Indicate if the driver requires the legacy network_info format. """ - # TODO(tr3buchet): update all subclasses and remove this return False def manage_image_cache(self, context): diff --git a/nova/virt/powervm/operator.py b/nova/virt/powervm/operator.py index 16da1d16c..7c7478b99 100644 --- a/nova/virt/powervm/operator.py +++ b/nova/virt/powervm/operator.py @@ -99,12 +99,7 @@ class PowerVMOperator(object): layer, as a list. """ lpar_instances = self._operator.list_lpar_instances() - # We filter out instances that haven't been created - # via OpenStack. Notice that this is fragile and it can - # be improved later. - instances = [instance for instance in lpar_instances - if re.search(r'^instance-[0-9]{8}$', instance)] - return instances + return lpar_instances def get_available_resource(self): """Retrieve resource info. |