SIMPLE-6397 Added support for 3.0, updated obsolete controller versions (#102)

* SIMPLE-6397 Added support for 3.0, updated obsolete controller versions

* Removed unrealistic test

Author: tmikuska

tests/conftest.py

@@ -49,11 +49,6 @@ def client_library_server_2_0_0():
     yield from client_library_patched_system_info(version="2.0.0")
 
 
-@pytest.fixture
-def client_library_server_1_0_0():
-    yield from client_library_patched_system_info(version="1.0.0")
-
-
 @pytest.fixture
 def client_library_server_3_9_0():
     yield from client_library_patched_system_info(version="3.9.0")

tests/test_client_library.py

@@ -365,15 +365,6 @@ def test_client_library_str_and_repr(client_library_server_current):
     assert str(client_library) == "ClientLibrary URL: https://somehost/api/v0/"
 
 
-def test_major_version_mismatch(client_library_server_1_0_0):
-    with pytest.raises(InitializationError) as err:
-        ClientLibrary("somehost", "virl2", password="virl2")
-    assert (
-        str(err.value)
-        == f"Major version mismatch. Client {CURRENT_VERSION}, controller 1.0.0."
-    )
-
-
 def test_incompatible_version(client_library_server_2_0_0):
     with pytest.raises(InitializationError) as err:
         with patch.object(
@@ -712,7 +703,7 @@ def test_different_version_strings():
         Version("54dev0+build8.7ee86bf8")
 
 
-def test_import_lab_offline(
+def test_import_lab_offline_deprecated(
     client_library_server_current, mocked_session, tmp_path: Path, test_dir
 ):
     client_library = ClientLibrary(
@@ -721,7 +712,8 @@ def test_import_lab_offline(
     topology_file_path = test_dir / "test_data/sample_topology.json"
     with open(topology_file_path) as fh:
         topology_file = fh.read()
-        client_library.import_lab(topology_file, "topology-v0_0_4", offline=True)
+        with pytest.deprecated_call():
+            client_library.import_lab(topology_file, "topology-v0_0_4", offline=True)
 
 
 def test_convergence_parametrization(client_library_server_current, mocked_session):

virl2_client/virl2_client.py

@@ -114,6 +114,9 @@ def __le__(self, other):
     def major_differs(self, other: Version) -> bool:
         return self.major != other.major
 
+    def major_lt(self, other: Version) -> bool:
+        return self.major < other.major
+
     def minor_differs(self, other: Version) -> bool:
         return self.minor != other.minor
 
@@ -174,6 +177,12 @@ class ClientLibrary:
         Version("2.2.1"),
         Version("2.2.2"),
         Version("2.2.3"),
+        Version("2.3.0"),
+        Version("2.3.1"),
+        Version("2.4.0"),
+        Version("2.4.1"),
+        Version("2.5.0"),
+        Version("2.5.1"),
     ]
     _URL_TEMPLATES = {
         "auth_test": "authok",
@@ -427,14 +436,12 @@ def check_controller_version(self) -> Version | None:
                 f"List of versions marked explicitly as incompatible: "
                 f"{self.INCOMPATIBLE_CONTROLLER_VERSIONS}."
             )
-        if self.VERSION.major_differs(controller_version_obj):
+        if self.VERSION.major_lt(controller_version_obj):
             raise InitializationError(
                 f"Major version mismatch. Client {self.VERSION}, "
                 f"controller {controller_version_obj}."
             )
-        if self.VERSION.minor_differs(controller_version_obj) and self.VERSION.minor_lt(
-            controller_version_obj
-        ):
+        if self.VERSION.minor_lt(controller_version_obj):
             _LOGGER.warning(
                 f"Please ensure the client version is compatible with the controller "
                 f"version. Client {self.VERSION}, controller {controller_version_obj}."