From b09cd5de23a862ca7598ed3ffdfdb9012a70bfef Mon Sep 17 00:00:00 2001 From: jhughesbiot Date: Wed, 3 Apr 2024 12:56:36 -0600 Subject: [PATCH 1/3] Remove private network from network service containers --- framework/python/src/net_orc/network_orchestrator.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/framework/python/src/net_orc/network_orchestrator.py b/framework/python/src/net_orc/network_orchestrator.py index 90dce8500..a62f759e2 100644 --- a/framework/python/src/net_orc/network_orchestrator.py +++ b/framework/python/src/net_orc/network_orchestrator.py @@ -479,6 +479,7 @@ def _start_network_service(self, net_module): network = 'host' if net_module.net_config.host else PRIVATE_DOCKER_NET LOGGER.debug(f"""Network: {network}, image name: {net_module.image_name}, container name: {net_module.container_name}""") + try: client = docker.from_env() net_module.container = client.containers.run( @@ -487,7 +488,10 @@ def _start_network_service(self, net_module): cap_add=['NET_ADMIN'], name=net_module.container_name, hostname=net_module.container_name, - network=PRIVATE_DOCKER_NET, + # Undetermined version of docker seems to have broken + # DNS configuration (/etc/resolv.conf) Re-add when/if + # this network is utilized and DNS issue is resolved + #network=PRIVATE_DOCKER_NET, privileged=True, detach=True, mounts=net_module.mounts, From 8f42e128c1bf3f2661b0bfb12ecd0c663e867719 Mon Sep 17 00:00:00 2001 From: jhughesbiot Date: Wed, 3 Apr 2024 13:14:20 -0600 Subject: [PATCH 2/3] Remove private network creation and cleanup --- cmd/prune | 4 +++- framework/python/src/net_orc/network_orchestrator.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmd/prune b/cmd/prune index ed9b4851d..9f471897d 100755 --- a/cmd/prune +++ b/cmd/prune @@ -36,4 +36,6 @@ fi # Remove docker networks echo Removing docker networks sudo docker network rm endev0 > /dev/null -sudo docker network rm tr-private-net > /dev/null \ No newline at end of file +# Private network not used, add cleanup +# back in if/when implemented +#sudo docker network rm tr-private-net > /dev/null \ No newline at end of file diff --git a/framework/python/src/net_orc/network_orchestrator.py b/framework/python/src/net_orc/network_orchestrator.py index a62f759e2..601c8c3f7 100644 --- a/framework/python/src/net_orc/network_orchestrator.py +++ b/framework/python/src/net_orc/network_orchestrator.py @@ -357,7 +357,9 @@ def create_net(self): if 'CI' in os.environ: self._ci_post_network_create() - self._create_private_net() + # Private network not used, disable until + # a use case is determined + #self._create_private_net() # Listener may have already been created. Only create if not if self._listener is None: From d3043a16f0e611e0cc9b14eebab0398a8df08f12 Mon Sep 17 00:00:00 2001 From: Jacob Boddey Date: Thu, 4 Apr 2024 10:17:19 +0100 Subject: [PATCH 3/3] Fix pylint --- framework/python/src/net_orc/network_orchestrator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/python/src/net_orc/network_orchestrator.py b/framework/python/src/net_orc/network_orchestrator.py index 601c8c3f7..94c747758 100644 --- a/framework/python/src/net_orc/network_orchestrator.py +++ b/framework/python/src/net_orc/network_orchestrator.py @@ -491,7 +491,7 @@ def _start_network_service(self, net_module): name=net_module.container_name, hostname=net_module.container_name, # Undetermined version of docker seems to have broken - # DNS configuration (/etc/resolv.conf) Re-add when/if + # DNS configuration (/etc/resolv.conf) Re-add when/if # this network is utilized and DNS issue is resolved #network=PRIVATE_DOCKER_NET, privileged=True,