Merge "Shorter names for service instance virtual-machine" into R2.20

Juniper · Dec 20, 2015 · 61905d9 · 61905d9
2 parents 2cda61a + 94d785f
commit 61905d9
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/config/svc-monitor/svc_monitor/virtual_machine_manager.py b/src/config/svc-monitor/svc_monitor/virtual_machine_manager.py
@@ -60,13 +60,15 @@ def _create_service_vm(self, instance_index, si, st):
             nics_with_port.append(nic_with_port)
 
         # launch vm
-        self.logger.log_info('Launching VM : ' + instance_name)
+        idx_str = "%(#)03d" % {'#': (instance_index + 1)}
+        nova_vm_name = si.name + idx_str
+        self.logger.log_info('Launching VM : ' + nova_vm_name)
         nova_vm = self._nc.oper('servers', 'create', proj_name,
-            name=instance_name, image=image,
+            name=nova_vm_name, image=image,
             flavor=flavor, nics=nics_with_port,
             availability_zone=si.availability_zone)
         if not nova_vm:
-            self.logger.log_error("Nova vm create failed %s" % instance_name)
+            self.logger.log_error("Nova vm create failed %s" % nova_vm_name)
             return None
 
         nova_vm.get()