From a7e7c73a9dc9664db9ff99a8dbf760984110f948 Mon Sep 17 00:00:00 2001 From: Yikun Jiang Date: Fri, 14 Sep 2018 11:22:02 +0800 Subject: [PATCH] Rename changes-since test sample file In the past, we only have changes-since filter, we called it as timestamp-filter, but now we will add a changes-before filter, the timestamp-filter is not clear anymore. In this patch, we rename timestamp to changes-since. Change-Id: Ieee912e197d17a5ffca7460f3b977316cd21813e blueprint: support-to-query-nova-resources-filter-by-changes-before --- ...ter.json => instance-actions-list-with-changes-since.json} | 0 ...ter.json => instance-actions-list-with-changes-since.json} | 0 ...amp-filter.json => migrations-get-with-changes-since.json} | 0 ....tpl => instance-actions-list-with-changes-since.json.tpl} | 0 ....tpl => instance-actions-list-with-changes-since.json.tpl} | 0 ...er.json.tpl => migrations-get-with-changes-since.json.tpl} | 0 .../functional/api_sample_tests/test_instance_actions.py | 4 ++-- nova/tests/functional/api_sample_tests/test_migrations.py | 4 ++-- 8 files changed, 4 insertions(+), 4 deletions(-) rename doc/api_samples/os-instance-actions/v2.58/{instance-actions-list-with-timestamp-filter.json => instance-actions-list-with-changes-since.json} (100%) rename doc/api_samples/os-instance-actions/v2.62/{instance-actions-list-with-timestamp-filter.json => instance-actions-list-with-changes-since.json} (100%) rename doc/api_samples/os-migrations/v2.59/{migrations-get-with-timestamp-filter.json => migrations-get-with-changes-since.json} (100%) rename nova/tests/functional/api_sample_tests/api_samples/os-instance-actions/v2.58/{instance-actions-list-with-timestamp-filter.json.tpl => instance-actions-list-with-changes-since.json.tpl} (100%) rename nova/tests/functional/api_sample_tests/api_samples/os-instance-actions/v2.62/{instance-actions-list-with-timestamp-filter.json.tpl => instance-actions-list-with-changes-since.json.tpl} (100%) rename nova/tests/functional/api_sample_tests/api_samples/os-migrations/v2.59/{migrations-get-with-timestamp-filter.json.tpl => migrations-get-with-changes-since.json.tpl} (100%) diff --git a/doc/api_samples/os-instance-actions/v2.58/instance-actions-list-with-timestamp-filter.json b/doc/api_samples/os-instance-actions/v2.58/instance-actions-list-with-changes-since.json similarity index 100% rename from doc/api_samples/os-instance-actions/v2.58/instance-actions-list-with-timestamp-filter.json rename to doc/api_samples/os-instance-actions/v2.58/instance-actions-list-with-changes-since.json diff --git a/doc/api_samples/os-instance-actions/v2.62/instance-actions-list-with-timestamp-filter.json b/doc/api_samples/os-instance-actions/v2.62/instance-actions-list-with-changes-since.json similarity index 100% rename from doc/api_samples/os-instance-actions/v2.62/instance-actions-list-with-timestamp-filter.json rename to doc/api_samples/os-instance-actions/v2.62/instance-actions-list-with-changes-since.json diff --git a/doc/api_samples/os-migrations/v2.59/migrations-get-with-timestamp-filter.json b/doc/api_samples/os-migrations/v2.59/migrations-get-with-changes-since.json similarity index 100% rename from doc/api_samples/os-migrations/v2.59/migrations-get-with-timestamp-filter.json rename to doc/api_samples/os-migrations/v2.59/migrations-get-with-changes-since.json diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-instance-actions/v2.58/instance-actions-list-with-timestamp-filter.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-instance-actions/v2.58/instance-actions-list-with-changes-since.json.tpl similarity index 100% rename from nova/tests/functional/api_sample_tests/api_samples/os-instance-actions/v2.58/instance-actions-list-with-timestamp-filter.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-instance-actions/v2.58/instance-actions-list-with-changes-since.json.tpl diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-instance-actions/v2.62/instance-actions-list-with-timestamp-filter.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-instance-actions/v2.62/instance-actions-list-with-changes-since.json.tpl similarity index 100% rename from nova/tests/functional/api_sample_tests/api_samples/os-instance-actions/v2.62/instance-actions-list-with-timestamp-filter.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-instance-actions/v2.62/instance-actions-list-with-changes-since.json.tpl diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-migrations/v2.59/migrations-get-with-timestamp-filter.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-migrations/v2.59/migrations-get-with-changes-since.json.tpl similarity index 100% rename from nova/tests/functional/api_sample_tests/api_samples/os-migrations/v2.59/migrations-get-with-timestamp-filter.json.tpl rename to nova/tests/functional/api_sample_tests/api_samples/os-migrations/v2.59/migrations-get-with-changes-since.json.tpl diff --git a/nova/tests/functional/api_sample_tests/test_instance_actions.py b/nova/tests/functional/api_sample_tests/test_instance_actions.py index 44b6c44be9..596a45288e 100644 --- a/nova/tests/functional/api_sample_tests/test_instance_actions.py +++ b/nova/tests/functional/api_sample_tests/test_instance_actions.py @@ -110,13 +110,13 @@ class ServerActionsV258SampleJsonTest(ServerActionsV251AdminSampleJsonTest): self._verify_response('instance-actions-list-with-marker-resp', self._get_subs(), response, 200) - def test_instance_actions_with_timestamp_filter(self): + def test_instance_actions_with_changes_since(self): stop_action_time = self.action_stop['start_time'] response = self._do_get( 'servers/%s/os-instance-actions' '?changes-since=%s' % (self.uuid, stop_action_time)) self._verify_response( - 'instance-actions-list-with-timestamp-filter', + 'instance-actions-list-with-changes-since', self._get_subs(), response, 200) diff --git a/nova/tests/functional/api_sample_tests/test_migrations.py b/nova/tests/functional/api_sample_tests/test_migrations.py index fc2af631fa..d860ffa37c 100644 --- a/nova/tests/functional/api_sample_tests/test_migrations.py +++ b/nova/tests/functional/api_sample_tests/test_migrations.py @@ -285,10 +285,10 @@ class MigrationsSamplesJsonTestV2_59(MigrationsSamplesJsonTestV2_23): {"instance_1": INSTANCE_UUID_1, "instance_2": INSTANCE_UUID_2}, response, 200) - def test_get_migrations_with_timestamp_filter(self): + def test_get_migrations_with_changes_since(self): response = self._do_get( 'os-migrations?changes-since=2016-06-23T13:42:01.000000') self.assertEqual(200, response.status_code) self._verify_response( - 'migrations-get-with-timestamp-filter', + 'migrations-get-with-changes-since', {"instance_2": INSTANCE_UUID_2}, response, 200)