From 54e1d414cabda5c378b4978b3f3cd4bc18740757 Mon Sep 17 00:00:00 2001 From: Shubhendu Date: Thu, 29 Mar 2018 17:32:53 +0530 Subject: [PATCH] Removed references of gdeploy from code tendrl-bug-id: Tendrl/gluster-integration#600 Signed-off-by: Shubhendu --- tendrl/gluster_integration/manager/__init__.py | 4 ---- tendrl/gluster_integration/tests/test_manager.py | 11 ----------- 2 files changed, 15 deletions(-) diff --git a/tendrl/gluster_integration/manager/__init__.py b/tendrl/gluster_integration/manager/__init__.py index f2c8607..2678e19 100644 --- a/tendrl/gluster_integration/manager/__init__.py +++ b/tendrl/gluster_integration/manager/__init__.py @@ -8,8 +8,6 @@ from tendrl.commons.utils import etcd_utils from tendrl.commons.utils import log_utils as logger from tendrl import gluster_integration -from tendrl.gluster_integration.gdeploy_wrapper.manager import \ - ProvisioningManager from tendrl.gluster_integration.message.gluster_native_message_handler\ import GlusterNativeMessageHandler from tendrl.gluster_integration import sds_sync @@ -63,8 +61,6 @@ def main(): NS.gluster.definitions.save() NS.gluster.config.save() - pm = ProvisioningManager("GdeployPlugin") - NS.gdeploy_plugin = pm.get_plugin() if NS.config.data.get("with_internal_profiling", False): from tendrl.commons import profiler profiler.start() diff --git a/tendrl/gluster_integration/tests/test_manager.py b/tendrl/gluster_integration/tests/test_manager.py index 2189eb5..999b888 100644 --- a/tendrl/gluster_integration/tests/test_manager.py +++ b/tendrl/gluster_integration/tests/test_manager.py @@ -65,16 +65,6 @@ def test_constructor(monkeypatch): 'tendrl.gluster_integration.objects.config.Config.__init__', mock.Mock(return_value=None) ) -@mock.patch( - 'tendrl.gluster_integration.gdeploy_wrapper.manager' - '.ProvisioningManager.__init__', - mock.Mock(return_value=None) -) -@mock.patch( - 'tendrl.gluster_integration.gdeploy_wrapper.manager' - '.ProvisioningManager.get_plugin', - mock.Mock(return_value=None) -) @mock.patch( 'tendrl.gluster_integration.sds_sync' '.GlusterIntegrationSdsSyncStateThread.__init__', @@ -113,7 +103,6 @@ def test_main(monkeypatch): assert NS.publisher_id == "gluster_integration" assert NS.state_sync_thread is not None assert NS.message_handler_thread is not None - assert NS.gdeploy_plugin is None with mock.patch.object(GlusterIntegrationManager, 'start') \ as manager_start: