Expose new API actions and update test suite accordingly; bump egg version to '4.15.2'

H.Eckert · sysradium · commit a591ad11ca98 · 2019-06-04T20:05:11.000+01:00
diff --git a/oca/tests/test_virtualmachine.py b/oca/tests/test_virtualmachine.py
@@ -4,14 +4,21 @@
 
 from mock import Mock
 from nose.tools import raises
+from parameterized import parameterized_class
 
 import oca
 import oca.pool
 
-
+@parameterized_class([
+    {'one_version': '4.10.0'},
+    {'one_version': '5.4.0'},
+    {'one_version': '6.0.0'},
+])
 class TestVirtualMachine(unittest.TestCase):
     def setUp(self):
         self.client = oca.Client('test:test')
+        self.client.call = Mock(return_value=self.one_version)
+        self.client.call.reset_mock()
         self.xml = open(os.path.join(os.path.dirname(oca.__file__),
                                      'tests/fixtures/vm.xml')).read()
 
@@ -64,38 +71,43 @@ def test_allocate(self):
         assert oca.VirtualMachine.allocate(self.client, '<VM></VM>') == 3
 
     def test_deploy(self):
-        self.client.call = Mock(return_value='')
         vm = oca.VirtualMachine(self.xml, self.client)
+        self.client.call = Mock(return_value='')
         vm.deploy(3)
         self.client.call.assert_called_once_with('vm.deploy', '6', 3)
 
     def test_migrate(self):
-        self.client.call = Mock(return_value='')
         vm = oca.VirtualMachine(self.xml, self.client)
+        self.client.call = Mock(return_value='')
         vm.migrate(3)
         self.client.call.assert_called_once_with('vm.migrate', '6', 3, False)
 
     def test_live_migrate(self):
-        self.client.call = Mock(return_value='')
         vm = oca.VirtualMachine(self.xml, self.client)
+        self.client.call = Mock(return_value='')
         vm.live_migrate(3)
         self.client.call.assert_called_once_with('vm.migrate', '6', 3, True)
 
     def test_save_disk(self):
-        self.client.call = Mock(return_value='')
         vm = oca.VirtualMachine(self.xml, self.client)
+        self.client.call = Mock(return_value='')
         vm.save_disk(1, 2)
         self.client.call.assert_called_once_with('vm.savedisk', '6', 1, 2)
 
     def test_actions(self):
-        oca.client = oca.Client('test:test')
         vm = oca.VirtualMachine(self.xml, self.client)
         for action in ['shutdown', 'shutdown_hard', 'poweroff', 'poweroff_hard',
                        'hold', 'release', 'stop', 'cancel', 'suspend', 'resume',
-                       'reboot', 'finalize', 'delete', 'resched', 'unresched']:
+                       'reboot', 'finalize', 'delete', 'resched', 'unresched',
+                       'terminate', 'terminate_hard']:
             self.client.call = Mock(return_value='')
             getattr(vm, action)()
-            if action in ('shutdown_hard', 'poweroff_hard', 'undeploy_hard'):
+            if self.one_version >= '5':
+                if action in ('shutdown', 'shutdown_hard'):
+                    action = action.replace("shutdown", "terminate")
+            elif action in ('terminate', 'terminate_hard'):
+                    action = action.replace("terminate", "shutdown")
+            if action in ('shutdown_hard', 'terminate_hard', 'poweroff_hard', 'undeploy_hard'):
                 action = action.replace("_", "-")
             self.client.call.assert_called_once_with('vm.action', action, '6')
 
@@ -120,8 +132,8 @@ def test_lcm_states(self):
             assert vm.short_lcm_state == lcm
 
     def test_resubmit(self):
-        self.client.call = Mock(return_value='')
         vm = oca.VirtualMachine(self.xml, self.client)
+        self.client.call = Mock(return_value='')
         vm.resubmit()
         self.client.call.assert_called_once_with('vm.action', 'resubmit', '6')
 
diff --git a/oca/vm.py b/oca/vm.py
@@ -175,6 +175,8 @@ def allocate(client, template):
         return vm_id
 
     def __init__(self, xml, client):
+        if client.one_version is None:
+            client.version()
         super(VirtualMachine, self).__init__(xml, client)
         self.id = self['ID'] if self['ID'] else None
 
@@ -229,13 +231,31 @@ def shutdown(self):
         """
         Shutdowns an already deployed VM
         """
-        self._action('shutdown')
+        self.terminate()
 
     def shutdown_hard(self):
         """
         Shutdown hard an already deployed VM
         """
-        self._action('shutdown-hard')
+        self.terminate_hard()
+
+    def terminate(self):
+        """
+        Terminates an already deployed VM
+        """
+        if self.client.one_version >= '5':
+            self._action('terminate')
+        else:
+            self._action('shutdown')
+
+    def terminate_hard(self):
+        """
+        Terminates an already deployed VM forcefully
+        """
+        if self.client.one_version >= '5':
+            self._action('terminate-hard')
+        else:
+            self._action('shutdown-hard')
 
     def poweroff(self):
         """
diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 import os
 import sys
 
-__version__ = '4.15.1'
+__version__ = '4.15.2'
 
 
 # borrowed from Pylons project
