x/os-xenapi
Code Issues Proposed changes

Remove uesless check

Browse Source 
We have changed plugin's version to 2.0, there is no need to
check version "2.0" and "1.8", this patch is to remove this part

Change-Id: I81d05c4b9afe4954b0e21d9890f82d7486180125
This commit is contained in:
Huan Xie 2016-12-13 00:25:39 -08:00
parent 68c5be4b57
commit 9d7cea4ca6
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
os_xenapi/client/session.py
View File

@ -109,11 +109,6 @@ class XenAPISession(object):
current_version = self.call_plugin_serialized(
'dom0_plugin_version.py', 'get_version')
# v2.0 is the same as v1.8, with no version bumps. Remove this once
# Ocata is released
if requested_version == '2.0' and current_version == '1.8':
return
if not versionutils.is_compatible(requested_version, current_version):
raise XenAPI.Failure(
_("Plugin version mismatch (Expected %(exp)s, got %(got)s)") %

9
os_xenapi/tests/client/test_session.py
View File

@ -317,15 +317,6 @@ class XenAPISessionTestCase(base.TestCase):
call_plugin_serialized.return_value = "2.5"
session._verify_plugin_version()
def test_verify_plugin_version_python_extensions(self):
# Validate that 2.0 is equivalent to 1.8
session = self._get_mock_xapisession({})
session.PLUGIN_REQUIRED_VERSION = '2.0'
with mock.patch.object(session, 'call_plugin_serialized',
spec=True) as call_plugin_serialized:
call_plugin_serialized.return_value = "1.8"
session._verify_plugin_version()
def test_verify_plugin_version_bad_maj(self):
session = self._get_mock_xapisession({})
session.PLUGIN_REQUIRED_VERSION = '2.4'