summaryrefslogtreecommitdiff
path: root/heat
diff options
context:
space:
mode:
authorPeter Razumovsky <prazumovsky@mirantis.com>2015-08-13 19:33:18 +0300
committerPeter Razumovsky <prazumovsky@mirantis.com>2015-08-14 12:00:28 +0300
commit361f5acb3a1cedae7a31ba1069fd9fc0658d1d37 (patch)
treee4ed5c487777759814e62538ea4a24804368b64e /heat
parent9f8e1e971d0d28d8bb9e4a77bce002f3b97b3bbe (diff)
downloadheat-361f5acb3a1cedae7a31ba1069fd9fc0658d1d37.tar.gz
Add base_attributes_schema to documentation
Currently base_attributes_schema omitted in docs, so there's no chance to learn about base attributes. This patch adds base_attributes_schema to docs and fixes description of "show" base attribute. Change-Id: Id382e39401d368367f1813e7f9e4508d4dffef72 Closes-bug: #1484142
Diffstat (limited to 'heat')
-rw-r--r--heat/engine/resource.py2
-rw-r--r--heat/tests/engine/test_resource_type.py4
-rw-r--r--heat/tests/test_resource.py4
3 files changed, 5 insertions, 5 deletions
diff --git a/heat/engine/resource.py b/heat/engine/resource.py
index c905a4d56..64f4f8d5e 100644
--- a/heat/engine/resource.py
+++ b/heat/engine/resource.py
@@ -130,7 +130,7 @@ class Resource(object):
# resources
base_attributes_schema = {
SHOW: attributes.Schema(
- _("Dictionary with resource attributes."),
+ _("Detailed information about resource."),
type=attributes.Schema.MAP
)
}
diff --git a/heat/tests/engine/test_resource_type.py b/heat/tests/engine/test_resource_type.py
index 4765cfb58..bcd610278 100644
--- a/heat/tests/engine/test_resource_type.py
+++ b/heat/tests/engine/test_resource_type.py
@@ -87,7 +87,7 @@ class ResourceTypeTest(common.HeatTestCase):
'foo': {'description': 'A generic attribute'},
'Foo': {'description': 'Another generic attribute'},
'show': {
- 'description': 'Dictionary with resource attributes.',
+ 'description': 'Detailed information about resource.',
'type': 'map'},
},
'support_status': {
@@ -113,7 +113,7 @@ class ResourceTypeTest(common.HeatTestCase):
'attr2': {'description': 'Another generic attribute',
'type': 'map'},
'show': {
- 'description': 'Dictionary with resource attributes.',
+ 'description': 'Detailed information about resource.',
'type': 'map'},
},
'support_status': {
diff --git a/heat/tests/test_resource.py b/heat/tests/test_resource.py
index a56cdf8ed..c8bb76b58 100644
--- a/heat/tests/test_resource.py
+++ b/heat/tests/test_resource.py
@@ -1156,7 +1156,7 @@ class ResourceTest(common.HeatTestCase):
'Value': '{"Fn::GetAtt": ["TestResource", "output2"]}'
},
'show': {
- 'Description': u'Dictionary with resource attributes.',
+ 'Description': u'Detailed information about resource.',
'Value': '{"Fn::GetAtt": ["TestResource", "show"]}'
}
}
@@ -1239,7 +1239,7 @@ class ResourceTest(common.HeatTestCase):
'value': '{"get_attr": ["TestResource", "output2"]}'
},
'show': {
- 'description': u'Dictionary with resource attributes.',
+ 'description': u'Detailed information about resource.',
'value': '{"get_attr": ["TestResource", "show"]}'
}
}