From: Javier García <javier.garcial.external@atos.net>
Date: Wed, 22 Apr 2015 16:19:07 +0000 (+0200)
Subject: SLA fix error accessing settings.py
X-Git-Tag: myslice-1.3~32
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d4c7a1675af736fb03828d8a09a2a68a871954e0;hp=dc21738604243f05aa3983e296a0e3730c386260;p=myslice.git

SLA fix error accessing settings.py
---

diff --git a/plugins/sladialog/templates/sladialog.html b/plugins/sladialog/templates/sladialog.html
index e569a429..9e3ba903 100644
--- a/plugins/sladialog/templates/sladialog.html
+++ b/plugins/sladialog/templates/sladialog.html
@@ -1,11 +1,28 @@
 <div id={{ domid }}>
+    <div id="sla_template_modal" class="modal fade">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    <h4 class="modal-title">SLA Template description</h4>
+                </div>
+                <div class="modal-body">
+                    <p>Testbed offers:</p>
+                    <p>99% availability for 99% of the selected resources</p>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                </div>
+            </div>
+        </div>
+    </div>
     <div id="sla_offers" class="container">
         <div id="fuseco-fokus-fraunhofer-de" class="row" data-urns="[]" style="display: none">
             <div class="col-md-6">
                 <p>Testbed <span class="provider">fuseco.fokus.fraunhofer.de</span> offers the following SLA for its resources</p>
             </div>
             <div class="col-md-1">
-                <button class="sla-info-button btn btn-default">
+                <button class="sla-info-button btn btn-default" data-toggle="modal" data-target="#sla_template_modal">
                     <span class="glyphicon glyphicon-info-sign"></span>
                     Details
                 </button>
@@ -22,7 +39,7 @@
                 <p>Testbed <span class="provider">omf:netmode</span> offers the following SLA for its resources</p>
             </div>
             <div class="col-md-1">
-                <button class="sla-info-button btn btn-default">
+                <button class="sla-info-button btn btn-default" data-toggle="modal" data-target="#sla_template_modal">
                     <span class="glyphicon glyphicon-info-sign"></span>
                     Details
                 </button>
@@ -39,7 +56,7 @@
                 <p>Testbed <span class="provider">wilab2.ilabt.iminds.be</span> offers the following SLA for its resources</p>
             </div>
             <div class="col-md-1">
-                <button class="sla-info-button btn btn-default">
+                <button class="sla-info-button btn btn-default" data-toggle="modal" data-target="#sla_template_modal">
                     <span class="glyphicon glyphicon-info-sign"></span>
                     Details
                 </button>
@@ -56,7 +73,7 @@
                 <p>Testbed <span class="provider">wall2.ilabt.iminds.be</span> offers the following SLA for its resources</p>
             </div>
             <div class="col-md-1">
-                <button class="sla-info-button btn btn-default">
+                <button class="sla-info-button btn btn-default" data-toggle="modal" data-target="#sla_template_modal">
                     <span class="glyphicon glyphicon-info-sign"></span>
                     Details
                 </button>
diff --git a/sla/slaclient/restclient.py b/sla/slaclient/restclient.py
index 47c6802d..e6c516d2 100755
--- a/sla/slaclient/restclient.py
+++ b/sla/slaclient/restclient.py
@@ -164,8 +164,8 @@ class Client(object):
             kwargs["headers"] = {"accept": "application/xml",
                                  "content-type": "application/xml"}
 
-        kwargs["auth"] = HTTPBasicAuth(settings.SLA_MANAGER_USER,
-                                      settings.SLA_MANAGER_PASSWORD)
+        kwargs["auth"] = HTTPBasicAuth(settings.SLA_COLLECTOR_USER,
+                                      settings.SLA_COLLECTOR_PASSWORD)
 
         result = requests.post(url, data, **kwargs)
         location = result.headers["location"] \