From 9e153253e59f6d1e23c3d974684a6447b795cf7e Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Tue, 15 Apr 2014 15:56:09 +0400 Subject: [PATCH] Deprecated extension name attribute It seems not to be used, so it is not needed. Change-Id: Ie46470d888ff11edaf16b94e5b2e716d13cf764f Closes-Bug: #1308017 --- ironic_python_agent/extensions/base.py | 3 +-- ironic_python_agent/extensions/decom.py | 2 +- ironic_python_agent/extensions/flow.py | 2 +- ironic_python_agent/extensions/standby.py | 2 +- ironic_python_agent/tests/extensions/base.py | 2 +- ironic_python_agent/tests/extensions/decom.py | 3 --- ironic_python_agent/tests/extensions/flow.py | 5 +---- ironic_python_agent/tests/extensions/standby.py | 3 --- 8 files changed, 6 insertions(+), 16 deletions(-) diff --git a/ironic_python_agent/extensions/base.py b/ironic_python_agent/extensions/base.py index 14a735503..5216ba22d 100644 --- a/ironic_python_agent/extensions/base.py +++ b/ironic_python_agent/extensions/base.py @@ -116,10 +116,9 @@ class AsyncCommandResult(BaseCommandResult): class BaseAgentExtension(object): - def __init__(self, name): + def __init__(self): super(BaseAgentExtension, self).__init__() self.log = log.getLogger(__name__) - self.name = name self.command_map = {} def execute(self, command_name, **kwargs): diff --git a/ironic_python_agent/extensions/decom.py b/ironic_python_agent/extensions/decom.py index 6cd483fba..454df683d 100644 --- a/ironic_python_agent/extensions/decom.py +++ b/ironic_python_agent/extensions/decom.py @@ -17,4 +17,4 @@ from ironic_python_agent.extensions import base class DecomExtension(base.BaseAgentExtension): def __init__(self): - super(DecomExtension, self).__init__('DECOM') + super(DecomExtension, self).__init__() diff --git a/ironic_python_agent/extensions/flow.py b/ironic_python_agent/extensions/flow.py index 617eebac5..229e19d53 100644 --- a/ironic_python_agent/extensions/flow.py +++ b/ironic_python_agent/extensions/flow.py @@ -39,7 +39,7 @@ def _validate_exts(ext, flow=None): class FlowExtension(base.BaseAgentExtension, base.ExecuteCommandMixin): def __init__(self): - super(FlowExtension, self).__init__('FLOW') + super(FlowExtension, self).__init__() self.command_map['start_flow'] = self.start_flow def get_extension_manager(self): diff --git a/ironic_python_agent/extensions/standby.py b/ironic_python_agent/extensions/standby.py index a73086c8f..eacd0b1c9 100644 --- a/ironic_python_agent/extensions/standby.py +++ b/ironic_python_agent/extensions/standby.py @@ -152,7 +152,7 @@ def _validate_image_info(ext, image_info=None, **kwargs): class StandbyExtension(base.BaseAgentExtension): def __init__(self): - super(StandbyExtension, self).__init__('STANDBY') + super(StandbyExtension, self).__init__() self.command_map['cache_image'] = self.cache_image self.command_map['prepare_image'] = self.prepare_image self.command_map['run_image'] = self.run_image diff --git a/ironic_python_agent/tests/extensions/base.py b/ironic_python_agent/tests/extensions/base.py index 24530a199..574333813 100644 --- a/ironic_python_agent/tests/extensions/base.py +++ b/ironic_python_agent/tests/extensions/base.py @@ -32,7 +32,7 @@ class ExecutionError(errors.RESTError): class FakeExtension(base.BaseAgentExtension): def __init__(self): - super(FakeExtension, self).__init__('FAKE') + super(FakeExtension, self).__init__() self.command_map['fake_async_command'] = self.fake_async_command self.command_map['fake_sync_command'] = self.fake_sync_command diff --git a/ironic_python_agent/tests/extensions/decom.py b/ironic_python_agent/tests/extensions/decom.py index 8d76c828d..10dc3d84b 100644 --- a/ironic_python_agent/tests/extensions/decom.py +++ b/ironic_python_agent/tests/extensions/decom.py @@ -21,6 +21,3 @@ class TestDecomExtension(test_base.BaseTestCase): def setUp(self): super(TestDecomExtension, self).setUp() self.agent_extension = decom.DecomExtension() - - def test_decom_extension(self): - self.assertEqual(self.agent_extension.name, 'DECOM') diff --git a/ironic_python_agent/tests/extensions/flow.py b/ironic_python_agent/tests/extensions/flow.py index 7588a4d2c..757560109 100644 --- a/ironic_python_agent/tests/extensions/flow.py +++ b/ironic_python_agent/tests/extensions/flow.py @@ -37,7 +37,7 @@ FLOW_INFO = [ class FakeExtension(base.BaseAgentExtension): def __init__(self): - super(FakeExtension, self).__init__('FAKE') + super(FakeExtension, self).__init__() self.command_map['sleep'] = self.sleep self.command_map['sync_sleep'] = self.sync_sleep @@ -59,9 +59,6 @@ class TestFlowExtension(test_base.BaseTestCase): FakeExtension, FakeExtension())]) - def test_flow_extension(self): - self.assertEqual(self.agent_extension.name, 'FLOW') - @mock.patch('time.sleep', autospec=True) def test_sleep_flow_success(self, sleep_mock): result = self.agent_extension.start_flow('start_flow', flow=FLOW_INFO) diff --git a/ironic_python_agent/tests/extensions/standby.py b/ironic_python_agent/tests/extensions/standby.py index 739cf96bc..e65ac2a93 100644 --- a/ironic_python_agent/tests/extensions/standby.py +++ b/ironic_python_agent/tests/extensions/standby.py @@ -30,9 +30,6 @@ class TestStandbyExtension(test_base.BaseTestCase): super(TestStandbyExtension, self).setUp() self.agent_extension = standby.StandbyExtension() - def test_standby_extension(self): - self.assertEqual(self.agent_extension.name, 'STANDBY') - def _build_fake_image_info(self): return { 'id': 'fake_id',