Skip to content

Commit da0fe24

Browse files
Brennwertsysradium
authored andcommitted
Revert "Add VM shutdown for OpenNebula5 API change"
1 parent 014bc30 commit da0fe24

1 file changed

Lines changed: 2 additions & 10 deletions

File tree

oca/vm.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,6 @@ def allocate(client, template):
177177
def __init__(self, xml, client):
178178
super(VirtualMachine, self).__init__(xml, client)
179179
self.id = self['ID'] if self['ID'] else None
180-
if client.one_version is None:
181-
client.version()
182180

183181
def deploy(self, host_id):
184182
"""
@@ -231,19 +229,13 @@ def shutdown(self):
231229
"""
232230
Shutdowns an already deployed VM
233231
"""
234-
if client.one_version >= '5':
235-
self._action('terminate')
236-
else:
237-
self._action('shutdown')
232+
self._action('shutdown')
238233

239234
def shutdown_hard(self):
240235
"""
241236
Shutdown hard an already deployed VM
242237
"""
243-
if client.one_version >= '5':
244-
self._action('terminate-hard')
245-
else:
246-
self._action('shutdown-hard')
238+
self._action('shutdown-hard')
247239

248240
def poweroff(self):
249241
"""

0 commit comments

Comments
 (0)