Maintain VM order

indigo-dc · Mar 8, 2017 · aa6276f · aa6276f
1 parent 60abb03
commit aa6276f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/IM/InfrastructureInfo.py b/IM/InfrastructureInfo.py
@@ -198,6 +198,8 @@ def add_vm(self, vm):
         Add, and assigns a new VM ID to the infrastructure
         """
         with self._lock:
+            # Set the ID of the pos in the list
+            vm.im_id = len(self.vm_list)
             self.vm_list.append(vm)
 
     def add_cont_msg(self, msg):

diff --git a/test/unit/test_im_logic.py b/test/unit/test_im_logic.py
@@ -518,7 +518,7 @@ def test_inf_addresources5(self):
         self.assertLess(delay, 17)
         self.assertGreater(delay, 14)
 
-        self.assertEqual(len(vms), 6)
+        self.assertEqual(vms, [0, 1, 2, 3, 4, 5])
         self.assertEqual(cloud.launch.call_count, 3)
         self.assertEqual(cloud.launch.call_args_list[0][0][3], 1)
         self.assertEqual(cloud.launch.call_args_list[1][0][3], 3)
@@ -537,7 +537,7 @@ def test_inf_addresources5(self):
         self.assertGreater(delay, 4)
         Config.MAX_SIMULTANEOUS_LAUNCHES = 1
 
-        self.assertEqual(len(vms), 6)
+        self.assertEqual(vms, [6, 7, 8, 9, 10, 11])
         self.assertEqual(cloud.launch.call_count, 3)
         self.assertEqual(cloud.launch.call_args_list[0][0][3], 1)
         self.assertEqual(cloud.launch.call_args_list[1][0][3], 3)