From dd9ea3eaf857f6790821ea4227447e43955c0fb4 Mon Sep 17 00:00:00 2001 From: Yuiko Takada Date: Tue, 17 Nov 2015 11:30:11 +0900 Subject: [PATCH] Distinguish project name and repo name Currently, initials of project names are written with a lower case. This patch set distinguishes project name of which initials are written with a capital case, and repo name of which initials are written with a lower case. e.g.) Nova project name: Nova repo name: nova Change-Id: I3899c06e970946d219c81638e089148ae0d7eb3b --- README.rst | 2 +- cookiecutter.json | 3 ++- .../README.rst | 0 .../__init__.py | 0 .../config.py | 0 .../plugin.py | 4 ++-- .../services/__init__.py | 0 .../tests/__init__.py | 0 .../tests/api/__init__.py | 0 .../tests/scenario/__init__.py | 0 10 files changed, 5 insertions(+), 4 deletions(-) rename {{cookiecutter.repo_name}}/{{{cookiecutter.project}}_tempest_plugin => {{cookiecutter.repo_name}}_tempest_plugin}/README.rst (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.project}}_tempest_plugin => {{cookiecutter.repo_name}}_tempest_plugin}/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.project}}_tempest_plugin => {{cookiecutter.repo_name}}_tempest_plugin}/config.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.project}}_tempest_plugin => {{cookiecutter.repo_name}}_tempest_plugin}/plugin.py (87%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.project}}_tempest_plugin => {{cookiecutter.repo_name}}_tempest_plugin}/services/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.project}}_tempest_plugin => {{cookiecutter.repo_name}}_tempest_plugin}/tests/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.project}}_tempest_plugin => {{cookiecutter.repo_name}}_tempest_plugin}/tests/api/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.project}}_tempest_plugin => {{cookiecutter.repo_name}}_tempest_plugin}/tests/scenario/__init__.py (100%) diff --git a/README.rst b/README.rst index 9b0e384..ae15a6e 100644 --- a/README.rst +++ b/README.rst @@ -17,4 +17,4 @@ To use, `cd` into the project directory then run:: cookiecutter https://git.openstack.org/openstack/tempest-plugin-cookiecutter.git -You will be prompted for the name/class of the tempest plugin to create. +You will be prompted for the project name/repository name/class of the tempest plugin to create. diff --git a/cookiecutter.json b/cookiecutter.json index 86cf323..e187819 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -1,4 +1,5 @@ { - "project": "sample", + "project": "Sample", + "repo_name": "sample", "testclass": "SampleTempestPlugin" } diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/README.rst b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/README.rst similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/README.rst rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/README.rst diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/config.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/config.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/config.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/config.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/plugin.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/plugin.py similarity index 87% rename from {{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/plugin.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/plugin.py index f66a7e9..073472d 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/plugin.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/plugin.py @@ -19,14 +19,14 @@ import os from tempest import config from tempest.test_discover import plugins -from {{cookiecutter.project}}_tempest_plugin import config as project_config +from {{cookiecutter.repo_name}}_tempest_plugin import config as project_config class {{cookiecutter.testclass}}(plugins.TempestPlugin): def load_tests(self): base_path = os.path.split(os.path.dirname( os.path.abspath(__file__)))[0] - test_dir = "{{cookiecutter.project}}_tempest_plugin/tests" + test_dir = "{{cookiecutter.repo_name}}_tempest_plugin/tests" full_test_dir = os.path.join(base_path, test_dir) return full_test_dir, base_path diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/services/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/services/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/services/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/services/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/tests/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/tests/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/tests/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/tests/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/tests/api/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/tests/api/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/tests/api/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/tests/api/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/tests/scenario/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/tests/scenario/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/tests/scenario/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/tests/scenario/__init__.py