First step towards the cloud node re-factoring.

This commit is contained in:
grossmj committed 2016-05-22 19:24:14 -06:00
1 parent 6d5085910c
commit 7d055968e5
8 files changed
+468 -10

No files matched your search

+133
View File
@@ -0,0 +1,133 @@
# -*- coding: utf-8 -*-
#
# Copyright (C) 2016 GNS3 Technologies Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
CLOUD_CREATE_SCHEMA = {
"$schema": "http://json-schema.org/draft-04/schema#",
"description": "Request validation to create a new cloud instance",
"type": "object",
"definitions": {
"EthernetHubPort": {
"description": "Ethernet port",
"properties": {
"name": {
"description": "Port name",
"type": "string",
"minLength": 1,
},
"port_number": {
"description": "Port number",
"type": "integer",
"minimum": 1
},
},
"required": ["name", "port_number"],
"additionalProperties": False
},
},
"properties": {
"name": {
"description": "Cloud name",
"type": "string",
"minLength": 1,
},
"node_id": {
"description": "Node UUID",
"oneOf": [
{"type": "string",
"minLength": 36,
"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}$"}
]
},
# "ports": {
# "type": "array",
# "items": [
# {"type": "object",
# "oneOf": [
# {"$ref": "#/definitions/EthernetHubPort"}
# ]},
# ]
# },
},
"additionalProperties": False,
"required": ["name"]
}
CLOUD_OBJECT_SCHEMA = {
"$schema": "http://json-schema.org/draft-04/schema#",
"description": "Cloud instance",
"type": "object",
"definitions": {
"EthernetHubPort": {
"description": "Ethernet port",
"properties": {
"name": {
"description": "Port name",
"type": "string",
"minLength": 1,
},
"port_number": {
"description": "Port number",
"type": "integer",
"minimum": 1
},
},
"required": ["name", "port_number"],
"additionalProperties": False
},
},
"properties": {
"name": {
"description": "Cloud name",
"type": "string",
"minLength": 1,
},
"node_id": {
"description": "Node UUID",
"type": "string",
"minLength": 36,
"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}$"
},
"project_id": {
"description": "Project UUID",
"type": "string",
"minLength": 36,
"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}$"
},
# "ports": {
# "type": "array",
# "items": [
# {"type": "object",
# "oneOf": [
# {"$ref": "#/definitions/EthernetHubPort"}
# ]},
# ]
# },
"status": {
"description": "Node status",
"enum": ["started", "stopped", "suspended"]
},
},
"additionalProperties": False,
"required": ["name", "node_id", "project_id"] #, "ports"]
}
CLOUD_UPDATE_SCHEMA = CLOUD_OBJECT_SCHEMA
del CLOUD_UPDATE_SCHEMA["required"]
+2 -1
View File
@@ -88,7 +88,8 @@ NODE_OBJECT_SCHEMA = {
},
"node_type": {
"description": "Type of node",
"enum": ["ethernet_hub",
"enum": ["cloud",
"ethernet_hub",
"ethernet_switch",
"frame_relay_switch",
"atm_switch",