a5c32aea36
Handling of provisioning images has changed on the Tuskar side; this fix brings Tukskar-UI in line with these changes. * There used to be separate images for all the deployment roles. This is no longer the case and all the roles now use the same image, 'overcloud-full'. As the result, the way the relationship between images and roles is displayed on the Provisioning Images page needs to be updated. * Related to the previous point, test data needed updating to reflect that. * Images associated with roles are now saved by name in the Tuskar plan. This fix ensures that the UI saves and retrieves images by name and not by UUID, like it used to do. Change-Id: I11b73fcaed45200dfbdb72dc3ab9a27afb67a31d
247 lines
8.0 KiB
Python
247 lines
8.0 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from openstack_dashboard.test.test_data import utils as test_data_utils
|
|
from tuskarclient.v2 import plans
|
|
from tuskarclient.v2 import roles
|
|
|
|
planmanager = plans.PlanManager(None)
|
|
rolemanager = roles.RoleManager(None)
|
|
|
|
|
|
def data(TEST):
|
|
|
|
# Plan
|
|
TEST.tuskarclient_plans = test_data_utils.TestDataContainer()
|
|
plan_1 = plans.Plan(planmanager, {
|
|
'uuid': 'plan-1',
|
|
'name': 'overcloud',
|
|
'description': 'this is an overcloud deployment plan',
|
|
'template': '',
|
|
'created_at': '2014-05-27T21:11:09Z',
|
|
'modified_at': '2014-05-30T21:11:09Z',
|
|
'roles': [
|
|
{
|
|
'uuid': 'role-1',
|
|
'name': 'Controller',
|
|
'version': 1,
|
|
}, {
|
|
'uuid': 'role-2',
|
|
'name': 'Compute',
|
|
'version': 1,
|
|
}, {
|
|
'uuid': 'role-3',
|
|
'name': 'Object Storage',
|
|
'version': 1,
|
|
}, {
|
|
'uuid': 'role-4',
|
|
'name': 'Block Storage',
|
|
'version': 1,
|
|
}],
|
|
'parameters': [{
|
|
'name': 'Controller-1::count',
|
|
'label': 'Controller Node Count',
|
|
'description': 'Controller node count',
|
|
'hidden': False,
|
|
'default': '',
|
|
'value': 1,
|
|
'parameter_type': 'string',
|
|
'constraints': [],
|
|
}, {
|
|
'name': 'Compute-1::count',
|
|
'label': 'Compute Node Count',
|
|
'description': 'Compute node count',
|
|
'hidden': False,
|
|
'default': '',
|
|
'value': 42,
|
|
'parameter_type': 'string',
|
|
'constraints': [],
|
|
}, {
|
|
'name': 'Block Storage-1::count',
|
|
'label': 'Block Sorage Node Count',
|
|
'description': 'Block storage node count',
|
|
'hidden': False,
|
|
'default': '',
|
|
'value': 5,
|
|
'parameter_type': 'string',
|
|
'constraints': [],
|
|
}, {
|
|
'name': 'Controller-1::Flavor',
|
|
'label': 'Controller Flavor',
|
|
'description': 'Controller flavor',
|
|
'hidden': False,
|
|
'default': '',
|
|
'value': 'flavor-1',
|
|
'parameter_type': 'string',
|
|
'constraints': [],
|
|
}, {
|
|
'name': 'Compute-1::Flavor',
|
|
'label': 'Compute Flavor',
|
|
'description': 'Compute flavor',
|
|
'hidden': False,
|
|
'default': '',
|
|
'value': 'flavor-1',
|
|
'parameter_type': 'string',
|
|
'constraints': [],
|
|
}, {
|
|
'name': 'Block Storage-1::Flavor',
|
|
'label': 'Block Storage Flavor',
|
|
'description': 'Block storage flavor',
|
|
'hidden': False,
|
|
'default': '',
|
|
'value': 'flavor-2',
|
|
'parameter_type': 'string',
|
|
'constraints': [],
|
|
}, {
|
|
'name': 'Controller-1::Image',
|
|
'label': 'Controller Image ID',
|
|
'description': 'Controller image ID',
|
|
'hidden': False,
|
|
'default': '',
|
|
'value': 'overcloud-full',
|
|
'parameter_type': 'string',
|
|
'constraints': [],
|
|
}, {
|
|
'name': 'Compute-1::Image',
|
|
'label': 'Compute Image ID',
|
|
'description': 'Compute image ID',
|
|
'hidden': False,
|
|
'default': '',
|
|
'value': 'overcloud-full',
|
|
'parameter_type': 'string',
|
|
'constraints': [],
|
|
}, {
|
|
'name': 'Block Storage-1::Image',
|
|
'label': 'Block Storage Image ID',
|
|
'description': 'Block storage image ID',
|
|
'hidden': False,
|
|
'default': '',
|
|
'value': 'overcloud-full',
|
|
'parameter_type': 'string',
|
|
'constraints': [],
|
|
}, {
|
|
'name': 'Controller-1::KeystoneCACertificate',
|
|
'label': 'Keystone CA CertificateAdmin',
|
|
'description': 'Keystone CA CertificateAdmin',
|
|
'hidden': True,
|
|
'default': '',
|
|
'value': 'unset',
|
|
'parameter_type': 'string',
|
|
'constraints': [],
|
|
}, {
|
|
'name': 'Controller-1::AdminPassword',
|
|
'label': 'Admin Password',
|
|
'description': 'Admin password',
|
|
'hidden': True,
|
|
'default': '',
|
|
'value': 'unset',
|
|
'parameter_type': 'string',
|
|
'constraints': [],
|
|
}, {
|
|
'name': 'Controller-1::AdminToken',
|
|
'label': 'Admin Token',
|
|
'description': 'Admin Token',
|
|
'hidden': True,
|
|
'default': '',
|
|
'value': '',
|
|
'parameter_type': 'string',
|
|
'constraints': [],
|
|
}, {
|
|
'name': 'Controller-1::SnmpdReadonlyUserPassword',
|
|
'label': 'Snmpd password',
|
|
'description': 'Snmpd password',
|
|
'hidden': True,
|
|
'default': '',
|
|
'value': '',
|
|
'parameter_type': 'string',
|
|
'constraints': [],
|
|
}, {
|
|
'name': 'Compute-1::SnmpdReadonlyUserPassword',
|
|
'label': 'Snmpd password',
|
|
'description': 'Snmpd password',
|
|
'hidden': True,
|
|
'default': '',
|
|
'value': 'unset',
|
|
'parameter_type': 'string',
|
|
'constraints': [],
|
|
}, {
|
|
'name': 'Controller-1::ExtraConfig',
|
|
'label': 'Extra Config',
|
|
'description': 'Extra Config',
|
|
'hidden': False,
|
|
'default': '',
|
|
'value': '{}',
|
|
'parameter_type': 'string',
|
|
'constraints': [],
|
|
}, {
|
|
'name': 'Compute-1::ExtraConfig',
|
|
'label': 'Extra Config',
|
|
'description': 'Extra Config',
|
|
'hidden': False,
|
|
'default': '',
|
|
'value': '{}',
|
|
'parameter_type': 'string',
|
|
'constraints': [],
|
|
}, {
|
|
'name': 'Block Storage-1::ExtraConfig',
|
|
'label': 'Extra Config',
|
|
'description': 'Extra Config',
|
|
'hidden': False,
|
|
'default': '',
|
|
'value': '{}',
|
|
'parameter_type': 'string',
|
|
'constraints': [],
|
|
}, {
|
|
'name': 'Object Storage-1::ExtraConfig',
|
|
'label': 'Extra Config',
|
|
'description': 'Extra Config',
|
|
'hidden': False,
|
|
'default': '',
|
|
'value': '{}',
|
|
'parameter_type': 'string',
|
|
'constraints': [],
|
|
}],
|
|
})
|
|
TEST.tuskarclient_plans.add(plan_1)
|
|
|
|
# Role
|
|
TEST.tuskarclient_roles = test_data_utils.TestDataContainer()
|
|
r_1 = roles.Role(rolemanager, {
|
|
'uuid': 'role-1',
|
|
'name': 'Controller',
|
|
'version': 1,
|
|
'description': 'controller role',
|
|
'created_at': '2014-05-27T21:11:09Z'
|
|
})
|
|
r_2 = roles.Role(rolemanager, {
|
|
'uuid': 'role-2',
|
|
'name': 'Compute',
|
|
'version': 1,
|
|
'description': 'compute role',
|
|
'created_at': '2014-05-27T21:11:09Z'
|
|
})
|
|
r_3 = roles.Role(rolemanager, {
|
|
'uuid': 'role-3',
|
|
'name': 'Object Storage',
|
|
'version': 1,
|
|
'description': 'object storage role',
|
|
'created_at': '2014-05-27T21:11:09Z'
|
|
})
|
|
r_4 = roles.Role(rolemanager, {
|
|
'uuid': 'role-4',
|
|
'name': 'Block Storage',
|
|
'version': 1,
|
|
'description': 'block storage role',
|
|
'created_at': '2014-05-27T21:11:09Z'
|
|
})
|
|
TEST.tuskarclient_roles.add(r_1, r_2, r_3, r_4)
|