Merge pull request #1462 from grycap/devel

Devel

IM/__init__.py

@@ -19,7 +19,7 @@
            'InfrastructureInfo', 'InfrastructureManager', 'recipe', 'request', 'REST', 'retry',
            'ServiceRequests', 'SSH', 'SSHRetry', 'timedcall', 'UnixHTTPAdapter',
            'VirtualMachine', 'VMRC', 'xmlobject']
-__version__ = '1.13.1'
+__version__ = '1.13.2'
 __author__ = 'Miguel Caballer'
 
 

changelog

@@ -726,3 +726,8 @@ IM 1.13.1:
     * Enable to create public router in openstack.
     * Enable to define dependencies in OSCAR conn.
     * Search VM Images in sites using name.
+
+IM 1.13.2:
+    * Enable use STS security token in EC2 connector.
+    * Fix error with OpenSSL in contextualization.
+    * Fix error deleting OST infras with dydns name.

codemeta.json

@@ -6,7 +6,7 @@
     "@type": "SoftwareSourceCode",
     "identifier": "im",
     "name": "Infrastructure Manager",
-    "version": "1.13.1",
+    "version": "1.13.2",
     "description": "IM is a tool that deploys complex and customized virtual infrastructures on IaaS Cloud deployments",
     "license": "GNU General Public License v3.0",
     "author": [

docker-devel/Dockerfile

@@ -2,7 +2,7 @@
 FROM ubuntu:22.04
 ARG BRANCH=devel
 LABEL maintainer="Miguel Caballer <[email protected]>"
-LABEL version="1.13.1"
+LABEL version="1.13.2"
 LABEL description="Container image to run the IM service. (http://www.grycap.upv.es/im)"
 EXPOSE 8899 8800
 

docker-py3/Dockerfile

@@ -1,7 +1,7 @@
 # Dockerfile to create a container with the IM service
 FROM ubuntu:22.04
 LABEL maintainer="Miguel Caballer <[email protected]>"
-LABEL version="1.13.1"
+LABEL version="1.13.2"
 LABEL description="Container image to run the IM service. (http://www.grycap.upv.es/im)"
 EXPOSE 8899 8800
 
@@ -13,7 +13,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y python3 python3
 RUN apt-get update && apt-get install --no-install-recommends -y python3-setuptools python3-pip git && \
      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==6.4.0&& \
-     pip3 install IM==1.13.1 && \
+     pip3 install IM==1.13.2 && \
      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/
 

docker-py3/Dockerfile.alp

@@ -1,7 +1,7 @@
 # Dockerfile to create a container with the IM service
 FROM alpine:3.16
 LABEL maintainer="Miguel Caballer <[email protected]>"
-LABEL version="1.13.1"
+LABEL version="1.13.2"
 LABEL description="Container image to run the IM service. (http://www.grycap.upv.es/im)"
 EXPOSE 8899 8800
 
@@ -34,7 +34,7 @@ RUN pip3 install pyOpenSSL \
 RUN pip3 install ansible==6.4.0
 
 RUN apk add --no-cache git &&\
-    pip3 install IM==1.13.1 &&\
+    pip3 install IM==1.13.2 &&\
     apk del git
 
 # Copy a ansible.cfg with correct minimum values

scripts/stats.py

@@ -48,16 +48,17 @@ def get_data(str_data):
 
     @staticmethod
     def get_stats(db_url, date):
-        stats = [("Inf ID.", "TOSCA", "User", "Creation Date", "Last Date")]
+        stats = [("Inf ID.", "TOSCA", "User", "EC3", "Creation Date", "Last Date")]
         db = DataBase(db_url)
         if db.connect():
             res = db.select("SELECT data, date, id FROM inf_list WHERE date > %s order by rowid desc;", (date,))
             for elem in res:
-                data = elem[0]
+                data = elem[0].decode()
                 date = elem[1]
                 inf_id = elem[2]
-                icon, im_user, creation_date = Stats.get_data(data.decode())
-                stats.append((inf_id, icon, im_user, str(creation_date), str(date)))
+                icon, im_user, creation_date = Stats.get_data(data)
+                ec3 = "1" if "ec3_max_instances" in data else "0"
+                stats.append((inf_id, icon, im_user, ec3, str(creation_date), str(date)))
 
             db.close()
             return stats