From 4099c44e21919f2291dd45b204d181708612ccbc Mon Sep 17 00:00:00 2001 From: Clint Byrum Date: Mon, 9 Nov 2015 15:16:51 -0800 Subject: [PATCH] Rename to os-performance-tools The name was too generic, and would have become a problem for import into OpenStack's QA program. So focus it on performance tools. --- CONTRIBUTING.rst | 2 +- HACKING.rst | 2 +- README.rst | 6 +++--- doc/source/conf.py | 2 +- doc/source/index.rst | 4 ++-- doc/source/installation.rst | 6 +++--- doc/source/usage.rst | 4 ++-- openstack-common.conf | 2 +- .../__init__.py | 2 +- .../collect.py | 6 +++--- .../collectors/__init__.py | 0 .../collectors/_delta.py | 0 .../collectors/mysql.py | 2 +- .../collectors/queues.py | 2 +- .../counters2statsd.py | 0 .../error.py | 0 .../tests/__init__.py | 0 .../tests/base.py | 0 .../tests/test_collect.py | 14 +++++++------- .../tests/test_collectors_delta.py | 6 +++--- .../tests/test_counters2statsd.py | 6 +++--- .../tests/test_mysql.py | 8 ++++---- .../tests/test_queues.py | 6 +++--- setup.cfg | 8 ++++---- 24 files changed, 44 insertions(+), 44 deletions(-) rename {openstack_qa_tools => os_performance_tools}/__init__.py (93%) rename {openstack_qa_tools => os_performance_tools}/collect.py (94%) rename {openstack_qa_tools => os_performance_tools}/collectors/__init__.py (100%) rename {openstack_qa_tools => os_performance_tools}/collectors/_delta.py (100%) rename {openstack_qa_tools => os_performance_tools}/collectors/mysql.py (98%) rename {openstack_qa_tools => os_performance_tools}/collectors/queues.py (98%) rename {openstack_qa_tools => os_performance_tools}/counters2statsd.py (100%) rename {openstack_qa_tools => os_performance_tools}/error.py (100%) rename {openstack_qa_tools => os_performance_tools}/tests/__init__.py (100%) rename {openstack_qa_tools => os_performance_tools}/tests/base.py (100%) rename {openstack_qa_tools => os_performance_tools}/tests/test_collect.py (87%) rename {openstack_qa_tools => os_performance_tools}/tests/test_collectors_delta.py (94%) rename {openstack_qa_tools => os_performance_tools}/tests/test_counters2statsd.py (90%) rename {openstack_qa_tools => os_performance_tools}/tests/test_mysql.py (86%) rename {openstack_qa_tools => os_performance_tools}/tests/test_queues.py (89%) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 347f943..4972f69 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -14,4 +14,4 @@ Pull requests submitted through GitHub will be ignored. Bugs should be filed on Launchpad, not GitHub: - https://bugs.launchpad.net/openstack-qa-tools + https://bugs.launchpad.net/os-performance-tools diff --git a/HACKING.rst b/HACKING.rst index 2a97437..35a1d1f 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -1,4 +1,4 @@ -openstack-qa-tools Style Commandments +os-performance-tools Style Commandments =============================================== Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/ diff --git a/README.rst b/README.rst index 20e2bab..1496aad 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ =============================== -openstack-qa-tools +os-performance-tools =============================== Python scripts for use in OpenStack's QA process @@ -9,8 +9,8 @@ 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/openstack-qa-tools -* Source: http://git.openstack.org/cgit/openstack/openstack-qa-tools +* Documentation: http://docs.openstack.org/developer/os-performance-tools +* Source: http://git.openstack.org/cgit/openstack/os-performance-tools * Bugs: http://bugs.launchpad.net/openstack-qa Features diff --git a/doc/source/conf.py b/doc/source/conf.py index c83be1b..265cd0a 100755 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -37,7 +37,7 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'openstack-qa-tools' +project = u'os-performance-tools' copyright = u'2013, OpenStack Foundation' # If true, '()' will be appended to :func: etc. cross-reference text. diff --git a/doc/source/index.rst b/doc/source/index.rst index 454fe70..dd15f78 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -1,9 +1,9 @@ -.. openstack-qa-tools documentation master file, created by +.. os-performance-tools 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 openstack-qa-tools's documentation! +Welcome to os-performance-tools's documentation! ======================================================== Contents: diff --git a/doc/source/installation.rst b/doc/source/installation.rst index f64d2ee..3667517 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -4,9 +4,9 @@ Installation At the command line:: - $ pip install openstack-qa-tools + $ pip install os-performance-tools Or, if you have virtualenvwrapper installed:: - $ mkvirtualenv openstack-qa-tools - $ pip install openstack-qa-tools + $ mkvirtualenv os-performance-tools + $ pip install os-performance-tools diff --git a/doc/source/usage.rst b/doc/source/usage.rst index 875a0a0..85612eb 100644 --- a/doc/source/usage.rst +++ b/doc/source/usage.rst @@ -2,6 +2,6 @@ Usage ======== -To use openstack-qa-tools in a project:: +To use os-performance-tools in a project:: - import openstack_qa_tools + import os_performance_tools diff --git a/openstack-common.conf b/openstack-common.conf index 396936c..3d135be 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -3,4 +3,4 @@ # The list of modules to copy from oslo-incubator.git # The base module to hold the copy of openstack.common -base=openstack_qa_tools +base=os_performance_tools diff --git a/openstack_qa_tools/__init__.py b/os_performance_tools/__init__.py similarity index 93% rename from openstack_qa_tools/__init__.py rename to os_performance_tools/__init__.py index 4acac12..28540f4 100644 --- a/openstack_qa_tools/__init__.py +++ b/os_performance_tools/__init__.py @@ -16,4 +16,4 @@ import pbr.version __version__ = pbr.version.VersionInfo( - 'openstack_qa_tools').version_string() + 'os_performance_tools').version_string() diff --git a/openstack_qa_tools/collect.py b/os_performance_tools/collect.py similarity index 94% rename from openstack_qa_tools/collect.py rename to os_performance_tools/collect.py index 849b355..6da6ac7 100644 --- a/openstack_qa_tools/collect.py +++ b/os_performance_tools/collect.py @@ -16,9 +16,9 @@ import logging import sys import threading -from openstack_qa_tools.collectors import _delta -from openstack_qa_tools.collectors import mysql -from openstack_qa_tools.collectors import queues +from os_performance_tools.collectors import _delta +from os_performance_tools.collectors import mysql +from os_performance_tools.collectors import queues from subunit import v2 as subunit_v2 mysql_data = {} diff --git a/openstack_qa_tools/collectors/__init__.py b/os_performance_tools/collectors/__init__.py similarity index 100% rename from openstack_qa_tools/collectors/__init__.py rename to os_performance_tools/collectors/__init__.py diff --git a/openstack_qa_tools/collectors/_delta.py b/os_performance_tools/collectors/_delta.py similarity index 100% rename from openstack_qa_tools/collectors/_delta.py rename to os_performance_tools/collectors/_delta.py diff --git a/openstack_qa_tools/collectors/mysql.py b/os_performance_tools/collectors/mysql.py similarity index 98% rename from openstack_qa_tools/collectors/mysql.py rename to os_performance_tools/collectors/mysql.py index 662750b..ab214ab 100644 --- a/openstack_qa_tools/collectors/mysql.py +++ b/os_performance_tools/collectors/mysql.py @@ -19,7 +19,7 @@ import os import pymysql from six.moves import configparser -from openstack_qa_tools import error +from os_performance_tools import error COLLECT_COUNTERS = ( 'Com_delete', diff --git a/openstack_qa_tools/collectors/queues.py b/os_performance_tools/collectors/queues.py similarity index 98% rename from openstack_qa_tools/collectors/queues.py rename to os_performance_tools/collectors/queues.py index c7c1dc7..d930158 100644 --- a/openstack_qa_tools/collectors/queues.py +++ b/os_performance_tools/collectors/queues.py @@ -19,7 +19,7 @@ import socket from six.moves import http_client -from openstack_qa_tools import error +from os_performance_tools import error OS_QA_RABBITMQ_API = os.environ.get('OS_QA_RABBITMQ_API', '127.0.0.1:15672') diff --git a/openstack_qa_tools/counters2statsd.py b/os_performance_tools/counters2statsd.py similarity index 100% rename from openstack_qa_tools/counters2statsd.py rename to os_performance_tools/counters2statsd.py diff --git a/openstack_qa_tools/error.py b/os_performance_tools/error.py similarity index 100% rename from openstack_qa_tools/error.py rename to os_performance_tools/error.py diff --git a/openstack_qa_tools/tests/__init__.py b/os_performance_tools/tests/__init__.py similarity index 100% rename from openstack_qa_tools/tests/__init__.py rename to os_performance_tools/tests/__init__.py diff --git a/openstack_qa_tools/tests/base.py b/os_performance_tools/tests/base.py similarity index 100% rename from openstack_qa_tools/tests/base.py rename to os_performance_tools/tests/base.py diff --git a/openstack_qa_tools/tests/test_collect.py b/os_performance_tools/tests/test_collect.py similarity index 87% rename from openstack_qa_tools/tests/test_collect.py rename to os_performance_tools/tests/test_collect.py index 3945395..f7b4116 100644 --- a/openstack_qa_tools/tests/test_collect.py +++ b/os_performance_tools/tests/test_collect.py @@ -16,14 +16,14 @@ test_collect ---------------------------------- -Tests for `openstack_qa_tools.collect` +Tests for `os_performance_tools.collect` """ import json import mock -from openstack_qa_tools import collect -from openstack_qa_tools.tests import base +from os_performance_tools import collect +from os_performance_tools.tests import base import six import subunit import testtools @@ -49,8 +49,8 @@ class TestCollect(base.TestCase): self.stdout = six.BytesIO() self.attachments = [] - @mock.patch('openstack_qa_tools.collectors.mysql.collect') - @mock.patch('openstack_qa_tools.collectors.queues.collect') + @mock.patch('os_performance_tools.collectors.mysql.collect') + @mock.patch('os_performance_tools.collectors.queues.collect') def test_collect_main(self, queues_mock, mysql_mock): mysql_mock.return_value = {} queues_mock.return_value = {} @@ -66,8 +66,8 @@ class TestCollect(base.TestCase): name = name.split(':')[0] self.attachments[name] = detail - @mock.patch('openstack_qa_tools.collectors.mysql.collect') - @mock.patch('openstack_qa_tools.collectors.queues.collect') + @mock.patch('os_performance_tools.collectors.mysql.collect') + @mock.patch('os_performance_tools.collectors.queues.collect') def test_collect_main_subunit(self, queues_mock, mysql_mock): mysql_mock.return_value = {} queues_mock.return_value = {} diff --git a/openstack_qa_tools/tests/test_collectors_delta.py b/os_performance_tools/tests/test_collectors_delta.py similarity index 94% rename from openstack_qa_tools/tests/test_collectors_delta.py rename to os_performance_tools/tests/test_collectors_delta.py index fa4dc9e..39db9bc 100644 --- a/openstack_qa_tools/tests/test_collectors_delta.py +++ b/os_performance_tools/tests/test_collectors_delta.py @@ -16,13 +16,13 @@ test_delta ---------------------------------- -Tests for `openstack_qa_tools.collectors._delta` +Tests for `os_performance_tools.collectors._delta` """ import testscenarios -from openstack_qa_tools.collectors import _delta -from openstack_qa_tools.tests import base +from os_performance_tools.collectors import _delta +from os_performance_tools.tests import base class TestOSQATDelta(testscenarios.WithScenarios, base.TestCase): diff --git a/openstack_qa_tools/tests/test_counters2statsd.py b/os_performance_tools/tests/test_counters2statsd.py similarity index 90% rename from openstack_qa_tools/tests/test_counters2statsd.py rename to os_performance_tools/tests/test_counters2statsd.py index 496a3bc..fedb900 100644 --- a/openstack_qa_tools/tests/test_counters2statsd.py +++ b/os_performance_tools/tests/test_counters2statsd.py @@ -16,14 +16,14 @@ test_counters2statsd ---------------------------------- -Tests for `openstack_qa_tools.counters2statsd` +Tests for `os_performance_tools.counters2statsd` """ import json import mock -from openstack_qa_tools import counters2statsd -from openstack_qa_tools.tests import base +from os_performance_tools import counters2statsd +from os_performance_tools.tests import base class TestOpenStackQaTols(base.TestCase): diff --git a/openstack_qa_tools/tests/test_mysql.py b/os_performance_tools/tests/test_mysql.py similarity index 86% rename from openstack_qa_tools/tests/test_mysql.py rename to os_performance_tools/tests/test_mysql.py index df1615d..0f47366 100644 --- a/openstack_qa_tools/tests/test_mysql.py +++ b/os_performance_tools/tests/test_mysql.py @@ -16,18 +16,18 @@ test_collectors ---------------------------------- -Tests for `openstack_qa_tools.collectors` +Tests for `os_performance_tools.collectors` """ import mock -from openstack_qa_tools.collectors import mysql -from openstack_qa_tools.tests import base +from os_performance_tools.collectors import mysql +from os_performance_tools.tests import base class TestOpenStackQaTools(base.TestCase): - @mock.patch('openstack_qa_tools.collectors.mysql._get_config') + @mock.patch('os_performance_tools.collectors.mysql._get_config') @mock.patch('pymysql.connect') def test_mysql(self, pymysql_mock, get_config_mock): connection = mock.MagicMock() diff --git a/openstack_qa_tools/tests/test_queues.py b/os_performance_tools/tests/test_queues.py similarity index 89% rename from openstack_qa_tools/tests/test_queues.py rename to os_performance_tools/tests/test_queues.py index a201286..e56cdad 100644 --- a/openstack_qa_tools/tests/test_queues.py +++ b/os_performance_tools/tests/test_queues.py @@ -16,14 +16,14 @@ test_collectors ---------------------------------- -Tests for `openstack_qa_tools.collectors` +Tests for `os_performance_tools.collectors` """ import json import mock -from openstack_qa_tools.collectors import queues -from openstack_qa_tools.tests import base +from os_performance_tools.collectors import queues +from os_performance_tools.tests import base class TestOpenStackQaTols(base.TestCase): diff --git a/setup.cfg b/setup.cfg index 3e20175..3f63287 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [metadata] -name = openstack-qa-tools +name = os-performance-tools summary = Python scripts for use in OpenStack's QA process description-file = README.rst @@ -21,13 +21,13 @@ classifier = [entry_points] console_scripts = - os-qa-counters = openstack_qa_tools.collect:main + os-qa-counters = os_performance_tools.collect:main subunit2sql.target = - openstack_qa_statsd = openstack_qa_tools.counters2statsd:AttachmentResult + openstack_qa_statsd = os_performance_tools.counters2statsd:AttachmentResult [files] packages = - openstack_qa_tools + os_performance_tools [build_sphinx] source-dir = doc/source