From b5453bc725ddb508f219f7e84187bf6494fc0c73 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Wed, 1 Feb 2023 10:11:20 +0100 Subject: [PATCH 1/2] Get EC3 stats --- scripts/stats.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/stats.py b/scripts/stats.py index eb5065cb9..ec361bcdc 100644 --- a/scripts/stats.py +++ b/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 From 59e0fa8ec996b1f9d455be9203c66de851c18c9c Mon Sep 17 00:00:00 2001 From: micafer Date: Thu, 2 Feb 2023 11:21:22 +0100 Subject: [PATCH 2/2] bump version 1.13.2 --- IM/__init__.py | 2 +- changelog | 5 +++++ codemeta.json | 2 +- docker-devel/Dockerfile | 2 +- docker-py3/Dockerfile | 4 ++-- docker-py3/Dockerfile.alp | 4 ++-- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/IM/__init__.py b/IM/__init__.py index 748ee858c..219bf393a 100644 --- a/IM/__init__.py +++ b/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' diff --git a/changelog b/changelog index 69565dda8..3fe9227e7 100644 --- a/changelog +++ b/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. diff --git a/codemeta.json b/codemeta.json index 1de4f373a..138a8e23c 100644 --- a/codemeta.json +++ b/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": [ diff --git a/docker-devel/Dockerfile b/docker-devel/Dockerfile index 1c4b3e6c5..d794dc7f3 100644 --- a/docker-devel/Dockerfile +++ b/docker-devel/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:22.04 ARG BRANCH=devel LABEL maintainer="Miguel Caballer " -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 diff --git a/docker-py3/Dockerfile b/docker-py3/Dockerfile index df189e4bb..a1fedc80e 100644 --- a/docker-py3/Dockerfile +++ b/docker-py3/Dockerfile @@ -1,7 +1,7 @@ # Dockerfile to create a container with the IM service FROM ubuntu:22.04 LABEL maintainer="Miguel Caballer " -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/ diff --git a/docker-py3/Dockerfile.alp b/docker-py3/Dockerfile.alp index 581a58676..0c57ac7a1 100644 --- a/docker-py3/Dockerfile.alp +++ b/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 " -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