Merge pull request #393 from grycap/devel

Change set infra name

Author: micafer

app/__init__.py

@@ -41,7 +41,7 @@
 from functools import wraps
 from urllib.parse import urlparse
 from radl import radl_parse
-from radl.radl import deploy
+from radl.radl import deploy, description
 from flask_apscheduler import APScheduler
 from flask_wtf.csrf import CSRFProtect
 
@@ -463,7 +463,9 @@ def showinfrastructures():
                 except Exception as ex:
                     app.logger.exception("Error getting user credentials: %s" % ex, "error")
                     creds = []
-                infra_data["site"] = utils.get_site_info_from_radl(radl_json, creds)
+                site_info = utils.get_site_info_from_radl(radl_json, creds)
+                if site_info:
+                    infra_data["site"] = site_info
                 try:
                     infra.write_infra(inf_id, infra_data)
                 except Exception as se:
@@ -1231,6 +1233,21 @@ def manage_inf(infid=None, op=None):
                     try:
                         infra_data = infra.get_infra(infid)
                         infra_data["name"] = form_data['description']
+
+                        # Set the name in the infrastructure RADL
+                        response = im.get_inf_property(infid, "radl", auth_data)
+                        if not response.ok:
+                            raise Exception(response.text)
+                        infra_radl = radl_parse.parse_radl(response.text)
+                        if not infra_radl.description:
+                            infra_radl.description = description("desc")
+                        if not infra_radl.description.getValue("name"):
+                            infra_radl.description.setValue("name", infra_data["name"])
+                        infra_radl.deploys = []
+                        response = im.addresource_inf(infid, str(infra_radl), auth_data, context=False)
+                        if not response.ok:
+                            raise Exception(response.text)
+
                         infra.write_infra(infid, infra_data)
                     except Exception as uex:
                         flash("Error updating infrastructure description: %s" % str(uex), "error")

app/im.py

@@ -112,9 +112,11 @@ def create_inf(self, payload, auth_data):
         url = "%s/infrastructures?async=1" % self.im_url
         return requests.post(url, headers=headers, data=payload, timeout=self.timeout)
 
-    def addresource_inf(self, infid, payload, auth_data):
+    def addresource_inf(self, infid, payload, auth_data, context=None):
         headers = {"Authorization": auth_data, "Accept": "application/json"}
         url = "%s/infrastructures/%s" % (self.im_url, infid)
+        if context is False:
+            url += "?context=0"
         return requests.post(url, headers=headers, data=payload, timeout=self.timeout)
 
     def get_cloud_images(self, cloud_id, auth_data):

app/templates/infrastructures.html

@@ -158,13 +158,13 @@ <h4 class="font-weight-bold text-primary">My Infrastructures</h4>
                 {% for infId, infInfo in infrastructures.items() %}
                 <tr>
                     <th scope="row">
-                      <a id="desc_{{infId}}_a" href="#" onclick="$('#edit_dest_{{infId}}').modal('show');">
                       {% if infInfo["name"] != "" %}
                         {{infInfo["name"]}}
                       {% else %}
+                      <a id="desc_{{infId}}_a" href="#" onclick="$('#edit_dest_{{infId}}').modal('show');">
                         N/A
-                      {% endif %}
                       </a>
+                      {% endif %}
                     </th>
                     <th>
                       {{infId}}
@@ -324,7 +324,7 @@ <h5 class="modal-title" id="outputs_label_{{infId}}">Outputs</h5>
                   <div class="modal-dialog" role="document">
                     <div class="modal-content">
                       <div class="modal-header">
-                        <h5 class="modal-title" id="edit_dest_label_{{infId}}">Edit Infrastructure Name</h5>
+                        <h5 class="modal-title" id="edit_dest_label_{{infId}}">Set Infrastructure Name</h5>
                         <button type="button" class="close" data-dismiss="modal">&times;</button>
                       </div>
                       <div class="modal-body">

app/utils.py

@@ -749,6 +749,10 @@ def getVOs(session):
 def get_site_info_from_radl(radl, creds):
     res_site = {}
 
+    site_type = None
+    site_host = None
+    site_vo = None
+
     # Get provider info from RADL
     for elem in radl:
         if elem["class"] == "system":
@@ -759,6 +763,9 @@ def get_site_info_from_radl(radl, creds):
                 site_type = "fedcloud"
             break
 
+    if not site_type:
+        return res_site
+
     # Now try to get the corresponding cred
     # only for EGI sites
     for cred in creds: