Fix node id vs uuid in processing_logger_prefix
this is a follow-up to Icd3de82877c6a53d32b4c9fd3e500d3cd9d7fb17 one more place was identified as trying to use uuid attr of a Node object from openstacksdk instead of id attr. In tests, use stricter mocking with spec_set (that actually fails to access or set an atribute of a mock that is absent from the spec class or instance) to guard against future possible changes. Change-Id: I83c420d0e91e00f583a28833f4f710cf70b01fa8 Story: 2008379 Task: 41300
This commit is contained in:
parent
8d06567a6e
commit
5c79d7552a
|
@ -93,7 +93,7 @@ class TestProcessingLogger(base.BaseTest):
|
||||||
utils.processing_logger_prefix())
|
utils.processing_logger_prefix())
|
||||||
|
|
||||||
def test_prefix_only_uuid(self):
|
def test_prefix_only_uuid(self):
|
||||||
node_info = mock.Mock(uuid='NNN', spec=node.Node)
|
node_info = mock.Mock(id='NNN', spec_set=node.Node)
|
||||||
self.assertEqual('[node: NNN]',
|
self.assertEqual('[node: NNN]',
|
||||||
utils.processing_logger_prefix(node_info=node_info))
|
utils.processing_logger_prefix(node_info=node_info))
|
||||||
|
|
||||||
|
@ -108,7 +108,7 @@ class TestProcessingLogger(base.BaseTest):
|
||||||
utils.processing_logger_prefix(data=data))
|
utils.processing_logger_prefix(data=data))
|
||||||
|
|
||||||
def test_prefix_everything(self):
|
def test_prefix_everything(self):
|
||||||
node_info = mock.Mock(uuid='NNN', spec=node.Node)
|
node_info = mock.Mock(id='NNN', spec_set=node.Node)
|
||||||
data = {'boot_interface': '01-aa-bb-cc-dd-ee-ff',
|
data = {'boot_interface': '01-aa-bb-cc-dd-ee-ff',
|
||||||
'inventory': {'bmc_address': '1.2.3.4'}}
|
'inventory': {'bmc_address': '1.2.3.4'}}
|
||||||
self.assertEqual('[node: NNN MAC aa:bb:cc:dd:ee:ff BMC 1.2.3.4]',
|
self.assertEqual('[node: NNN MAC aa:bb:cc:dd:ee:ff BMC 1.2.3.4]',
|
||||||
|
@ -116,7 +116,7 @@ class TestProcessingLogger(base.BaseTest):
|
||||||
data=data))
|
data=data))
|
||||||
|
|
||||||
def test_prefix_uuid_not_str(self):
|
def test_prefix_uuid_not_str(self):
|
||||||
node_info = mock.Mock(uuid=None, spec=node.Node)
|
node_info = mock.Mock(id=None, spec_set=node.Node)
|
||||||
self.assertEqual('[node: None]',
|
self.assertEqual('[node: None]',
|
||||||
utils.processing_logger_prefix(node_info=node_info))
|
utils.processing_logger_prefix(node_info=node_info))
|
||||||
|
|
||||||
|
@ -131,7 +131,7 @@ class TestProcessingLogger(base.BaseTest):
|
||||||
utils.processing_logger_prefix(node_info=node_info))
|
utils.processing_logger_prefix(node_info=node_info))
|
||||||
|
|
||||||
def test_adapter_with_bmc(self):
|
def test_adapter_with_bmc(self):
|
||||||
node_info = mock.Mock(uuid='NNN', spec=node.Node)
|
node_info = mock.Mock(id='NNN', spec_set=node.Node)
|
||||||
data = {'boot_interface': '01-aa-bb-cc-dd-ee-ff',
|
data = {'boot_interface': '01-aa-bb-cc-dd-ee-ff',
|
||||||
'inventory': {'bmc_address': '1.2.3.4'}}
|
'inventory': {'bmc_address': '1.2.3.4'}}
|
||||||
logger = utils.getProcessingLogger(__name__)
|
logger = utils.getProcessingLogger(__name__)
|
||||||
|
|
|
@ -86,7 +86,7 @@ def processing_logger_prefix(data=None, node_info=None):
|
||||||
|
|
||||||
if node_info is not None:
|
if node_info is not None:
|
||||||
if isinstance(node_info, node.Node):
|
if isinstance(node_info, node.Node):
|
||||||
parts.append(str(node_info.uuid))
|
parts.append(str(node_info.id))
|
||||||
else:
|
else:
|
||||||
parts.append(str(node_info))
|
parts.append(str(node_info))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue