From 40e20462b184ae6b9dd9eb87cc57ce22e97b7b9c Mon Sep 17 00:00:00 2001
From: Michael Still <mikal@stillhq.com>
Date: Wed, 22 Feb 2012 12:30:37 +1100
Subject: [PATCH] Move get_info to taking an instance.
This is a first step towards using uuids in this interface instead
of instance names (which are synonyms for instance ids).
Change-Id: I54b32a5020b0dbc21ba7156ed38ed188c483086b
---
nova/tests/baremetal/test_proxy_bare_metal.py | 3 ++-
nova/virt/baremetal/proxy.py | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/nova/tests/baremetal/test_proxy_bare_metal.py b/nova/tests/baremetal/test_proxy_bare_metal.py
index 0ea7462272..d1768d151a 100644
--- a/nova/tests/baremetal/test_proxy_bare_metal.py
+++ b/nova/tests/baremetal/test_proxy_bare_metal.py
@@ -282,7 +282,8 @@ class ProxyBareMetalTestCase(test.TestCase):
# Code under test
conn = proxy.get_connection(True)
- info = conn.get_info('instance-00000001')
+ # TODO: this is not a very good fake instance
+ info = conn.get_info({'name': 'instance-00000001'})
# Expected values
self.assertEquals(info['mem'], 16777216)
diff --git a/nova/virt/baremetal/proxy.py b/nova/virt/baremetal/proxy.py
index b651ee2c41..cd2427a6d4 100644
--- a/nova/virt/baremetal/proxy.py
+++ b/nova/virt/baremetal/proxy.py
@@ -531,7 +531,7 @@ class ProxyConnection(driver.ComputeDriver):
LOG.debug(_('instance %s: finished toXML method'), instance['name'])
return xml_info
- def get_info(self, instance_name):
+ def get_info(self, instance):
"""Retrieve information from baremetal for a specific instance name.
If a baremetal error is encountered during lookup, we might raise a
@@ -539,7 +539,7 @@ class ProxyConnection(driver.ComputeDriver):
baremetal error is.
"""
- _domain_info = self._conn.get_domain_info(instance_name)
+ _domain_info = self._conn.get_domain_info(instance['name'])
state, max_mem, mem, num_cpu, cpu_time = _domain_info
return {'state': state,
'max_mem': max_mem,