From 8d3082fcdfc771c8d17e67049bf7d5837068f96d Mon Sep 17 00:00:00 2001
From: Timur Nurlygayanov <tnurlygayanov@mirantis.com>
Date: Thu, 28 Mar 2013 14:08:07 +0400
Subject: [PATCH] Fixed issue with sessions.

---
 tabula/tabula/templates/_service_logs.html |  4 +++-
 tabula/tabula/templates/_services.html     | 18 ++++--------------
 tabula/tabula/windc/api.py                 |  6 ++++++
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/tabula/tabula/templates/_service_logs.html b/tabula/tabula/templates/_service_logs.html
index c02519e..c82acba 100644
--- a/tabula/tabula/templates/_service_logs.html
+++ b/tabula/tabula/templates/_service_logs.html
@@ -1,5 +1,7 @@
 {% load i18n %}
-LOGs
+<div class="clearfix">
+  <h3 class="pull-left">{% trans "Service Logs" %}</h3>
+</div>
 <pre class="logs">
   {{ service.operation }}
 </pre>
\ No newline at end of file
diff --git a/tabula/tabula/templates/_services.html b/tabula/tabula/templates/_services.html
index 3749f9c..6a1fbb7 100644
--- a/tabula/tabula/templates/_services.html
+++ b/tabula/tabula/templates/_services.html
@@ -1,17 +1,7 @@
 {% load i18n %}
 
 <div class="clearfix">
-  <h3 class="pull-left">{% trans "Service Logs" %}</h3>
-
-  <form id="tail_length" action="{% url horizon:project:instances:console instance.id %}" class="form-inline pull-right">
-    <label for="tail_length_select">{% trans "Log Length" %}</label>
-    <input class="span1" type="text" name="length" value="35" />
-    <button class="btn btn-small btn-primary" type="submit">{% trans "Go" %}</button>
-    {% url horizon:project:instances:console instance.id as console_url %}
-    <a class="btn btn-small" target="_blank" href="{{ console_url }}">{% trans "View Full Log" %}</a>
-  </form>
-</div>
-
-<pre class="logs">
-  {{ service.operation }}
-</pre>
\ No newline at end of file
+  <h3 class="pull-left">{% trans "Service Details" %}</h3>
+  Name: {{ service.name }}
+  ID:   {{ service.id }}
+</div>
\ No newline at end of file
diff --git a/tabula/tabula/windc/api.py b/tabula/tabula/windc/api.py
index 7722212..8e06bee 100644
--- a/tabula/tabula/windc/api.py
+++ b/tabula/tabula/windc/api.py
@@ -81,6 +81,8 @@ def services_list(request, datacenter_id):
     for s in sessions:
         if s.state in ['open', 'deploying']:
             session_id = s.id
+        else:
+            windcclient(request).sessions.delete(datacenter_id, s.id)
 
     if session_id is None:
         session_id = windcclient(request).sessions.configure(datacenter_id).id
@@ -101,6 +103,8 @@ def get_active_directories(request, datacenter_id):
     for s in sessions:
         if s.state in ['open', 'deploying']:
             session_id = s.id
+        else:
+            windcclient(request).sessions.delete(datacenter_id, s.id)
 
     if session_id is None:
         session_id = windcclient(request).sessions.configure(datacenter_id).id
@@ -144,6 +148,8 @@ def get_status_message_for_service(request, service_id):
     for s in sessions:
         if s.state in ['open', 'deploying']:
             session_id = s.id
+        else:
+            windcclient(request).sessions.delete(datacenter_id, s.id)
 
     if session_id is None:
         session_id = windcclient(request).sessions.configure(datacenter_id).id