commit ebdc9d33761677cf1df6e2e3be440f7add5c1aae
author Jenkins <jenkins@review.openstack.org> Tue Dec 02 06:17:42 2014 +0000
committer Gerrit Code Review <review@openstack.org> Tue Dec 02 06:17:42 2014 +0000
tree aab05659e2809227c2e7341ab4703756a3c0639c
parent bcb3a82148fb5e37cbba594d014b8ce71adbf3af
parent 8d356799367fda79b4fbc6a3bb290bf6a4bbb021

Merge "Expand service validation to work for Nova cells"

tempest/api_schema/response/compute/services.py

diff --git a/tempest/api_schema/response/compute/services.py b/tempest/api_schema/response/compute/services.py
index fc42b89..6f361ef 100644
--- a/tempest/api_schema/response/compute/services.py
+++ b/tempest/api_schema/response/compute/services.py
@@ -22,7 +22,8 @@
                 'items': {
                     'type': 'object',
                     'properties': {
-                        'id': {'type': 'integer'},
+                        'id': {'type': ['integer', 'string'],
+                               'pattern': '^[a-zA-Z!]*@[0-9]+$'},
                         'zone': {'type': 'string'},
                         'host': {'type': 'string'},
                         'state': {'type': 'string'},