4356ab20a3
Originally the image property in instance resource metadata is correct since instance information is fetched from db access. After switching to nova client api, these information is lost since the returned data format from nova client is different with db access result. Image ref and image url is fixed with this patch while kernel_id and ramdisk_id should be fixed in nova side. For bug 1090310 Change-Id: I51816b4bd31c09a59e1ef857f8981a45f33f68dc Signed-off-by: Yunhong, Jiang <yunhong.jiang@intel.com>
57 lines
1.7 KiB
Python
57 lines
1.7 KiB
Python
# -*- encoding: utf-8 -*-
|
|
#
|
|
# Copyright © 2012 New Dream Network, LLC (DreamHost)
|
|
#
|
|
# Author: Doug Hellmann <doug.hellmann@dreamhost.com>
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
"""Common code for working with instances
|
|
"""
|
|
|
|
INSTANCE_PROPERTIES = [
|
|
# Identity properties
|
|
'reservation_id',
|
|
# Type properties
|
|
'architecture',
|
|
# Location properties
|
|
'availability_zone',
|
|
'kernel_id',
|
|
'os_type',
|
|
'ramdisk_id',
|
|
# Capacity properties
|
|
'disk_gb',
|
|
'ephemeral_gb',
|
|
'memory_mb',
|
|
'root_gb',
|
|
'vcpus',
|
|
]
|
|
|
|
|
|
def get_metadata_from_object(instance):
|
|
"""Return a metadata dictionary for the instance.
|
|
"""
|
|
metadata = {
|
|
'display_name': instance.name,
|
|
'name': getattr(instance, 'OS-EXT-SRV-ATTR:instance_name', u''),
|
|
'instance_type': (instance.flavor['id'] if instance.flavor else None),
|
|
'host': instance.hostId,
|
|
# Image properties
|
|
'image_ref': (instance.image['id'] if instance.image else None),
|
|
'image_ref_url': (instance.image['links'][0]['href']
|
|
if instance.image else None),
|
|
}
|
|
|
|
for name in INSTANCE_PROPERTIES:
|
|
metadata[name] = getattr(instance, name, u'')
|
|
return metadata
|