Remove access to deprecated top-level bridge NetworkSettings

DataDog · Oct 3, 2017 · d2c9d7c · d2c9d7c
1 parent 71802db
commit d2c9d7c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 35 deletions.
diff --git a/tests/core/test_service_discovery.py b/tests/core/test_service_discovery.py
@@ -245,18 +245,14 @@ def test_get_host_address(self, mock_check_yaml, mock_get, *args):
             ({'NetworkSettings': {}}, 'host', None),
             ({'NetworkSettings': {'IPAddress': ''}}, 'host', None),
 
-            ({'NetworkSettings': {'IPAddress': '127.0.0.1'}}, 'host', '127.0.0.1'),
-            ({'NetworkSettings': {'IPAddress': '127.0.0.1', 'Networks': {}}}, 'host', '127.0.0.1'),
+            ({'NetworkSettings': {'Networks': {'bridge': {'IPAddress': '127.0.0.1'}}}}, 'host', '127.0.0.1'),
             ({'NetworkSettings': {
-                'IPAddress': '127.0.0.1',
                 'Networks': {'bridge': {'IPAddress': '127.0.0.1'}}}},
              'host', '127.0.0.1'),
             ({'NetworkSettings': {
-                'IPAddress': '',
                 'Networks': {'bridge': {'IPAddress': '127.0.0.1'}}}},
              'host_bridge', '127.0.0.1'),
             ({'NetworkSettings': {
-                'IPAddress': '127.0.0.1',
                 'Networks': {
                     'bridge': {'IPAddress': '172.17.0.2'},
                     'foo': {'IPAddress': '192.168.0.2'}}}},
@@ -404,10 +400,6 @@ def test_fill_tpl(self, *args):
         valid_configs = [
             # ((inspect, instance_tpl, variables, tags), (expected_instance_tpl, expected_var_values))
             (({}, {'host': 'localhost'}, [], None), ({'host': 'localhost'}, {})),
-            (
-                ({'NetworkSettings': {'IPAddress': ''}}, {'host': 'localhost'}, [], None),
-                ({'host': 'localhost'}, {})
-            ),
             (
                 ({'NetworkSettings': {'Networks': {}}}, {'host': 'localhost'}, [], None),
                 ({'host': 'localhost'}, {})
@@ -416,27 +408,15 @@ def test_fill_tpl(self, *args):
                 ({'NetworkSettings': {'Networks': {'bridge': {}}}}, {'host': 'localhost'}, [], None),
                 ({'host': 'localhost'}, {})
             ),
-            (
-                ({'NetworkSettings': {'IPAddress': '127.0.0.1'}},
-                 {'host': '%%host%%', 'port': 1337}, ['host'], ['foo', 'bar:baz']),
-                ({'host': '%%host%%', 'port': 1337, 'tags': ['foo', 'bar:baz']}, {'host': '127.0.0.1'}),
-            ),
-            (
-                ({'NetworkSettings': {'IPAddress': '127.0.0.1', 'Networks': {}}},
-                 {'host': '%%host%%', 'port': 1337}, ['host'], ['foo', 'bar:baz']),
-                ({'host': '%%host%%', 'port': 1337, 'tags': ['foo', 'bar:baz']}, {'host': '127.0.0.1'}),
-            ),
             (
                 ({'NetworkSettings': {
-                    'IPAddress': '127.0.0.1',
                     'Networks': {'bridge': {'IPAddress': '172.17.0.2'}}}
                   },
                  {'host': '%%host%%', 'port': 1337}, ['host'], ['foo', 'bar:baz']),
                 ({'host': '%%host%%', 'port': 1337, 'tags': ['foo', 'bar:baz']}, {'host': '172.17.0.2'}),
             ),
             (
                 ({'NetworkSettings': {
-                    'IPAddress': '',
                     'Networks': {
                         'bridge': {'IPAddress': '172.17.0.2'},
                         'foo': {'IPAddress': '192.168.0.2'}
@@ -448,7 +428,6 @@ def test_fill_tpl(self, *args):
             ),
             (
                 ({'NetworkSettings': {
-                    'IPAddress': '',
                     'Networks': {
                         'bridge': {'IPAddress': '172.17.0.2'},
                         'foo': {'IPAddress': '192.168.0.2'}
@@ -459,14 +438,14 @@ def test_fill_tpl(self, *args):
                  {'host_foo': '192.168.0.2'}),
             ),
             (
-                ({'NetworkSettings': {'IPAddress': '127.0.0.1', 'Ports': {'42/tcp': None, '22/tcp': None}}},
+                ({'NetworkSettings': {'Networks': {'bridge': {'IPAddress': '127.0.0.1'}}, 'Ports': {'42/tcp': None, '22/tcp': None}}},
                  {'host': '%%host%%', 'port': '%%port_1%%', 'tags': ['env:test']},
                  ['host', 'port_1'], ['foo', 'bar:baz']),
                 ({'host': '%%host%%', 'port': '%%port_1%%', 'tags': ['env:test', 'foo', 'bar:baz']},
                  {'host': '127.0.0.1', 'port_1': '42'})
             ),
             (
-                ({'NetworkSettings': {'IPAddress': '127.0.0.1', 'Ports': {'42/tcp': None, '22/tcp': None}}},
+                ({'NetworkSettings': {'Networks': {'bridge': {'IPAddress': '127.0.0.1'}}, 'Ports': {'42/tcp': None, '22/tcp': None}}},
                  {'host': '%%host%%', 'port': '%%port_1%%', 'tags': {'env': 'test'}},
                  ['host', 'port_1'], ['foo', 'bar:baz']),
                 ({'host': '%%host%%', 'port': '%%port_1%%', 'tags': ['env:test', 'foo', 'bar:baz']},
@@ -481,7 +460,6 @@ def test_fill_tpl(self, *args):
             # specify bridge but there is also a default IPAddress (networks should be preferred)
             (
                 ({'NetworkSettings': {
-                    'IPAddress': '127.0.0.1',
                     'Networks': {'bridge': {'IPAddress': '172.17.0.2'}}}},
                  {'host': '%%host_bridge%%', 'port': 1337}, ['host_bridge'], ['foo', 'bar:baz']),
                 ({'host': '%%host_bridge%%', 'port': 1337, 'tags': ['foo', 'bar:baz']},
@@ -490,7 +468,6 @@ def test_fill_tpl(self, *args):
             # specify index but there is a default IPAddress (there's a specifier, even if it's wrong, walking networks should be preferred)
             (
                 ({'NetworkSettings': {
-                    'IPAddress': '127.0.0.1',
                     'Networks': {'bridge': {'IPAddress': '172.17.0.2'}}}},
                  {'host': '%%host_0%%', 'port': 1337}, ['host_0'], ['foo', 'bar:baz']),
                 ({'host': '%%host_0%%', 'port': 1337, 'tags': ['foo', 'bar:baz']}, {'host_0': '172.17.0.2'}),
@@ -505,7 +482,7 @@ def test_fill_tpl(self, *args):
             ),
             # missing index for port
             (
-                ({'NetworkSettings': {'IPAddress': '127.0.0.1', 'Ports': {'42/tcp': None, '22/tcp': None}}},
+                ({'NetworkSettings': {'Networks': {'bridge': {'IPAddress': '127.0.0.1'}}, 'Ports': {'42/tcp': None, '22/tcp': None}}},
                  {'host': '%%host%%', 'port': '%%port_2%%', 'tags': ['env:test']},
                  ['host', 'port_2'], ['foo', 'bar:baz']),
                 ({'host': '%%host%%', 'port': '%%port_2%%', 'tags': ['env:test', 'foo', 'bar:baz']},

diff --git a/utils/orchestrator/ecsutil.py b/utils/orchestrator/ecsutil.py
@@ -45,7 +45,7 @@ def _detect_agent(self):
 
         # Try to detect the ecs-agent container's IP (net=bridge)
         ecs_config = self.docker_util.inspect_container('ecs-agent')
-        ip = ecs_config.get('NetworkSettings', {}).get('IPAddress')
+        ip = ecs_config.get('NetworkSettings', {}).get('Networks', {}).get('bridge', {}).get('IPAddress')
         if ip:
             ports = ecs_config.get('NetworkSettings', {}).get('Ports')
             port = ports.keys()[0].split('/')[0] if ports else str(ECS_AGENT_DEFAULT_PORT)

diff --git a/utils/service_discovery/sd_docker_backend.py b/utils/service_discovery/sd_docker_backend.py
@@ -195,13 +195,6 @@ def _get_host_address(self, state, c_id, tpl_var):
         if ip_addr:
             return ip_addr
 
-        # try to get the bridge (default) IP address
-        log.debug("No IP address was found in container %s (%s) "
-            "networks, trying with the IPAddress field" % (c_id[:12], c_img))
-        ip_addr = c_inspect.get('NetworkSettings', {}).get('IPAddress')
-        if ip_addr:
-            return ip_addr
-
         if Platform.is_k8s():
             # kubernetes case
             log.debug("Couldn't find the IP address for container %s (%s), "