Merge pull request #1252 from grycap/devel

Devel

IM/connectors/CloudConnector.py

@@ -628,6 +628,14 @@ def get_dns_entries(vm):
         return res
 
     def resize_vm_radl(self, vm, radl):
+        """
+        Update the current VM RADL with the new RADL
+
+        Arguments:
+           - vm(:py:class:`IM.VirtualMachine`): VM information.
+           - radl(RADL): RADL document.
+        Returns: an RADL system or None if no changes are made
+        """
         orig_system = vm.info.systems[0].clone()
         new_cpu = radl.systems[0].getValue('cpu.count')
         if new_cpu:

changelog

@@ -669,8 +669,9 @@ IM 1.10.7:
     * Enable to access infrastructure using multiple IM credentials.
     * Fix Flavor extra specs are not get on OST conn.
     * Initial integration EGI Dynamic DNS service. 
-    * Fix simbol & is not supported in cloud ids.
+    * Fix symbol & is not supported in cloud ids.
     * Add vault credentials support.
     * Fix error in case of declaring multiple local_storage in TOSCA node.
     * Improve resize VM functions.
+    * Fix errors in contextualization in case of unnatended apt process running.
 

doc/source/client.rst

@@ -178,6 +178,11 @@ The :program:`im_client` is called like this::
       Import the data of an infrastructure previously exported with the previous function.
       The ``json_file`` is a file with the data generated with the  ``export`` function.
 
+   ``wait infId [max_time]``
+      Wait infrastructure with ID ``infId`` to get a final state. It will return code ``0`` if it
+      becomes ``configured`` or ``1`` otherwhise. Optional parameter ``max_time`` to set the max time
+      to wait.
+
 .. _auth-file:
 
 Authorization File

docker-py3/Dockerfile

@@ -13,8 +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 && \
      pip3 install pyOpenSSL cheroot xmltodict pymongo ansible==2.9.21&& \
-     cd /tmp && git clone https://github.com/openstack/tosca-parser && pip3 install /tmp/tosca-parser && \
-     cd /tmp && git clone https://github.com/micafer/libcloud && pip3 install /tmp/libcloud && \
+     cd /tmp && git clone https://github.com/apache/libcloud && pip3 install /tmp/libcloud && \
      pip3 install IM==1.10.7 && \
      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/