From 2644f55ba6617124d8e3c0513da020cc27ec77f9 Mon Sep 17 00:00:00 2001
From: javier <javier.garcial.external@atos.net>
Date: Tue, 17 Jun 2014 18:33:59 +0200
Subject: [PATCH] SLA code updated and new image for SmartSantander Application
 Service added

---
 .../img/servicedirectory/smartsantander.png   | Bin 5263 -> 5413 bytes
 sla/slaclient/restclient.py                   |   9 --
 sla/slaclient/wsag_model.py                   |  12 ++-
 sla/slicetabsla.py                            |  25 +++--
 sla/templates/slice-tab-sla.html              |  96 +++++++++++++-----
 5 files changed, 99 insertions(+), 43 deletions(-)

diff --git a/portal/static/img/servicedirectory/smartsantander.png b/portal/static/img/servicedirectory/smartsantander.png
index 806e459ee34e7643a36ab375bb7431b39c946798..73197627388e30f89d5388e5be791fe50fecb6d8 100755
GIT binary patch
literal 5413
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

literal 5263
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
VILTrK=GFiJ002ovPDHLkV1h)_P7eS8

diff --git a/sla/slaclient/restclient.py b/sla/slaclient/restclient.py
index 9d1306b1..c00ca2f5 100755
--- a/sla/slaclient/restclient.py
+++ b/sla/slaclient/restclient.py
@@ -281,19 +281,10 @@ class Agreements(object):
         path = _buildpath_(agreementid, "guaranteestatus")
         r = self.res.client.get(path, headers={'accept': 'application/json'})
 
-        print "---- JSON Response ----"
-        print r.text
-
         json_obj = r.json()
-        print "-- json_obj() --"
-        print type(json_obj)
-        print json_obj
         
         status = wsag_model.AgreementStatus.json_decode(json_obj)
 
-        print "---- STATUS ----"
-        print status
-
         return status, r
     
     def create(self, agreement):
diff --git a/sla/slaclient/wsag_model.py b/sla/slaclient/wsag_model.py
index 1c9bd41a..f141d6ad 100755
--- a/sla/slaclient/wsag_model.py
+++ b/sla/slaclient/wsag_model.py
@@ -30,6 +30,11 @@ class Agreement(object):
         def testbed_formatted(self):
             return self.template_id.replace('Service', ' - ')
 
+        def time_formatted(self):
+            import dateutil.parser
+            time = dateutil.parser.parse(self.expirationtime)
+            return time.strftime('%d-%m-%Y at %H:%M:%S')
+
     class Property(object):
         def __init__(self):
             self.servicename = ""
@@ -187,7 +192,7 @@ class Violation(object):
         self.contract_uuid = ""
         self.service_scope = ""
         self.metric_name = ""
-        self.datetime = datetime.now()
+        self.datetime = datetime.utcnow()
         self.actual_value = 0
 
     def __repr__(self):
@@ -201,6 +206,11 @@ class Violation(object):
                 self.actual_value)
         )
 
+    def format_time(self):
+        # return datetime.strptime(self.datetime.datetime.utcnow,'%Y-%m-%d %H:%M:%S')
+        # return str(datetime.fromtimestamp(self.datetime))
+        return str(self.datetime)
+
 
 class Provider(object):
     def __init__(self):
diff --git a/sla/slicetabsla.py b/sla/slicetabsla.py
index 6b350d41..19655404 100755
--- a/sla/slicetabsla.py
+++ b/sla/slicetabsla.py
@@ -92,6 +92,7 @@ class SLAView (FreeAccessView, ThemeView):
         consumer_id = None
         agreement_id = None
         enforcements = {}
+        violations = {}
 
         filter_ = None
         form = FilterForm(request.GET)
@@ -100,15 +101,21 @@ class SLAView (FreeAccessView, ThemeView):
              filter_ = _get_filter_from_form(form)
 
         consumer_id = _get_consumer_id(request)
