From 27224fa8a14ce029e06fd0692dcfe0d9be98f0db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adolfo=20G=C3=B3mez=20Garc=C3=ADa?= <dkmaster@dkmon.com>
Date: Tue, 10 Mar 2015 09:25:18 +0100
Subject: [PATCH] Starting to work on reporting

---
 server/src/uds/admin/urls.py                   |  4 ++--
 .../views/{reports => reporting}/__init__.py   |  0
 .../admin/views/{reports => reporting}/urls.py |  6 +++---
 .../views/{reports => reporting}/usage.py      |  0
 server/src/uds/core/util/stats/charts.py       | 18 +++++++++---------
 .../uds/services/OVirt/client/oVirtClient.py   |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)
 rename server/src/uds/admin/views/{reports => reporting}/__init__.py (100%)
 rename server/src/uds/admin/views/{reports => reporting}/urls.py (95%)
 rename server/src/uds/admin/views/{reports => reporting}/usage.py (100%)

diff --git a/server/src/uds/admin/urls.py b/server/src/uds/admin/urls.py
index fdf754e1..52d78fd9 100644
--- a/server/src/uds/admin/urls.py
+++ b/server/src/uds/admin/urls.py
@@ -32,12 +32,12 @@
 from __future__ import unicode_literals
 from django.conf.urls import patterns, include
 
-__updated__ = '2015-02-28'
+__updated__ = '2015-03-10'
 
 urlpatterns = patterns(
     'uds.admin.views',
     (r'^$', 'index'),
     (r'^tmpl/(?P<template>[a-zA-Z0-9_-]*)$', 'tmpl'),
     (r'^sample$', 'sample'),
-    (r'^reports/', include('uds.admin.views.reports.urls')),
+    (r'^reporting/', include('uds.admin.views.reporting.urls')),
 )
diff --git a/server/src/uds/admin/views/reports/__init__.py b/server/src/uds/admin/views/reporting/__init__.py
similarity index 100%
rename from server/src/uds/admin/views/reports/__init__.py
rename to server/src/uds/admin/views/reporting/__init__.py
diff --git a/server/src/uds/admin/views/reports/urls.py b/server/src/uds/admin/views/reporting/urls.py
similarity index 95%
rename from server/src/uds/admin/views/reports/urls.py
rename to server/src/uds/admin/views/reporting/urls.py
index dfe93e7b..d63241a0 100644
--- a/server/src/uds/admin/views/reports/urls.py
+++ b/server/src/uds/admin/views/reporting/urls.py
@@ -32,9 +32,9 @@
 from __future__ import unicode_literals
 from django.conf.urls import patterns
 
-__updated__ = '2015-02-28'
+__updated__ = '2015-03-10'
 
 urlpatterns = patterns(
-    'uds.admin.views.reports',
-    (r'^usage/', 'usage'),
+    'uds.admin.views.reporting',
+    (r'', 'usage'),
 )
diff --git a/server/src/uds/admin/views/reports/usage.py b/server/src/uds/admin/views/reporting/usage.py
similarity index 100%
rename from server/src/uds/admin/views/reports/usage.py
rename to server/src/uds/admin/views/reporting/usage.py
diff --git a/server/src/uds/core/util/stats/charts.py b/server/src/uds/core/util/stats/charts.py
index ad719947..9036b04f 100644
--- a/server/src/uds/core/util/stats/charts.py
+++ b/server/src/uds/core/util/stats/charts.py
@@ -81,15 +81,15 @@ def make(obj, counterType, **kwargs):
     dataset = ((counters.getCounterTitle(counterType).encode('iso-8859-1', errors='ignore'), dataset1),)
 
     options = {
-         'axis': {
-                    'x': {
-                        'ticks': [dict(v=i, label=datetime.datetime.fromtimestamp(i).strftime(xLabelFormat)) for i in firstLast],
-                        'range': (firstLast[0], firstLast[1])
-                    },
-                    'y': {
-                        'tickCount': 4,
-                    }
-                },
+        'axis': {
+            'x': {
+                'ticks': [dict(v=i, label=datetime.datetime.fromtimestamp(i).strftime(xLabelFormat)) for i in firstLast],
+                'range': (firstLast[0], firstLast[1])
+            },
+            'y': {
+                'tickCount': 4,
+            }
+        },
         'legend': {'hide': True},
         'background': {
             'chartColor': '#ffeeff',
diff --git a/server/src/uds/services/OVirt/client/oVirtClient.py b/server/src/uds/services/OVirt/client/oVirtClient.py
index fb63757b..bb8c80bb 100644
--- a/server/src/uds/services/OVirt/client/oVirtClient.py
+++ b/server/src/uds/services/OVirt/client/oVirtClient.py
@@ -48,7 +48,7 @@ class Client(object):
         Again, due to the fact that ovirtsdk don't allow (at this moment, but it's on the "TODO" list) concurrent access to
         more than one server, we keep only one opened connection.
 
-        Must be acceses "locked", we can alter cached_api and cached_api_key
+        Must be accesed "locked", so we can safely alter cached_api and cached_api_key
         '''
         global cached_api, cached_api_key
         aKey = self.__getKey('o-host')