From 4eb3c2e7440fd845c3f91e054ad61b1f98bfedb9 Mon Sep 17 00:00:00 2001 From: David Ames Date: Tue, 21 Aug 2018 11:35:24 -0700 Subject: [PATCH] Set model on subprocess juju cmds --- .../utilities/test_zaza_utilities_juju.py | 14 +++++++++----- zaza/utilities/juju.py | 17 ++++++++++++----- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/unit_tests/utilities/test_zaza_utilities_juju.py b/unit_tests/utilities/test_zaza_utilities_juju.py index e0ffa41..e5cd43b 100644 --- a/unit_tests/utilities/test_zaza_utilities_juju.py +++ b/unit_tests/utilities/test_zaza_utilities_juju.py @@ -49,6 +49,7 @@ class TestJujuUtils(ut_utils.BaseTestCase): # Model self.patch_object(juju_utils, "model") self.model_name = "model-name" + self.model.get_juju_model.return_value = self.model_name self.model.get_status.return_value = self.juju_status self.run_output = {"Code": "0", "Stderr": "", "Stdout": "RESULT"} self.error_run_output = {"Code": "1", "Stderr": "ERROR", "Stdout": ""} @@ -269,25 +270,28 @@ class TestJujuUtils(ut_utils.BaseTestCase): _to_series = "bionic" juju_utils.prepare_series_upgrade(_machine_num, to_series=_to_series) self.subprocess.check_call.assert_called_once_with( - ['juju', 'upgrade-series', 'prepare', - _machine_num, _to_series, '--agree']) + ["juju", "upgrade-series", "-m", self.model_name, + "prepare", _machine_num, _to_series, "--agree"]) def test_complete_series_upgrade(self): _machine_num = "1" juju_utils.complete_series_upgrade(_machine_num) self.subprocess.check_call.assert_called_once_with( - ['juju', 'upgrade-series', 'complete', _machine_num]) + ["juju", "upgrade-series", "-m", self.model_name, + "complete", _machine_num]) def test_set_series(self): _application = "application" _to_series = "bionic" juju_utils.set_series(_application, _to_series) self.subprocess.check_call.assert_called_once_with( - ['juju', 'set-series', _application, _to_series]) + ["juju", "set-series", "-m", self.model_name, + _application, _to_series]) def test_update_series(self): _machine_num = "1" _to_series = "bionic" juju_utils.update_series(_machine_num, _to_series) self.subprocess.check_call.assert_called_once_with( - ['juju', 'update-series', _machine_num, _to_series]) + ["juju", "update-series", "-m", self.model_name, + _machine_num, _to_series]) diff --git a/zaza/utilities/juju.py b/zaza/utilities/juju.py index cc0e278..642a3d4 100644 --- a/zaza/utilities/juju.py +++ b/zaza/utilities/juju.py @@ -275,8 +275,9 @@ def prepare_series_upgrade(machine_num, to_series="xenial"): :returns: None :rtype: None """ - cmd = ["juju", "upgrade-series", "prepare", - machine_num, to_series, "--agree"] + juju_model = model.get_juju_model() + cmd = ["juju", "upgrade-series", "-m", juju_model, + "prepare", machine_num, to_series, "--agree"] subprocess.check_call(cmd) @@ -292,7 +293,9 @@ def complete_series_upgrade(machine_num): :returns: None :rtype: None """ - cmd = ["juju", "upgrade-series", "complete", machine_num] + juju_model = model.get_juju_model() + cmd = ["juju", "upgrade-series", "-m", juju_model, + "complete", machine_num] subprocess.check_call(cmd) @@ -308,7 +311,9 @@ def set_series(application, to_series): :returns: None :rtype: None """ - cmd = ["juju", "set-series", application, to_series] + juju_model = model.get_juju_model() + cmd = ["juju", "set-series", "-m", juju_model, + application, to_series] subprocess.check_call(cmd) @@ -324,5 +329,7 @@ def update_series(machine_num, to_series): :returns: None :rtype: None """ - cmd = ["juju", "update-series", machine_num, to_series] + juju_model = model.get_juju_model() + cmd = ["juju", "update-series", "-m", juju_model, + machine_num, to_series] subprocess.check_call(cmd)