-
+        
         agreements = _get_agreements(agreement_id, consumer_id=consumer_id, filter_=filter_)
-
+        
         for agreement in agreements:
             enf = _get_enforcement(agreement.agreement_id)
-            enforcements[agreement.agreement_id] = enf.enabled
-        
-        for key, value in enforcements.items():
-            print key + ": " + value
+            if enf.enabled == 'true':
+                enforcements[agreement.agreement_id] = "ACTIVE"
+            else:
+                enforcements[agreement.agreement_id] = "UNACTIVE"
+            violations_list = _get_agreement_violations(agreement.agreement_id, "GT_Performance")
+            
+            if len(violations_list):
+                violations[agreement.agreement_id] = float(violations_list[0]["actualValue"])*100
+            else:
+                violations[agreement.agreement_id] = 100
 
         template_env = {}
        # write something of our own instead
@@ -118,6 +125,7 @@ class SLAView (FreeAccessView, ThemeView):
         template_env['username'] = request.user
         template_env['slicename'] = slicename
         template_env['enforcements'] = enforcements
+        template_env['last_violation_list'] = violations
        
        # the prelude object in page contains a summary of the requirements() for all plugins
        # define {js,css}_{files,chunks}
@@ -224,12 +232,17 @@ def agreement_term_violations(request, agreement_id, guarantee_name):
         # If page is out of range (e.g. 9999), deliver first page.
         violation_page = paginator.page(1)
     
+    print "\n******************"
+    print violations[-1]
+    print "******************\n"
+
     context = {
         'agreement_id': agreement_id,
         'guarantee_term': agreement.guaranteeterms[guarantee_name],
         'violations': violation_page,
         'agreement': agreement,
         'slicename': slicename,
+        'last_violation': violations[-1].actual_value
     }
     
     context.update(prelude_env)
diff --git a/sla/templates/slice-tab-sla.html b/sla/templates/slice-tab-sla.html
index c605b6d3..f09aa8de 100755
--- a/sla/templates/slice-tab-sla.html
+++ b/sla/templates/slice-tab-sla.html
@@ -2,7 +2,7 @@
 <div class="col-md-2">
 </div>
 
- <div class="col-md-8">
+ <div class="col-md-9">
    <div class="row" id="agreements">
     <table class="table dataTable" id="sla_table" >
         <thead>
@@ -48,14 +48,14 @@
                  <dd>{{ a.agreement_id|default:"&nbsp;" }}</dd>
                  <dt>Provider</dt>
                  <dd>{{ a.context.provider|default:"&nbsp;" }}</dd>
-                 <dt>Consumer</dt>
+                 <dt>Experimenter</dt>
                  <dd>{{ a.context.consumer|default:"&nbsp;" }}</dd>
                  <dt>Service</dt>
                  <dd>Testbed guarantees 0.99 Uptime rate for 0.99 rate of the resources during the sliver lifetime</dd>
                  <dt>Testbed</dt>
                  <dd>{{ a.context.testbed_formatted }}</dd>
                  <dt>Accepted on:</dt>
-                 <dd>{{ a.context.expirationtime|default:"&nbsp;" }}</dd>
+                 <dd>{{ a.context.time_formatted|default:"&nbsp;" }}</dd>
 			</div>
 			<div class="modal-footer">
  				<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
@@ -67,47 +67,89 @@
        <tr>
        		{% if a.guaranteestatus == "VIOLATED" %}
        		<td class="glyphicon glyphicon-remove-sign" style="color:red;"></td>
-        	{% else %}
+        	{% elif a.guaranteestatus == "FULFILLED" %}
         	<td class="glyphicon glyphicon-ok-sign" style="color:green;"></td>
+          {% else %}
+          <td></td>
         	{% endif %}
