NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-01-18 07:23:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't send variables to computes where are empty, Ref: #1340

Browse Source
This commit is contained in:
ziajka 2018-06-13 18:55:47 +02:00
parent 2e586f56ca
commit ac73c72727
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gns3server/controller/project.py
View File

@ -500,18 +500,21 @@ class Project:
if compute not in self._project_created_on_compute: if compute not in self._project_created_on_compute:
# For a local server we send the project path # For a local server we send the project path
if compute.id == "local": if compute.id == "local":
yield from compute.post("/projects", data={ data = {
"name": self._name, "name": self._name,
"project_id": self._id, "project_id": self._id,
"path": self._path, "path": self._path
"variables": self._variables }
})
else: else:
yield from compute.post("/projects", data={ data = {
"name": self._name, "name": self._name,
"project_id": self._id, "project_id": self._id
"variables": self._variables }
})
if self._variables:
data["variables"] = self._variables
yield from compute.post("/projects", data=data)
self._project_created_on_compute.add(compute) self._project_created_on_compute.add(compute)
yield from node.create() yield from node.create()

10
tests/handlers/api/compute/test_project.py
View File

@ -36,6 +36,16 @@ def test_create_project_with_path(http_compute, tmpdir):
assert response.json["project_id"] == "00010203-0405-0607-0809-0a0b0c0d0e0f" assert response.json["project_id"] == "00010203-0405-0607-0809-0a0b0c0d0e0f"
def test_create_project_with_path_and_empty_variables(http_compute, tmpdir):
with patch("gns3server.compute.project.Project.is_local", return_value=True):
response = http_compute.post("/projects", {
"name": "test",
"path": str(tmpdir), "project_id": "00010203-0405-0607-0809-0a0b0c0d0e0f",
"variables": None})
assert response.status == 201
assert response.json["project_id"] == "00010203-0405-0607-0809-0a0b0c0d0e0f"
def test_create_project_without_dir(http_compute): def test_create_project_without_dir(http_compute):
query = {"name": "test", "project_id": "10010203-0405-0607-0809-0a0b0c0d0e0f"} query = {"name": "test", "project_id": "10010203-0405-0607-0809-0a0b0c0d0e0f"}
response = http_compute.post("/projects", query, example=True) response = http_compute.post("/projects", query, example=True)