From 9b10fa917e7462bc9ced26136026b25367ece95b Mon Sep 17 00:00:00 2001
From: Andrey Pavlov <apavlov@mirantis.com>
Date: Wed, 30 Mar 2016 11:32:23 +0300
Subject: [PATCH] Fixing "commands list" command

TrivialFix

Change-Id: I6f73c0c8d6f8d6b69ee311659ae8abb4c242e39a
---
 kolla_mesos/commands.py            |  9 ++++++---
 kolla_mesos/tests/test_commands.py | 10 +++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/kolla_mesos/commands.py b/kolla_mesos/commands.py
index 00005000..e63585b8 100644
--- a/kolla_mesos/commands.py
+++ b/kolla_mesos/commands.py
@@ -29,14 +29,17 @@ CONF.import_group('kolla', 'kolla_mesos.config.kolla')
 
 
 def _get_task_from_cmd(role, cmd, cmd_info):
-    reg = '/kolla/%s/status/%s/%s' % (CONF.kolla.deployment_id, role, cmd)
+    reg = '/kolla/%s/status/global/%s/%s' % (CONF.kolla.deployment_id,
+                                             role, cmd)
     task = {'register': reg, 'requires': []}
-    for dep in cmd_info.get('dependencies', []):
+    dependencies = cmd_info.get('dependencies', None) or []
+    for dep in dependencies:
         path = dep['path']
         scope = dep.get('scope', 'global')
         if scope == 'global':
             task['requires'].append(
-                '/kolla/%s/status/%s' % (CONF.kolla.deployment_id, path))
+                '/kolla/%s/status/global/%s' % (CONF.kolla.deployment_id,
+                                                path))
         elif scope == 'local':
             task['requires'].append(
                 '/kolla/%s/status/%s/%s' % (CONF.kolla.deployment_id,
diff --git a/kolla_mesos/tests/test_commands.py b/kolla_mesos/tests/test_commands.py
index be6fd18c..aa233b0e 100644
--- a/kolla_mesos/tests/test_commands.py
+++ b/kolla_mesos/tests/test_commands.py
@@ -38,7 +38,7 @@ class CommandsTest(base.BaseTestCase):
 
     @fake_mesos.FakeMesosStateTaggedSlaves()
     def test_get_tasks_sanity(self):
-        var = '/kolla/test/status'
+        var = '/kolla/test/status/global'
         exp = {'register': '%s/cinder-api/db_sync' % var,
                'requires': [
                    '%s/cinder_ansible_tasks/create_database' % var,
@@ -51,7 +51,7 @@ class CommandsTest(base.BaseTestCase):
 
     @fake_mesos.FakeMesosStateTaggedSlaves()
     def test_get_service_tasks_sanity(self):
-        var = '/kolla/test/status'
+        var = '/kolla/test/status/global'
         exp = {'register': '%s/cinder-api/db_sync' % var,
                'requires': [
                    '%s/cinder_ansible_tasks/create_database' % var,
@@ -73,7 +73,7 @@ class CommandsTest(base.BaseTestCase):
         # just get what we want for the test
         test_tasks = {'cinder-api/db_sync':
                       tasks['cinder-api/db_sync']}
-        var = '/kolla/test/status'
+        var = '/kolla/test/status/global'
         exp = {
             'register': ('%s/cinder-api/db_sync' % var, 'waiting'),
             'requirements': {
@@ -102,7 +102,7 @@ class CommandsTest(base.BaseTestCase):
         # just get what we want for the test
         test_tasks = {'cinder-api/db_sync':
                       tasks['cinder-api/db_sync']}
-        var = '/kolla/test/status'
+        var = '/kolla/test/status/global'
         at = '%s/cinder_ansible_tasks' % var
         exp = {
             'register': ('%s/cinder-api/db_sync' % var, ''),
@@ -131,7 +131,7 @@ class CommandsTest(base.BaseTestCase):
         # just get what we want for the test
         test_tasks = {'cinder-api/db_sync':
                       tasks['cinder-api/db_sync']}
-        var = '/kolla/test/status'
+        var = '/kolla/test/status/global'
         at = '%s/cinder_ansible_tasks' % var
         exp = {
             'register': ('%s/cinder-api/db_sync' % var, 'done'),