openstack/ironic
Code Issues Proposed changes

Merge "Remove backward compatibility code for agent url"

Browse Source
This commit is contained in:
Jenkins 2016-05-30 13:07:56 +00:00 committed by Gerrit Code Review
commit 8a7f4dfcb5
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ironic/drivers/modules/agent_client.py
View File

@ -41,10 +41,6 @@ class AgentClient(object):
def _get_command_url(self, node): def _get_command_url(self, node):
agent_url = node.driver_internal_info.get('agent_url') agent_url = node.driver_internal_info.get('agent_url')
if not agent_url:
# (lintan) Keep backwards compatible with booted nodes before this
# change. Remove this after Kilo.
agent_url = node.driver_info.get('agent_url')
if not agent_url: if not agent_url:
raise exception.IronicException(_('Agent driver requires ' raise exception.IronicException(_('Agent driver requires '
'agent_url in ' 'agent_url in '

2
ironic/tests/unit/drivers/modules/test_agent_client.py
View File

@ -38,7 +38,6 @@ class MockResponse(object):
class MockNode(object): class MockNode(object):
def __init__(self): def __init__(self):
self.uuid = 'uuid' self.uuid = 'uuid'
self.driver_info = {}
self.driver_internal_info = { self.driver_internal_info = {
'agent_url': "http://127.0.0.1:9999", 'agent_url': "http://127.0.0.1:9999",
'clean_version': {'generic': '1'} 'clean_version': {'generic': '1'}
@ -48,7 +47,6 @@ class MockNode(object):
def as_dict(self): def as_dict(self):
return { return {
'uuid': self.uuid, 'uuid': self.uuid,
'driver_info': self.driver_info,
'driver_internal_info': self.driver_internal_info, 'driver_internal_info': self.driver_internal_info,
'instance_info': self.instance_info 'instance_info': self.instance_info
} }