x
/
fuel-ccp
Code Issues Proposed changes

Improve validation for topology 

Change-Id: If99a06ec0e38e1880fea2f1e9cbb2604fbf90185
This commit is contained in:
Kirill Bespalov 2017-01-20 18:15:43 +03:00
parent 300dd96fd5
commit 020786cb53
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fuel_ccp/deploy.py
View File

@ -73,13 +73,15 @@ def process_files(files, service_dir):
def parse_role(component, topology, configmaps):
service_dir = component["service_dir"]
role = component["service_content"]
component_name = component["component_name"]
service = role["service"]
service_name = service["name"]
if service_name not in topology:
raise ValueError('The %s is not defined in topology.' % service_name)
LOG.info("Scheduling service %s deployment", service_name)
files = role.get("files")
files_header = service['exports_ctx']['files_header']
@ -269,8 +271,12 @@ def _create_post_jobs(service, container, component_name, topology):
def _get_job(service, container, job, component_name, topology):
if 'topology_key' in job:
affinity = templates.serialize_affinity(
{"name": job['topology_key']}, topology)
key = job['topology_key']
if key not in topology:
raise ValueError('You must specify "%s" in topology to setup '
'affinity for "%s" job of "%s" component' %
(key, job['name'], component_name))
affinity = templates.serialize_affinity({"name": key}, topology)
else:
affinity = {}
cont_spec = templates.serialize_job_container_spec(container, job)
@ -567,6 +573,11 @@ def deploy_components(components_map, components):
topology = _make_topology(CONF.nodes, CONF.roles, CONF.replicas._dict)
if not components:
components = set(topology.keys()) & set(components_map.keys())
else:
diff = components - set(topology.keys())
if not diff:
raise ValueError('The next components are not '
'defined in topology: %s' % list(diff))
deploy_validation.validate_requested_components(components, components_map)