From abd5370d8750dd4472dfef3b51751ec7ffc1ed2c Mon Sep 17 00:00:00 2001 From: Santhosh Manohar Date: Fri, 7 Apr 2017 11:19:37 -0700 Subject: [PATCH 1/2] Add 'verbose' option for network inspect api Signed-off-by: Santhosh Manohar --- docker/api/network.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/docker/api/network.py b/docker/api/network.py index 9652228d..46cd68c5 100644 --- a/docker/api/network.py +++ b/docker/api/network.py @@ -168,14 +168,23 @@ class NetworkApiMixin(object): self._raise_for_status(res) @minimum_version('1.21') - def inspect_network(self, net_id): + def inspect_network(self, net_id, verbose=False): """ Get detailed information about a network. Args: net_id (str): ID of network + verbose (bool): If set shows the service details across the cluster + in swarm mode """ - url = self._url("/networks/{0}", net_id) + if verbose is True: + if version_lt(self._version, '1.28'): + raise InvalidVersion( + 'Verbose option was introduced in API 1.28' + ) + url = self._url("/networks/{0}?verbose=true", net_id) + else: + url = self._url("/networks/{0}", net_id) res = self._get(url) return self._result(res, json=True) From e506a2b8eaef4cea0453af0f40870e488a66d568 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Mon, 10 Apr 2017 16:02:43 -0700 Subject: [PATCH 2/2] Standardize handling of verbose param in inspect_network Signed-off-by: Joffrey F --- docker/api/network.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/docker/api/network.py b/docker/api/network.py index 46cd68c5..74f4cd2b 100644 --- a/docker/api/network.py +++ b/docker/api/network.py @@ -168,24 +168,23 @@ class NetworkApiMixin(object): self._raise_for_status(res) @minimum_version('1.21') - def inspect_network(self, net_id, verbose=False): + def inspect_network(self, net_id, verbose=None): """ Get detailed information about a network. Args: net_id (str): ID of network - verbose (bool): If set shows the service details across the cluster - in swarm mode + verbose (bool): Show the service details across the cluster in + swarm mode. """ - if verbose is True: + params = {} + if verbose is not None: if version_lt(self._version, '1.28'): - raise InvalidVersion( - 'Verbose option was introduced in API 1.28' - ) - url = self._url("/networks/{0}?verbose=true", net_id) - else: - url = self._url("/networks/{0}", net_id) - res = self._get(url) + raise InvalidVersion('verbose was introduced in API 1.28') + params['verbose'] = verbose + + url = self._url("/networks/{0}", net_id) + res = self._get(url, params=params) return self._result(res, json=True) @check_resource