-    		<td>{{ a.context.template_id }}</td>
-            <td>{{ a.context.expirationtime }}</td>
-            <td>
-                {% with a.agreement_id as key %}
-                {% if enforcements.key == false %}
-                  Disabled
-                {% else %}
-                  Enabled
-                {% endif %}
-                {% endwith %}
-            </td>
-            <!-- <td>{{slicename}}</td> -->
-            <td>
-                <!-- <a class="agreement-detail" href="{% url "agreement_details" a.agreement_id %}" data-toggle="modal" data-target="#agreementModal">View Agreement</a> -->
-                <!-- <a class="agreement-detail" href="#" data-agreement="{{ a.agreement_id }}">View Agreement</a> -->
-                <a class="agreement-detail" data-toggle="modal" data-target="#agreementModal{{a.agreement_id}}">View Agreement</a>
-            </td>
+    		  <td>{{ a.context.template_id }}</td>
+          <td>{{ a.context.time_formatted }}</td>
+          
+          {% with a.agreement_id as key %}
+          
+          <td>
+              <!-- <a class="agreement-detail" href="{% url "agreement_details" a.agreement_id %}" data-toggle="modal" data-target="#agreementModal">View Agreement</a> -->
+              <!-- <a class="agreement-detail" href="#" data-agreement="{{ a.agreement_id }}">View Agreement</a> -->
+              <a class="agreement-detail" data-toggle="modal" data-target="#agreementModal{{a.agreement_id}}">View Agreement</a>
+          </td>
+
+          {% for k,v in enforcements.items %}
+            {% if key == k %}
+              <td>
+              {% if v == "ACTIVE" %}
+                In progress
+              {% elif v == "UNACTIVE" %}
+                Disabled
+              {% endif %}
+              </td>
+
+              {% if a.guaranteestatus == "VIOLATED" and v == "UNACTIVE" %}
+              <td style="font-weight: bold">
+                Result: 99% uptime for
+                {% for vi, value in last_violation_list.items %}
+                  {% if a.agreement_id == vi %}
+                      {{ value }}%
+                  {% endif %}
+                {% endfor %}
+                resources
+              </td>
+              {% elif a.guaranteestatus == "FULFILLED" and v == "UNACTIVE" %}
+              <td style="font-weight: bold">
+                Result: 99% uptime for
+                {% for vi, value in last_violation_list.items %}
+                  {% if a.agreement_id == vi %}
+                      {{ value }}%
+                  {% endif %}
+                {% endfor %}
+                resources
+              </td>
+              {% endif %}
+            {% endif %}
 
-            {% for tname,t in a.guaranteeterms.items %}
+          {% endfor %}
+          
+          <!-- <td>{{slicename}}</td> -->
+
+          
+
+          
+              
+
+            {% endwith %}
+            <!-- {% for tname,t in a.guaranteeterms.items %}
             <td> {{ t.servicelevelobjective.kpiname }}</td>
             <td>
                 {% if t.status == "VIOLATED" %}
 
-                  <!-- <a class="violation-detail" href="{% url "agreement_term_violations" a.agreement_id t.name %}" data-toggle="modal" data-target="#violationModal">View Violations</a>
+                  <a class="violation-detail" href="{% url "agreement_term_violations" a.agreement_id t.name %}" data-toggle="modal" data-target="#violationModal">View Violations</a>
                   <a class="violation-detail" href="#"
                   			data-agreement="{{ a.agreement_id }}" 
-                  			data-violation="{{ t.name }}">View Violations</a> -->
-                  <a class="violation-detail" href="#" data-agreement="{{ a.agreement_id }}" data-violation="{{ t.name }}">View Violations</a>
+                  			data-violation="{{ t.name }}">View Violations</a>
+                  <a class="violation-detail" href="#" data-agreement="{{ a.agreement_id }}" data-violation="{{ t.name }}">{{last_violation_list}}</a>
+                  {{ t.name }}
 
                 {% endif %}
             </td>
             <td id="status" style="display:none;">
                 {{ a.statusclass }}
             </td>
-            {% endfor %}
+            {% endfor %} -->
+
+
+            
         </tr>
         
-        {% empty %}
+        
         {% endfor %}
         </tbody>
 
-- 
2.47.0