Fix ups so pbr and setup works
Moved octavia/bin directory to octavia/octavia/cmd and renamed octavia-api to api.py. This follows the new strucutre most openstack projects are doing. Also implemented octavia-api being built when doing setup install. Had to remove the octavia/tests/specs symlink because pbr did not like it and would not allow anything to be built. Also found out the test_titles test was not being run on the specs, so that has been added as a separate tox environment. Change-Id: I92f2bc6eaa346983f7a2479dc9fa43d2040f2cd5
This commit is contained in:
parent
08e95875b8
commit
a48ccb03fb
@ -27,7 +27,8 @@ from octavia.i18n import _LI
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
def main():
|
||||
octavia_service.prepare_service(sys.argv)
|
||||
app = api_app.setup_app()
|
||||
|
@ -1 +0,0 @@
|
||||
../../specs-tests/tests
|
@ -9,6 +9,8 @@ anyjson>=0.3.3
|
||||
Babel>=1.3
|
||||
eventlet>=0.16.1,!=0.17.0
|
||||
requests>=2.2.0,!=2.4.0
|
||||
ipaddr==2.1.11
|
||||
iso8601>=0.1.9
|
||||
jsonrpclib
|
||||
keystonemiddleware>=1.5.0
|
||||
netaddr>=0.7.12
|
||||
@ -35,5 +37,5 @@ pyOpenSSL>=0.11
|
||||
WSME>=0.6
|
||||
pyasn1
|
||||
pyasn1_modules
|
||||
|
||||
singledispatch>=3.4.0.3 # For pecan
|
||||
Jinja2>=2.6 # BSD License (3 clause)
|
||||
|
@ -18,6 +18,10 @@ classifier =
|
||||
Programming Language :: Python
|
||||
Programming Language :: Python :: 2.7
|
||||
|
||||
[files]
|
||||
packages =
|
||||
octavia
|
||||
|
||||
[build_sphinx]
|
||||
all_files = 1
|
||||
build-dir = doc/build
|
||||
@ -30,6 +34,8 @@ warnerrors = True
|
||||
universal = 1
|
||||
|
||||
[entry_points]
|
||||
console_scripts =
|
||||
octavia-api = octavia.cmd.api:main
|
||||
octavia.api.handlers =
|
||||
simulated_handler = octavia.api.v1.handlers.controller_simulator.handler:SimulatedControllerHandler
|
||||
queue_producer = octavia.api.v1.handlers.queue.producer:ProducerHandler
|
||||
|
7
tox.ini
7
tox.ini
@ -1,6 +1,6 @@
|
||||
[tox]
|
||||
minversion = 1.6
|
||||
envlist = docs,py27,pep8
|
||||
envlist = docs,py27,pep8,specs
|
||||
skipsdist = True
|
||||
|
||||
[testenv]
|
||||
@ -26,6 +26,11 @@ commands = flake8
|
||||
[testenv:docs]
|
||||
commands = python setup.py build_sphinx
|
||||
|
||||
[testenv:specs]
|
||||
commands =
|
||||
find . -type f -name "*.pyc" -delete
|
||||
python -m unittest specs-tests.test_titles
|
||||
|
||||
[flake8]
|
||||
# Ignoring O321 because it's unnecessarily restricting use of json package.
|
||||
# jsonutils version doesn't add additional value
|
||||
|
Loading…
Reference in New Issue
Block a user