summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Odden <mrodden@us.ibm.com>2012-09-28 21:57:56 +0000
committerMatt Odden <mrodden@us.ibm.com>2012-10-03 22:17:44 +0000
commitb4e9e3ee3917deddc3ae043645b11740fd1e8b8d (patch)
tree78f824eacdfa74604e30674628c3bd10d0d7fba5
parent1d4506c16aec9674be6a3685ba585a8bbd9c1559 (diff)
powervm: remove broken instance filtering
Filtering isn't necessary (nor desired in some cases) Irrelevant comment cleanup fixes bug #1061291 Change-Id: I0798ff20aea7551b1d1100e8a439c39be99291e1
-rw-r--r--nova/virt/powervm/driver.py2
-rw-r--r--nova/virt/powervm/operator.py7
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 8b411c055..175b7abdb 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.