Extract provisioned nodes - use ironic node uuid
Instead of using the baremetal node name in instance 'name',
use the baremetal node uuid.
Co-authored-by: Daniel Bengtsson <dbengt@redhat.com>
Change-Id: I7bc7d89cda2c46d6a75bf3124f3fa5f4fb9f9a20
(cherry picked from commit 5900a1ebe1
)
This commit is contained in:
parent
8f01143da4
commit
bdcc3a8ab1
|
@ -809,12 +809,16 @@ class TestExtractProvisionedNode(test_utils.TestCommand):
|
|||
mock.Mock()
|
||||
]
|
||||
self.nodes[0].name = 'bm-0'
|
||||
self.nodes[0].id = 'bm-0-uuid'
|
||||
self.nodes[0].resource_class = 'controller'
|
||||
self.nodes[1].name = 'bm-1'
|
||||
self.nodes[1].id = 'bm-1-uuid'
|
||||
self.nodes[1].resource_class = 'controller'
|
||||
self.nodes[2].name = 'bm-2'
|
||||
self.nodes[2].id = 'bm-2-uuid'
|
||||
self.nodes[2].resource_class = None
|
||||
self.nodes[3].name = 'bm-3'
|
||||
self.nodes[3].id = 'bm-3-uuid'
|
||||
self.nodes[3].resource_class = 'compute'
|
||||
|
||||
self.nodes[0].instance_info = {
|
||||
|
@ -953,7 +957,7 @@ class TestExtractProvisionedNode(test_utils.TestCommand):
|
|||
},
|
||||
'instances': [{
|
||||
'hostname': 'overcloud-novacompute-0',
|
||||
'name': 'bm-3',
|
||||
'name': 'bm-3-uuid',
|
||||
'resource_class': 'compute',
|
||||
}],
|
||||
}, {
|
||||
|
@ -976,15 +980,15 @@ class TestExtractProvisionedNode(test_utils.TestCommand):
|
|||
},
|
||||
'instances': [{
|
||||
'hostname': 'overcloud-controller-0',
|
||||
'name': 'bm-0',
|
||||
'name': 'bm-0-uuid',
|
||||
'resource_class': 'controller',
|
||||
}, {
|
||||
'hostname': 'overcloud-controller-1',
|
||||
'name': 'bm-1',
|
||||
'name': 'bm-1-uuid',
|
||||
'resource_class': 'controller',
|
||||
}, {
|
||||
'hostname': 'overcloud-controller-2',
|
||||
'name': 'bm-2'
|
||||
'name': 'bm-2-uuid',
|
||||
}],
|
||||
}], yaml.safe_load(result))
|
||||
|
||||
|
@ -1040,7 +1044,7 @@ class TestExtractProvisionedNode(test_utils.TestCommand):
|
|||
},
|
||||
'instances': [{
|
||||
'hostname': 'overcloud-novacompute-0',
|
||||
'name': 'bm-3',
|
||||
'name': 'bm-3-uuid',
|
||||
'resource_class': 'compute',
|
||||
'networks': [{'fixed_ip': '192.168.26.11',
|
||||
'network': 'ctlplane',
|
||||
|
@ -1069,7 +1073,7 @@ class TestExtractProvisionedNode(test_utils.TestCommand):
|
|||
},
|
||||
'instances': [{
|
||||
'hostname': 'overcloud-controller-0',
|
||||
'name': 'bm-0',
|
||||
'name': 'bm-0-uuid',
|
||||
'resource_class': 'controller',
|
||||
'networks': [{'fixed_ip': '192.168.25.21',
|
||||
'network': 'ctlplane',
|
||||
|
@ -1082,7 +1086,7 @@ class TestExtractProvisionedNode(test_utils.TestCommand):
|
|||
'subnet': 'internal_api_a'}],
|
||||
}, {
|
||||
'hostname': 'overcloud-controller-1',
|
||||
'name': 'bm-1',
|
||||
'name': 'bm-1-uuid',
|
||||
'resource_class': 'controller',
|
||||
'networks': [{'fixed_ip': '192.168.25.25',
|
||||
'network': 'ctlplane',
|
||||
|
@ -1095,7 +1099,7 @@ class TestExtractProvisionedNode(test_utils.TestCommand):
|
|||
'subnet': 'internal_api_a'}],
|
||||
}, {
|
||||
'hostname': 'overcloud-controller-2',
|
||||
'name': 'bm-2',
|
||||
'name': 'bm-2-uuid',
|
||||
'networks': [{'fixed_ip': '192.168.25.28',
|
||||
'network': 'ctlplane',
|
||||
'vif': True},
|
||||
|
@ -1174,7 +1178,7 @@ class TestExtractProvisionedNode(test_utils.TestCommand):
|
|||
'instances': [{
|
||||
'hostname': 'overcloud-novacompute-0',
|
||||
'resource_class': 'compute',
|
||||
'name': 'bm-3'
|
||||
'name': 'bm-3-uuid'
|
||||
}],
|
||||
}, {
|
||||
'name': 'Controller',
|
||||
|
@ -1197,11 +1201,11 @@ class TestExtractProvisionedNode(test_utils.TestCommand):
|
|||
'instances': [{
|
||||
'hostname': 'overcloud-controller-0',
|
||||
'resource_class': 'controller',
|
||||
'name': 'bm-0'
|
||||
'name': 'bm-0-uuid'
|
||||
}, {
|
||||
'hostname': 'overcloud-controller-1',
|
||||
'resource_class': 'controller',
|
||||
'name': 'bm-1'
|
||||
'name': 'bm-1-uuid'
|
||||
}, {
|
||||
'hostname': 'overcloud-controller-2',
|
||||
'name': 'bm-2'
|
||||
|
|
|
@ -636,8 +636,8 @@ class ExtractProvisionedNode(command.Command):
|
|||
hostname_node_resource = {}
|
||||
for node in node_details:
|
||||
hostname = node.instance_info.get('display_name')
|
||||
if hostname and node.name:
|
||||
hostname_node_map[hostname] = node.name
|
||||
if hostname:
|
||||
hostname_node_map[hostname] = node.id
|
||||
if hostname and node.resource_class:
|
||||
hostname_node_resource[hostname] = node.resource_class
|
||||
|
||||
|
|
Loading…
Reference in New Issue