From 561d7363bf1c5b150f5d03fd6ad50fca5af7b270 Mon Sep 17 00:00:00 2001 From: Ruslan Aliev Date: Fri, 30 Oct 2015 23:57:19 +0300 Subject: [PATCH] Adds correct plugin installing without internet Fuel no longer tries to connect to internet when installing local plugin Change-Id: I05cb48fb8cff69c46b4c8be93134dffdfffe3102 Closes-Bug: 1467212 --- fuelclient/objects/plugins.py | 6 ++++-- fuelclient/tests/unit/v1/test_plugins_object.py | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/fuelclient/objects/plugins.py b/fuelclient/objects/plugins.py index 921b18a..3682cab 100644 --- a/fuelclient/objects/plugins.py +++ b/fuelclient/objects/plugins.py @@ -182,10 +182,12 @@ class PluginV2(BasePlugin): def install(cls, plugin_path, force=False): if force: utils.exec_cmd( - 'yum -y install {0} || yum -y reinstall {0}' + 'yum -y install --disablerepo=\'*\' {0} || ' + 'yum -y reinstall --disablerepo=\'*\' {0}' .format(plugin_path)) else: - utils.exec_cmd('yum -y install {0}'.format(plugin_path)) + utils.exec_cmd('yum -y install --disablerepo=\'*\' {0}' + .format(plugin_path)) @classmethod @master_only diff --git a/fuelclient/tests/unit/v1/test_plugins_object.py b/fuelclient/tests/unit/v1/test_plugins_object.py index 9703cb3..e7a524b 100644 --- a/fuelclient/tests/unit/v1/test_plugins_object.py +++ b/fuelclient/tests/unit/v1/test_plugins_object.py @@ -113,7 +113,8 @@ class TestPluginV2(base.UnitTestCase): def test_install(self, exec_mock, master_only_mock): self.plugin.install(self.path) - exec_mock.assert_called_once_with('yum -y install /tmp/plugin/path') + exec_mock.assert_called_once_with( + 'yum -y install --disablerepo=\'*\' /tmp/plugin/path') master_only_mock.assert_called_once_with() @patch('fuelclient.objects.plugins.utils.exec_cmd') @@ -121,8 +122,8 @@ class TestPluginV2(base.UnitTestCase): self.plugin.install(self.path, force=True) exec_mock.assert_called_once_with( - 'yum -y install /tmp/plugin/path' - ' || yum -y reinstall /tmp/plugin/path') + 'yum -y install --disablerepo=\'*\' /tmp/plugin/path' + ' || yum -y reinstall --disablerepo=\'*\' /tmp/plugin/path') master_only_mock.assert_called_once_with() @patch('fuelclient.objects.plugins.utils.exec_cmd')