Merge pull request #1546 from grycap/devel

Devel
grycap · Apr 29, 2024 · 14ad860 · 14ad860
2 parents 9cabe2a + 57667d7
commit 14ad860
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 3 deletions.
diff --git a/doc/source/client.rst b/doc/source/client.rst
@@ -225,6 +225,48 @@ The :program:`im_client` is called like this::
          
          {"infid": "ID", "error": "Error message"}
 
+   ``cloudusage cloud_id``
+      Show the usage/quotas of the cloud with ID ``cloud_id``.
+      The results will be returned to stdout in json format::
+
+         [
+            {
+               "uri": "ost://server.com/image_id1",
+               "name": "Image 1 Name"
+            },
+            {
+               "uri": "ost://server.com/image_id2",
+               "name": "Image 2 Name"
+            }
+         ]
+
+   ``cloudimages cloud_id``
+      Show the images available in the cloud with ID ``cloud_id``.
+      The results will be returned to stdout in json format (-1 means no limit)::
+
+         {
+            "cores": {
+               "used": 36,
+               "limit": -1
+            },
+            "ram": {
+               "used": 50,
+               "limit": -1
+            },
+            "instances": {
+               "used": 10,
+               "limit": 50
+            },
+            "security_groups": {
+               "used": 0,
+               "limit": -1
+            },
+            "floating_ips": {
+               "used": 0,
+               "limit": -1
+            }
+         }
+
 .. _auth-file:
 
 Authorization File

diff --git a/docker-devel/Dockerfile b/docker-devel/Dockerfile
@@ -25,7 +25,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.8/dist-packages/boto/endpoints.json
+COPY endpoints.json /usr/local/lib/python3.10/dist-packages/boto/endpoints.json
 
 # Start IM service
 CMD im_service.py
diff --git a/docker-py3/Dockerfile b/docker-py3/Dockerfile
@@ -21,7 +21,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y python3-setupto
 COPY ansible.cfg /etc/ansible/ansible.cfg
 
 # Fix boto issue https://github.com/boto/boto/issues/3783
-COPY endpoints.json /usr/local/lib/python3.8/dist-packages/boto/endpoints.json
+COPY endpoints.json /usr/local/lib/python3.10/dist-packages/boto/endpoints.json
 
 # Start IM service
 CMD im_service.py
diff --git a/docker-py3/Dockerfile.alp b/docker-py3/Dockerfile.alp
@@ -41,7 +41,7 @@ RUN apk add --no-cache git &&\
 COPY ansible.cfg /etc/ansible/ansible.cfg
 
 # Fix boto issue https://github.com/boto/boto/issues/3783
-COPY endpoints.json /usr/local/lib/python3.8/dist-packages/boto/endpoints.json
+COPY endpoints.json /usr/lib/python3.10/site-packages/boto/endpoints.json
 
 # Start IM service
 CMD im_service.py