diff --git a/os_xenapi/client/session.py b/os_xenapi/client/session.py index df83085..dbc4356 100644 --- a/os_xenapi/client/session.py +++ b/os_xenapi/client/session.py @@ -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)") % diff --git a/os_xenapi/tests/client/test_session.py b/os_xenapi/tests/client/test_session.py index 02725d7..4d0579b 100644 --- a/os_xenapi/tests/client/test_session.py +++ b/os_xenapi/tests/client/test_session.py @@ -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'