ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-02-21 09:51:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support filename for project in the controller

Browse Source
This commit is contained in:
Julien Duponchelle 2016-06-16 16:57:54 +02:00
parent 411ca56b94
commit c66ef9d218
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gns3server/controller/__init__.py
View File

@ -217,9 +217,10 @@ class Controller:
topo_data.pop("revision") topo_data.pop("revision")
topo_data.pop("type") topo_data.pop("type")
project = yield from self.add_project(path=os.path.dirname(path), status="closed", **topo_data) project = yield from self.add_project(path=os.path.dirname(path), status="closed", filename=os.path.basename(path), **topo_data)
if load: if load:
yield from project.open() yield from project.open()
return project
@property @property
def projects(self): def projects(self):

19
gns3server/controller/project.py
View File

@ -43,7 +43,7 @@ class Project:
:param status: Status of the project (opened / closed) :param status: Status of the project (opened / closed)
""" """
def __init__(self, name=None, project_id=None, path=None, controller=None, status="opened"): def __init__(self, name=None, project_id=None, path=None, controller=None, status="opened", filename=None):
self._controller = controller self._controller = controller
self._name = name self._name = name
@ -60,6 +60,13 @@ class Project:
if path is None: if path is None:
path = os.path.join(get_default_project_directory(), self._id) path = os.path.join(get_default_project_directory(), self._id)
self.path = path self.path = path
if filename is None and name is None:
self._filename = "project.gns3"
elif filename is not None:
self._filename = filename
else:
self._filename = self.name + ".gns3"
self.reset() self.reset()
def reset(self): def reset(self):
@ -322,14 +329,8 @@ class Project:
raise aiohttp.web.HTTPInternalServerError(text="Could not create project directory: {}".format(e)) raise aiohttp.web.HTTPInternalServerError(text="Could not create project directory: {}".format(e))
return path return path
def _filename(self):
if self.name is None:
return "untitled.gns3"
else:
return self.name + ".gns3"
def _topology_file(self): def _topology_file(self):
return os.path.join(self.path, self._filename()) return os.path.join(self.path, self._filename)
@asyncio.coroutine @asyncio.coroutine
def open(self): def open(self):
@ -373,6 +374,6 @@ class Project:
"name": self._name, "name": self._name,
"project_id": self._id, "project_id": self._id,
"path": self._path, "path": self._path,
"filename": self._filename(), "filename": self._filename,
"status": self._status "status": self._status
} }

7
tests/controller/test_controller.py
View File

@ -188,7 +188,7 @@ def test_close(controller, async_run):
def test_load_project(controller, async_run, tmpdir): def test_load_project(controller, async_run, tmpdir):
data = { data = {
"name": "Test", "name": "Experience",
"project_id": "c8d07a5a-134f-4c3f-8599-e35eac85eb17", "project_id": "c8d07a5a-134f-4c3f-8599-e35eac85eb17",
"revision": 5, "revision": 5,
"type": "topology", "type": "topology",
@ -242,11 +242,12 @@ def test_load_project(controller, async_run, tmpdir):
controller._computes["my_remote"] = MagicMock() controller._computes["my_remote"] = MagicMock()
with asyncio_patch("gns3server.controller.node.Node.create") as mock_node_create: with asyncio_patch("gns3server.controller.node.Node.create") as mock_node_create:
async_run(controller.load_project(str(tmpdir / "test.gns3"))) project = async_run(controller.load_project(str(tmpdir / "test.gns3")))
assert project._topology_file() == str(tmpdir / "test.gns3")
controller.add_compute.assert_called_with(compute_id='my_remote', host='127.0.0.1', name='My remote', port=3080, protocol='http') controller.add_compute.assert_called_with(compute_id='my_remote', host='127.0.0.1', name='My remote', port=3080, protocol='http')
project = controller.get_project('c8d07a5a-134f-4c3f-8599-e35eac85eb17') project = controller.get_project('c8d07a5a-134f-4c3f-8599-e35eac85eb17')
assert project.name == "Test" assert project.name == "Experience"
assert project.path == str(tmpdir) assert project.path == str(tmpdir)
link = project.get_link("c44331d2-2da4-490d-9aad-7f5c126ae271") link = project.get_link("c44331d2-2da4-490d-9aad-7f5c126ae271")
assert len(link.nodes) == 2 assert len(link.nodes) == 2

2
tests/controller/test_project.py
View File

@ -43,7 +43,7 @@ def test_affect_uuid():
def test_json(tmpdir): def test_json(tmpdir):
p = Project() p = Project()
assert p.__json__() == {"name": p.name, "project_id": p.id, "path": p.path, "status": "opened", "filename": "untitled.gns3"} assert p.__json__() == {"name": p.name, "project_id": p.id, "path": p.path, "status": "opened", "filename": "project.gns3"}
def test_path(tmpdir): def test_path(tmpdir):