openstack
/
shade
Code Issues Proposed changes

Merge "Also add server interfaces for server get"

This commit is contained in:
Jenkins 2016-03-25 20:19:27 +00:00 committed by Gerrit Code Review
parent a9f4130ad0 060ce2e055
commit 5f75b97728
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shade/openstackcloud.py
View File

@ -1611,9 +1611,9 @@ class OpenStackCloud(object):
return _utils._get_entity(searchfunc, name_or_id, filters)
def get_server_by_id(self, id):
return _utils.normalize_server(
return meta.add_server_interfaces(self, _utils.normalize_server(
self.manager.submitTask(_tasks.ServerGet(server=id)),
cloud_name=self.name, region_name=self.region_name)
cloud_name=self.name, region_name=self.region_name))
def get_image(self, name_or_id, filters=None):
"""Get an image by name or ID.

9
shade/tests/fakes.py
View File

@ -85,8 +85,9 @@ class FakeProject(object):
class FakeServer(object):
def __init__(
self, id, name, status, addresses=None,
accessIPv4='', accessIPv6='', flavor=None, image=None,
adminPass=None):
accessIPv4='', accessIPv6='', private_v4='',
private_v6='', public_v4='', public_v6='',
flavor=None, image=None, adminPass=None):
self.id = id
self.name = name
self.status = status
@ -102,6 +103,10 @@ class FakeServer(object):
self.image = image
self.accessIPv4 = accessIPv4
self.accessIPv6 = accessIPv6
self.private_v4 = private_v4
self.public_v4 = public_v4
self.private_v6 = private_v6
self.public_v6 = public_v6
self.adminPass = adminPass