From 01297c64c81a46f66982655d07fc427a6f79ee13 Mon Sep 17 00:00:00 2001
From: Devdatta Kulkarni <devdatta.kulkarni@rackspace.com>
Date: Mon, 15 Feb 2016 13:53:33 -0600
Subject: [PATCH] Updating app domain model to contain scale_config

Updating the app domain model object with a field to
contain the scale_config information. This can be used
in the cli to display the target number of instances
that may have been requested using 'app scale' command.

Change-Id: If3e214064e107726ebbe1040ffee35a84ed32971
Closes-Bug: #1545836
---
 solum/api/controllers/v1/datamodel/app.py | 6 +++++-
 solum/api/handlers/workflow_handler.py    | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/solum/api/controllers/v1/datamodel/app.py b/solum/api/controllers/v1/datamodel/app.py
index a7713c243..cd7a0f302 100644
--- a/solum/api/controllers/v1/datamodel/app.py
+++ b/solum/api/controllers/v1/datamodel/app.py
@@ -58,6 +58,9 @@ class App(api_types.Base):
     repo_token = wtypes.text
     created_at = datetime.datetime
     raw_content = wtypes.text
+    scale_config = wtypes.DictType(
+        wtypes.text,
+        wtypes.DictType(wtypes.text, wtypes.text))
 
     parameters = wtypes.DictType(
         wtypes.text,
@@ -80,6 +83,7 @@ class App(api_types.Base):
 
     @classmethod
     def from_db_model(cls, m, host_url):
+
         json = m.as_dict()
         json['type'] = m.__tablename__
         json['uri'] = '%s/v1/apps/%s' % (host_url, m.id)
@@ -101,7 +105,7 @@ class App(api_types.Base):
             'trigger_actions',
             'workflow_config',
             'stack_id',
-            'raw_content',
+            'raw_content'
             ]
         base = super(App, self).as_dict(db_model)
 
diff --git a/solum/api/handlers/workflow_handler.py b/solum/api/handlers/workflow_handler.py
index a980beac9..74b9eafac 100644
--- a/solum/api/handlers/workflow_handler.py
+++ b/solum/api/handlers/workflow_handler.py
@@ -80,11 +80,11 @@ class WorkflowHandler(handler.Handler):
         current_config = app.scale_config
 
         if current_config:
-            current_config[app.name]['target'] = target
+            current_config[app.name]['target'] = str(target)
             scale_config['scale_config'] = current_config
         else:
             config_data = dict()
-            config_data['target'] = target
+            config_data['target'] = str(target)
             app_scale_config = dict()
             app_scale_config[app.name] = config_data
             scale_config = dict()