Merge pull request #686 from grycap/devel

Devel

IM/tosca/Tosca.py

@@ -225,7 +225,7 @@ def _order_deploys(self, radl):
             else:
                 priv.append(d)
 
-        # This is patch, we need a solution for that
+        # This is patch, we need an actual solution for that
         wn = []
         fe = []
         for d in pub:

changelog

@@ -436,3 +436,10 @@ IM 1.7.5:
     * Fix error deleting OCCI infrastructure: Volume deleting returns forbidden and takes too long
     * Fix error with OCCI server 2.0.4 authentication error
     * Fix problem installing specific branch of Ansible galaxy roles
+    * Fix error in REST API in case of strange char in ansible output
+    * Add support to disk.*.image_url in OpenStack connector
+    * Fix error detecting ansible process end
+    * Enable to specify spot to EC2 instances in TOSCA
+    * Get EC2 instances info from ec2instances.info
+    * Fix error geting the subnets of the default VPC on EC2 conn
+    * Add volume_id to TOSCA BlockStorage type

contextualization/basic.yml

@@ -8,6 +8,11 @@
       register: python_exists
       changed_when: false
 
+    # Ubuntu 16 have an annoying apt boot process
+    - name: Delete apt processes
+      raw: sudo killall apt ; sleep 1 ; sudo rm -f /var/lib/apt/lists/lock && sudo rm -f /var/lib/dpkg/lock && sudo dpkg --configure -a ; sudo apt-get -f -y install
+      ignore_errors: yes
+
     - name: Bootstrap with python
       raw: sudo apt update; sudo apt install -y python; sudo yum install -y python; sudo zypper -n install python python-xml
       ignore_errors: yes

contextualization/conf-ansible.yml

@@ -14,6 +14,11 @@
       register: python_exists
       changed_when: false
 
+    # Ubuntu 16 have an annoying apt boot process
+    - name: Delete apt processes
+      raw: sudo killall apt ; sleep 1 ; sudo rm -f /var/lib/apt/lists/lock && sudo rm -f /var/lib/dpkg/lock && sudo dpkg --configure -a ; sudo apt-get -f -y install
+      ignore_errors: yes
+
     - name: Bootstrap with python
       raw: sudo apt update; sudo apt install -y python; sudo yum install -y python; sudo zypper -n install python python-xml
       ignore_errors: yes

test/unit/Tosca.py

@@ -80,7 +80,7 @@ def test_tosca_to_radl(self):
         self.assertEqual(lrms_wn.getValue("spot"), 'no')
         self.assertEqual(lrms_wn.getValue("instance_type"), 'some_type')
 
-        self.assertEqual([d.id for d in radl.deploys], ['other_server', 'lrms_server', 'lrms_wn'])
+        self.assertEqual([d.id for d in radl.deploys][2], 'lrms_wn')
 
     def test_tosca_get_outputs(self):
         """Test TOSCA get_outputs function"""