NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-03 14:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add /projects before /project

Browse Source
This commit is contained in:
Julien Duponchelle committed 2015-02-06 17:42:25 +01:00
1 parent 27cbfbbdc6
commit e81dcd4bba
6 files changed
+61 -59
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gns3server/config.py
+2 -1
View File
@@ -182,10 +182,11 @@ class Config(object):
self._override_config[section] = content
@staticmethod
def instance():
def instance(files=[]):
"""
Singleton to return only on instance of Config.
:params files: Array of configuration files (optionnal)
:returns: instance of Config
"""
gns3server/handlers/virtualbox_handler.py
+13 -13
View File
@@ -47,7 +47,7 @@ class VirtualBoxHandler:
@classmethod
@Route.post(
r"/{project_id}/virtualbox/vms",
r"/projects/{project_id}/virtualbox/vms",
parameters={
"project_id": "UUID for the project"
},
@@ -78,7 +78,7 @@ class VirtualBoxHandler:
@classmethod
@Route.get(
r"/{project_id}/virtualbox/vms/{vm_id}",
r"/projects/{project_id}/virtualbox/vms/{vm_id}",
parameters={
"project_id": "UUID for the project",
"vm_id": "UUID for the instance"
@@ -98,7 +98,7 @@ class VirtualBoxHandler:
@classmethod
@Route.put(
r"/{project_id}/virtualbox/vms/{vm_id}",
r"/projects/{project_id}/virtualbox/vms/{vm_id}",
parameters={
"project_id": "UUID for the project",
"vm_id": "UUID for the instance"
@@ -126,7 +126,7 @@ class VirtualBoxHandler:
@classmethod
@Route.delete(
r"/{project_id}/virtualbox/vms/{vm_id}",
r"/projects/{project_id}/virtualbox/vms/{vm_id}",
parameters={
"project_id": "UUID for the project",
"vm_id": "UUID for the instance"
@@ -147,7 +147,7 @@ class VirtualBoxHandler:
@classmethod
@Route.post(
r"/{project_id}/virtualbox/vms/{vm_id}/start",
r"/projects/{project_id}/virtualbox/vms/{vm_id}/start",
parameters={
"project_id": "UUID for the project",
"vm_id": "UUID for the instance"
@@ -167,7 +167,7 @@ class VirtualBoxHandler:
@classmethod
@Route.post(
r"/{project_id}/virtualbox/vms/{vm_id}/stop",
r"/projects/{project_id}/virtualbox/vms/{vm_id}/stop",
parameters={
"project_id": "UUID for the project",
"vm_id": "UUID for the instance"
@@ -187,7 +187,7 @@ class VirtualBoxHandler:
@classmethod
@Route.post(
r"/{project_id}/virtualbox/vms/{vm_id}/suspend",
r"/projects/{project_id}/virtualbox/vms/{vm_id}/suspend",
parameters={
"project_id": "UUID for the project",
"vm_id": "UUID for the instance"
@@ -207,7 +207,7 @@ class VirtualBoxHandler:
@classmethod
@Route.post(
r"/{project_id}/virtualbox/vms/{vm_id}/resume",
r"/projects/{project_id}/virtualbox/vms/{vm_id}/resume",
parameters={
"project_id": "UUID for the project",
"vm_id": "UUID for the instance"
@@ -227,7 +227,7 @@ class VirtualBoxHandler:
@classmethod
@Route.post(
r"/{project_id}/virtualbox/vms/{vm_id}/reload",
r"/projects/{project_id}/virtualbox/vms/{vm_id}/reload",
parameters={
"project_id": "UUID for the project",
"vm_id": "UUID for the instance"
@@ -246,7 +246,7 @@ class VirtualBoxHandler:
response.set_status(204)
@Route.post(
r"/{project_id}/virtualbox/vms/{vm_id}/adapters/{adapter_id:\d+}/nio",
r"/projects/{project_id}/virtualbox/vms/{vm_id}/adapters/{adapter_id:\d+}/nio",
parameters={
"project_id": "UUID for the project",
"vm_id": "UUID for the instance",
@@ -271,7 +271,7 @@ class VirtualBoxHandler:
@classmethod
@Route.delete(
r"/{project_id}/virtualbox/vms/{vm_id}/adapters/{adapter_id:\d+}/nio",
r"/projects/{project_id}/virtualbox/vms/{vm_id}/adapters/{adapter_id:\d+}/nio",
parameters={
"project_id": "UUID for the project",
"vm_id": "UUID for the instance",
@@ -291,7 +291,7 @@ class VirtualBoxHandler:
response.set_status(204)
@Route.post(
r"/{project_id}/virtualbox/{vm_id}/capture/{adapter_id:\d+}/start",
r"/projects/{project_id}/virtualbox/{vm_id}/capture/{adapter_id:\d+}/start",
parameters={
"project_id": "UUID for the project",
"vm_id": "UUID for the instance",
@@ -314,7 +314,7 @@ class VirtualBoxHandler:
response.json({"pcap_file_path": pcap_file_path})
@Route.post(
r"/{project_id}/virtualbox/{vm_id}/capture/{adapter_id:\d+}/stop",
r"/projects/{project_id}/virtualbox/{vm_id}/capture/{adapter_id:\d+}/stop",
parameters={
"project_id": "UUID for the project",
"vm_id": "UUID for the instance",
gns3server/handlers/vpcs_handler.py
+9 -9
View File
@@ -31,7 +31,7 @@ class VPCSHandler:
@classmethod
@Route.post(
r"/{project_id}/vpcs/vms",
r"/projects/{project_id}/vpcs/vms",
parameters={
"project_id": "UUID for the project"
},
@@ -56,7 +56,7 @@ class VPCSHandler:
@classmethod
@Route.get(
r"/{project_id}/vpcs/vms/{vm_id}",
r"/projects/{project_id}/vpcs/vms/{vm_id}",
parameters={
"project_id": "UUID for the project",
"vm_id": "UUID for the instance"
@@ -76,7 +76,7 @@ class VPCSHandler:
@classmethod
@Route.put(
r"/{project_id}/vpcs/vms/{vm_id}",
r"/projects/{project_id}/vpcs/vms/{vm_id}",
parameters={
"project_id": "UUID for the project",
"vm_id": "UUID for the instance"
@@ -101,7 +101,7 @@ class VPCSHandler:
@classmethod
@Route.delete(
r"/{project_id}/vpcs/vms/{vm_id}",
r"/projects/{project_id}/vpcs/vms/{vm_id}",
parameters={
"project_id": "UUID for the project",
"vm_id": "UUID for the instance"
@@ -119,7 +119,7 @@ class VPCSHandler:
@classmethod
@Route.post(
r"/{project_id}/vpcs/vms/{vm_id}/start",
r"/projects/{project_id}/vpcs/vms/{vm_id}/start",
parameters={
"project_id": "UUID for the project",
"vm_id": "UUID for the instance"
@@ -139,7 +139,7 @@ class VPCSHandler:
@classmethod
@Route.post(
r"/{project_id}/vpcs/vms/{vm_id}/stop",
r"/projects/{project_id}/vpcs/vms/{vm_id}/stop",
parameters={
"project_id": "UUID for the project",
"vm_id": "UUID for the instance"
@@ -159,7 +159,7 @@ class VPCSHandler:
@classmethod
@Route.post(
r"/{project_id}/vpcs/vms/{vm_id}/reload",
r"/projects/{project_id}/vpcs/vms/{vm_id}/reload",
parameters={
"project_id": "UUID for the project",
"vm_id": "UUID for the instance",
@@ -178,7 +178,7 @@ class VPCSHandler:
response.set_status(204)
@Route.post(
r"/{project_id}/vpcs/vms/{vm_id}/ports/{port_number:\d+}/nio",
r"/projects/{project_id}/vpcs/vms/{vm_id}/ports/{port_number:\d+}/nio",
parameters={
"project_id": "UUID for the project",
"vm_id": "UUID for the instance",
@@ -203,7 +203,7 @@ class VPCSHandler:
@classmethod
@Route.delete(
r"/{project_id}/vpcs/vms/{vm_id}/ports/{port_number:\d+}/nio",
r"/projects/{project_id}/vpcs/vms/{vm_id}/ports/{port_number:\d+}/nio",
parameters={
"project_id": "UUID for the project",
"vm_id": "UUID for the instance",
gns3server/main.py
+1
View File
@@ -78,6 +78,7 @@ def parse_arguments():
parser.add_argument("-v", "--version", help="show the version", action="version", version=__version__)
parser.add_argument("--host", help="run on the given host/IP address", default="127.0.0.1")
parser.add_argument("--port", help="run on the given port", type=int, default=8000)
parser.add_argument("--config", help="use this config file", type=str, default=None)
parser.add_argument("--ssl", action="store_true", help="run in SSL mode")
parser.add_argument("--certfile", help="SSL cert file", default="")
parser.add_argument("--certkey", help="SSL key file", default="")