From 1823b837cd26a5b04888eb1d39533a1931af020e Mon Sep 17 00:00:00 2001 From: "Brad P. Crochet" Date: Wed, 9 Sep 2015 10:13:27 -0400 Subject: [PATCH] Cleanup some strangling references to rdomanager-oscplugin Change-Id: I46e3e0b6c4028789676428eaaa1e4c558346ecf4 --- .coveragerc | 4 +- CONTRIBUTING.rst | 2 +- README.rst | 12 +- doc/source/conf.py | 4 +- doc/source/index.rst | 8 +- doc/source/installation.rst | 6 +- doc/source/usage.rst | 4 +- jenkins-config.yml | 106 ------------------ requirements.txt | 2 +- setup.cfg | 2 +- tripleoclient/plugin.py | 12 +- ...ger_oscplugin.py => test_tripleoclient.py} | 2 +- 12 files changed, 29 insertions(+), 135 deletions(-) delete mode 100644 jenkins-config.yml rename tripleoclient/tests/{test_rdomanager_oscplugin.py => test_tripleoclient.py} (93%) diff --git a/.coveragerc b/.coveragerc index 0be0928bc..f18f85d5b 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,7 +1,7 @@ [run] branch = True -source = rdomanager_oscplugin -omit = rdomanager_oscplugin/tests/*,rdomanager_oscplugin/openstack/* +source = tripleoclient +omit = tripleoclient/tests/*,tripleoclient/openstack/* [report] ignore-errors = True \ No newline at end of file diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index b3dfb3124..67aef0678 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/python-rdomanager-oscplugin \ No newline at end of file + https://bugs.launchpad.net/tripleo \ No newline at end of file diff --git a/README.rst b/README.rst index 41131ba42..35c43858f 100644 --- a/README.rst +++ b/README.rst @@ -1,6 +1,6 @@ -==================== -rdomanager-oscplugin -==================== +============= +tripleoclient +============= OpenStackClient reference plugin module @@ -9,8 +9,8 @@ properly installed for OSC to find and use it. It utilizes the ``setuptools`` entry points mechanism to advertise to OSC the plugin module and supported commands. -**rdomanager-oscplugin** is an OpenStackClient (OSC) plugin implementation that -implements commands useful for RDO manager and the install and management of +**tripleoclient** is an OpenStackClient (OSC) plugin implementation that +implements commands useful for TripleO and the install and management of both an undercloud and an overcloud. Discovery @@ -57,7 +57,7 @@ requirements. This limits the ability to add additional auth modules to OSC. Client ====== -The current implementation of the ``rdomanager_oscplugin`` Client class is an +The current implementation of the ``tripleoclient`` Client class is an empty placeholder. This client object is not equired but OSC's ClientManager will maintain it as required and is the interface point for other plugins to access anything implemented by this plugin. diff --git a/doc/source/conf.py b/doc/source/conf.py index ee83b3b15..06e65f6c5 100755 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -37,8 +37,8 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'osc-plugin' -copyright = u'2013 Nebula Inc.' +project = u'tripleoclient' +copyright = u'2015 Red Hat, Inc.' # If true, '()' will be appended to :func: etc. cross-reference text. add_function_parentheses = True diff --git a/doc/source/index.rst b/doc/source/index.rst index e033c350c..d8020567d 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -1,8 +1,8 @@ -==================== -rdomanager-oscplugin -==================== +============= +tripleoclient +============= -rdomanager-oscplugin is an OpenStackClient plugin. +tripleoclient is an OpenStackClient plugin. Contents: diff --git a/doc/source/installation.rst b/doc/source/installation.rst index f9a121f9a..bd636c476 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -4,9 +4,9 @@ Installation At the command line:: - $ pip install rdomanager-oscplugin + $ pip install python-tripleoclient Or, if you have virtualenvwrapper installed:: - $ mkvirtualenv rdomanager-oscplugin - $ pip install rdomanager-oscplugin + $ mkvirtualenv python-tripleoclient + $ pip install python-tripleoclient diff --git a/doc/source/usage.rst b/doc/source/usage.rst index 5daa91b38..204cf8ec1 100644 --- a/doc/source/usage.rst +++ b/doc/source/usage.rst @@ -2,6 +2,6 @@ Usage ===== -To use rdomanager-oscplugin in a project:: +To use tripleoclient in a project:: - import rdomanager_oscplugin + import tripleoclient diff --git a/jenkins-config.yml b/jenkins-config.yml deleted file mode 100644 index 88b0c2c2d..000000000 --- a/jenkins-config.yml +++ /dev/null @@ -1,106 +0,0 @@ -# This file is used by the jenkins job -# read: 'How it works' section at the bottom - - -### config template ### -# test_env: # top-level namespace used by khaleesi -# env_name: # test config -# Distro-Version: # test configuration for the distro-version -# | setup: # how the testbed VM needs to be setup -# | ' repos: # add the following repos -# | ' - filename: repo-name.repo -# | ' contents: | -# | ' [section] -# | ' contents -# | ' of -# | ' Repo -# -# | ' install: # install the following rpm and -# | ' - rpm-abc # ensure latest is installed -# | ' - rpm-foo -# | ' - rpm-bar -# -# | ' remove: # delete the following rpms -# | ' - rpm-foo -# | ' - rpm-bar -# | ' - rpm-baz -# | ' pip: # use virtualenv --system-site-packages to -# | ' overrides: # override system packages -# | ' - pip-pkg-foo -# | ' - pip-pkg-foo -# -# | run: > # how tests should be run -# | run_command; another_command; -# | ./run_tests.sh -N -P # all but last statement should terminated by ; -# -# | archive: # what files to archive -# | - nosetest.xml -# -# NOTE: there must be a env_name: called virt: which will be used to run tests -# in virtualenv when running tests in env_name fails - -product: - name: rhos - repo_type: poodle - version: 7 - full_version: 7.0 - config: - enable_epel: y - rpmrepo: - RedHat: http://rhos-release.virt.bos.redhat.com/repos/rhos-release/ - - -python_rdomanager_oscplugin_rpm_deps: [ - gcc, git, python-sphinx, python-tox, python-pip, - libxml2-devel, libxslt-devel, libffi-devel, openssl-devel, -] - -rdomanager_oscplugin_virt_config: - setup: - install: "{{python_rdomanager_oscplugin_rpm_deps}}" - run: > - sudo rm -Rf .tox || true; - sudo pip install -U unittest2; - export NOSE_WITH_XUNIT=1; - export NOSE_WITH_HTML_OUTPUT=1; - export NOSE_HTML_OUT_FILE=../logs/nose_results.html; - export NSS_HASH_ALG_SUPPORT=+MD5; - export OPENSSL_ENABLE_MD5_VERIFY=1; - rpm -qa > all-rpms.txt; - set -o pipefail; - tox --sitepackages -v -epy27 2>&1 | tee ../logs/venv-testrun.log; - archive: - - ../logs/venv-testrun.log - - tox.ini - - requirements.txt - - all-rpms.txt - -### actual test_config: starts here: used by khaleesi ### -### NOTE: test_config.virt must be defined ### -test_config: - virt: - Fedora-20: "{{rdomanager_oscplugin_virt_config}}" - RedHat-7.0: "{{rdomanager_oscplugin_virt_config}}" - RedHat-7.1: "{{rdomanager_oscplugin_virt_config}}" - -# How this works! -# ============== -# This file is used by khaleesi[1] playbook unit_test.yml[2]. -# - The jenkins job checks out khaleesi, settings and this repo and -# runs unit_test.yml playbook. -# - The playbook reads this config file and -# - adds repos in test_dependencies.rpm.repos -# - installs all packages in test_dependencies.rpm.install -# - removes all packages in test_dependencies.rpm.remove -# - it then runs the test by executing the command specfied in -# test_env.run NOTE all commands should terminate with a ';' -# - if tests fail, the same is run in venv with pip packages. -# -# PIP overrides -# ------------- -# When there is no corresponding rpm for a pip package, you can override that -# particular package using the pip.override section. When you do so, make sure -# the packaging team is notified about the new requirement. -# -# [1] https://github.com/redhat-openstack/khaleesi -# [2] https://github.com/redhat-openstack/khaleesi/blob/master/playbooks/unit_test.yml diff --git a/requirements.txt b/requirements.txt index fd2ee2736..0d97751f8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,4 +15,4 @@ python-tuskarclient>=0.1.17 six>=1.9.0 # tripleo-common lib is not yet on PyPi --e git://github.com/rdo-management/tripleo-common.git#egg=tripleo_common +-e git://github.com/openstack/tripleo-common.git#egg=tripleo_common diff --git a/setup.cfg b/setup.cfg index 95f7bc1dd..21fb41db3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,7 +6,7 @@ description-file = license = Apache License, Version 2.0 author = Brad P. Crochet author-email = brad@redhat.com -home-page = https://github.com/openstack/python-tripleoclient +home-page = http://www.openstack.org/ classifier = Environment :: Console Environment :: OpenStack diff --git a/tripleoclient/plugin.py b/tripleoclient/plugin.py index e2d4220c4..34daab48a 100644 --- a/tripleoclient/plugin.py +++ b/tripleoclient/plugin.py @@ -24,7 +24,7 @@ from tuskarclient import client as tuskar_client LOG = logging.getLogger(__name__) -DEFAULT_RDOMANAGER_OSCPLUGIN_API_VERSION = '1' +DEFAULT_TRIPLEOCLIENT_API_VERSION = '1' # Required by the OSC plugin interface API_NAME = 'tripleoclient' @@ -53,11 +53,11 @@ def build_option_parser(parser): '--os-tripleoclient-api-version', metavar='', default=utils.env( - 'OS_RDOMANAGER_OSCPLUGIN_API_VERSION', - default=DEFAULT_RDOMANAGER_OSCPLUGIN_API_VERSION), - help='RDO Manager OSC Plugin API version, default=' + - DEFAULT_RDOMANAGER_OSCPLUGIN_API_VERSION + - ' (Env: OS_RDOMANAGER_OSCPLUGIN_API_VERSION)') + 'OS_TRIPLEOCLIENT_API_VERSION', + default=DEFAULT_TRIPLEOCLIENT_API_VERSION), + help='TripleO Client API version, default=' + + DEFAULT_TRIPLEOCLIENT_API_VERSION + + ' (Env: OS_TRIPLEOCLIENT_API_VERSION)') return parser diff --git a/tripleoclient/tests/test_rdomanager_oscplugin.py b/tripleoclient/tests/test_tripleoclient.py similarity index 93% rename from tripleoclient/tests/test_rdomanager_oscplugin.py rename to tripleoclient/tests/test_tripleoclient.py index 60b469f48..74fa23fa2 100644 --- a/tripleoclient/tests/test_rdomanager_oscplugin.py +++ b/tripleoclient/tests/test_tripleoclient.py @@ -22,5 +22,5 @@ Tests for `tripleoclient` module. from tripleoclient.tests import base -class TestRdomanagerOscplugin(base.TestCase): +class TestTripleoclient(base.TestCase): pass