openstack/tenks
Code Issues Proposed changes

Merge pull request #13 from w-miller/prefix-vol-names

Browse Source 
Prefix volume names with node name
This commit is contained in:
w-miller 2018-09-20 13:35:40 +01:00 committed by GitHub
commit 0ff2a038af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ansible/action_plugins/tenks_update_state.py
View File

@ -173,6 +173,11 @@ class ActionModule(ActionBase):
hostname, idx = scheduler.choose_host(node)
# Set node name based on its index.
node['name'] = "%s%d" % (self.args['node_name_prefix'], idx)
# Sequentially number the volume names.
for vol_idx, vol in enumerate(node['volumes']):
vol['name'] = ("%s%s%d"
% (node['name'],
self.args['vol_name_prefix'], vol_idx))
# Set IPMI port using its index as an offset from the lowest
# port.
node['ipmi_port'] = (
@ -196,10 +201,6 @@ class ActionModule(ActionBase):
)
# Set the type name, for future reference.
node['type'] = type_name
# Sequentially number the volume names.
for vol_idx, vol in enumerate(node['volumes']):
vol['name'] = (
"%s%d" % (self.args['vol_name_prefix'], vol_idx))
# Ironic config is not mandatory.
if ironic_config:
node['ironic_config'] = ironic_config

2
tests/test_tenks_update_state.py
View File

@ -173,7 +173,7 @@ class TestTenksUpdateState(unittest.TestCase):
for node in nodes:
self.assertEqual(len(node['volumes']), 2)
for n in {'0', '1'}:
self.assertIn('test_vol_pfx' + n,
self.assertIn(node['name'] + 'test_vol_pfx' + n,
[vol['name'] for vol in node['volumes']])
for c in {'10GB', '20GB'}:
self.assertIn(c, [vol['capacity'] for vol in node['volumes']])