Merge pull request #469 from grycap/devel

Devel

Author: micafer

app/__init__.py

@@ -1380,6 +1380,7 @@ def manage_inf(infid=None, op=None):
                 new_infra_id = new_im.import_inf(infra_data, auth_data)
                 if new_infra_id:
                     im.export_inf(infid, auth_data, delete=True)
+                    infra.delete_infra(infid)
                     flash("Infrastructure successfully migrated to %s." % new_infra_id, "success")
                 else:
                     flash("Error migrating the infrastructure %s." % infid, "error")

app/im.py

@@ -174,7 +174,7 @@ def export_inf(self, infid, auth_data, delete=False):
             url += "?delete=1"
         response = requests.get(url, headers=headers, timeout=self.timeout)
         response.raise_for_status()
-        return response.text
+        return response.json()['data']
 
     def import_inf(self, data, auth_data):
         headers = {"Authorization": auth_data}

app/static/images/nomad.png

@@ -52,7 +52,7 @@ <h1 class="display-4">Infrastructure Manager Dashboard.</p>
             <div class="col-lg-3"></div>
             <div class="col-lg-6">
             <h2 class="section-heading text-center">
-                Available Topologies
+                Some of the available topologies
             </h2>
             <hr class="style-seven"/>
             </div>
@@ -65,7 +65,7 @@ <h2 class="section-heading text-center">
                 <a href="https://kubernetes.io/" target="_blank"><img class="img-fluid" src="{{ url_for('static', filename='images/kubernetes.png') }}" alt="Kubernetes"></a>
             </div>
             <div class="card p-2 text-center">
-                <a href="http://mesos.apache.org/" target="_blank"><img class="img-fluid" src="{{ url_for('static', filename='images/mesos.png') }}" alt="Mesos"></a>
+                <a href="https://oscar.grycap.net/" target="_blank"><img class="img-fluid" src="{{ url_for('static', filename='images/oscar.png') }}" alt="OSCAR"></a>
             </div>
             <div class="card p-2 text-center">
                 <a href="https://slurm.schedmd.com/" target="_blank"><img class="img-fluid" src="{{ url_for('static', filename='images/slurm.png') }}" alt="SLURM"></a>
@@ -74,9 +74,11 @@ <h2 class="section-heading text-center">
 
           <div class="card-group px-5 mx-5">
             <div class="card p-2 text-center">
-                <a href="https://galaxyproject.org/" target="_blank"><img class="img-fluid" src="{{ url_for('static', filename='images/galaxy.png') }}" alt="Galaxy"></a>            </div>
+                <a href="https://jupyter.org/hub" target="_blank"><img class="img-fluid" src="{{ url_for('static', filename='images/jupyterhub.png') }}" alt="JupyterHub"></a>
+            </div>
             <div class="card p-2 text-center">
-                <a href="http://ophidia.cmcc.it/" target="_blank"><img class="img-fluid" src="{{ url_for('static', filename='images/ophidia.png') }}" alt="Ophidia"></a>            </div>
+                <a href="https://www.docker.com/" target="_blank"><img class="img-fluid" src="{{ url_for('static', filename='images/docker.png') }}" alt="Docker"></a>
+            </div>
             <div class="card p-2">
                 <p class="text-dark" style="text-align: center; font-size: x-large;">
                 <br/>and more ...

app/templates/home.html

@@ -214,7 +214,10 @@ <h4 class="font-weight-bold text-primary">My Infrastructures</h4>
                           <a id="delete_{{infId}}_a" class="dropdown-item" href="#" onclick="$('#delete_confirm_{{infId}}').modal('show');"><span class="fas fa-trash-alt mr-2 grey-text"></span>Delete</a>
                           <a id="reconfigure_{{infId}}_a" class="dropdown-item" href="#" onclick="$('#reconfigure_confirm_{{infId}}').modal('show');"><span class="fas fa-recycle mr-2 grey-text"></span>Reconfigure</a>
                           <a id="change_auth_{{infId}}_a" class="dropdown-item" href="#" onclick="$('#change_auth_{{infId}}').modal('show');"><span class="fas fa-users mr-2 grey-text"></span>Change Owner</a>
+                          <!--
+                            Do not show it for now
                           <a id="migrate_{{infId}}_a" class="dropdown-item" href="#" onclick="$('#migrate_{{infId}}').modal('show');"><span class="fas fa-file-export mr-2 grey-text"></span>Migrate</a>
+                          -->
                       </div>
                     </td>
                 </tr>

app/templates/infrastructures.html

@@ -88,8 +88,9 @@ <h5 class="card-title text-center">
                 <h5>
 		  <strong>{% if tosca['metadata']['display_name'] is defined %}{{tosca['metadata']['display_name']}}{% else %}{{tosca_filename}}{% endif %}</strong>
 		</h5>
+                <p id="fullToscaDescription" class="d-none">{{tosca['description']}}</p>
                 <p id="toscaDescription" class="card-text tosca-descr"><small>{{tosca['description']}}</small></p>
-                <a selector="toscaDescription" class="text-left badge badge-pill badge-info read_more" tabindex="0" data-bs-toggle="popover" title="Full description" data-trigger="focus" data-content="{{tosca['description']}}">Read More</a>
+                <a selector="toscaDescription" class="text-left badge badge-pill badge-info read_more" tabindex="0" data-bs-toggle="popover" title="Full description" data-bs-trigger="focus" data-bs-content="{{tosca['description']}}">Read More</a>
                 {% if parent %}
                 <a href="#!" onclick="AddChild(this, '{{tosca_filename}}')" class="badge badge-pill badge-primary"><span class='fas fa-plus mr-2'></span>Add</a>
                 {% elif 'link' in tosca['metadata'] %}
@@ -292,7 +293,7 @@ <h5>
     cardContainer = document.getElementById("cardsContainer");
     cards = cardContainer.getElementsByClassName("card");
     for (i = 0; i < cards.length; i++) {
-        title = cards[i].querySelector(".card-text");
+        title = cards[i].querySelector("#fullToscaDescription");
         if (title.innerText.toUpperCase().indexOf(filter) > -1) {
             cards[i].style.display = "";
         } else {

app/templates/portfolio.html

@@ -96,7 +96,7 @@ def get_response(url, params=None, **kwargs):
         elif url == "/im/infrastructures/infid/data":
             resp.ok = True
             resp.status_code = 200
-            resp.text = '{"some": "value"}'
+            resp.json.return_value = {'data': '{"some": "value"}'}
 
         return resp
 

app/tests/test_app.py

@@ -379,6 +379,18 @@ def extractToscaInfo(toscaDir, tosca_pars_dir, toscaTemplates, tags_to_hide):
 
         toscaInfoOrder = OrderedDict(sorted(toscaInfo.items(), key=lambda x: x[1]["metadata"]['order']))
 
+    # Add addons to description
+    for tosca in toscaTemplates:
+        if "childs" in toscaInfo[tosca]["metadata"] and toscaInfo[tosca]["metadata"]["childs"]:
+            if 'description' not in toscaInfo[tosca]:
+                toscaInfo[tosca]["description"] = ""
+            child_names = []
+            for child in toscaInfo[tosca]["metadata"]["childs"]:
+                child_name = toscaInfo.get(child, {}).get("metadata", {}).get("name")
+                if child_name:
+                    child_names.append(child_name)
+            toscaInfo[tosca]["description"] += " Addons: %s" % ", ".join(child_names)
+
     return toscaInfoOrder