ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-16 14:28:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.1' into 2.2

Browse Source 
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/version.py
This commit is contained in:
grossmj
2018-08-07 21:06:42 +07:00
parent 1cc1ccd511 12e71a2917
commit 033f005bde
402 changed files with 11042 additions and 10444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gns3server/handlers/api/controller/node_handler.py
View File

@ -213,7 +213,7 @@ class NodeHandler:
"node_id": "Node UUID"
},
status_codes={
204: "Instance started",
200: "Instance started",
400: "Invalid request",
404: "Instance doesn't exist"
},
@ -225,7 +225,7 @@ class NodeHandler:
node = project.get_node(request.match_info["node_id"])
yield from node.start(data=request.json)
response.json(node)
response.set_status(201)
response.set_status(200)
@Route.post(
r"/projects/{project_id}/nodes/{node_id}/stop",
@ -234,7 +234,7 @@ class NodeHandler:
"node_id": "Node UUID"
},
status_codes={
204: "Instance stopped",
200: "Instance stopped",
400: "Invalid request",
404: "Instance doesn't exist"
},
@ -246,7 +246,7 @@ class NodeHandler:
node = project.get_node(request.match_info["node_id"])
yield from node.stop()
response.json(node)
response.set_status(201)
response.set_status(200)
@Route.post(
r"/projects/{project_id}/nodes/{node_id}/suspend",
@ -255,7 +255,7 @@ class NodeHandler:
"node_id": "Node UUID"
},
status_codes={
204: "Instance suspended",
200: "Instance suspended",
400: "Invalid request",
404: "Instance doesn't exist"
},
@ -267,7 +267,7 @@ class NodeHandler:
node = project.get_node(request.match_info["node_id"])
yield from node.suspend()
response.json(node)
response.set_status(201)
response.set_status(200)
@Route.post(
r"/projects/{project_id}/nodes/{node_id}/reload",
@ -276,7 +276,7 @@ class NodeHandler:
"node_id": "Node UUID"
},
status_codes={
204: "Instance reloaded",
200: "Instance reloaded",
400: "Invalid request",
404: "Instance doesn't exist"
},
@ -288,7 +288,7 @@ class NodeHandler:
node = project.get_node(request.match_info["node_id"])
#yield from node.reload()
response.json(node)
response.set_status(201)
response.set_status(200)
@Route.delete(
r"/projects/{project_id}/nodes/{node_id}",