Return command_line and node_directory via the controller

This commit is contained in:
Julien Duponchelle committed 2016-05-12 10:39:50 +02:00
1 parent 885a870ae8
commit 5280644327
167 files changed
+5280 -33

No files matched your search

+2 -2
View File
@@ -229,13 +229,13 @@ DOCKER_OBJECT_SCHEMA = {
"type": ["string", "null"],
"minLength": 0,
},
"vm_directory": {
"node_directory": {
"decription": "Path to the VM working directory",
"type": "string"
}
},
"additionalProperties": False,
"required": ["node_id", "project_id", "image", "container_id", "adapters", "aux", "console", "console_type", "console_resolution", "start_command", "environment", "vm_directory"]
"required": ["node_id", "project_id", "image", "container_id", "adapters", "aux", "console", "console_type", "console_resolution", "start_command", "environment", "node_directory"]
}
+1 -1
View File
@@ -516,7 +516,7 @@ VM_OBJECT_SCHEMA = {
"maxLength": 36,
"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
},
"vm_directory": {
"node_directory": {
"decription": "Path to the vm working directory",
"type": "string"
},
+1 -1
View File
@@ -194,7 +194,7 @@ IOU_OBJECT_SCHEMA = {
"maxLength": 36,
"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
},
"vm_directory": {
"node_directory": {
"decription": "Path to the VM working directory",
"type": "string"
},
+8
View File
@@ -87,6 +87,14 @@ NODE_OBJECT_SCHEMA = {
"description": "Type of node",
"enum": ["docker", "dynamips", "vpcs", "virtualbox", "vmware", "iou", "qemu"]
},
"node_directory": {
"description": "Working directory of the node. Read only",
"type": ["null", "string"]
},
"command_line": {
"description": "Command line use to start the node",
"type": ["null", "string"]
},
"name": {
"description": "Node name",
"type": "string",
+2 -2
View File
@@ -470,7 +470,7 @@ QEMU_OBJECT_SCHEMA = {
"description": "QEMU boot priority",
"enum": ["c", "d", "n", "cn", "cd"]
},
"vm_directory": {
"node_directory": {
"decription": "Path to the VM working directory",
"type": "string"
},
@@ -602,7 +602,7 @@ QEMU_OBJECT_SCHEMA = {
"cpu_throttling",
"process_priority",
"options",
"vm_directory",
"node_directory",
"command_line"]
}
+2 -2
View File
@@ -177,7 +177,7 @@ VBOX_OBJECT_SCHEMA = {
"type": "string",
"minLength": 1,
},
"vm_directory": {
"node_directory": {
"decription": "Path to the VM working directory",
"type": ["string", "null"]
},
@@ -222,5 +222,5 @@ VBOX_OBJECT_SCHEMA = {
},
},
"additionalProperties": False,
"required": ["name", "node_id", "project_id", "vm_directory"]
"required": ["name", "node_id", "project_id", "node_directory"]
}
+1 -1
View File
@@ -158,7 +158,7 @@ VMWARE_OBJECT_SCHEMA = {
"maxLength": 36,
"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
},
"vm_directory": {
"node_directory": {
"decription": "Path to the VM working directory",
"type": ["string", "null"]
},
+1 -1
View File
@@ -104,7 +104,7 @@ VPCS_OBJECT_SCHEMA = {
"maxLength": 36,
"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
},
"vm_directory": {
"node_directory": {
"decription": "Path to the VM working directory",
"type": "string"
},