From 81ac6a1fa1e78ae0e44ea59a2a077fb9e978e361 Mon Sep 17 00:00:00 2001 From: David Shrewsbury Date: Fri, 14 Sep 2012 07:48:06 -0400 Subject: [PATCH] Reorganize package structure around new product name (libra). Make tests directory NOT be a Python package. Rename executables. Add common source dir. --- README | 6 +++--- {lbaas_worker => libra}/__init__.py | 0 libra/common/__init__.py | 13 +++++++++++++ {lbaas_mgm => libra/mgm}/__init__.py | 0 {lbaas_mgm => libra/mgm}/faults.py | 0 {lbaas_mgm => libra/mgm}/json_gearman.py | 0 {lbaas_mgm => libra/mgm}/listener.py | 2 +- {lbaas_mgm => libra/mgm}/mgm.py | 2 +- libra/worker/__init__.py | 13 +++++++++++++ {lbaas_worker => libra/worker}/faults.py | 0 {lbaas_worker => libra/worker}/json_gearman.py | 0 {lbaas_worker => libra/worker}/worker.py | 4 ++-- setup.py | 6 +++--- tests/__init__.py | 0 tests/test_lbaas_mgm.py | 10 +++++----- tests/test_lbaas_task.py | 2 +- 16 files changed, 42 insertions(+), 16 deletions(-) rename {lbaas_worker => libra}/__init__.py (100%) create mode 100644 libra/common/__init__.py rename {lbaas_mgm => libra/mgm}/__init__.py (100%) rename {lbaas_mgm => libra/mgm}/faults.py (100%) rename {lbaas_mgm => libra/mgm}/json_gearman.py (100%) rename {lbaas_mgm => libra/mgm}/listener.py (97%) rename {lbaas_mgm => libra/mgm}/mgm.py (98%) create mode 100644 libra/worker/__init__.py rename {lbaas_worker => libra/worker}/faults.py (100%) rename {lbaas_worker => libra/worker}/json_gearman.py (100%) rename {lbaas_worker => libra/worker}/worker.py (97%) delete mode 100644 tests/__init__.py diff --git a/README b/README index 04c5aec6..4f0bc024 100644 --- a/README +++ b/README @@ -36,13 +36,13 @@ mode (-d option) is useful for testing. Basic commands: # Getting help - $ lbaas_worker -h + $ libra_worker -h # Start up as a daemon - $ sudo lbaas_worker + $ sudo libra_worker # Start up with debugging output in non-daemon mode - $ lbaas_worker --debug -d + $ libra_worker --debug -d You can verify that the worker is running by using the sample Gearman client in the bin/ directory: diff --git a/lbaas_worker/__init__.py b/libra/__init__.py similarity index 100% rename from lbaas_worker/__init__.py rename to libra/__init__.py diff --git a/libra/common/__init__.py b/libra/common/__init__.py new file mode 100644 index 00000000..582348cb --- /dev/null +++ b/libra/common/__init__.py @@ -0,0 +1,13 @@ +# Copyright 2012 Hewlett-Packard Development Company, L.P. +# +# 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/lbaas_mgm/__init__.py b/libra/mgm/__init__.py similarity index 100% rename from lbaas_mgm/__init__.py rename to libra/mgm/__init__.py diff --git a/lbaas_mgm/faults.py b/libra/mgm/faults.py similarity index 100% rename from lbaas_mgm/faults.py rename to libra/mgm/faults.py diff --git a/lbaas_mgm/json_gearman.py b/libra/mgm/json_gearman.py similarity index 100% rename from lbaas_mgm/json_gearman.py rename to libra/mgm/json_gearman.py diff --git a/lbaas_mgm/listener.py b/libra/mgm/listener.py similarity index 97% rename from lbaas_mgm/listener.py rename to libra/mgm/listener.py index dec9acfa..e7415ae6 100644 --- a/lbaas_mgm/listener.py +++ b/libra/mgm/listener.py @@ -17,7 +17,7 @@ import json import socket from json_gearman import JSONGearmanWorker -from lbaas_mgm.faults import BadRequest +from libra.mgm.faults import BadRequest class Listener(object): diff --git a/lbaas_mgm/mgm.py b/libra/mgm/mgm.py similarity index 98% rename from lbaas_mgm/mgm.py rename to libra/mgm/mgm.py index 61233081..7130429f 100644 --- a/lbaas_mgm/mgm.py +++ b/libra/mgm/mgm.py @@ -19,7 +19,7 @@ import daemon import signal import sys -from lbaas_mgm.listener import Listener +from libra.mgm.listener import Listener class Server(object): diff --git a/libra/worker/__init__.py b/libra/worker/__init__.py new file mode 100644 index 00000000..582348cb --- /dev/null +++ b/libra/worker/__init__.py @@ -0,0 +1,13 @@ +# Copyright 2012 Hewlett-Packard Development Company, L.P. +# +# 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/lbaas_worker/faults.py b/libra/worker/faults.py similarity index 100% rename from lbaas_worker/faults.py rename to libra/worker/faults.py diff --git a/lbaas_worker/json_gearman.py b/libra/worker/json_gearman.py similarity index 100% rename from lbaas_worker/json_gearman.py rename to libra/worker/json_gearman.py diff --git a/lbaas_worker/worker.py b/libra/worker/worker.py similarity index 97% rename from lbaas_worker/worker.py rename to libra/worker/worker.py index 2930f077..ef7587b8 100644 --- a/lbaas_worker/worker.py +++ b/libra/worker/worker.py @@ -21,8 +21,8 @@ import logging import socket from time import sleep -from lbaas_worker.json_gearman import JSONGearmanWorker -from lbaas_worker.faults import BadRequest +from libra.worker.json_gearman import JSONGearmanWorker +from libra.worker.faults import BadRequest def lbaas_task(worker, job): diff --git a/setup.py b/setup.py index dbe53b21..1a251b94 100644 --- a/setup.py +++ b/setup.py @@ -45,7 +45,7 @@ except Exception: ci_cmdclass['test'] = PyTest setuptools.setup( - name="lbaas_devices", + name="libra", description="Python LBaaS Gearman Worker and Pool Manager", version="1.0", author="David Shrewsbury , \ @@ -53,8 +53,8 @@ setuptools.setup( packages=setuptools.find_packages(exclude=["*.tests"]), entry_points={ 'console_scripts': [ - 'lbaas_worker = lbaas_worker.worker:main', - 'lbaas_pool_mgm = lbaas_mgm.mgm:main' + 'libra_worker = libra.worker.worker:main', + 'libra_pool_mgm = libra.mgm.mgm:main' ] }, cmdclass=ci_cmdclass, diff --git a/tests/__init__.py b/tests/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/test_lbaas_mgm.py b/tests/test_lbaas_mgm.py index a89a2eb3..7f0f5569 100644 --- a/tests/test_lbaas_mgm.py +++ b/tests/test_lbaas_mgm.py @@ -1,15 +1,15 @@ import unittest import logging -import tests.mock +import mock -from lbaas_mgm.listener import Listener +from libra.mgm.listener import Listener class TestLBaaSMgmTask(unittest.TestCase): def setUp(self): self.logger = logging.getLogger('lbass_mgm_test') - self.lh = tests.mock.MockLoggingHandler() + self.lh = mock.MockLoggingHandler() self.logger.setLevel(logging.DEBUG) self.logger.addHandler(self.lh) @@ -19,7 +19,7 @@ class TestLBaaSMgmTask(unittest.TestCase): def testTaskGet(self): listener = Listener(self.logger) data = {'command': 'get'} - job = tests.mock.FakeJob(data) + job = mock.FakeJob(data) result = listener.task(None, job) self.assertIn('Command: get', self.lh.messages['debug']) self.assertEqual(result['command'], data['command']) @@ -27,7 +27,7 @@ class TestLBaaSMgmTask(unittest.TestCase): def testTaskBad(self): listener = Listener(self.logger) data = {'command': 'bad'} - job = tests.mock.FakeJob(data) + job = mock.FakeJob(data) result = listener.task(None, job) self.assertIn("badRequest", result) self.assertIn("validationErrors", result['badRequest']) diff --git a/tests/test_lbaas_task.py b/tests/test_lbaas_task.py index 12b6f401..f2f0ff3a 100644 --- a/tests/test_lbaas_task.py +++ b/tests/test_lbaas_task.py @@ -1,6 +1,6 @@ import json import unittest -from lbaas_worker.worker import lbaas_task +from libra.worker.worker import lbaas_task class FakeJob(object):