Merge "Deprecated extension name attribute"
This commit is contained in:
@@ -115,10 +115,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):
|
||||
|
@@ -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__()
|
||||
|
@@ -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):
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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')
|
||||
|
@@ -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)
|
||||
|
@@ -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',
|
||||
|
Reference in New Issue
Block a user