From badf05a969091c01d2ed29c640773d7297ad4669 Mon Sep 17 00:00:00 2001 From: Drew Thorstensen Date: Fri, 31 Oct 2014 10:16:25 -0500 Subject: [PATCH] Import python-powervm into ceilometer-powervm This change set supports bringing in the python powervm REST API library for initial use within ceilometer-powervm. This change also fixes pep8 issues, mainly around the copyright rules that are needed (do not copyright empty files). Also updates the tox file such that we run the new oslo concurrency as ceilometer removed the integrated package. Change-Id: I12739ca702e004cd048067ad25e9e07d1ef106e6 --- ceilometer_powervm/__init__.py | 14 -------------- .../compute/virt/powervm/__init__.py | 16 ---------------- .../compute/virt/powervm/inspector.py | 3 +++ .../tests/compute/virt/powervm/__init__.py | 16 ---------------- requirements.txt | 2 -- tox.ini | 3 ++- 6 files changed, 5 insertions(+), 49 deletions(-) diff --git a/ceilometer_powervm/__init__.py b/ceilometer_powervm/__init__.py index 31285c4f..e69de29b 100644 --- a/ceilometer_powervm/__init__.py +++ b/ceilometer_powervm/__init__.py @@ -1,14 +0,0 @@ -# Copyright 2011 OpenStack Foundation -# All Rights Reserved. -# -# 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. diff --git a/ceilometer_powervm/compute/virt/powervm/__init__.py b/ceilometer_powervm/compute/virt/powervm/__init__.py index a4215e2b..e69de29b 100644 --- a/ceilometer_powervm/compute/virt/powervm/__init__.py +++ b/ceilometer_powervm/compute/virt/powervm/__init__.py @@ -1,16 +0,0 @@ -# Copyright 2014 IBM Corp. -# -# All Rights Reserved. -# -# 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. - diff --git a/ceilometer_powervm/compute/virt/powervm/inspector.py b/ceilometer_powervm/compute/virt/powervm/inspector.py index 8b57f36c..912b8756 100644 --- a/ceilometer_powervm/compute/virt/powervm/inspector.py +++ b/ceilometer_powervm/compute/virt/powervm/inspector.py @@ -15,3 +15,6 @@ # under the License. # # @author: Adam Reznechek, IBM Corp. + +# Simple pass till we add content +pass diff --git a/ceilometer_powervm/tests/compute/virt/powervm/__init__.py b/ceilometer_powervm/tests/compute/virt/powervm/__init__.py index a4215e2b..e69de29b 100644 --- a/ceilometer_powervm/tests/compute/virt/powervm/__init__.py +++ b/ceilometer_powervm/tests/compute/virt/powervm/__init__.py @@ -1,16 +0,0 @@ -# Copyright 2014 IBM Corp. -# -# All Rights Reserved. -# -# 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. - diff --git a/requirements.txt b/requirements.txt index 823c2b4e..75e9e30b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,4 @@ oslosphinx pbr>=0.6,!=0.7,<1.0 sphinx>=1.1.2,<1.2 -testrepository>=0.0.18 -testtools>=0.9.34 yasfb>=0.5.1 diff --git a/tox.ini b/tox.ini index 23bc6967..0ec1e719 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,8 @@ setenv = VIRTUAL_ENV={envdir} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt -egit+https://github.com/openstack/ceilometer#egg=ceilometer -commands = python -m ceilometer.openstack.common.lockutils python setup.py testr --slowest --testr-args="{posargs}" + -egit+ssh://***REMOVED***:29418/python-powervm.git#egg=python-powervm +commands = python -m oslo.concurrency.lockutils python setup.py testr --slowest --testr-args="{posargs}" downloadcache = {toxworkdir}/_download [testenv:pep8]