fixed a bug where list_clusters would always use DEFAULT_SOA_DIR

Yelp · Jan 21, 2016 · 6731acc · 6731acc
1 parent 93c548c
commit 6731acc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/general_itests/steps/deployments_json_steps.py b/general_itests/steps/deployments_json_steps.py
@@ -28,6 +28,7 @@
 
 from paasta_tools import generate_deployments_for_service
 from paasta_tools import marathon_tools
+from paasta_tools.utils import InstanceConfig
 
 
 @given(u'a test git repo is setup with commits')
@@ -73,8 +74,14 @@ def step_impl_when(context):
                    return_value=context.test_git_repo_dir),
         mock.patch('paasta_tools.generate_deployments_for_service.parse_args',
                    autospec=True, return_value=fake_args),
-        mock.patch('paasta_tools.generate_deployments_for_service.get_branches_for_service', autospec=True,
-                   return_value=['paasta-test_cluster.test_instance']),
+        mock.patch('paasta_tools.generate_deployments_for_service.get_instance_config_for_service', autospec=True,
+                   return_value=[InstanceConfig(
+                       cluster='paasta-test_cluster',
+                       service='fake_deployments_json_service',
+                       instance='test_instance',
+                       config_dict={},
+                       branch_dict={},
+                   )]),
     ) as (
         mock_get_git_url,
         mock_parse_args,

diff --git a/paasta_tools/cli/cmds/validate.py b/paasta_tools/cli/cmds/validate.py
@@ -191,7 +191,13 @@ def validate_chronos(service_path):
     instance_type = 'chronos'
 
     returncode = 0
+    print "Clusters:"
+    print list_clusters(service, soa_dir, instance_type)
     for cluster in list_clusters(service, soa_dir, instance_type):
+        print cluster
+        print list_all_instances_for_service(
+            service=service, clusters=[cluster], instance_type=instance_type,
+            soa_dir=soa_dir)
         for instance in list_all_instances_for_service(
                 service=service, clusters=[cluster], instance_type=instance_type,
                 soa_dir=soa_dir):

diff --git a/paasta_tools/utils.py b/paasta_tools/utils.py
@@ -816,7 +816,7 @@ def get_default_cluster_for_service(service):
 def get_soa_cluster_deploy_files(service=None, soa_dir=DEFAULT_SOA_DIR, instance_type=None):
     if service is None:
         service = '*'
-    service_path = os.path.join(DEFAULT_SOA_DIR, service)
+    service_path = os.path.join(soa_dir, service)
 
     if instance_type == 'marathon' or instance_type == 'chronos':
         instance_types = instance_type