vm: fix _rename and its tests

🍻

circle/vm/operations.py

 from __future__ import absolute_import, unicode_literals
 from __future__ import absolute_import, unicode_literals
 from logging import getLogger
 from logging import getLogger
-from re import match
+from re import search
 
 
 from django.core.exceptions import PermissionDenied
 from django.core.exceptions import PermissionDenied
 from django.utils import timezone
 from django.utils import timezone
@@ -203,13 +203,15 @@ class SaveAsTemplateOperation(InstanceOperation):
         """)
         """)
     icon = 'save'
     icon = 'save'
 
 
-    def _rename(self, name):
-        m = match("^(.*)( v(\d+))?$", name)
-        if m.group(3) is None:
-            v = 2
+    @staticmethod
+    def _rename(name):
+        m = search(r" v(\d+)$", name)
+        if m:
+            v = int(m.group(1)) + 1
+            name = search(r"^(.*) v(\d+)$", name).group(1)
         else:
         else:
-            v = int(v) + 1
-        return "%s v%d" % (m.group(1), v)
+            v = 1
+        return "%s v%d" % (name, v)
 
 
     def _operation(self, activity, user, system, timeout=300,
     def _operation(self, activity, user, system, timeout=300,
                    with_shutdown=True, **kwargs):
                    with_shutdown=True, **kwargs):

circle/vm/tests/test_operations.py

@@ -44,11 +44,12 @@ class SaveAsTemplateOperationTestCase(TestCase):
         assert SaveAsTemplateOperation.id in getattr(Instance, op_reg_name)
         assert SaveAsTemplateOperation.id in getattr(Instance, op_reg_name)
 
 
     def test_rename(self):
     def test_rename(self):
-        assert SaveAsTemplateOperation._rename("foo") == "foo v2"
-        assert SaveAsTemplateOperation._rename("foo v2") == "foo v3"
-        assert SaveAsTemplateOperation._rename("foo v") == "foo v v2"
-        assert SaveAsTemplateOperation._rename("foo v9") == "foo v10"
-        assert SaveAsTemplateOperation._rename("foo v111") == "foo v112"
+        self.assertEqual(SaveAsTemplateOperation._rename("foo"), "foo v1")
+        self.assertEqual(SaveAsTemplateOperation._rename("foo v2"), "foo v3")
+        self.assertEqual(SaveAsTemplateOperation._rename("foo v"), "foo v v1")
+        self.assertEqual(SaveAsTemplateOperation._rename("foo v9"), "foo v10")
+        self.assertEqual(
+            SaveAsTemplateOperation._rename("foo v111"), "foo v112")
 
 
 
 
 class ShutdownOperationTestCase(TestCase):
 class ShutdownOperationTestCase(TestCase):