Merge pull request #1615 from grycap/devel

Devel

Author: micafer

IM/SSH.py

@@ -131,8 +131,15 @@ def __init__(self, host, user, passwd=None, private_key=None, port=22, proxy_hos
 
             self.private_key = private_key
             private_key_obj.seek(0)
-            self.private_key_obj = paramiko.RSAKey.from_private_key(
-                private_key_obj)
+
+            if "BEGIN RSA PRIVATE KEY" in private_key:
+                self.private_key_obj = paramiko.RSAKey.from_private_key(private_key_obj)
+            elif "BEGIN DSA PRIVATE KEY" in private_key:
+                self.private_key_obj = paramiko.DSSKey.from_private_key(private_key_obj)
+            elif "BEGIN EC PRIVATE KEY" in private_key:
+                self.private_key_obj = paramiko.ECDSAKey.from_private_key(private_key_obj)
+            elif "BEGIN OPENSSH PRIVATE KEY" in private_key:
+                self.private_key_obj = paramiko.Ed25519Key.from_private_key(private_key_obj)
 
     def __del__(self):
         self.close()

IM/connectors/Kubernetes.py

@@ -443,7 +443,7 @@ def _generate_pod_data(self, namespace, name, outports, system, volumes, configm
         if tags:
             for k, v in tags.items():
                 # Remove special characters
-                pod_data['metadata']['labels'][k] = re.sub('[!"#$%&\'()*+,/:;<=>?@[\\]^`{|}~]', '', v).lstrip("_-")
+                pod_data['metadata']['labels'][k] = re.sub('[!"#$%&\'()*+,/:;<=>?@[\\]^`{|}~ ]', '', v).lstrip("_-")
 
         containers = [{
             'name': name,
@@ -553,7 +553,7 @@ def launch(self, inf, radl, requested_radl, num_vm, auth_data):
             vm = VirtualMachine(inf, None, self.cloud, radl, requested_radl, self)
             vm.destroy = True
             inf.add_vm(vm)
-            pod_name = re.sub('[!"#$%&\'()*+,/:;<=>?@[\\]^`{|}~_]', '-', system.name)
+            pod_name = re.sub('[!"#$%&\'()*+,/:;<=>?@[\\]^`{|}~_ ]', '-', system.name)
 
             volumes = self._create_volumes(namespace, system, pod_name, auth_data)
 

doc/source/client.rst

@@ -501,6 +501,9 @@ There are several ways to get the EGI AAI token:
 
    token = command(oidc-token OIDC_ACCOUNT)
 
+* It is also possible to get the token using the EGI AAI endpoint. The token can be obtained in the
+   `Check-in Token Portal <https://aai.egi.eu/token/>`_.
+
 * Another way is using the IM-Dashboard (:ref:`use-dashboard`). In the "Advanced" menu, the "Settings"
   item enables getting the some configuration settings as the OIDC issuer or the current user's
   access token.

docker-devel/Dockerfile

@@ -1,5 +1,5 @@
 # Dockerfile to create a container with the IM service
-FROM ubuntu:24.04
+FROM ubuntu:22.04
 ARG BRANCH=devel
 LABEL maintainer="Miguel Caballer <[email protected]>"
 LABEL version="1.17.0"
@@ -12,18 +12,19 @@ RUN apt-get update && apt-get install --no-install-recommends -y patch wget pyth
 
 # Install IM
 RUN apt-get update && apt-get install --no-install-recommends -y python3-setuptools python3-pip git && \
-     pip3 install --break-system-packages msrest msrestazure azure-common azure-mgmt-storage azure-mgmt-compute azure-mgmt-network azure-mgmt-resource azure-mgmt-dns azure-identity==1.8.0 && \
-     pip3 install --break-system-packages pyOpenSSL cheroot xmltodict pymongo ansible==8.7.0&& \
-     pip3 install --break-system-packages git+https://github.com/micafer/libcloud@ost_nets_extra && \
-     pip3 install --break-system-packages apache-libcloud==3.8.0 git+https://github.com/grycap/im@$BRANCH && \
+     pip3 install -U pip && \
+     pip3 install msrest msrestazure azure-common azure-mgmt-storage azure-mgmt-compute azure-mgmt-network azure-mgmt-resource azure-mgmt-dns azure-identity==1.8.0 && \
+     pip3 install pyOpenSSL cheroot xmltodict pymongo ansible==8.7.0&& \
+     pip3 install git+https://github.com/micafer/libcloud@ost_nets_extra && \
+     pip3 install apache-libcloud==3.8.0 git+https://github.com/grycap/im@$BRANCH && \
      apt-get purge -y python3-pip git && \
      apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf ~/.cache/
 
 # Patch libcloud to add network extra
 # untill this PR is merged and released
 # https://github.com/apache/libcloud/pull/2016
 COPY ost.patch /tmp/ost.patch
-RUN patch /usr/local/lib/python3.12/dist-packages/libcloud/compute/drivers/openstack.py < /tmp/ost.patch && rm /tmp/ost.patch
+RUN patch /usr/local/lib/python3.10/dist-packages/libcloud/compute/drivers/openstack.py < /tmp/ost.patch && rm /tmp/ost.patch
 
 # Copy im configuration files
 RUN mkdir /etc/im
@@ -38,7 +39,7 @@ RUN sed -i -e 's/VM_NUM_USE_CTXT_DIST = 30/VM_NUM_USE_CTXT_DIST = 3/g' /etc/im/i
 COPY ansible.cfg /etc/ansible/ansible.cfg
 
 # Fix boto issue https://github.com/boto/boto/issues/3783
-COPY endpoints.json /usr/local/lib/python3.12/dist-packages/boto/endpoints.json
+COPY endpoints.json /usr/local/lib/python3.10/dist-packages/boto/endpoints.json
 
 # Start IM service
 CMD /usr/local/bin/im_service

docker-py3/Dockerfile

@@ -1,5 +1,5 @@
 # Dockerfile to create a container with the IM service
-FROM ubuntu:24.04
+FROM ubuntu:22.04
 
 ENV VERSION=1.17.0
 
@@ -14,17 +14,18 @@ RUN apt-get update && apt-get install --no-install-recommends -y patch wget pyth
 
 # Install IM
 RUN apt-get update && apt-get install --no-install-recommends -y python3-setuptools python3-pip git && \
-     pip3 install --break-system-packages msrest msrestazure azure-common azure-mgmt-storage azure-mgmt-compute azure-mgmt-network azure-mgmt-resource azure-mgmt-dns azure-identity==1.8.0 && \
-     pip3 install --break-system-packages pyOpenSSL cheroot xmltodict pymongo ansible==8.7.0&& \
-     pip3 install --break-system-packages apache-libcloud==3.8.0 IM==${VERSION} && \
+     pip3 install -U pip && \
+     pip3 install msrest msrestazure azure-common azure-mgmt-storage azure-mgmt-compute azure-mgmt-network azure-mgmt-resource azure-mgmt-dns azure-identity==1.8.0 && \
+     pip3 install pyOpenSSL cheroot xmltodict pymongo ansible==8.7.0&& \
+     pip3 install apache-libcloud==3.8.0 && IM==${VERSION}\
      apt-get purge -y python3-pip git && \
      apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf ~/.cache/
 
 # Patch libcloud to add network extra
 # untill this PR is merged and released
 # https://github.com/apache/libcloud/pull/2016
 COPY ost.patch /tmp/ost.patch
-RUN patch /usr/local/lib/python3.12/dist-packages/libcloud/compute/drivers/openstack.py < /tmp/ost.patch && rm /tmp/ost.patch
+RUN patch /usr/local/lib/python3.10/dist-packages/libcloud/compute/drivers/openstack.py < /tmp/ost.patch && rm /tmp/ost.patch
 
 # Copy im configuration files
 RUN mkdir /etc/im
@@ -36,7 +37,7 @@ RUN wget https://raw.githubusercontent.com/grycap/im/v${VERSION}/etc/logging.con
 COPY ansible.cfg /etc/ansible/ansible.cfg
 
 # Fix boto issue https://github.com/boto/boto/issues/3783
-COPY endpoints.json /usr/local/lib/python3.12/dist-packages/boto/endpoints.json
+COPY endpoints.json /usr/local/lib/python3.10/dist-packages/boto/endpoints.json
 
 # Start IM service
 CMD ["/usr/local/bin/im_service"]

test/files/privatekeyec.pem

@@ -0,0 +1,7 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+QyNTUxOQAAACAJRqoIjiHNnr8AugARO9zIoSQP+lIRmSkl92mcc8T9JAAAAKANznLhDc5y
+4QAAAAtzc2gtZWQyNTUxOQAAACAJRqoIjiHNnr8AugARO9zIoSQP+lIRmSkl92mcc8T9JA
+AAAECBnGuXE7SFHDP32PbNFbfXkkZNpeHJKG5luU1H7kH1HQlGqgiOIc2evwC6ABE73Mih
+JA/6UhGZKSX3aZxzxP0kAAAAF21pY2FmZXJAREVTS1RPUC02Vk9DNEMzAQIDBAUG
+-----END OPENSSH PRIVATE KEY-----

test/unit/AppDB.py

@@ -99,8 +99,6 @@ def test_get_site_url(self, requests):
         requests.side_effect = self.get_response
         res = AppDB.get_site_url("8016G0", "openstack")
         self.assertEqual(res, "https://cloud.recas.ba.infn.it:5000")
-        res = AppDB.get_site_url("8015G0", "occi")
-        self.assertEqual(res, "http://cloud.recas.ba.infn.it:8787/occi/")
 
     @patch('requests.request')
     def test_get_image_id(self, requests):

test/unit/SSH.py

@@ -47,7 +47,7 @@ def test_str(self):
 
     @patch('paramiko.SSHClient')
     def test_test_connectivity(self, ssh_client):
-        ssh = SSHRetry("host", "user", "passwd", read_file_as_string("../files/privatekey.pem"))
+        ssh = SSHRetry("host", "user", "passwd", read_file_as_string("../files/privatekeyec.pem"))
         success = ssh.test_connectivity(5)
         self.assertTrue(success)