From 5cb0d7a9fe66d201b6a56f22f449c1b6d566dc25 Mon Sep 17 00:00:00 2001 From: Sergey Reshetnyak Date: Tue, 12 Jul 2016 16:45:23 +0300 Subject: [PATCH] Rename microservices to fuel-ccp Change-Id: I883f2a583fd3ff497df91c216d4fae6a7b6a6d6e --- HACKING.rst | 4 +-- README.rst | 12 ++++---- doc/source/index.rst | 4 +-- doc/source/installation.rst | 6 ++-- doc/source/usage.rst | 8 +++--- {microservices => fuel_ccp}/__init__.py | 2 +- {microservices => fuel_ccp}/build.py | 12 ++++---- {microservices => fuel_ccp}/cli.py | 14 +++++----- .../common/__init__.py | 0 .../common/jinja_utils.py | 2 +- {microservices => fuel_ccp}/common/utils.py | 9 +++--- .../config/__init__.py | 0 {microservices => fuel_ccp}/config/builder.py | 0 {microservices => fuel_ccp}/config/cli.py | 0 {microservices => fuel_ccp}/config/images.py | 0 .../config/kubernetes.py | 0 .../config/registry.py | 0 .../config/repositories.py | 0 {microservices => fuel_ccp}/deploy.py | 12 ++++---- {microservices => fuel_ccp}/fetch.py | 2 +- {microservices => fuel_ccp}/kubernetes.py | 4 +-- .../resources/defaults.yaml | 0 {microservices => fuel_ccp}/templates.py | 6 ++-- {microservices => fuel_ccp}/tests/__init__.py | 0 {microservices => fuel_ccp}/tests/base.py | 0 .../tests/common/__init__.py | 0 .../tests/common/example.j2 | 0 .../tests/common/test_jinja_utils.py | 4 +-- .../tests/test_build.py | 16 +++++------ .../tests/test_deploy.py | 6 ++-- .../tests/test_fetch.py | 4 +-- .../tests/test_kubernetes.py | 4 +-- .../test_repository/service/test.yaml.j2 | 0 microservices/tests/test_microservices.py | 28 ------------------- setup.cfg | 18 ++++++------ 35 files changed, 74 insertions(+), 103 deletions(-) rename {microservices => fuel_ccp}/__init__.py (91%) rename {microservices => fuel_ccp}/build.py (97%) rename {microservices => fuel_ccp}/cli.py (73%) rename {microservices => fuel_ccp}/common/__init__.py (100%) rename {microservices => fuel_ccp}/common/jinja_utils.py (87%) rename {microservices => fuel_ccp}/common/utils.py (83%) rename {microservices => fuel_ccp}/config/__init__.py (100%) rename {microservices => fuel_ccp}/config/builder.py (100%) rename {microservices => fuel_ccp}/config/cli.py (100%) rename {microservices => fuel_ccp}/config/images.py (100%) rename {microservices => fuel_ccp}/config/kubernetes.py (100%) rename {microservices => fuel_ccp}/config/registry.py (100%) rename {microservices => fuel_ccp}/config/repositories.py (100%) rename {microservices => fuel_ccp}/deploy.py (96%) rename {microservices => fuel_ccp}/fetch.py (96%) rename {microservices => fuel_ccp}/kubernetes.py (95%) rename {microservices => fuel_ccp}/resources/defaults.yaml (100%) rename {microservices => fuel_ccp}/templates.py (98%) rename {microservices => fuel_ccp}/tests/__init__.py (100%) rename {microservices => fuel_ccp}/tests/base.py (100%) rename {microservices => fuel_ccp}/tests/common/__init__.py (100%) rename {microservices => fuel_ccp}/tests/common/example.j2 (100%) rename {microservices => fuel_ccp}/tests/common/test_jinja_utils.py (90%) rename {microservices => fuel_ccp}/tests/test_build.py (93%) rename {microservices => fuel_ccp}/tests/test_deploy.py (98%) rename {microservices => fuel_ccp}/tests/test_fetch.py (95%) rename {microservices => fuel_ccp}/tests/test_kubernetes.py (96%) rename {microservices => fuel_ccp}/tests/test_repository/service/test.yaml.j2 (100%) delete mode 100644 microservices/tests/test_microservices.py diff --git a/HACKING.rst b/HACKING.rst index 3f9b727e..bafdb989 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -1,4 +1,4 @@ -microservices Style Commandments -=============================================== +Fuel-ccp Style Commandments +=========================== Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/ diff --git a/README.rst b/README.rst index d24f7c02..0ef0f887 100644 --- a/README.rst +++ b/README.rst @@ -1,6 +1,6 @@ -=============================== -microservices -=============================== +======== +fuel-ccp +======== Docker images builder for OpenStack services and infra. @@ -9,9 +9,9 @@ Please feel here a long description which must be at least 3 lines wrapped on Note that this is a hard requirement. * Free software: Apache license -* Documentation: http://docs.openstack.org/developer/microservices -* Source: http://git.openstack.org/cgit/nextgen/microservices -* Bugs: http://bugs.launchpad.net/microservices +* Documentation: http://docs.openstack.org/developer/fuel-ccp +* Source: http://git.openstack.org/cgit/openstack/fuel-ccp +* Bugs: http://bugs.launchpad.net/fuel-ccp Features -------- diff --git a/doc/source/index.rst b/doc/source/index.rst index 3b0d4bdd..05e54bd1 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -1,9 +1,9 @@ -.. microservices documentation master file, created by +.. Fuel-ccp documentation master file, created by sphinx-quickstart on Tue Jul 9 22:26:36 2013. You can adapt this file completely to your liking, but it should at least contain the root `toctree` directive. -Welcome to microservices's documentation! +Welcome to Fuel-ccp's documentation! ======================================================== Contents: diff --git a/doc/source/installation.rst b/doc/source/installation.rst index b2a900b1..3a7d7a0b 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -4,9 +4,9 @@ Installation At the command line:: - $ pip install microservices + $ pip install fuel-ccp Or, if you have virtualenvwrapper installed:: - $ mkvirtualenv microservices - $ pip install microservices + $ mkvirtualenv fuel-ccp + $ pip install fuel-ccp diff --git a/doc/source/usage.rst b/doc/source/usage.rst index 51630c5e..30194330 100644 --- a/doc/source/usage.rst +++ b/doc/source/usage.rst @@ -1,7 +1,7 @@ -======== +===== Usage -======== +===== -To use microservices in a project:: +To use fuel-ccp in a project:: - import microservices + import fuel_ccp diff --git a/microservices/__init__.py b/fuel_ccp/__init__.py similarity index 91% rename from microservices/__init__.py rename to fuel_ccp/__init__.py index aabc08a0..b8a26bec 100644 --- a/microservices/__init__.py +++ b/fuel_ccp/__init__.py @@ -15,5 +15,5 @@ import pbr.version -version_info = pbr.version.VersionInfo("microservices") +version_info = pbr.version.VersionInfo("fuel_ccp") __version__ = version_info.version_string() diff --git a/microservices/build.py b/fuel_ccp/build.py similarity index 97% rename from microservices/build.py rename to fuel_ccp/build.py index 3a71bc1b..f4688970 100644 --- a/microservices/build.py +++ b/fuel_ccp/build.py @@ -11,17 +11,17 @@ import docker from oslo_config import cfg from oslo_log import log as logging -from microservices.common import jinja_utils -from microservices.common import utils +from fuel_ccp.common import jinja_utils +from fuel_ccp.common import utils BUILD_TIMEOUT = 2 ** 16 # in seconds CONF = cfg.CONF -CONF.import_group('builder', 'microservices.config.builder') -CONF.import_group('images', 'microservices.config.images') -CONF.import_group('repositories', 'microservices.config.repositories') -CONF.import_group('registry', 'microservices.config.registry') +CONF.import_group('builder', 'fuel_ccp.config.builder') +CONF.import_group('images', 'fuel_ccp.config.images') +CONF.import_group('repositories', 'fuel_ccp.config.repositories') +CONF.import_group('registry', 'fuel_ccp.config.registry') LOG = logging.getLogger(__name__) diff --git a/microservices/cli.py b/fuel_ccp/cli.py similarity index 73% rename from microservices/cli.py rename to fuel_ccp/cli.py index fc21b730..615230be 100644 --- a/microservices/cli.py +++ b/fuel_ccp/cli.py @@ -4,15 +4,15 @@ import sys from oslo_config import cfg from oslo_log import log as logging -from microservices import build -from microservices import deploy -from microservices import fetch +from fuel_ccp import build +from fuel_ccp import deploy +from fuel_ccp import fetch CONF = cfg.CONF -CONF.import_group('registry', 'microservices.config.registry') -CONF.import_group('repositories', 'microservices.config.repositories') -CONF.import_opt('action', 'microservices.config.cli') +CONF.import_group('registry', 'fuel_ccp.config.registry') +CONF.import_group('repositories', 'fuel_ccp.config.repositories') +CONF.import_opt('action', 'fuel_ccp.config.cli') def do_build(): @@ -42,7 +42,7 @@ def main(): signal.signal(signal.SIGINT, signal_handler) logging.register_options(CONF) CONF(sys.argv[1:]) - logging.setup(CONF, 'microservices') + logging.setup(CONF, 'fuel-ccp') func = globals()['do_%s' % CONF.action.name] func() diff --git a/microservices/common/__init__.py b/fuel_ccp/common/__init__.py similarity index 100% rename from microservices/common/__init__.py rename to fuel_ccp/common/__init__.py diff --git a/microservices/common/jinja_utils.py b/fuel_ccp/common/jinja_utils.py similarity index 87% rename from microservices/common/jinja_utils.py rename to fuel_ccp/common/jinja_utils.py index 19e44899..6dd5872f 100644 --- a/microservices/common/jinja_utils.py +++ b/fuel_ccp/common/jinja_utils.py @@ -5,7 +5,7 @@ from oslo_config import cfg CONF = cfg.CONF -CONF.import_group('images', 'microservices.config.images') +CONF.import_group('images', 'fuel_ccp.config.images') def str_to_bool(text): diff --git a/microservices/common/utils.py b/fuel_ccp/common/utils.py similarity index 83% rename from microservices/common/utils.py rename to fuel_ccp/common/utils.py index c7176812..96c1ce28 100644 --- a/microservices/common/utils.py +++ b/fuel_ccp/common/utils.py @@ -5,12 +5,12 @@ from oslo_config import cfg from oslo_log import log as logging import yaml -import microservices +import fuel_ccp CONF = cfg.CONF -CONF.import_group('repositories', 'microservices.config.repositories') -CONF.import_opt("deploy_config", "microservices.config.cli") +CONF.import_group('repositories', 'fuel_ccp.config.repositories') +CONF.import_opt("deploy_config", "fuel_ccp.config.cli") LOG = logging.getLogger(__name__) @@ -20,8 +20,7 @@ def k8s_name(*args): def get_resource_path(path): - return pkg_resources.resource_filename( - microservices.version_info.package, path) + return pkg_resources.resource_filename(fuel_ccp.version_info.package, path) def get_global_parameters(config_group): diff --git a/microservices/config/__init__.py b/fuel_ccp/config/__init__.py similarity index 100% rename from microservices/config/__init__.py rename to fuel_ccp/config/__init__.py diff --git a/microservices/config/builder.py b/fuel_ccp/config/builder.py similarity index 100% rename from microservices/config/builder.py rename to fuel_ccp/config/builder.py diff --git a/microservices/config/cli.py b/fuel_ccp/config/cli.py similarity index 100% rename from microservices/config/cli.py rename to fuel_ccp/config/cli.py diff --git a/microservices/config/images.py b/fuel_ccp/config/images.py similarity index 100% rename from microservices/config/images.py rename to fuel_ccp/config/images.py diff --git a/microservices/config/kubernetes.py b/fuel_ccp/config/kubernetes.py similarity index 100% rename from microservices/config/kubernetes.py rename to fuel_ccp/config/kubernetes.py diff --git a/microservices/config/registry.py b/fuel_ccp/config/registry.py similarity index 100% rename from microservices/config/registry.py rename to fuel_ccp/config/registry.py diff --git a/microservices/config/repositories.py b/fuel_ccp/config/repositories.py similarity index 100% rename from microservices/config/repositories.py rename to fuel_ccp/config/repositories.py diff --git a/microservices/deploy.py b/fuel_ccp/deploy.py similarity index 96% rename from microservices/deploy.py rename to fuel_ccp/deploy.py index 7edad973..46d22c81 100644 --- a/microservices/deploy.py +++ b/fuel_ccp/deploy.py @@ -5,15 +5,15 @@ import yaml from oslo_config import cfg from oslo_log import log as logging -from microservices.common import utils -from microservices import kubernetes -from microservices import templates +from fuel_ccp.common import utils +from fuel_ccp import kubernetes +from fuel_ccp import templates CONF = cfg.CONF -CONF.import_group('repositories', 'microservices.config.repositories') -CONF.import_opt("action", "microservices.config.cli") -CONF.import_opt("deploy_config", "microservices.config.cli") +CONF.import_group('repositories', 'fuel_ccp.config.repositories') +CONF.import_opt("action", "fuel_ccp.config.cli") +CONF.import_opt("deploy_config", "fuel_ccp.config.cli") LOG = logging.getLogger(__name__) diff --git a/microservices/fetch.py b/fuel_ccp/fetch.py similarity index 96% rename from microservices/fetch.py rename to fuel_ccp/fetch.py index 66c38f5d..7ad6e334 100644 --- a/microservices/fetch.py +++ b/fuel_ccp/fetch.py @@ -7,7 +7,7 @@ from oslo_log import log as logging CONF = cfg.CONF -CONF.import_group('repositories', 'microservices.config.repositories') +CONF.import_group('repositories', 'fuel_ccp.config.repositories') LOG = logging.getLogger(__name__) diff --git a/microservices/kubernetes.py b/fuel_ccp/kubernetes.py similarity index 95% rename from microservices/kubernetes.py rename to fuel_ccp/kubernetes.py index cc2c618b..81174276 100644 --- a/microservices/kubernetes.py +++ b/fuel_ccp/kubernetes.py @@ -10,8 +10,8 @@ from oslo_log import log as logging CONF = cfg.CONF -CONF.import_opt("action", "microservices.config.cli") -CONF.import_group('kubernetes', 'microservices.config.kubernetes') +CONF.import_opt("action", "fuel_ccp.config.cli") +CONF.import_group('kubernetes', 'fuel_ccp.config.kubernetes') LOG = logging.getLogger(__name__) diff --git a/microservices/resources/defaults.yaml b/fuel_ccp/resources/defaults.yaml similarity index 100% rename from microservices/resources/defaults.yaml rename to fuel_ccp/resources/defaults.yaml diff --git a/microservices/templates.py b/fuel_ccp/templates.py similarity index 98% rename from microservices/templates.py rename to fuel_ccp/templates.py index 0f12507d..f88d460d 100644 --- a/microservices/templates.py +++ b/fuel_ccp/templates.py @@ -2,12 +2,12 @@ import copy from oslo_config import cfg -from microservices.common import utils +from fuel_ccp.common import utils CONF = cfg.CONF -CONF.import_group('images', 'microservices.config.images') -CONF.import_group('registry', 'microservices.config.registry') +CONF.import_group('images', 'fuel_ccp.config.images') +CONF.import_group('registry', 'fuel_ccp.config.registry') GLOBAL_CONFIG = "globals" SCRIPT_CONFIG = "start-script" diff --git a/microservices/tests/__init__.py b/fuel_ccp/tests/__init__.py similarity index 100% rename from microservices/tests/__init__.py rename to fuel_ccp/tests/__init__.py diff --git a/microservices/tests/base.py b/fuel_ccp/tests/base.py similarity index 100% rename from microservices/tests/base.py rename to fuel_ccp/tests/base.py diff --git a/microservices/tests/common/__init__.py b/fuel_ccp/tests/common/__init__.py similarity index 100% rename from microservices/tests/common/__init__.py rename to fuel_ccp/tests/common/__init__.py diff --git a/microservices/tests/common/example.j2 b/fuel_ccp/tests/common/example.j2 similarity index 100% rename from microservices/tests/common/example.j2 rename to fuel_ccp/tests/common/example.j2 diff --git a/microservices/tests/common/test_jinja_utils.py b/fuel_ccp/tests/common/test_jinja_utils.py similarity index 90% rename from microservices/tests/common/test_jinja_utils.py rename to fuel_ccp/tests/common/test_jinja_utils.py index 7e7db2b0..42912e31 100644 --- a/microservices/tests/common/test_jinja_utils.py +++ b/fuel_ccp/tests/common/test_jinja_utils.py @@ -1,8 +1,8 @@ import os import sys -from microservices.common import jinja_utils -from microservices.tests import base +from fuel_ccp.common import jinja_utils +from fuel_ccp.tests import base class TestJinjaUtils(base.TestCase): diff --git a/microservices/tests/test_build.py b/fuel_ccp/tests/test_build.py similarity index 93% rename from microservices/tests/test_build.py rename to fuel_ccp/tests/test_build.py index e3ce0ba1..15166879 100644 --- a/microservices/tests/test_build.py +++ b/fuel_ccp/tests/test_build.py @@ -4,8 +4,8 @@ import io import mock from oslo_config import fixture as conf_fixture -from microservices import build -from microservices.tests import base +from fuel_ccp import build +from fuel_ccp.tests import base BASE_DOCKERFILE = u"""FROM debian:jessie @@ -66,7 +66,7 @@ class TestBuild(base.TestCase): io.StringIO(COMPONENT_DOCKERFILE.format('')) ] dockerfiles = self.__create_dockerfile_objects() - with mock.patch('microservices.build.open', m_open, create=True): + with mock.patch('fuel_ccp.build.open', m_open, create=True): build.find_dependencies(dockerfiles) self.assertListEqual([dockerfiles['ms-mysql']], @@ -81,7 +81,7 @@ class TestBuild(base.TestCase): io.StringIO(COMPONENT_DOCKERFILE.format('example.com:8909/')) ] dockerfiles = self.__create_dockerfile_objects() - with mock.patch('microservices.build.open', m_open, create=True): + with mock.patch('fuel_ccp.build.open', m_open, create=True): build.find_dependencies(dockerfiles) self.assertListEqual([dockerfiles['ms-mysql']], @@ -90,8 +90,8 @@ class TestBuild(base.TestCase): dockerfiles['ms-mysql']['parent']) @mock.patch("docker.Client") - @mock.patch("microservices.build.build_dockerfile") - @mock.patch("microservices.build.submit_dockerfile_processing") + @mock.patch("fuel_ccp.build.build_dockerfile") + @mock.patch("fuel_ccp.build.submit_dockerfile_processing") def test_process_dockerfile_middle(self, submit_dockerfile_processing_mock, build_dockerfile_mock, dc_mock): dockerfiles = { @@ -133,8 +133,8 @@ class TestBuild(base.TestCase): dockerfiles["leaf"], mock.ANY, mock.ANY, mock.ANY) @mock.patch("docker.Client") - @mock.patch("microservices.build.build_dockerfile") - @mock.patch("microservices.build.submit_dockerfile_processing") + @mock.patch("fuel_ccp.build.build_dockerfile") + @mock.patch("fuel_ccp.build.submit_dockerfile_processing") def test_process_dockerfile_middle_keep_consistency_off( self, submit_dockerfile_processing_mock, build_dockerfile_mock, dc_mock): diff --git a/microservices/tests/test_deploy.py b/fuel_ccp/tests/test_deploy.py similarity index 98% rename from microservices/tests/test_deploy.py rename to fuel_ccp/tests/test_deploy.py index 7615bbd6..e05ca2d6 100644 --- a/microservices/tests/test_deploy.py +++ b/fuel_ccp/tests/test_deploy.py @@ -2,8 +2,8 @@ import mock from oslo_config import cfg import yaml -from microservices import deploy -from microservices.tests import base +from fuel_ccp import deploy +from fuel_ccp.tests import base CONF = cfg.CONF @@ -96,7 +96,7 @@ class TestDeployCreateService(base.TestCase): def setUp(self): super(TestDeployCreateService, self).setUp() self._create_obj = mock.patch( - "microservices.kubernetes.create_object_from_definition") + "fuel_ccp.kubernetes.create_object_from_definition") self.create_obj = self._create_obj.start() def test_create_service_without_ports(self): diff --git a/microservices/tests/test_fetch.py b/fuel_ccp/tests/test_fetch.py similarity index 95% rename from microservices/tests/test_fetch.py rename to fuel_ccp/tests/test_fetch.py index f6af34f2..b12d642e 100644 --- a/microservices/tests/test_fetch.py +++ b/fuel_ccp/tests/test_fetch.py @@ -4,8 +4,8 @@ import fixtures import mock from oslo_config import cfg -from microservices import fetch -from microservices.tests import base +from fuel_ccp import fetch +from fuel_ccp.tests import base CONF = cfg.CONF diff --git a/microservices/tests/test_kubernetes.py b/fuel_ccp/tests/test_kubernetes.py similarity index 96% rename from microservices/tests/test_kubernetes.py rename to fuel_ccp/tests/test_kubernetes.py index d789f3b4..51adf5d3 100644 --- a/microservices/tests/test_kubernetes.py +++ b/fuel_ccp/tests/test_kubernetes.py @@ -2,8 +2,8 @@ import mock from oslo_config import cfg -from microservices import kubernetes -from microservices.tests import base +from fuel_ccp import kubernetes +from fuel_ccp.tests import base CONF = cfg.CONF diff --git a/microservices/tests/test_repository/service/test.yaml.j2 b/fuel_ccp/tests/test_repository/service/test.yaml.j2 similarity index 100% rename from microservices/tests/test_repository/service/test.yaml.j2 rename to fuel_ccp/tests/test_repository/service/test.yaml.j2 diff --git a/microservices/tests/test_microservices.py b/microservices/tests/test_microservices.py deleted file mode 100644 index 20d631a2..00000000 --- a/microservices/tests/test_microservices.py +++ /dev/null @@ -1,28 +0,0 @@ -# -*- coding: utf-8 -*- - -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -""" -test_microservices ----------------------------------- - -Tests for `microservices` module. -""" - -from microservices.tests import base - - -class TestMicroservices(base.TestCase): - - def test_something(self): - pass diff --git a/setup.cfg b/setup.cfg index 1ddc32fd..a6e1fe45 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [metadata] -name = microservices +name = fuel-ccp summary = Docker images builder for OpenStack services and infra. description-file = README.rst @@ -21,11 +21,11 @@ classifier = [files] packages = - microservices + fuel_ccp [entry_points] console_scripts = - mcp-microservices = microservices.cli:main + mcp-microservices = fuel_ccp.cli:main [build_sphinx] source-dir = doc/source @@ -36,15 +36,15 @@ all_files = 1 upload-dir = doc/build/html [compile_catalog] -directory = microservices/locale -domain = microservices +directory = fuel_ccp/locale +domain = fuel-ccp [update_catalog] -domain = microservices -output_dir = microservices/locale -input_file = microservices/locale/microservices.pot +domain = fuel-ccp +output_dir = fuel_ccp/locale +input_file = fuel_ccp/locale/microservices.pot [extract_messages] keywords = _ gettext ngettext l_ lazy_gettext mapping_file = babel.cfg -output_file = microservices/locale/microservices.pot +output_file = fuel_ccp/locale/microservices.pot