diff options
| author | Hiroshi Yokoi <yokoi.hiroshi@po.ntts.co.jp> | 2015-06-18 19:28:48 +0900 |
|---|---|---|
| committer | Hiroshi Yokoi <yokoi.hiroshi@po.ntts.co.jp> | 2015-06-18 21:10:50 +0900 |
| commit | 056218150a2e9e3e3271e375ba26fa27f6cb4d19 (patch) | |
| tree | bfd06f6d6eb14cae220c147e69e6edc2580582de /test/scenario_test/docker_control.py | |
| parent | b38154da1aa53763cd3515163501dfef305c63e7 (diff) | |
scenario_test: check gobgp container before remove in its preparation
Diffstat (limited to 'test/scenario_test/docker_control.py')
| -rw-r--r-- | test/scenario_test/docker_control.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/test/scenario_test/docker_control.py b/test/scenario_test/docker_control.py index 44f3d4bc..b1263a72 100644 --- a/test/scenario_test/docker_control.py +++ b/test/scenario_test/docker_control.py @@ -197,7 +197,7 @@ def docker_container_stop_quagga(quagga): def docker_container_stop_gobgp(remove=True): if docker_check_running(GOBGP_CONTAINER_NAME): - cmd = "docker stop --time=1 " + GOBGP_CONTAINER_NAME + cmd = "docker stop --time=0 " + GOBGP_CONTAINER_NAME local(cmd, capture=True) if remove: @@ -207,7 +207,7 @@ def docker_container_stop_gobgp(remove=True): def docker_container_stop_exabgp(): if docker_check_running(EXABGP_CONTAINER_NAME): - cmd = "docker stop --time=1 " + EXABGP_CONTAINER_NAME + cmd = "docker stop --time=0 " + EXABGP_CONTAINER_NAME local(cmd, capture=True) cmd = "docker rm " + EXABGP_CONTAINER_NAME @@ -387,7 +387,9 @@ def reload_config(): def prepare_gobgp(log_debug, use_local): # cleanup gobgp container - docker_container_stop_gobgp(remove=True) + containers = docker_containers_get() + if GOBGP_CONTAINER_NAME in containers: + docker_container_stop_gobgp(remove=True) recreate_conf_dir(CONFIG_DIRR) # set log option opt = "-l debug" if log_debug else "" |