Merge pull request #13 from prav-ab/master

Update get_resources json schema
ntt-nflex · Mar 16, 2017 · 3d7f128 · 3d7f128
2 parents d96712d + 87a135e
commit 3d7f128
Showing 1 changed file with 75 additions and 16 deletions.
diff --git a/flexer/validation/get_resources.json b/flexer/validation/get_resources.json
@@ -69,6 +69,30 @@
                     },
                     "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",
@@ -89,21 +113,44 @@
                             "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"
+                                ]
+                            }
+                        },
+                        "type":"object"
+                    },
+                    "saas_user":{
+                        "properties":{
+                            "avatar_url":{
+                                "type":[
+                                    "string",
+                                    "null"
+                                ]
+                            },
+                            "size_b":{
+                                "type":[
+                                    "number",
+                                    "null"
+                                ]
+                            },
+                            "used_b":{
+                                "type":[
+                                    "number",
                                     "null"
                                 ]
                             }
@@ -118,9 +165,9 @@
                                     "null"
                                 ]
                             },
-                            "cpu_mhz":{
+                            "cpu_hz":{
                                 "type":[
-                                    "integer",
+                                    "number",
                                     "null"
                                 ]
                             },
@@ -219,9 +266,9 @@
                                     "null"
                                 ]
                             },
-                            "ram_mb":{
+                            "ram_b":{
                                 "type":[
-                                    "integer",
+                                    "number",
                                     "null"
                                 ]
                             },
@@ -231,9 +278,20 @@
                                     "null"
                                 ]
                             },
-                            "volumes_mb":{
+                            "volumes_b":{
                                 "type":[
-                                    "integer",
+                                    "number",
+                                    "null"
+                                ]
+                            }
+                        },
+                        "type":"object"
+                    },
+                    "service_offering":{
+                        "properties":{
+                            "type_id":{
+                                "type":[
+                                    "string",
                                     "null"
                                 ]
                             }
@@ -248,9 +306,9 @@
                                     "null"
                                 ]
                             },
-                            "size_mb":{
+                            "size_b":{
                                 "type":[
-                                    "integer",
+                                    "number",
                                     "null"
                                 ]
                             },
@@ -281,7 +339,8 @@
                     "resource",
                     "server",
                     "volume",
-                    "service_offering"
+                    "service_offering",
+                    "saas_user"
                 ],
                 "type":"string"
             }
@@ -294,4 +353,4 @@
         "type":"object"
     },
     "type":"array"
-}
+}