Merge pull request #618 from grycap/eu_node

Add EU Node Containers

app/cred.py

@@ -64,7 +64,7 @@ def validate_cred(self, userid, new_cred):
                 if isequal:
                     return 1, "Credentials already available."
 
-                if new_cred["type"] == "EUNode":
+                if new_cred["type"] in ["EUNode", "EUNodeCont"]:
                     if new_cred["node"] == cred["node"]:
                         return 2, ("This site has already a Credential with the same EU Node site." +
                                    " This may cause problems authenticating with the site." +

app/templates/modal_creds.html

@@ -314,6 +314,19 @@
             </select>
           </div>
         </div>
+{% elif cred_type == "EUNodeCont" %}
+        <div class="row form-group">
+          <div class="col">
+              <input placeholder="Token" name="token" class="col-sm-12 form-control my-1" type="text" id="token" value="{{ creds['token'] if creds else '' }}" required/>
+          </div>
+          <div class="col">
+            <select class="js-example-basic-single js-states form-control" id="node" name="node" required>
+              <option name="node" value="">-- Set EU Node Provider --</option>
+              <option name="node" value="eu-1" {{ "selected" if creds and creds['node'] == "eu-1" else '' }}>eu-1</option>
+              <option name="node" value="eu-2" {{ "selected" if creds and creds['node'] == "eu-2" else '' }}>eu-2</option>
+            </select>
+          </div>
+        </div>
 {% else %}
 
 

app/utils.py

@@ -210,7 +210,11 @@ def getUserAuthData(access_token, cred, userid, cred_id=None, full=False, add_ex
     for cred in creds:
         if cred['enabled'] and (cred_id is None or cred_id == cred['id'] or cred['id'] in extra_auth_ids):
             res += "\\nid = %s" % cred['id']
-            if cred['type'] == "EUNode":
+            if cred['type'] == "EUNodeCont":
+                # Add the EUNode provider as Kubernetes
+                res += "; type = Kubernetes; token = '%s';" % cred['token']
+                res += " host = https://api.%s.paas.open-science-cloud.ec.europa.eu:6443" % cred['node']
+            elif cred['type'] == "EUNode":
                 # Add the EUNode provider as OpenStack
                 res += "; type = OpenStack; auth_version = 3.x_appcred;"
                 res += " host = https://api.%s.iaas.open-science-cloud.ec.europa.eu:5000" % cred['node']