Support auth for network V2 hypervisors

tests/controller/test_hypervisor.py

@@ -24,12 +24,14 @@ from unittest.mock import patch, MagicMock
 from gns3server.controller.project import Project
 from gns3server.controller.hypervisor import Hypervisor, HypervisorError
 from gns3server.version import __version__
-from tests.utils import asyncio_patch
+from tests.utils import asyncio_patch, AsyncioMagicMock
 
 
 @pytest.fixture
 def hypervisor():
-    return Hypervisor("my_hypervisor_id", protocol="https", host="example.com", port=84, user="test", password="secure")
+    hypervisor = Hypervisor("my_hypervisor_id", protocol="https", host="example.com", port=84)
+    hypervisor._connected = True
+    return hypervisor
 
 
 def test_init(hypervisor):
@@ -56,7 +58,66 @@ def test_hypervisor_httpQuery(hypervisor, async_run):
         response.status = 200
 
         async_run(hypervisor.post("/projects", {"a": "b"}))
-        mock.assert_called_with("POST", "https://example.com:84/v2/hypervisor/projects", data='{"a": "b"}', headers={'content-type': 'application/json'})
+        mock.assert_called_with("POST", "https://example.com:84/v2/hypervisor/projects", data='{"a": "b"}', headers={'content-type': 'application/json'}, auth=None)
+        assert hypervisor._auth is None
+
+
+def test_hypervisor_httpQueryAuth(hypervisor, async_run):
+    response = MagicMock()
+    with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
+        response.status = 200
+
+        hypervisor.user = "root"
+        hypervisor.password = "toor"
+        async_run(hypervisor.post("/projects", {"a": "b"}))
+        mock.assert_called_with("POST", "https://example.com:84/v2/hypervisor/projects", data='{"a": "b"}', headers={'content-type': 'application/json'}, auth=hypervisor._auth)
+        assert hypervisor._auth.login == "root"
+        assert hypervisor._auth.password == "toor"
+
+
+def test_hypervisor_httpQueryNotConnected(hypervisor, async_run):
+    hypervisor._connected = False
+    response = AsyncioMagicMock()
+    response.read = AsyncioMagicMock(return_value = json.dumps({"version": __version__}).encode())
+    response.status = 200
+    with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
+        async_run(hypervisor.post("/projects", {"a": "b"}))
+        mock.assert_any_call("GET", "https://example.com:84/v2/hypervisor/version", headers={'content-type': 'application/json'}, data=None, auth=None)
+        mock.assert_any_call("POST", "https://example.com:84/v2/hypervisor/projects", data='{"a": "b"}', headers={'content-type': 'application/json'}, auth=None)
+        assert hypervisor._connected
+
+
+def test_hypervisor_httpQueryNotConnectedInvalidVersion(hypervisor, async_run):
+    hypervisor._connected = False
+    response = AsyncioMagicMock()
+    response.read = AsyncioMagicMock(return_value = json.dumps({"version": "1.42.4"}).encode())
+    response.status = 200
+    with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
+        with pytest.raises(aiohttp.web.HTTPConflict):
+            async_run(hypervisor.post("/projects", {"a": "b"}))
+        mock.assert_any_call("GET", "https://example.com:84/v2/hypervisor/version", headers={'content-type': 'application/json'}, data=None, auth=None)
+
+
+def test_hypervisor_httpQueryNotConnectedNonGNS3Server(hypervisor, async_run):
+    hypervisor._connected = False
+    response = AsyncioMagicMock()
+    response.read = AsyncioMagicMock(return_value = b'Blocked by super antivirus')
+    response.status = 200
+    with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
+        with pytest.raises(aiohttp.web.HTTPConflict):
+            async_run(hypervisor.post("/projects", {"a": "b"}))
+        mock.assert_any_call("GET", "https://example.com:84/v2/hypervisor/version", headers={'content-type': 'application/json'}, data=None, auth=None)
+
+
+def test_hypervisor_httpQueryNotConnectedNonGNS3Server2(hypervisor, async_run):
+    hypervisor._connected = False
+    response = AsyncioMagicMock()
+    response.read = AsyncioMagicMock(return_value = b'{}')
+    response.status = 200
+    with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock:
+        with pytest.raises(aiohttp.web.HTTPConflict):
+            async_run(hypervisor.post("/projects", {"a": "b"}))
+        mock.assert_any_call("GET", "https://example.com:84/v2/hypervisor/version", headers={'content-type': 'application/json'}, data=None, auth=None)
 
 
 def test_hypervisor_httpQueryError(hypervisor, async_run):
@@ -75,16 +136,16 @@ def test_hypervisor_httpQuery_project(hypervisor, async_run):
 
         project = Project()
         async_run(hypervisor.post("/projects", project))
-        mock.assert_called_with("POST", "https://example.com:84/v2/hypervisor/projects", data=json.dumps(project.__json__()), headers={'content-type': 'application/json'})
+        mock.assert_called_with("POST", "https://example.com:84/v2/hypervisor/projects", data=json.dumps(project.__json__()), headers={'content-type': 'application/json'}, auth=None)
 
 
 def test_json(hypervisor):
+    hypervisor.user = "test"
     assert hypervisor.__json__() == {
         "hypervisor_id": "my_hypervisor_id",
         "protocol": "https",
         "host": "example.com",
         "port": 84,
         "user": "test",
-        "connected": False,
-        "version": __version__
+        "connected": True
     }