openstack
/
heat
Code Issues Proposed changes

Merge "Add docker network_gateway attribute"

This commit is contained in:
Jenkins 2014-03-28 12:20:29 +00:00 committed by Gerrit Code Review
parent 0a6239f79a 13afa377ff
commit bc644814d9
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/docker/docker/resources/docker_container.py
View File

@ -130,6 +130,7 @@ class DockerContainer(resource.Resource):
'info': _('Container info'),
'network_info': _('Container network info'),
'network_ip': _('Container ip address'),
'network_gateway': _('Container ip gateway'),
'network_tcp_ports': _('Container TCP ports'),
'network_udp_ports': _('Container UDP ports'),
'logs': _('Container logs'),
@ -183,6 +184,10 @@ class DockerContainer(resource.Resource):
client = self.get_client()
networkinfo = self._container_networkinfo(client, self.resource_id)
return networkinfo['IPAddress']
if name == 'network_gateway':
client = self.get_client()
networkinfo = self._container_networkinfo(client, self.resource_id)
return networkinfo['Gateway']
if name == 'network_tcp_ports':
client = self.get_client()
networkinfo = self._container_networkinfo(client, self.resource_id)

1
contrib/docker/docker/tests/test_docker_container.py
View File

@ -81,6 +81,7 @@ class DockerContainerTest(HeatTestCase):
def test_resource_attributes(self):
container = self.create_container('Blog')
# Test network info attributes
self.assertEqual('172.17.42.1', container.FnGetAtt('network_gateway'))
self.assertEqual('172.17.0.3', container.FnGetAtt('network_ip'))
self.assertEqual('1080', container.FnGetAtt('network_tcp_ports'))
self.assertEqual('', container.FnGetAtt('network_udp_ports'))