From 32d27c607653f02e20f3d869602ceb1cded7986c Mon Sep 17 00:00:00 2001 From: prav-ab Date: Fri, 10 Mar 2017 15:26:18 +0000 Subject: [PATCH 1/3] Update get_resources json schema validation --- flexer/validation/get_resources.json | 73 ++++++++++++++++++++++------ 1 file changed, 58 insertions(+), 15 deletions(-) diff --git a/flexer/validation/get_resources.json b/flexer/validation/get_resources.json index 3e2b997..573ed83 100644 --- a/flexer/validation/get_resources.json +++ b/flexer/validation/get_resources.json @@ -67,26 +67,67 @@ ], "type":"object" }, + "colo_space":{ + "properties":{ + "colo_space_location":{ + "type":[ + "string", + "null" + ] + }, + "combination":{ + "type":[ + "string", + "null" + ] + }, + "customer_description":{ + "type":[ + "string", + "null" + ] + }, + "customer_label":{ + "type":[ + "string", + "null" + ] + }, + "power_allocation_w":{ + "type":[ + "integer", + "null" + ] + }, + "type_id":{ + "type":[ + "string", + "null" + ] + } + }, + "type":"object" + }, "compute_pool":{ "properties":{ "billing_tag":{ "type":"string" }, - "cpu_mhz":{ + "cpu_hz":{ "type":[ - "integer", + "number", "null" ] }, - "memory_mb":{ + "memory_b":{ "type":[ - "integer", + "number", "null" ] }, - "storage_mb":{ + "storage_b":{ "type":[ - "integer", + "number", "null" ] } @@ -101,9 +142,9 @@ "null" ] }, - "cpu_mhz":{ + "cpu_hz":{ "type":[ - "integer", + "number", "null" ] }, @@ -202,9 +243,9 @@ "null" ] }, - "ram_mb":{ + "ram_b":{ "type":[ - "integer", + "number", "null" ] }, @@ -214,9 +255,9 @@ "null" ] }, - "volumes_mb":{ + "volumes_b":{ "type":[ - "integer", + "number", "null" ] } @@ -231,9 +272,9 @@ "null" ] }, - "size_mb":{ + "size_b":{ "type":[ - "integer", + "number", "null" ] }, @@ -259,11 +300,13 @@ "enum":[ "appliance", "compute_pool", + "colo_space", "network", "resource", "server", "volume", - "service_offering" + "service_offering", + "saas_user" ], "type":"string" } From d98348348c56cfd950d3b4153d576753529939e5 Mon Sep 17 00:00:00 2001 From: prav-ab Date: Tue, 14 Mar 2017 08:45:26 +0000 Subject: [PATCH 2/3] Update get_resources.json --- flexer/validation/get_resources.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/flexer/validation/get_resources.json b/flexer/validation/get_resources.json index 3065f31..a4ee9c0 100644 --- a/flexer/validation/get_resources.json +++ b/flexer/validation/get_resources.json @@ -134,6 +134,17 @@ }, "type":"object" }, + "saas_user":{ + "properties":{ + "avatar_url":{ + "type":[ + "string", + "null" + ] + } + }, + "type":"object" + }, "server":{ "properties":{ "cpu_cores":{ @@ -319,4 +330,4 @@ "type":"object" }, "type":"array" -} \ No newline at end of file +} From 87a135e334bb9a3fe44b1fcd8016db6a2697a6e0 Mon Sep 17 00:00:00 2001 From: prav-ab Date: Thu, 16 Mar 2017 13:31:18 +0000 Subject: [PATCH 3/3] Update get_resources.json --- flexer/validation/get_resources.json | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/flexer/validation/get_resources.json b/flexer/validation/get_resources.json index a4ee9c0..acb437d 100644 --- a/flexer/validation/get_resources.json +++ b/flexer/validation/get_resources.json @@ -141,6 +141,18 @@ "string", "null" ] + }, + "size_b":{ + "type":[ + "number", + "null" + ] + }, + "used_b":{ + "type":[ + "number", + "null" + ] } }, "type":"object" @@ -275,6 +287,17 @@ }, "type":"object" }, + "service_offering":{ + "properties":{ + "type_id":{ + "type":[ + "string", + "null" + ] + } + }, + "type":"object" + }, "volume":{ "properties":{ "iops":{