From 0146734e7e4ba1aac3b156d13f25f707eb15d084 Mon Sep 17 00:00:00 2001
From: tengqm <tengqim@cn.ibm.com>
Date: Tue, 2 Aug 2016 05:32:29 -0400
Subject: [PATCH] Fix to_json_schema() call

The to_json_schema() method now has the 'required_fields' incorrectly
placed outside of the 'data_key' dict. This patch moves it inside that
dict.

Change-Id: Id50a75bc27198576b615c4e76c046a53008d20bc
Closes-Bug: #1608870
---
 oslo_versionedobjects/base.py               | 4 ++--
 oslo_versionedobjects/tests/test_objects.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/oslo_versionedobjects/base.py b/oslo_versionedobjects/base.py
index d8ded83..b952619 100644
--- a/oslo_versionedobjects/base.py
+++ b/oslo_versionedobjects/base.py
@@ -360,9 +360,9 @@ class VersionedObject(object):
                 data_key: {
                     'type': 'object',
                     'description': 'fields of %s' % (obj_name),
-                    'properties': field_schemas
+                    'properties': field_schemas,
+                    'required': required_fields
                 },
-                'required': required_fields
             },
             'required': [namespace_key, name_key, version_key, data_key]
         }
diff --git a/oslo_versionedobjects/tests/test_objects.py b/oslo_versionedobjects/tests/test_objects.py
index 9a4ea3c..c800bfb 100644
--- a/oslo_versionedobjects/tests/test_objects.py
+++ b/oslo_versionedobjects/tests/test_objects.py
@@ -2094,8 +2094,8 @@ class TestSchemaGeneration(test.TestCase):
                         'foo': {'type': ['fake']},
                         'bar': {'type': ['fake', 'null']}
                     },
+                    'required': ['bar', 'foo'],
                 },
-                'required': ['bar', 'foo']
             },
             'required': ['versioned_object.namespace', 'versioned_object.name',
                          'versioned_object.version', 'versioned_object.data']