From 13faef74ec6feaa52eaed0ea0b5ede81f81f9194 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Tue, 13 Sep 2022 17:12:53 +0200 Subject: [PATCH 1/5] Update changelog --- changelog | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/changelog b/changelog index e6e20b4ee..5a098f853 100644 --- a/changelog +++ b/changelog @@ -703,3 +703,15 @@ IM 1.11.0: IM 1.11.1: * Fix error in OpenStack connector setting microversion. * Fix vo set in appdb image in EGI conn is not compared with auth data. + +IM 1.12.0: + * Fix error creating snapshot in OpenNebula 6. + * Fix error deleting VMs in OpenNebula 6. + * Minor changes to support Keycloak EGI checkin. + * Enable to set a subnet in GCE. + * Add support for availability_zone in OpenStack conn. + * Fix error "No compatible OpenStack auth data has been specified.". + * In case of setting network_name using OST format (priv,pub) pub net is not assigned. + * Fix error getting OpenNebula quotas. + * Enable to get info from VM images from AppDB/AppDBIS or CMDB. + From 97ca37ee87dbd826d78256bf7bcae997c7fa15f7 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Wed, 14 Sep 2022 12:21:29 +0200 Subject: [PATCH 2/5] Use ubuntu 20 for tests --- test/files/test.radl | 2 +- test/files/test_cont_dist.radl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/files/test.radl b/test/files/test.radl index a83f6e1b7..4b0717a05 100644 --- a/test/files/test.radl +++ b/test/files/test.radl @@ -27,7 +27,7 @@ cpu.count>=1 and memory.size>=1g and net_interface.0.connection = 'privada' and disk.0.os.name='linux' and -disk.0.image.url = 'one://ramses.i3m.upv.es/1129' and +disk.0.image.url = 'one://ramses.i3m.upv.es/1396' and disk.0.os.credentials.new.password = 'Tututu+01' and disk.0.applications contains (name='ganglia') and disk.1.size=1GB and diff --git a/test/files/test_cont_dist.radl b/test/files/test_cont_dist.radl index 4ffcc58af..e4d192138 100644 --- a/test/files/test_cont_dist.radl +++ b/test/files/test_cont_dist.radl @@ -20,7 +20,7 @@ cpu.count>=1 and memory.size>=1g and net_interface.0.connection = 'privada' and disk.0.os.name='linux' and -disk.0.image.url = 'one://ramses.i3m.upv.es/1129' and +disk.0.image.url = 'one://ramses.i3m.upv.es/1396' and disk.0.os.credentials.new.password = 'Tututu+01' ) From 9d13fef4c886d022e69cae93929e7eac7c93b53b Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Wed, 14 Sep 2022 12:22:03 +0200 Subject: [PATCH 3/5] set ver num 1.12.0 --- codemeta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codemeta.json b/codemeta.json index 743f5d361..5a48d59b3 100644 --- a/codemeta.json +++ b/codemeta.json @@ -6,7 +6,7 @@ "@type": "SoftwareSourceCode", "identifier": "im", "name": "Infrastructure Manager", - "version": "1.11.1", + "version": "1.12.0", "description": "IM is a tool that deploys complex and customized virtual infrastructures on IaaS Cloud deployments", "license": "GNU General Public License v3.0", "author": [ From 38e5c4bfb735a748386e302b573443ecc49ac9c1 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Wed, 14 Sep 2022 12:23:14 +0200 Subject: [PATCH 4/5] set ver num 1.12.0 --- IM/__init__.py | 2 +- docker-devel/Dockerfile | 2 +- docker-py3/Dockerfile | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/IM/__init__.py b/IM/__init__.py index 4639f7092..09411ee22 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.11.1' +__version__ = '1.12.0' __author__ = 'Miguel Caballer' diff --git a/docker-devel/Dockerfile b/docker-devel/Dockerfile index d4ba4b100..6f14527de 100644 --- a/docker-devel/Dockerfile +++ b/docker-devel/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:20.04 ARG BRANCH=devel LABEL maintainer="Miguel Caballer " -LABEL version="1.11.1" +LABEL version="1.12.0" 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 b4fbdf975..e816ac03d 100644 --- a/docker-py3/Dockerfile +++ b/docker-py3/Dockerfile @@ -1,7 +1,7 @@ # Dockerfile to create a container with the IM service FROM ubuntu:20.04 LABEL maintainer="Miguel Caballer " -LABEL version="1.11.1" +LABEL version="1.12.0" 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==2.9.26&& \ - pip3 install IM==1.11.1 && \ + pip3 install IM==1.12.0 && \ 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/ From 33b929ac44ed6053db0ee79dff4ed716253ef0ea Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Wed, 14 Sep 2022 13:28:39 +0200 Subject: [PATCH 5/5] Fix test --- test/files/test.radl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/files/test.radl b/test/files/test.radl index 4b0717a05..91faf2b40 100644 --- a/test/files/test.radl +++ b/test/files/test.radl @@ -62,7 +62,7 @@ configure test ( - vars: NODENAME: '{{IM_INFRASTRUCTURE_RADL|json_query("[?id == ''front''].net_interface_0_dns_name|[0]")}}' pre_tasks: - - apt: name=python-setuptools,python-pip update_cache=yes cache_valid_time=3600 + - apt: name=python3-setuptools,python3-pip update_cache=yes cache_valid_time=3600 when: ansible_os_family == "Debian" - yum: name=epel-release when: ansible_os_family == "RedHat"