Correct plugin test location reporting
Commit 6f67e3787338407e637d80a6fad0edb5f9a08b24 changed the
directory structure for the plugin, but the code that reports
where the tests can be found was not fully updated.
This updates the plugin reporting to get the correct directory
for tempest to look in and cleans up a few nits with the file.
Change-Id: Ib89f7a9493e3d83382d8dd1f07a3e9e4bb4fcd80
Closes-bug: #1745175
Sean McGinnis
8 years ago
| 12 | 12 | # License for the specific language governing permissions and limitations |
| 13 | 13 | # under the License. |
| 14 | 14 | |
| 15 | import cinder | |
| 16 | 15 | import os |
| 17 | ||
| 18 | from cinder_tempest_plugin import config as project_config | |
| 19 | 16 | |
| 20 | 17 | from tempest import config |
| 21 | 18 | from tempest.test_discover import plugins |
| 22 | 19 | |
| 20 | from cinder_tempest_plugin import config as project_config | |
| 21 | ||
| 23 | 22 | |
| 24 | 23 | class CinderTempestPlugin(plugins.TempestPlugin): |
| 25 | 24 | def load_tests(self): |
| 25 | """Provides information to load the plugin tests. | |
| 26 | ||
| 27 | :return: A tuple with the first value being the test dir and the | |
| 28 | second being the top level dir. | |
| 29 | """ | |
| 26 | 30 | base_path = os.path.split(os.path.dirname( |
| 27 | os.path.abspath(cinder.__file__)))[0] | |
| 31 | os.path.abspath(__file__)))[0] | |
| 28 | 32 | test_dir = "cinder_tempest_plugin" |
| 29 | 33 | full_test_dir = os.path.join(base_path, test_dir) |
| 30 | 34 | return full_test_dir, base_path |
| 31 | 35 | |
| 32 | 36 | def register_opts(self, conf): |
| 33 | config.register_opt_group( | |
| 34 | conf, config.volume_feature_group, | |
| 35 | project_config.cinder_option | |
| 36 | ) | |
| 37 | """Adds additional configuration options to tempest. | |
| 38 | ||
| 39 | This method will be run for the plugin during the register_opts() | |
| 40 | function in tempest.config | |
| 41 | ||
| 42 | :param conf: The conf object that can be used to register additional | |
| 43 | options. | |
| 44 | """ | |
| 45 | config.register_opt_group(conf, config.volume_feature_group, | |
| 46 | project_config.cinder_option) | |
| 37 | 47 | |
| 38 | 48 | def get_opt_lists(self): |
| 49 | """Get a list of options for sample config generation. | |
| 50 | ||
| 51 | :return: A list of tuples with the group name and options in that | |
| 52 | group. | |
| 53 | """ | |
| 39 | 54 | return [ |
| 40 | (config.volume_feature_group.name, | |
| 41 | project_config.cinder_option), | |
| 55 | (config.volume_feature_group.name, project_config.cinder_option), | |
| 42 | 56 | ] |