openstack/nova
Code Issues Proposed changes

Revert "functional: Grab the service version from the module"

Browse Source 
This reverts commit d411d60587.

The point of doc/*samples* is they are static files, not
dynamic. We shouldn't be doing substitution here, this
breaks all kinds of things, including the doc target.

Change-Id: Iaaf9fa0096ab62e6d3efbe018d8d4853a2ff8cda
Closes-Bug: #1553634
This commit is contained in:
Sean Dague 2016-03-07 17:44:41 +00:00
parent d411d60587
commit 235e0b04ea
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/notification_samples/service-update.json
View File

@ -13,7 +13,7 @@
"disabled_reason": null,
"report_count": 1,
"forced_down": false,
"version": %(current_service_version)s
"version": 9
}
},
"event_type": "service.update",

3
nova/tests/functional/notification_sample_tests/notification_sample_base.py
View File

@ -16,7 +16,6 @@ import os
from oslo_serialization import jsonutils
from nova.objects import service as service_obj
from nova import test
from nova.tests import fixtures as nova_fixtures
from nova.tests.unit import fake_notifier
@ -86,8 +85,6 @@ class NotificationSampleTestBase(test.TestCase):
with open(self._get_notification_sample(sample_file_name)) as sample:
sample_data = sample.read()
sample_data = sample_data % {
"current_service_version": service_obj.SERVICE_VERSION}
sample_obj = jsonutils.loads(sample_data)
self._apply_replacements(replacements, sample_obj)