Early import project api

tests/controller/test_controller.py

@@ -335,3 +335,13 @@ def test_load_project(controller, async_run, tmpdir):
     with asyncio_patch("gns3server.controller.Controller.add_project") as mock_add_project:
         project = async_run(controller.load_project(str(tmpdir / "test.gns3")))
     assert not mock_add_project.called
+
+
+def test_get_free_project_name(controller, async_run):
+
+    async_run(controller.add_project(project_id=str(uuid.uuid4()), name="Test"))
+    assert controller.get_free_project_name("Test") == "Test-1"
+    async_run(controller.add_project(project_id=str(uuid.uuid4()), name="Test-1"))
+    assert controller.get_free_project_name("Test") == "Test-2"
+    assert controller.get_free_project_name("Hello") == "Hello"
+

tests/controller/test_import_project.py

@@ -0,0 +1,69 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2016 GNS3 Technologies Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import uuid
+import json
+import zipfile
+
+
+from gns3server.controller.project import Project
+from gns3server.controller.import_project import import_project
+
+
+def test_import_project(async_run, tmpdir, controller):
+    project_id = str(uuid.uuid4())
+
+    topology = {
+        "project_id": str(uuid.uuid4()),
+        "name": "test",
+        "topology": {
+        },
+        "version": "2.0.0"
+    }
+
+    with open(str(tmpdir / "project.gns3"), 'w+') as f:
+        json.dump(topology, f)
+    with open(str(tmpdir / "b.png"), 'w+') as f:
+        f.write("B")
+
+    zip_path = str(tmpdir / "project.zip")
+    with zipfile.ZipFile(zip_path, 'w') as myzip:
+        myzip.write(str(tmpdir / "project.gns3"), "project.gns3")
+        myzip.write(str(tmpdir / "b.png"), "b.png")
+        myzip.write(str(tmpdir / "b.png"), "project-files/dynamips/test")
+        myzip.write(str(tmpdir / "b.png"), "project-files/qemu/test")
+
+    with open(zip_path, "rb") as f:
+        project = async_run(import_project(controller, project_id, f))
+
+    assert project.name == "test"
+    assert project.id == project_id # The project should changed
+
+    assert os.path.exists(os.path.join(project.path, "b.png"))
+    assert not os.path.exists(os.path.join(project.path, "project.gns3"))
+    assert os.path.exists(os.path.join(project.path, "test.gns3"))
+    assert os.path.exists(os.path.join(project.path, "project-files/dynamips/test"))
+    assert os.path.exists(os.path.join(project.path, "project-files/qemu/test"))
+
+    # A new project name is generated when you import twice the same name
+    with open(zip_path, "rb") as f:
+        project = async_run(import_project(controller, str(uuid.uuid4()), f))
+    assert project.name != "test"
+
+
+

tests/handlers/api/compute/test_project.py

@@ -221,12 +221,12 @@ def test_export(http_compute, tmpdir, loop, project):
             assert content == b"hello"
 
 
-def test_import(http_compute, tmpdir, loop, project):
+def test_import(http_compute, tmpdir, loop):
 
     with zipfile.ZipFile(str(tmpdir / "test.zip"), 'w') as myzip:
         myzip.writestr("demo", b"hello")
 
-    project_id = project.id
+    project_id = str(uuid.uuid4())
 
     with open(str(tmpdir / "test.zip"), "rb") as f:
         response = http_compute.post("/projects/{project_id}/import".format(project_id=project_id), body=f.read(), raw=True)

tests/handlers/api/controller/test_project.py

@@ -202,3 +202,21 @@ def test_write_file(http_controller, tmpdir, project):
 
     response = http_controller.post("/projects/{project_id}/files/../hello".format(project_id=project.id), raw=True)
     assert response.status == 403
+
+
+def test_import(http_controller, tmpdir, controller):
+
+    with zipfile.ZipFile(str(tmpdir / "test.zip"), 'w') as myzip:
+        myzip.writestr("project.gns3", b'{"version": "2.0.0", "name": "test"}')
+        myzip.writestr("demo", b"hello")
+
+    project_id = str(uuid.uuid4())
+
+    with open(str(tmpdir / "test.zip"), "rb") as f:
+        response = http_controller.post("/projects/{project_id}/import".format(project_id=project_id), body=f.read(), raw=True)
+    assert response.status == 201
+
+    project = controller.get_project(project_id)
+    with open(os.path.join(project.path, "demo")) as f:
+        content = f.read()
+    assert content == "hello"