diff --git a/doc/notification_samples/service-update.json b/doc/notification_samples/service-update.json index f1e7e0bd9e..78380d79f9 100644 --- a/doc/notification_samples/service-update.json +++ b/doc/notification_samples/service-update.json @@ -13,7 +13,7 @@ "disabled_reason": null, "report_count": 1, "forced_down": false, - "version": 8 + "version": %(current_service_version)s } }, "event_type": "service.update", diff --git a/nova/tests/functional/notification_sample_tests/notification_sample_base.py b/nova/tests/functional/notification_sample_tests/notification_sample_base.py index 56724e4fee..df4cf5bdf8 100644 --- a/nova/tests/functional/notification_sample_tests/notification_sample_base.py +++ b/nova/tests/functional/notification_sample_tests/notification_sample_base.py @@ -16,6 +16,7 @@ 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 @@ -85,6 +86,8 @@ 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)