commit 6725b351a3113c4f03cafc0cb8d4abab30e6cf6d
author Jenkins <jenkins@review.openstack.org> Tue Feb 24 11:26:18 2015 +0000
committer Gerrit Code Review <review@openstack.org> Tue Feb 24 11:26:18 2015 +0000
tree 33587339cf4fd7e2b4654472efb585bd5d3b9ad1
parent a84770cf54d22f7900a1f6796f55c5e55b83105d
parent f8eb01a45ae5099ce2f53451d3e133d492cb5b69

Merge "Fix compute baremetal_nodes API schema"

tempest/api_schema/response/compute/baremetal_nodes.py

diff --git a/tempest/api_schema/response/compute/baremetal_nodes.py b/tempest/api_schema/response/compute/baremetal_nodes.py
index 2f67d37..e82792c 100644
--- a/tempest/api_schema/response/compute/baremetal_nodes.py
+++ b/tempest/api_schema/response/compute/baremetal_nodes.py
@@ -19,9 +19,9 @@
         'interfaces': {'type': 'array'},
         'host': {'type': 'string'},
         'task_state': {'type': ['string', 'null']},
-        'cpus': {'type': 'integer'},
-        'memory_mb': {'type': 'integer'},
-        'disk_gb': {'type': 'integer'},
+        'cpus': {'type': ['integer', 'string']},
+        'memory_mb': {'type': ['integer', 'string']},
+        'disk_gb': {'type': ['integer', 'string']},
     },
     'required': ['id', 'interfaces', 'host', 'task_state', 'cpus', 'memory_mb',
                  'disk_gb']