Merge "Include support status in resource schema"

This commit is contained in:
Jenkins 2015-06-03 01:09:18 +00:00 committed by Gerrit Code Review
commit 7ebef029c6
4 changed files with 19 additions and 1 deletions

View File

@ -1054,6 +1054,8 @@ class EngineService(service.Service):
rpc_api.RES_SCHEMA_RES_TYPE: type_name,
rpc_api.RES_SCHEMA_PROPERTIES: dict(properties_schema()),
rpc_api.RES_SCHEMA_ATTRIBUTES: dict(attributes_schema()),
rpc_api.RES_SCHEMA_SUPPORT_STATUS:
resource_class.support_status.to_dict(),
}
def generate_template(self, cnxt, type_name, template_type='cfn'):

View File

@ -76,8 +76,9 @@ RES_KEYS = (
RES_SCHEMA_KEYS = (
RES_SCHEMA_RES_TYPE, RES_SCHEMA_PROPERTIES, RES_SCHEMA_ATTRIBUTES,
RES_SCHEMA_SUPPORT_STATUS,
) = (
RES_TYPE, 'properties', 'attributes',
RES_TYPE, 'properties', 'attributes', 'support_status'
)
EVENT_KEYS = (

View File

@ -2036,6 +2036,11 @@ class StackControllerTest(ControllerTest, common.HeatTestCase):
'foo': {'description': 'A generic attribute'},
'Foo': {'description': 'Another generic attribute'},
},
'support_status': {
'status': 'SUPPORTED',
'version': None,
'message': None,
},
}
self.m.StubOutWithMock(rpc_client.EngineClient, 'call')
rpc_client.EngineClient.call(

View File

@ -2328,6 +2328,11 @@ class StackServiceTest(common.HeatTestCase):
'foo': {'description': 'A generic attribute'},
'Foo': {'description': 'Another generic attribute'},
},
'support_status': {
'status': 'SUPPORTED',
'version': None,
'message': None,
},
}
schema = self.eng.resource_schema(self.ctx, type_name=type_name)
@ -2347,6 +2352,11 @@ class StackServiceTest(common.HeatTestCase):
'attr2': {'description': 'Another generic attribute',
'type': 'map'},
},
'support_status': {
'status': 'SUPPORTED',
'version': None,
'message': None,
},
}
schema = self.eng.resource_schema(self.ctx, type_name=type_name)
self.assertEqual(expected, schema)