Merge "Move name resolving before get server"
This commit is contained in:
commit
5b4a7bc0a7
@ -623,14 +623,14 @@ class Server(stack_user.StackUser):
|
|||||||
if name == self.FIRST_ADDRESS:
|
if name == self.FIRST_ADDRESS:
|
||||||
return self.client_plugin().server_to_ipaddress(
|
return self.client_plugin().server_to_ipaddress(
|
||||||
self.resource_id) or ''
|
self.resource_id) or ''
|
||||||
|
if name == self.NAME_ATTR:
|
||||||
|
return self._server_name()
|
||||||
try:
|
try:
|
||||||
server = self.nova().servers.get(self.resource_id)
|
server = self.nova().servers.get(self.resource_id)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.client_plugin().ignore_not_found(e)
|
self.client_plugin().ignore_not_found(e)
|
||||||
LOG.warn(_('Instance (%s) not found') % self.resource_id)
|
LOG.warn(_('Instance (%s) not found') % self.resource_id)
|
||||||
return ''
|
return ''
|
||||||
if name == self.NAME_ATTR:
|
|
||||||
return self._server_name()
|
|
||||||
if name == self.ADDRESSES:
|
if name == self.ADDRESSES:
|
||||||
return self._add_port_for_address(server)
|
return self._add_port_for_address(server)
|
||||||
if name == self.NETWORKS_ATTR:
|
if name == self.NETWORKS_ATTR:
|
||||||
|
Loading…
Reference in New Issue
Block a user