NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-04 22:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1' into 2.2

Browse Source 
# Conflicts:
#	gns3server/compute/iou/iou_vm.py
#	gns3server/compute/virtualbox/virtualbox_vm.py
#	gns3server/compute/vmware/vmware_vm.py
This commit is contained in:
grossmj committed 2018-04-18 17:08:42 +08:00
2 parents ee5317948b 9ecb058343
commit 2ea0aa5ded
29 files changed
+291 -89
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gns3server/schemas/project.py
+12
View File
@@ -66,6 +66,10 @@ PROJECT_CREATE_SCHEMA = {
"type": "boolean",
"description": "Show the grid on the drawing area"
},
"grid_size": {
"type": "integer",
"description": "Grid size for the drawing area"
},
"show_interface_labels": {
"type": "boolean",
"description": "Show interface labels on the drawing area"
@@ -125,6 +129,10 @@ PROJECT_UPDATE_SCHEMA = {
"type": "boolean",
"description": "Show the grid on the drawing area"
},
"grid_size": {
"type": "integer",
"description": "Grid size for the drawing area"
},
"show_interface_labels": {
"type": "boolean",
"description": "Show interface labels on the drawing area"
@@ -200,6 +208,10 @@ PROJECT_OBJECT_SCHEMA = {
"type": "boolean",
"description": "Show the grid on the drawing area"
},
"grid_size": {
"type": "integer",
"description": "Grid size for the drawing area"
},
"show_interface_labels": {
"type": "boolean",
"description": "Show interface labels on the drawing area"
gns3server/schemas/topology.py
+4
View File
@@ -89,6 +89,10 @@ TOPOLOGY_SCHEMA = {
"type": "boolean",
"description": "Show the grid on the drawing area"
},
"grid_size": {
"type": "integer",
"description": "Grid size for the drawing area"
},
"show_interface_labels": {
"type": "boolean",
"description": "Show interface labels on the drawing area"
gns3server/schemas/traceng.py
+13 -2
View File
@@ -48,6 +48,10 @@ TRACENG_CREATE_SCHEMA = {
"ip_address": {
"description": "Source IP address for tracing",
"type": ["string"]
},
"default_destination": {
"description": "Default destination IP address or hostname for tracing",
"type": ["string"]
}
},
"additionalProperties": False,
@@ -77,6 +81,10 @@ TRACENG_UPDATE_SCHEMA = {
"ip_address": {
"description": "Source IP address for tracing",
"type": ["string"]
},
"default_destination": {
"description": "Default destination IP address or hostname for tracing",
"type": ["string"]
}
},
"additionalProperties": False,
@@ -92,7 +100,6 @@ TRACENG_START_SCHEMA = {
"type": ["string"]
}
},
"required": ["destination"],
}
TRACENG_OBJECT_SCHEMA = {
@@ -144,8 +151,12 @@ TRACENG_OBJECT_SCHEMA = {
"ip_address": {
"description": "Source IP address for tracing",
"type": ["string"]
},
"default_destination": {
"description": "Default destination IP address or hostname for tracing",
"type": ["string"]
}
},
"additionalProperties": False,
"required": ["name", "node_id", "status", "console", "console_type", "project_id", "command_line", "ip_address"]
"required": ["name", "node_id", "status", "console", "console_type", "project_id", "command_line", "ip_address", "default_destination"]
}