Move service validation to validate_service().

Signed-off-by: Daniel Nephin <dnephin@docker.com>

compose/config/config.py

@@ -312,15 +312,11 @@ def load_services(working_dir, filename, service_configs, version):
         resolver = ServiceExtendsResolver(service_config, version)
         service_dict = process_service(resolver.run())
 
-        # TODO: move to validate_service()
-        validate_against_service_schema(service_dict, service_config.name, version)
-        validate_paths(service_dict)
-
+        validate_service(service_dict, service_config.name, version)
         service_dict = finalize_service(
             service_config._replace(config=service_dict),
             service_names,
             version)
-        service_dict['name'] = service_config.name
         return service_dict
 
     def build_services(service_config):
@@ -494,7 +490,14 @@ def validate_ulimits(ulimit_config):
                     "than 'hard' value".format(ulimit_config))
 
 
-# TODO: rename to normalize_service
+def validate_service(service_dict, service_name, version):
+    validate_against_service_schema(service_dict, service_name, version)
+    validate_paths(service_dict)
+
+    if 'ulimits' in service_dict:
+        validate_ulimits(service_dict['ulimits'])
+
+
 def process_service(service_config):
     working_dir = service_config.working_dir
     service_dict = dict(service_config.config)
@@ -525,10 +528,6 @@ def process_service(service_config):
         if field in service_dict:
             service_dict[field] = to_list(service_dict[field])
 
-    # TODO: move to a validate_service()
-    if 'ulimits' in service_dict:
-        validate_ulimits(service_dict['ulimits'])
-
     return service_dict
 
 
@@ -554,6 +553,7 @@ def finalize_service(service_config, service_names, version):
 
     normalize_build(service_dict, service_config.working_dir)
 
+    service_dict['name'] = service_config.name
     return normalize_v1_service_format(service_dict)