arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-24 17:28:08 +00:00
Code Issues Releases Wiki Activity

Strip user from compute in topology and return project filename

Browse Source
This commit is contained in:
Julien Duponchelle 2016-06-15 18:22:11 +02:00
parent c4d619ce3c
commit aa5988788d
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gns3server/controller/compute.py
View File

@ -238,8 +238,7 @@ class Compute:
"name": self._name, "name": self._name,
"protocol": self._protocol, "protocol": self._protocol,
"host": self._host, "host": self._host,
"port": self._port, "port": self._port
"user": self._user
} }
return { return {
"compute_id": self._id, "compute_id": self._id,

11
gns3server/controller/project.py
View File

@ -322,12 +322,14 @@ 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 _topology_file(self): def _filename(self):
if self.name is None: if self.name is None:
filename = "untitled.gns3" return "untitled.gns3"
else: else:
filename = self.name + ".gns3" return self.name + ".gns3"
return os.path.join(self.path, filename)
def _topology_file(self):
return os.path.join(self.path, self._filename())
@asyncio.coroutine @asyncio.coroutine
def open(self): def open(self):
@ -371,5 +373,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(),
"status": self._status "status": self._status
} }

5
gns3server/schemas/project.py
View File

@ -82,6 +82,11 @@ PROJECT_OBJECT_SCHEMA = {
"type": ["string", "null"], "type": ["string", "null"],
"minLength": 1 "minLength": 1
}, },
"filename": {
"description": "Project filename",
"type": ["string", "null"],
"minLength": 1
},
"status": { "status": {
"description": "Project status Read only", "description": "Project status Read only",
"enum": ["opened", "closed"] "enum": ["opened", "closed"]

1
tests/controller/test_compute.py
View File

@ -211,7 +211,6 @@ def test_json(compute):
"protocol": "https", "protocol": "https",
"host": "example.com", "host": "example.com",
"port": 84, "port": 84,
"user": "test",
} }

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"} assert p.__json__() == {"name": p.name, "project_id": p.id, "path": p.path, "status": "opened", "filename": "untitled.gns3"}
def test_path(tmpdir): def test_path(tmpdir):