* Added upstream patches:

    - Fix_DummyResource_missing_in_provider_error.patch

Rewritten-From: b9403a493c85bf339e8fb6fa5254a3aa843c4e50

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index c3d8fc1c0c40f3deff9a3bdccb95b2282fd4dca8..d767f0e3a49f7b5eb334a19eb35b4060ec61bb72 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -3,6 +3,8 @@ heat (1:5.0.0~b2-1) experimental; urgency=medium
   * New upstream release.
   * Fixed (build-)depends for this release.
   * Rebased and updated patches.
+  * Added upstream patches:
+    - Fix_DummyResource_missing_in_provider_error.patch
 
  -- Thomas Goirand <zigo@debian.org>  Sun, 02 Aug 2015 11:22:32 +0200
 

diff --git a/xenial/debian/patches/Fix_DummyResource_missing_in_provider_error.patch b/xenial/debian/patches/Fix_DummyResource_missing_in_provider_error.patch
new file mode 100644 (file)
index 0000000..c9eb784
--- /dev/null
+++ b/xenial/debian/patches/Fix_DummyResource_missing_in_provider_error.patch
@@ -0,0 +1,50 @@
+Description: Fix `DummyResource missing in provider` error
+Author: Rabi Mishra <ramishra@redhat.com>
+Date: Wed, 29 Jul 2015 03:33:19 +0000 (+0530)
+X-Git-Url: https://review.openstack.org/gitweb?p=openstack%2Fheat.git;a=commitdiff_plain;h=c6c1cc9e8ad68c431debfa92cdf2d2b9aca53804
+Change-Id: Ie1144702b9a6c008889116b408b4b09c3087d73e
+Bug-Ubuntu: https://bugs.launchpad.net/heat/+bug/1479185
+Origin: upstream, https://review.openstack.org/#/c/206862/
+Last-Update: 2015-08-03
+
+diff --git a/heat/tests/test_provider_template.py b/heat/tests/test_provider_template.py
+index f883c0b..1394750 100644
+--- a/heat/tests/test_provider_template.py
++++ b/heat/tests/test_provider_template.py
+@@ -279,12 +279,19 @@ class ProviderTemplateTest(common.HeatTestCase):
+         provider = {
+             'HeatTemplateFormatVersion': '2012-12-12',
+             'Outputs': {
+-                'Blarg': {'Value': 'wibble'},
++                'Foo': {'Value': 'bar'},
+             },
+         }
+         files = {'test_resource.template': json.dumps(provider)}
+ 
++        class DummyResource(object):
++            support_status = support.SupportStatus()
++            properties_schema = {}
++            attributes_schema = {"Foo": attributes.Schema(
++                "A test attribute")}
++
+         env = environment.Environment()
++        resource._register_class('DummyResource', DummyResource)
+         env.load({'resource_registry':
+                   {'DummyResource': 'test_resource.template'}})
+         stack = parser.Stack(utils.dummy_context(), 'test_stack',
+@@ -298,12 +305,12 @@ class ProviderTemplateTest(common.HeatTestCase):
+                                                       definition, stack)
+         self.assertIsNone(temp_res.validate())
+         nested = mock.Mock()
+-        nested.outputs = {'Blarg': {'Value': 'not-this',
+-                                    'error_msg': 'it is all bad'}}
++        nested.outputs = {'Foo': {'Value': 'not-this',
++                                  'error_msg': 'it is all bad'}}
+         nested.output.return_value = None
+         temp_res._nested = nested
+         self.assertRaises(exception.InvalidTemplateAttribute,
+-                          temp_res.FnGetAtt, 'Blarg')
++                          temp_res.FnGetAtt, 'Foo')
+ 
+     def test_properties_normal(self):
+         provider = {

diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series
index b8ea60012f42277f641ff8ae4d8b0769f30859f7..b5c9cb1449918699ef056b56fdf7619def2d3895 100644 (file)
--- a/xenial/debian/patches/series
+++ b/xenial/debian/patches/series
@@ -1,2 +1,3 @@
 only-run-tests-in-heat.tests.patch
 allow-route-2.0.patch
+Fix_DummyResource_missing_in_provider_error.patch