From f56dbff8387e3d3a9e985661f0e573f8fd0225c8 Mon Sep 17 00:00:00 2001
From: Ekaterina Fedorova <efedorova@mirantis.com>
Date: Tue, 24 Sep 2013 18:11:47 +0400
Subject: [PATCH] Add mininum logging to dynamicUI

Change-Id: I1c1088f89ab2e8e3a6909a1497b7f23bba11f186
---
 muranodashboard/panel/api.py               | 12 +++++++++---
 muranodashboard/panel/services/__init__.py | 11 ++++++++++-
 muranodashboard/panel/services/fields.py   |  1 +
 muranodashboard/panel/services/forms.py    | 10 +++++++---
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/muranodashboard/panel/api.py b/muranodashboard/panel/api.py
index ca8dcb2c9..59d1ba096 100644
--- a/muranodashboard/panel/api.py
+++ b/muranodashboard/panel/api.py
@@ -152,9 +152,15 @@ class Session(object):
         """
         #We store opened sessions for each environment in dictionary per user
         sessions = request.session.get('sessions', {})
-        log.debug("Get session info")
-
-        return sessions[environment_id] if environment_id in sessions else None
+        session_id = sessions[environment_id] \
+            if environment_id in sessions else None
+        if session_id:
+            log.debug("Using session_id {0} for the environment {1}".format(
+                session_id, environment_id))
+        else:
+            log.debug("Session for the environment {0} not found".found(
+                environment_id))
+        return session_id
 
 
 def environments_list(request):
diff --git a/muranodashboard/panel/services/__init__.py b/muranodashboard/panel/services/__init__.py
index 64f0808b4..e761d21b7 100644
--- a/muranodashboard/panel/services/__init__.py
+++ b/muranodashboard/panel/services/__init__.py
@@ -14,12 +14,15 @@
 
 import os
 import re
+import time
+import logging
 from django.conf import settings
 from ordereddict import OrderedDict
 import yaml
 from yaml.scanner import ScannerError
 from django.utils.translation import ugettext_lazy as _
 
+log = logging.getLogger(__name__)
 _all_services = OrderedDict()
 
 
@@ -62,6 +65,7 @@ def import_all_services():
     directory = getattr(settings, 'MURANO_SERVICES_DESC_PATH', None)
     if directory is None:
         directory = os.path.join(os.path.dirname(__file__), '../../services/')
+    log.debug("Importing service definitions from '{0}'".format(directory))
 
     for filename in os.listdir(directory):
         if not filename.endswith('.yaml'):
@@ -77,11 +81,16 @@ def import_all_services():
         try:
             with open(service_file) as stream:
                 yaml_desc = yaml.load(stream)
-        except (OSError, ScannerError):
+        except (OSError, ScannerError) as e:
+            log.warn("Failed to import service definition from {0},"
+                     " reason: {1!s}".format(service_file, e))
             continue
 
         service = dict((decamelize(k), v) for (k, v) in yaml_desc.iteritems())
         _all_services[filename] = Service(modified_on, **service)
+        log.info("Added service '{0}' from '{1}', modified on {2}".format(
+            _all_services[filename].name, service_file,
+            time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(modified_on))))
 
 
 def iterate_over_services():
diff --git a/muranodashboard/panel/services/fields.py b/muranodashboard/panel/services/fields.py
index c853c56f7..f62d233fe 100644
--- a/muranodashboard/panel/services/fields.py
+++ b/muranodashboard/panel/services/fields.py
@@ -38,6 +38,7 @@ def with_request(func):
         if request:
             func(self, request, **kwargs)
         else:
+            log.error("No 'request' key in form initial dictionary")
             raise forms.ValidationError("Can't get a request information")
     return update
 
diff --git a/muranodashboard/panel/services/forms.py b/muranodashboard/panel/services/forms.py
index 770148477..5be6ff2b2 100644
--- a/muranodashboard/panel/services/forms.py
+++ b/muranodashboard/panel/services/forms.py
@@ -13,6 +13,7 @@
 #    under the License.
 
 import re
+import logging
 from django import forms
 from django.core.validators import RegexValidator
 from django.utils.translation import ugettext_lazy as _
@@ -21,10 +22,13 @@ import muranodashboard.panel.services.helpers as helpers
 import yaql
 import types
 
+log = logging.getLogger(__name__)
+
 
 class UpdatableFieldsForm(forms.Form):
     def update_fields(self):
-        # duplicate all password fields
+
+        #Create 'Confirm Password' fields by duplicating" Password fields
         while True:
             index, inserted = 0, False
             for name, field in self.fields.iteritems():
@@ -66,10 +70,10 @@ class ServiceConfigurationForm(UpdatableFieldsForm):
     localizable_keys = set(['label', 'help_text', 'error_messages'])
 
     def __init__(self, *args, **kwargs):
+        log.info("Creating form {0}".format(self.__class__.__name__))
         super(ServiceConfigurationForm, self).__init__(*args, **kwargs)
         self.attribute_mappings = {}
         self.insert_fields(self.fields_template)
-        self.initial = kwargs.get('initial', self.initial)
         self.update_fields()
 
     @staticmethod
@@ -199,7 +203,6 @@ class ServiceConfigurationForm(UpdatableFieldsForm):
                     return 'validators', [prepare_regexp(spec)]
                 else:
                     return key, spec
-
         for spec in field_specs:
             append_field(spec)
 
@@ -261,6 +264,7 @@ class ServiceConfigurationForm(UpdatableFieldsForm):
                     value = field.postclean(self, cleaned_data)
                     if value:
                         cleaned_data[name] = value
+                        log.debug("Update cleaned data in postclean method")
 
             self.service.update_cleaned_data(self, cleaned_data)
             return cleaned_data