From 768494667a3547c2a1ac1e8716b5d81e41a70080 Mon Sep 17 00:00:00 2001 From: Adam Gandelman Date: Thu, 14 May 2015 15:03:13 -0700 Subject: [PATCH] Rework akanda-horizon packaging This is a rework of the repository packaging to: * Renames project to akanda-horizon * Moves all code to akanda_horizon module * Updates setup.cfg/setup.py for PBR * Moves openstack extensions to a subdir This updates setup.cfg/.py for pbr, renames the project to akanda-horizon and moves dashboard extensions into a subdirectory. Change-Id: I5cb1dad2e7dd7f47d0bac2ac39bdf34348fa6240 --- .gitignore | 42 ++++++++++++++---- README.md | 4 +- akanda_horizon/__init__.py | 35 +++++++++++++++ .../rug_openstack_dashboard/__init__.py | 0 .../rug_openstack_dashboard/api/__init__.py | 0 .../rug_openstack_dashboard/api/rug.py | 0 .../dashboards/__init__.py | 0 .../dashboards/admin/__init__.py | 0 .../dashboards/admin/rugrouters/__init__.py | 0 .../dashboards/admin/rugrouters/forms.py | 2 +- .../dashboards/admin/rugrouters/models.py | 0 .../dashboards/admin/rugrouters/panel.py | 0 .../dashboards/admin/rugrouters/tables.py | 2 +- .../templates/rugrouters/_poll.html | 0 .../templates/rugrouters/_rebuild.html | 0 .../templates/rugrouters/index.html | 0 .../rugrouters/templates/rugrouters/poll.html | 0 .../templates/rugrouters/rebuild.html | 0 .../dashboards/admin/rugrouters/tests.py | 0 .../dashboards/admin/rugrouters/urls.py | 3 +- .../dashboards/admin/rugrouters/views.py | 6 +-- .../dashboards/admin/rugtenants/__init__.py | 0 .../dashboards/admin/rugtenants/models.py | 0 .../dashboards/admin/rugtenants/panel.py | 0 .../dashboards/admin/rugtenants/tables.py | 2 +- .../templates/rugtenants/_rebuild.html | 0 .../templates/rugtenants/index.html | 0 .../templates/rugtenants/rebuild.html | 0 .../templates/rugtenants/router-index.html | 0 .../dashboards/admin/rugtenants/tests.py | 0 .../dashboards/admin/rugtenants/urls.py | 3 +- .../dashboards/admin/rugtenants/views.py | 10 ++--- .../_80_admin_rug.py | 0 .../_81_admin_rug_rugrouters.py | 2 +- .../_82_admin_rug_rugtenants.py | 6 ++- setup.cfg | 43 +++++++++++++++++++ setup.py | 30 ++++++++----- test/README.md | 1 + tox.ini | 2 +- 39 files changed, 154 insertions(+), 39 deletions(-) create mode 100644 akanda_horizon/__init__.py rename {akanda => akanda_horizon}/rug_openstack_dashboard/__init__.py (100%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/api/__init__.py (100%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/api/rug.py (100%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/__init__.py (100%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/admin/__init__.py (100%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/admin/rugrouters/__init__.py (100%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/admin/rugrouters/forms.py (97%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/admin/rugrouters/models.py (100%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/admin/rugrouters/panel.py (100%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/admin/rugrouters/tables.py (98%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/admin/rugrouters/templates/rugrouters/_poll.html (100%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/admin/rugrouters/templates/rugrouters/_rebuild.html (100%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/admin/rugrouters/templates/rugrouters/index.html (100%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/admin/rugrouters/templates/rugrouters/poll.html (100%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/admin/rugrouters/templates/rugrouters/rebuild.html (100%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/admin/rugrouters/tests.py (100%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/admin/rugrouters/urls.py (81%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/admin/rugrouters/views.py (89%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/admin/rugtenants/__init__.py (100%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/admin/rugtenants/models.py (100%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/admin/rugtenants/panel.py (100%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/admin/rugtenants/tables.py (98%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/admin/rugtenants/templates/rugtenants/_rebuild.html (100%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/admin/rugtenants/templates/rugtenants/index.html (100%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/admin/rugtenants/templates/rugtenants/rebuild.html (100%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/admin/rugtenants/templates/rugtenants/router-index.html (100%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/admin/rugtenants/tests.py (100%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/admin/rugtenants/urls.py (83%) rename {akanda => akanda_horizon}/rug_openstack_dashboard/dashboards/admin/rugtenants/views.py (93%) rename _80_admin_rug.py => openstack_dashboard_extensions/_80_admin_rug.py (100%) rename _81_admin_rug_rugrouters.py => openstack_dashboard_extensions/_81_admin_rug_rugrouters.py (77%) rename _82_admin_rug_rugtenants.py => openstack_dashboard_extensions/_82_admin_rug_rugtenants.py (72%) create mode 100644 setup.cfg create mode 120000 test/README.md diff --git a/.gitignore b/.gitignore index 733810a..c306f56 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,36 @@ -.coverage *.py[co] -*.sw[po] -*.pyc + +# Packages +*.egg *.egg-info -.venv -dropin.cache -.tox -build dist -fpm.log* -packages/ +build +eggs +parts +bin +var +sdist +develop-eggs +.installed.cfg + +# Installer logs +pip-log.txt + +# Unit test / coverage reports +.coverage +.tox + +#Translations +*.mo + +#Mr Developer +.mr.developer.cfg + +# Packaging output +*.deb + +# pbr output +AUTHORS +ChangeLog + +test.conf diff --git a/README.md b/README.md index d4a3738..1bec6e5 100644 --- a/README.md +++ b/README.md @@ -3,13 +3,13 @@ 1. Install module ``` - pip install akanda-rug-horizon + pip install akanda-horizon ``` 2. Copy extension files from the project root folder to ```/etc/openstack_dashboard/local/enabled``` or to ```/opt/stack/horizon/openstack_dashboard/local/enabled``` folder ``` - cp _80_admin_rug.py _81_admin_rug_rugrouters.py _82_admin_rug_rugtenants.py /opt/stack/horizon/openstack_dashboard/local/enabled/ + cp openstack_dashboard_extensions/*.py /opt/stack/horizon/openstack_dashboard/local/enabled/ ``` 3. Specify rug management prefix, rug api port, and router image uuid in ```local_setting.py``` diff --git a/akanda_horizon/__init__.py b/akanda_horizon/__init__.py new file mode 100644 index 0000000..5566347 --- /dev/null +++ b/akanda_horizon/__init__.py @@ -0,0 +1,35 @@ +# Copyright 2014 DreamHost, LLC +# +# Author: DreamHost, LLC +# +# 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. + + +# Copyright 2014 DreamHost, LLC +# +# Author: DreamHost, LLC +# +# 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. + + +__import__('pkg_resources').declare_namespace(__name__) diff --git a/akanda/rug_openstack_dashboard/__init__.py b/akanda_horizon/rug_openstack_dashboard/__init__.py similarity index 100% rename from akanda/rug_openstack_dashboard/__init__.py rename to akanda_horizon/rug_openstack_dashboard/__init__.py diff --git a/akanda/rug_openstack_dashboard/api/__init__.py b/akanda_horizon/rug_openstack_dashboard/api/__init__.py similarity index 100% rename from akanda/rug_openstack_dashboard/api/__init__.py rename to akanda_horizon/rug_openstack_dashboard/api/__init__.py diff --git a/akanda/rug_openstack_dashboard/api/rug.py b/akanda_horizon/rug_openstack_dashboard/api/rug.py similarity index 100% rename from akanda/rug_openstack_dashboard/api/rug.py rename to akanda_horizon/rug_openstack_dashboard/api/rug.py diff --git a/akanda/rug_openstack_dashboard/dashboards/__init__.py b/akanda_horizon/rug_openstack_dashboard/dashboards/__init__.py similarity index 100% rename from akanda/rug_openstack_dashboard/dashboards/__init__.py rename to akanda_horizon/rug_openstack_dashboard/dashboards/__init__.py diff --git a/akanda/rug_openstack_dashboard/dashboards/admin/__init__.py b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/__init__.py similarity index 100% rename from akanda/rug_openstack_dashboard/dashboards/admin/__init__.py rename to akanda_horizon/rug_openstack_dashboard/dashboards/admin/__init__.py diff --git a/akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/__init__.py b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/__init__.py similarity index 100% rename from akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/__init__.py rename to akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/__init__.py diff --git a/akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/forms.py b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/forms.py similarity index 97% rename from akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/forms.py rename to akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/forms.py index df5d3a6..944da4f 100644 --- a/akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/forms.py +++ b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/forms.py @@ -7,7 +7,7 @@ from horizon import messages from openstack_dashboard.dashboards.project.images import utils -from rug_openstack_dashboard.api.rug import RugClient +from akanda_horizon.rug_openstack_dashboard.api.rug import RugClient rc = RugClient() diff --git a/akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/models.py b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/models.py similarity index 100% rename from akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/models.py rename to akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/models.py diff --git a/akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/panel.py b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/panel.py similarity index 100% rename from akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/panel.py rename to akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/panel.py diff --git a/akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/tables.py b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/tables.py similarity index 98% rename from akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/tables.py rename to akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/tables.py index d8dfe13..def71ab 100644 --- a/akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/tables.py +++ b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/tables.py @@ -4,7 +4,7 @@ from django.utils.translation import ungettext_lazy from horizon import exceptions from horizon import tables -from rug_openstack_dashboard.api.rug import RugClient +from akanda_horizon.rug_openstack_dashboard.api.rug import RugClient rc = RugClient() diff --git a/akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/templates/rugrouters/_poll.html b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/templates/rugrouters/_poll.html similarity index 100% rename from akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/templates/rugrouters/_poll.html rename to akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/templates/rugrouters/_poll.html diff --git a/akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/templates/rugrouters/_rebuild.html b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/templates/rugrouters/_rebuild.html similarity index 100% rename from akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/templates/rugrouters/_rebuild.html rename to akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/templates/rugrouters/_rebuild.html diff --git a/akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/templates/rugrouters/index.html b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/templates/rugrouters/index.html similarity index 100% rename from akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/templates/rugrouters/index.html rename to akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/templates/rugrouters/index.html diff --git a/akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/templates/rugrouters/poll.html b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/templates/rugrouters/poll.html similarity index 100% rename from akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/templates/rugrouters/poll.html rename to akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/templates/rugrouters/poll.html diff --git a/akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/templates/rugrouters/rebuild.html b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/templates/rugrouters/rebuild.html similarity index 100% rename from akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/templates/rugrouters/rebuild.html rename to akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/templates/rugrouters/rebuild.html diff --git a/akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/tests.py b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/tests.py similarity index 100% rename from akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/tests.py rename to akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/tests.py diff --git a/akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/urls.py b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/urls.py similarity index 81% rename from akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/urls.py rename to akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/urls.py index 8eb4f01..60848f0 100644 --- a/akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/urls.py +++ b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/urls.py @@ -1,7 +1,8 @@ from django.conf.urls import patterns from django.conf.urls import url -from rug_openstack_dashboard.dashboards.admin.rugrouters import views +from akanda_horizon.rug_openstack_dashboard.dashboards.admin.rugrouters \ + import views ROUTERS = r'^(?P[^/]+)/%s$' diff --git a/akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/views.py b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/views.py similarity index 89% rename from akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/views.py rename to akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/views.py index a58c9a6..2097e2b 100644 --- a/akanda/rug_openstack_dashboard/dashboards/admin/rugrouters/views.py +++ b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugrouters/views.py @@ -8,11 +8,11 @@ from horizon import exceptions from openstack_dashboard import api -from rug_openstack_dashboard.dashboards.admin.rugrouters import \ +from akanda_horizon.rug_openstack_dashboard.dashboards.admin.rugrouters import \ tables as router_tables -from rug_openstack_dashboard.dashboards.admin.rugrouters import \ +from akanda_horizon.rug_openstack_dashboard.dashboards.admin.rugrouters import \ forms as rugrouters_forms -from rug_openstack_dashboard.api.rug import RugClient +from akanda_horizon.rug_openstack_dashboard.api.rug import RugClient rc = RugClient() diff --git a/akanda/rug_openstack_dashboard/dashboards/admin/rugtenants/__init__.py b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugtenants/__init__.py similarity index 100% rename from akanda/rug_openstack_dashboard/dashboards/admin/rugtenants/__init__.py rename to akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugtenants/__init__.py diff --git a/akanda/rug_openstack_dashboard/dashboards/admin/rugtenants/models.py b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugtenants/models.py similarity index 100% rename from akanda/rug_openstack_dashboard/dashboards/admin/rugtenants/models.py rename to akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugtenants/models.py diff --git a/akanda/rug_openstack_dashboard/dashboards/admin/rugtenants/panel.py b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugtenants/panel.py similarity index 100% rename from akanda/rug_openstack_dashboard/dashboards/admin/rugtenants/panel.py rename to akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugtenants/panel.py diff --git a/akanda/rug_openstack_dashboard/dashboards/admin/rugtenants/tables.py b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugtenants/tables.py similarity index 98% rename from akanda/rug_openstack_dashboard/dashboards/admin/rugtenants/tables.py rename to akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugtenants/tables.py index 6c834ee..ca838d4 100644 --- a/akanda/rug_openstack_dashboard/dashboards/admin/rugtenants/tables.py +++ b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugtenants/tables.py @@ -5,7 +5,7 @@ from django.utils.translation import ungettext_lazy from horizon import tables from horizon import exceptions -from rug_openstack_dashboard.api.rug import RugClient +from akanda_horizon.rug_openstack_dashboard.api.rug import RugClient rc = RugClient() diff --git a/akanda/rug_openstack_dashboard/dashboards/admin/rugtenants/templates/rugtenants/_rebuild.html b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugtenants/templates/rugtenants/_rebuild.html similarity index 100% rename from akanda/rug_openstack_dashboard/dashboards/admin/rugtenants/templates/rugtenants/_rebuild.html rename to akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugtenants/templates/rugtenants/_rebuild.html diff --git a/akanda/rug_openstack_dashboard/dashboards/admin/rugtenants/templates/rugtenants/index.html b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugtenants/templates/rugtenants/index.html similarity index 100% rename from akanda/rug_openstack_dashboard/dashboards/admin/rugtenants/templates/rugtenants/index.html rename to akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugtenants/templates/rugtenants/index.html diff --git a/akanda/rug_openstack_dashboard/dashboards/admin/rugtenants/templates/rugtenants/rebuild.html b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugtenants/templates/rugtenants/rebuild.html similarity index 100% rename from akanda/rug_openstack_dashboard/dashboards/admin/rugtenants/templates/rugtenants/rebuild.html rename to akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugtenants/templates/rugtenants/rebuild.html diff --git a/akanda/rug_openstack_dashboard/dashboards/admin/rugtenants/templates/rugtenants/router-index.html b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugtenants/templates/rugtenants/router-index.html similarity index 100% rename from akanda/rug_openstack_dashboard/dashboards/admin/rugtenants/templates/rugtenants/router-index.html rename to akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugtenants/templates/rugtenants/router-index.html diff --git a/akanda/rug_openstack_dashboard/dashboards/admin/rugtenants/tests.py b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugtenants/tests.py similarity index 100% rename from akanda/rug_openstack_dashboard/dashboards/admin/rugtenants/tests.py rename to akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugtenants/tests.py diff --git a/akanda/rug_openstack_dashboard/dashboards/admin/rugtenants/urls.py b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugtenants/urls.py similarity index 83% rename from akanda/rug_openstack_dashboard/dashboards/admin/rugtenants/urls.py rename to akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugtenants/urls.py index 39f7bee..c40da6f 100644 --- a/akanda/rug_openstack_dashboard/dashboards/admin/rugtenants/urls.py +++ b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugtenants/urls.py @@ -1,7 +1,8 @@ from django.conf.urls import patterns from django.conf.urls import url -from rug_openstack_dashboard.dashboards.admin.rugtenants import views +from akanda_horizon.rug_openstack_dashboard.dashboards.admin.rugtenants \ + import views TENANT = r'^(?P[^/]+)/%s$' diff --git a/akanda/rug_openstack_dashboard/dashboards/admin/rugtenants/views.py b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugtenants/views.py similarity index 93% rename from akanda/rug_openstack_dashboard/dashboards/admin/rugtenants/views.py rename to akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugtenants/views.py index c5f021f..d40a433 100644 --- a/akanda/rug_openstack_dashboard/dashboards/admin/rugtenants/views.py +++ b/akanda_horizon/rug_openstack_dashboard/dashboards/admin/rugtenants/views.py @@ -10,11 +10,11 @@ from horizon import forms from openstack_dashboard import api from openstack_dashboard import policy -from rug_openstack_dashboard.dashboards.admin.rugtenants import \ - tables as tenant_tables -from rug_openstack_dashboard.dashboards.admin.rugrouters import \ - forms as rugrouters_forms -from rug_openstack_dashboard.api.rug import RugClient +from akanda_horizon.rug_openstack_dashboard.dashboards.admin.rugtenants \ + import tables as tenant_tables +from akanda_horizon.rug_openstack_dashboard.dashboards.admin.rugrouters \ + import forms as rugrouters_forms +from akanda_horizon.rug_openstack_dashboard.api.rug import RugClient rc = RugClient() diff --git a/_80_admin_rug.py b/openstack_dashboard_extensions/_80_admin_rug.py similarity index 100% rename from _80_admin_rug.py rename to openstack_dashboard_extensions/_80_admin_rug.py diff --git a/_81_admin_rug_rugrouters.py b/openstack_dashboard_extensions/_81_admin_rug_rugrouters.py similarity index 77% rename from _81_admin_rug_rugrouters.py rename to openstack_dashboard_extensions/_81_admin_rug_rugrouters.py index fd6639c..e1dd579 100644 --- a/_81_admin_rug_rugrouters.py +++ b/openstack_dashboard_extensions/_81_admin_rug_rugrouters.py @@ -7,4 +7,4 @@ PANEL_GROUP = 'rug' # Python panel class of the PANEL to be added. ADD_PANEL = \ - 'rug_openstack_dashboard.dashboards.admin.rugrouters.panel.Rugrouters' + 'akanda_horizon.rug_openstack_dashboard.dashboards.admin.rugrouters.panel.Rugrouters' diff --git a/_82_admin_rug_rugtenants.py b/openstack_dashboard_extensions/_82_admin_rug_rugtenants.py similarity index 72% rename from _82_admin_rug_rugtenants.py rename to openstack_dashboard_extensions/_82_admin_rug_rugtenants.py index f7fdc5e..9a3923e 100644 --- a/_82_admin_rug_rugtenants.py +++ b/openstack_dashboard_extensions/_82_admin_rug_rugtenants.py @@ -6,5 +6,7 @@ PANEL_DASHBOARD = 'admin' PANEL_GROUP = 'rug' # Python panel class of the PANEL to be added. -ADD_PANEL = \ - 'rug_openstack_dashboard.dashboards.admin.rugtenants.panel.Rugtenants' +ADD_PANEL = ( + 'akanda_horizon.rug_openstack_dashboard.dashboards.admin.rugtenants.' + 'panel.Rugtenants') + diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..8facf9a --- /dev/null +++ b/setup.cfg @@ -0,0 +1,43 @@ +[metadata] +name = akanda-horizon +version = 2015.1 +summary = Akanda plugin for Horizon +description-file = + README.md +author = OpenStack +author-email = openstack-dev@lists.openstack.org +home-page = http://github.com/stackforge/akanda-horizon +classifier = + Environment :: OpenStack + Intended Audience :: Developers + Intended Audience :: Information Technology + Intended Audience :: System Administrators + License :: OSI Approved :: Apache Software License + Operating System :: POSIX :: Linux + Programming Language :: Python + Programming Language :: Python :: 2 + Programming Language :: Python :: 2.7 + Programming Language :: Python :: 2.6 + + +[files] +packages = + akanda_horizon + akanda_horizon.rug_openstack_dashboard +namespace_packages = + akanda_horizon + +[global] +setup-hooks = + pbr.hooks.setup_hook + +[build_sphinx] +all_files = 1 +build-dir = doc/build +source-dir = doc/source + +[nosetests] +where = test +verbosity = 2 +detailed-errors = 1 +cover-package = akanda_horizon diff --git a/setup.py b/setup.py index 6eb3bde..7fc6985 100644 --- a/setup.py +++ b/setup.py @@ -1,12 +1,20 @@ -#!/usr/bin/env python -from setuptools import setup, find_packages +# Copyright 2015 Akanda, Inc +# +# 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. -setup( - name='akanda-rug-horizon', - version='0.1', - packages=find_packages("akanda"), - package_dir={'': 'akanda'}, - install_requires=[ - 'requests', - ], -) + +import setuptools + +setuptools.setup( + setup_requires=['pbr'], + pbr=True) diff --git a/test/README.md b/test/README.md new file mode 120000 index 0000000..61cfe9a --- /dev/null +++ b/test/README.md @@ -0,0 +1 @@ +./README.md \ No newline at end of file diff --git a/tox.ini b/tox.ini index f976513..4b0b609 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ sitepackages = False [testenv:style] deps = flake8 setuptools_git>=0.4 -commands = flake8 akanda setup.py +commands = flake8 akanda_horizon setup.py [testenv:pep8] deps = {[testenv:style]deps}