From 163c01a11ed5d0ddc5034ae997c1e4309aca1255 Mon Sep 17 00:00:00 2001 From: Sergey Reshetnyak Date: Wed, 7 Sep 2016 01:39:45 +0300 Subject: [PATCH] Rename ms_ext_config to fuel_ccp_entrypoint package Change-Id: Iac055705a7c9de345c73828e6031aae45d2b8068 --- .coveragerc | 4 ++-- doc/source/usage.rst | 2 +- .../__init__.py | 2 +- .../start_script.py | 0 .../tests/__init__.py | 0 .../tests/base.py | 0 .../tests/test_fuel_ccp_entrypoint.py | 14 +++----------- setup.cfg | 18 +++++++++--------- 8 files changed, 16 insertions(+), 24 deletions(-) rename {ms_ext_config => fuel_ccp_entrypoint}/__init__.py (93%) rename {ms_ext_config => fuel_ccp_entrypoint}/start_script.py (100%) rename {ms_ext_config => fuel_ccp_entrypoint}/tests/__init__.py (100%) rename {ms_ext_config => fuel_ccp_entrypoint}/tests/base.py (100%) rename ms_ext_config/tests/test_ms_ext_config.py => fuel_ccp_entrypoint/tests/test_fuel_ccp_entrypoint.py (96%) diff --git a/.coveragerc b/.coveragerc index 47cc2e9..e0c0a95 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,7 +1,7 @@ [run] branch = True -source = ms_ext_config -omit = ms_ext_config/openstack/* +source = fuel_ccp_entrypoint +omit = fuel_ccp_entrypoint/openstack/* [report] ignore_errors = True diff --git a/doc/source/usage.rst b/doc/source/usage.rst index 769c0cc..350681d 100644 --- a/doc/source/usage.rst +++ b/doc/source/usage.rst @@ -4,4 +4,4 @@ Usage To use ms-ext-config in a project:: - import ms_ext_config + import fuel_ccp_entrypoint diff --git a/ms_ext_config/__init__.py b/fuel_ccp_entrypoint/__init__.py similarity index 93% rename from ms_ext_config/__init__.py rename to fuel_ccp_entrypoint/__init__.py index 73e1030..c48da5d 100644 --- a/ms_ext_config/__init__.py +++ b/fuel_ccp_entrypoint/__init__.py @@ -16,4 +16,4 @@ import pbr.version __version__ = pbr.version.VersionInfo( - 'ms_ext_config').version_string() + 'fuel_ccp_entrypoint').version_string() diff --git a/ms_ext_config/start_script.py b/fuel_ccp_entrypoint/start_script.py similarity index 100% rename from ms_ext_config/start_script.py rename to fuel_ccp_entrypoint/start_script.py diff --git a/ms_ext_config/tests/__init__.py b/fuel_ccp_entrypoint/tests/__init__.py similarity index 100% rename from ms_ext_config/tests/__init__.py rename to fuel_ccp_entrypoint/tests/__init__.py diff --git a/ms_ext_config/tests/base.py b/fuel_ccp_entrypoint/tests/base.py similarity index 100% rename from ms_ext_config/tests/base.py rename to fuel_ccp_entrypoint/tests/base.py diff --git a/ms_ext_config/tests/test_ms_ext_config.py b/fuel_ccp_entrypoint/tests/test_fuel_ccp_entrypoint.py similarity index 96% rename from ms_ext_config/tests/test_ms_ext_config.py rename to fuel_ccp_entrypoint/tests/test_fuel_ccp_entrypoint.py index 9d80992..2251880 100644 --- a/ms_ext_config/tests/test_ms_ext_config.py +++ b/fuel_ccp_entrypoint/tests/test_fuel_ccp_entrypoint.py @@ -12,21 +12,13 @@ # License for the specific language governing permissions and limitations # under the License. - -""" -test_ms_ext_config ----------------------------------- - -Tests for `ms_ext_config` module. -""" - import os import etcd import mock -from ms_ext_config import start_script -from ms_ext_config.tests import base +from fuel_ccp_entrypoint import start_script +from fuel_ccp_entrypoint.tests import base class TestGetIpAddress(base.TestCase): @@ -89,7 +81,7 @@ class TestGetVariables(base.TestCase): @mock.patch('six.moves.builtins.open', mock.mock_open()) @mock.patch('json.load') - @mock.patch('ms_ext_config.start_script.create_network_topology') + @mock.patch('fuel_ccp_entrypoint.start_script.create_network_topology') def test_get_variables(self, m_create_network_topology, m_json_load): def side_effect(file_name): return {'glob': 'glob_val'} diff --git a/setup.cfg b/setup.cfg index b16ec17..b59d71c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] -name = ms-ext-config -summary = OpenStack Boilerplate contains all the boilerplate you need to create an OpenStack package. +name = fuel-ccp-entrypoint +summary = Entrypoint script for CCP containers description-file = README.rst author = OpenStack @@ -21,7 +21,7 @@ classifier = [files] packages = - ms_ext_config + fuel_ccp_entrypoint [build_sphinx] source-dir = doc/source @@ -32,15 +32,15 @@ all_files = 1 upload-dir = doc/build/html [compile_catalog] -directory = ms_ext_config/locale -domain = ms_ext_config +directory = fuel_ccp_entrypoint/locale +domain = fuel_ccp_entrypoint [update_catalog] -domain = ms_ext_config -output_dir = ms_ext_config/locale -input_file = ms_ext_config/locale/ms_ext_config.pot +domain = fuel_ccp_entrypoint +output_dir = fuel_ccp_entrypoint/locale +input_file = fuel_ccp_entrypoint/locale/fuel_ccp_entrypoint.pot [extract_messages] keywords = _ gettext ngettext l_ lazy_gettext mapping_file = babel.cfg -output_file = ms_ext_config/locale/ms_ext_config.pot +output_file = fuel_ccp_entrypoint/locale/fuel_ccp_entrypoint.pot