summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorNaveed Massjouni <naveedm9@gmail.com>2011-03-01 01:09:43 +0000
committerTarmac <>2011-03-01 01:09:43 +0000
commitbb7c1b8c63632c789ed0cd3785a22b7baa90fd83 (patch)
tree1e2a203ec0df7bfdd9af6da3f5845eb033113b92 /nova/api
parent78bd53a44a529f0c6641357fa001d4d037fbc375 (diff)
parent4572ffcf734b734870b90497063fc27e7642f67c (diff)
downloadnova-bb7c1b8c63632c789ed0cd3785a22b7baa90fd83.tar.gz
nova-bb7c1b8c63632c789ed0cd3785a22b7baa90fd83.tar.xz
nova-bb7c1b8c63632c789ed0cd3785a22b7baa90fd83.zip
This branch implements the openstack-api-hostid blueprint: "Openstack API support for hostId".
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/servers.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index f7ad0b8ae..69273ad7b 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -13,6 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
+import hashlib
import json
import traceback
@@ -71,14 +72,16 @@ def _translate_detail_keys(inst):
public_ips = utils.get_from_path(inst, 'fixed_ip/floating_ips/address')
inst_dict['addresses']['public'] = public_ips
- inst_dict['hostId'] = ''
-
# Return the metadata as a dictionary
metadata = {}
for item in inst['metadata']:
metadata[item['key']] = item['value']
inst_dict['metadata'] = metadata
+ inst_dict['hostId'] = ''
+ if inst['host']:
+ inst_dict['hostId'] = hashlib.sha224(inst['host']).hexdigest()
+
return dict(server=inst_dict)