From de1a2b9db41b47f4df2f5332bc0ffb25a495ea36 Mon Sep 17 00:00:00 2001 From: Ming-Chi Kuo Date: Mon, 4 Oct 2021 13:07:21 -0700 Subject: [PATCH 1/3] add ipv6 stderr prints out --- cirque/connectivity/homelan.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cirque/connectivity/homelan.py b/cirque/connectivity/homelan.py index 8a7f65d..e1d04d0 100644 --- a/cirque/connectivity/homelan.py +++ b/cirque/connectivity/homelan.py @@ -49,7 +49,8 @@ def __create_docker_network(self): cmd.append('--ipv6') ret = host_run(self.logger, cmd) if ret.returncode != 0: - self.logger.error('Failed to create home lan %s', self.__name) + self.logger.error("Failed to create home lan %s: %s " % ( + self.__name, ret.stderr)) if self.__ipv6: self.__enable_ipv6_external_access() @@ -102,7 +103,8 @@ def __enable_ipv6_external_access(self): "! -o docker0 -j MASQUERADE"]) ret = host_run(self.logger, ip6tables_command) if ret.returncode != 0: - self.logger.error('Fail to setup ipv6 external access in ip6tables') + self.logger.error( + 'Fail to setup ipv6 external access in ip6tables: %s' % ret.stderr) def __inspect_network_properties(self): ret = host_run(self.logger, ['docker', 'network', 'inspect', self.__name]) From 14f19e2b2b8c16247c887c8e6ded6b5a3638fd47 Mon Sep 17 00:00:00 2001 From: mingchik Date: Mon, 4 Oct 2021 14:11:43 -0600 Subject: [PATCH 2/3] Update homelan.py --- cirque/connectivity/homelan.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cirque/connectivity/homelan.py b/cirque/connectivity/homelan.py index e1d04d0..8031317 100644 --- a/cirque/connectivity/homelan.py +++ b/cirque/connectivity/homelan.py @@ -49,7 +49,7 @@ def __create_docker_network(self): cmd.append('--ipv6') ret = host_run(self.logger, cmd) if ret.returncode != 0: - self.logger.error("Failed to create home lan %s: %s " % ( + self.logger.error("Failed to create home lan %s: %s" % ( self.__name, ret.stderr)) if self.__ipv6: self.__enable_ipv6_external_access() @@ -104,7 +104,7 @@ def __enable_ipv6_external_access(self): ret = host_run(self.logger, ip6tables_command) if ret.returncode != 0: self.logger.error( - 'Fail to setup ipv6 external access in ip6tables: %s' % ret.stderr) + "%s: Fail to setup ipv6 external access in ip6tables" % ret.stderr) def __inspect_network_properties(self): ret = host_run(self.logger, ['docker', 'network', 'inspect', self.__name]) From c5b7dd34a28effe901d7797841e1bcced9cb733f Mon Sep 17 00:00:00 2001 From: mingchik Date: Mon, 4 Oct 2021 14:13:31 -0600 Subject: [PATCH 3/3] Update homelan.py --- cirque/connectivity/homelan.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cirque/connectivity/homelan.py b/cirque/connectivity/homelan.py index 8031317..084cda0 100644 --- a/cirque/connectivity/homelan.py +++ b/cirque/connectivity/homelan.py @@ -49,8 +49,8 @@ def __create_docker_network(self): cmd.append('--ipv6') ret = host_run(self.logger, cmd) if ret.returncode != 0: - self.logger.error("Failed to create home lan %s: %s" % ( - self.__name, ret.stderr)) + self.logger.error("%s: Failed to create home lan %s" % ( + ret.stderr, self.__name)) if self.__ipv6: self.__enable_ipv6_external_access()