From 7b4cbda9305402fb97714a261a198cf362fb6de2 Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Wed, 16 Nov 2016 09:37:20 +0100 Subject: [PATCH] create a horizon plugin Move vitragedashboard to vitrage-dashboard/dashboard vitragealarms to vitrage-dashboard/alarms vitragetemplates to vitrage-dashboard/templates etc. Enable to use this as horizon plugin without the need of copying over API files, simply place files from enabled directory in horizons openstack_dashboard/local/enabled folder. Change-Id: I38ea4e32abbad75e5432b8c1dfe64511162a7248 --- .gitignore | 1 - README.rst | 2 - devstack/plugin.sh | 6 +- .../_80_project_vitrage_panel_group.py | 0 .../_90_project_topology_vitrage_panel.py | 4 +- .../_91_project_alarms_vitrage_panel.py | 4 +- .../_92_project_entities_vitrage_panel.py | 4 +- .../_93_project_template_vitrage_panel.py | 4 +- setup.cfg | 13 ++-- .../tests => vitrage_dashboard}/__init__.py | 0 .../alarms}/__init__.py | 0 .../alarms}/panel.py | 0 .../alarms}/templates/alarms/index.html | 0 .../alarms}/urls.py | 2 +- .../alarms}/version.py | 0 .../alarms}/views.py | 0 vitrage_dashboard/api/__init__.py | 0 .../api/vitrage.py | 0 .../api/vitrage_rest_api.py | 16 +++-- .../dashboard}/__init__.py | 0 .../dashboard}/panel.py | 0 .../openstack-service-api/vitrage.service.js | 0 .../vitrage.service.spec.js | 0 .../project/alarmList/alarmList.controller.js | 0 .../project/alarmList/alarmList.html | 0 .../project/alarmList/alarmList.scss | 0 .../static/dashboard/project/assets/all.png | Bin .../project/assets/bell_gray_off.svg | 0 .../dashboard/project/assets/bell_gray_on.svg | 0 .../project/assets/bell_green_off.svg | 0 .../project/assets/bell_green_on.svg | 0 .../project/assets/bell_orange_off.svg | 0 .../project/assets/bell_orange_on.svg | 0 .../dashboard/project/assets/bell_red_off.svg | 0 .../dashboard/project/assets/bell_red_on.svg | 0 .../project/assets/bell_yellow_off.svg | 0 .../project/assets/bell_yellow_on.svg | 0 .../dashboard/project/assets/cluster.png | Bin .../static/dashboard/project/assets/host.png | Bin .../static/dashboard/project/assets/vm.png | Bin .../static/dashboard/project/assets/zone.png | Bin .../components/alarms/alarms.directive.js | 0 .../project/components/alarms/alarms.html | 0 .../project/components/alarms/alarms.scss | 0 .../information/information.directive.js | 0 .../components/information/information.html | 0 .../components/information/information.scss | 0 .../components/rca/rcaContainer.controller.js | 0 .../project/components/rca/rcaContainer.html | 0 .../project/components/rca/rcaContainer.scss | 0 .../rca/rootCauseAnalysisGraph.directive.js | 0 .../rca/rootCauseAnalysisGraph.html | 0 .../rca/rootCauseAnalysisGraph.scss | 0 .../components/stacks/stacks.directive.js | 0 .../project/components/stacks/stacks.html | 0 .../project/components/stacks/stacks.scss | 0 .../sunburst-minimap.directive.js | 0 .../sunburst-minimap/sunburst-minimap.html | 0 .../components/sunburst/sunburst.directive.js | 0 .../project/components/sunburst/sunburst.html | 0 .../project/components/sunburst/sunburst.scss | 0 .../components/sunburst/sunburst.test.js | 0 .../template/templateContainer.controller.js | 0 .../template/templateContainer.html | 0 .../template/templateContainer.scss | 0 .../project/components/vms/vms.directive.js | 0 .../dashboard/project/components/vms/vms.html | 0 .../dashboard/project/components/vms/vms.scss | 0 .../project/entities/entities.controller.js | 0 .../dashboard/project/entities/entities.html | 0 .../dashboard/project/entities/entities.scss | 0 .../graph/entities-graph.directive.js | 0 .../entities/graph/entities-graph.html | 0 .../entities/graph/entities-graph.scss | 0 .../entities/info/entities-info.directive.js | 0 .../project/entities/info/entities-info.html | 0 .../project/entities/info/entities-info.scss | 0 .../toolbox/entities-toolbox.directive.js | 0 .../entities/toolbox/entities-toolbox.html | 0 .../entities/toolbox/entities-toolbox.scss | 0 .../project/filters/titleCase.filter.js | 0 .../layout/main/compute/compute.directive.js | 0 .../project/layout/main/compute/compute.html | 0 .../project/layout/main/compute/compute.scss | 0 .../project/layout/main/main.controller.js | 0 .../dashboard/project/layout/main/main.html | 0 .../dashboard/project/layout/main/main.scss | 0 .../layout/main/network/network.directive.js | 0 .../project/layout/main/network/network.html | 0 .../project/layout/main/network/network.scss | 0 .../layout/main/storage/storage.directive.js | 0 .../project/layout/main/storage/storage.html | 0 .../project/layout/main/storage/storage.scss | 0 .../project/services/modal.service.js | 0 .../services/vitrage_topology.service.js | 0 .../templateList/templateList.controller.js | 0 .../project/templateList/templateList.html | 0 .../project/templateList/templateList.scss | 0 .../dashboard/project/topology/graph.json | 0 .../project/topology/graph.sample.json | 0 .../dashboard/project/vitrage.module.js | 0 .../static/dashboard/project/vitrage.scss | 0 .../dashboard}/static/vendor/d3/.bower.json | 0 .../dashboard}/static/vendor/d3/.spmignore | 0 .../static/vendor/d3/CONTRIBUTING.md | 0 .../dashboard}/static/vendor/d3/LICENSE | 0 .../dashboard}/static/vendor/d3/README.md | 0 .../dashboard}/static/vendor/d3/bower.json | 0 .../dashboard}/static/vendor/d3/composer.json | 0 .../dashboard}/static/vendor/d3/d3.js | 0 .../dashboard}/static/vendor/d3/d3.min.js | 0 .../static/vendor/dagre-d3/.bower.json | 0 .../dashboard}/static/vendor/dagre-d3/LICENSE | 0 .../static/vendor/dagre-d3/bower.json | 0 .../vendor/dagre-d3/dist/dagre-d3.core.js | 0 .../vendor/dagre-d3/dist/dagre-d3.core.min.js | 0 .../static/vendor/dagre/.bower.json | 0 .../dashboard}/static/vendor/dagre/LICENSE | 0 .../dashboard}/static/vendor/dagre/bower.json | 0 .../static/vendor/dagre/dist/dagre.core.js | 0 .../vendor/dagre/dist/dagre.core.min.js | 0 .../static/vendor/graphlib/.bower.json | 0 .../dashboard}/static/vendor/graphlib/LICENSE | 0 .../static/vendor/graphlib/bower.json | 0 .../vendor/graphlib/dist/graphlib.core.js | 0 .../vendor/graphlib/dist/graphlib.core.min.js | 0 .../static/vendor/lodash/.bower.json | 0 .../static/vendor/lodash/LICENSE.txt | 0 .../static/vendor/lodash/bower.json | 0 .../vendor/lodash/dist/lodash.compat.js | 0 .../vendor/lodash/dist/lodash.compat.min.js | 0 .../static/vendor/lodash/dist/lodash.js | 0 .../static/vendor/lodash/dist/lodash.min.js | 0 .../vendor/lodash/dist/lodash.underscore.js | 0 .../lodash/dist/lodash.underscore.min.js | 0 .../dashboard}/templates/topology/index.html | 0 vitrage_dashboard/dashboard/tests/__init__.py | 0 .../dashboard}/tests/base.py | 0 .../dashboard}/tests/test_vitragedashboard.py | 2 +- .../dashboard}/urls.py | 3 +- .../dashboard}/version.py | 0 .../dashboard}/views.py | 0 .../entities}/__init__.py | 0 .../entities}/panel.py | 0 .../entities}/templates/entities/index.html | 0 .../entities}/urls.py | 2 +- .../entities}/version.py | 0 .../entities}/views.py | 0 .../templates}/__init__.py | 0 .../templates}/panel.py | 0 .../templates}/templates/templates/index.html | 0 .../templates}/urls.py | 2 +- .../templates}/version.py | 0 .../templates}/views.py | 0 vitrageclient/api/__init__.py | 65 ------------------ vitrageclient/api/rest/__init__.py | 34 --------- 156 files changed, 30 insertions(+), 134 deletions(-) rename {vitragedashboard/enabled => enabled}/_80_project_vitrage_panel_group.py (100%) rename {vitragedashboard/enabled => enabled}/_90_project_topology_vitrage_panel.py (88%) rename {vitragedashboard/enabled => enabled}/_91_project_alarms_vitrage_panel.py (89%) rename {vitragedashboard/enabled => enabled}/_92_project_entities_vitrage_panel.py (89%) rename {vitragedashboard/enabled => enabled}/_93_project_template_vitrage_panel.py (89%) rename {vitragedashboard/tests => vitrage_dashboard}/__init__.py (100%) rename {vitragealarms => vitrage_dashboard/alarms}/__init__.py (100%) rename {vitragealarms => vitrage_dashboard/alarms}/panel.py (100%) rename {vitragealarms => vitrage_dashboard/alarms}/templates/alarms/index.html (100%) rename {vitragealarms => vitrage_dashboard/alarms}/urls.py (94%) rename {vitragealarms => vitrage_dashboard/alarms}/version.py (100%) rename {vitragealarms => vitrage_dashboard/alarms}/views.py (100%) create mode 100644 vitrage_dashboard/api/__init__.py rename {vitrageclient => vitrage_dashboard}/api/vitrage.py (100%) rename vitrageclient/api/rest/vitrage.py => vitrage_dashboard/api/vitrage_rest_api.py (89%) rename {vitragedashboard => vitrage_dashboard/dashboard}/__init__.py (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/panel.py (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/app/core/openstack-service-api/vitrage.service.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/app/core/openstack-service-api/vitrage.service.spec.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/alarmList/alarmList.controller.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/alarmList/alarmList.html (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/alarmList/alarmList.scss (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/assets/all.png (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/assets/bell_gray_off.svg (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/assets/bell_gray_on.svg (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/assets/bell_green_off.svg (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/assets/bell_green_on.svg (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/assets/bell_orange_off.svg (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/assets/bell_orange_on.svg (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/assets/bell_red_off.svg (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/assets/bell_red_on.svg (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/assets/bell_yellow_off.svg (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/assets/bell_yellow_on.svg (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/assets/cluster.png (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/assets/host.png (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/assets/vm.png (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/assets/zone.png (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/alarms/alarms.directive.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/alarms/alarms.html (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/alarms/alarms.scss (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/information/information.directive.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/information/information.html (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/information/information.scss (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/rca/rcaContainer.controller.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/rca/rcaContainer.html (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/rca/rcaContainer.scss (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/rca/rootCauseAnalysisGraph.directive.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/rca/rootCauseAnalysisGraph.html (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/rca/rootCauseAnalysisGraph.scss (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/stacks/stacks.directive.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/stacks/stacks.html (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/stacks/stacks.scss (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/sunburst-minimap/sunburst-minimap.directive.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/sunburst-minimap/sunburst-minimap.html (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/sunburst/sunburst.directive.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/sunburst/sunburst.html (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/sunburst/sunburst.scss (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/sunburst/sunburst.test.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/template/templateContainer.controller.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/template/templateContainer.html (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/template/templateContainer.scss (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/vms/vms.directive.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/vms/vms.html (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/components/vms/vms.scss (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/entities/entities.controller.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/entities/entities.html (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/entities/entities.scss (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/entities/graph/entities-graph.directive.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/entities/graph/entities-graph.html (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/entities/graph/entities-graph.scss (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/entities/info/entities-info.directive.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/entities/info/entities-info.html (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/entities/info/entities-info.scss (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/entities/toolbox/entities-toolbox.directive.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/entities/toolbox/entities-toolbox.html (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/entities/toolbox/entities-toolbox.scss (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/filters/titleCase.filter.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/layout/main/compute/compute.directive.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/layout/main/compute/compute.html (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/layout/main/compute/compute.scss (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/layout/main/main.controller.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/layout/main/main.html (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/layout/main/main.scss (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/layout/main/network/network.directive.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/layout/main/network/network.html (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/layout/main/network/network.scss (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/layout/main/storage/storage.directive.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/layout/main/storage/storage.html (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/layout/main/storage/storage.scss (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/services/modal.service.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/services/vitrage_topology.service.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/templateList/templateList.controller.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/templateList/templateList.html (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/templateList/templateList.scss (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/topology/graph.json (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/topology/graph.sample.json (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/vitrage.module.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/dashboard/project/vitrage.scss (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/d3/.bower.json (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/d3/.spmignore (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/d3/CONTRIBUTING.md (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/d3/LICENSE (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/d3/README.md (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/d3/bower.json (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/d3/composer.json (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/d3/d3.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/d3/d3.min.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/dagre-d3/.bower.json (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/dagre-d3/LICENSE (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/dagre-d3/bower.json (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/dagre-d3/dist/dagre-d3.core.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/dagre-d3/dist/dagre-d3.core.min.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/dagre/.bower.json (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/dagre/LICENSE (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/dagre/bower.json (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/dagre/dist/dagre.core.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/dagre/dist/dagre.core.min.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/graphlib/.bower.json (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/graphlib/LICENSE (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/graphlib/bower.json (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/graphlib/dist/graphlib.core.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/graphlib/dist/graphlib.core.min.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/lodash/.bower.json (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/lodash/LICENSE.txt (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/lodash/bower.json (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/lodash/dist/lodash.compat.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/lodash/dist/lodash.compat.min.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/lodash/dist/lodash.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/lodash/dist/lodash.min.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/lodash/dist/lodash.underscore.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/static/vendor/lodash/dist/lodash.underscore.min.js (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/templates/topology/index.html (100%) create mode 100644 vitrage_dashboard/dashboard/tests/__init__.py rename {vitragedashboard => vitrage_dashboard/dashboard}/tests/base.py (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/tests/test_vitragedashboard.py (93%) rename {vitrageentities => vitrage_dashboard/dashboard}/urls.py (87%) rename {vitragedashboard => vitrage_dashboard/dashboard}/version.py (100%) rename {vitragedashboard => vitrage_dashboard/dashboard}/views.py (100%) rename {vitrageentities => vitrage_dashboard/entities}/__init__.py (100%) rename {vitrageentities => vitrage_dashboard/entities}/panel.py (100%) rename {vitrageentities => vitrage_dashboard/entities}/templates/entities/index.html (100%) rename {vitragedashboard => vitrage_dashboard/entities}/urls.py (94%) rename {vitrageentities => vitrage_dashboard/entities}/version.py (100%) rename {vitrageentities => vitrage_dashboard/entities}/views.py (100%) rename {vitragetemplates => vitrage_dashboard/templates}/__init__.py (100%) rename {vitragetemplates => vitrage_dashboard/templates}/panel.py (100%) rename {vitragetemplates => vitrage_dashboard/templates}/templates/templates/index.html (100%) rename {vitragetemplates => vitrage_dashboard/templates}/urls.py (93%) rename {vitragetemplates => vitrage_dashboard/templates}/version.py (100%) rename {vitragetemplates => vitrage_dashboard/templates}/views.py (100%) delete mode 100644 vitrageclient/api/__init__.py delete mode 100644 vitrageclient/api/rest/__init__.py diff --git a/.gitignore b/.gitignore index 172db6e..a672aea 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ # Packages *.egg *.egg-info -dist build .eggs eggs diff --git a/README.rst b/README.rst index 06e050e..be08a34 100644 --- a/README.rst +++ b/README.rst @@ -55,8 +55,6 @@ With Horizon cp -a vitragedashboard/enabled/* ../horizon/openstack_dashboard/enabled/ - cp -a vitrageclient/api/* ../horizon/openstack_dashboard/api/ - popd cd python-vitrageclient diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 4f08f4b..405fee6 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -5,9 +5,7 @@ VITRAGE_DASHBOARD_DIR=$(cd $(dirname $BASH_SOURCE)/.. && pwd) function install_vitrage_dashboard { sudo pip install --upgrade ${VITRAGE_DASHBOARD_DIR} - cp -a ${VITRAGE_DASHBOARD_DIR}/vitragedashboard/static ${DEST}/horizon/ - cp -a ${VITRAGE_DASHBOARD_DIR}/vitragedashboard/enabled/* ${DEST}/horizon/openstack_dashboard/enabled/ - cp -a ${VITRAGE_DASHBOARD_DIR}/vitrageclient/api/* ${DEST}/horizon/openstack_dashboard/api/ + cp -a ${VITRAGE_DASHBOARD_DIR}/enabled/* ${DEST}/horizon/openstack_dashboard/enabled/ python ${DEST}/horizon/manage.py compress --force } @@ -46,4 +44,4 @@ if is_service_enabled vitrage-dashboard; then # no-op : fi -fi \ No newline at end of file +fi diff --git a/vitragedashboard/enabled/_80_project_vitrage_panel_group.py b/enabled/_80_project_vitrage_panel_group.py similarity index 100% rename from vitragedashboard/enabled/_80_project_vitrage_panel_group.py rename to enabled/_80_project_vitrage_panel_group.py diff --git a/vitragedashboard/enabled/_90_project_topology_vitrage_panel.py b/enabled/_90_project_topology_vitrage_panel.py similarity index 88% rename from vitragedashboard/enabled/_90_project_topology_vitrage_panel.py rename to enabled/_90_project_topology_vitrage_panel.py index da05864..21566ca 100644 --- a/vitragedashboard/enabled/_90_project_topology_vitrage_panel.py +++ b/enabled/_90_project_topology_vitrage_panel.py @@ -18,9 +18,9 @@ PANEL_DASHBOARD = 'project' PANEL_GROUP = 'vitrage_panel_group' # Python panel class of the PANEL to be added. -ADD_PANEL = 'vitragedashboard.panel.TopologyVitrage' +ADD_PANEL = 'vitrage_dashboard.dashboard.panel.TopologyVitrage' -ADD_INSTALLED_APPS = ['vitragedashboard'] +ADD_INSTALLED_APPS = ['vitrage_dashboard', 'vitrage_dashboard.dashboard', ] ADD_ANGULAR_MODULES = ['horizon.dashboard.project.vitrage'] diff --git a/vitragedashboard/enabled/_91_project_alarms_vitrage_panel.py b/enabled/_91_project_alarms_vitrage_panel.py similarity index 89% rename from vitragedashboard/enabled/_91_project_alarms_vitrage_panel.py rename to enabled/_91_project_alarms_vitrage_panel.py index a325959..1b72fa7 100644 --- a/vitragedashboard/enabled/_91_project_alarms_vitrage_panel.py +++ b/enabled/_91_project_alarms_vitrage_panel.py @@ -18,9 +18,9 @@ PANEL_DASHBOARD = 'project' PANEL_GROUP = 'vitrage_panel_group' # Python panel class of the PANEL to be added. -ADD_PANEL = 'vitragealarms.panel.AlarmsVitrage' +ADD_PANEL = 'vitrage_dashboard.alarms.panel.AlarmsVitrage' -ADD_INSTALLED_APPS = ['vitragealarms'] +ADD_INSTALLED_APPS = ['vitrage_dashboard.alarms'] ADD_ANGULAR_MODULES = ['horizon.dashboard.project.vitrage'] diff --git a/vitragedashboard/enabled/_92_project_entities_vitrage_panel.py b/enabled/_92_project_entities_vitrage_panel.py similarity index 89% rename from vitragedashboard/enabled/_92_project_entities_vitrage_panel.py rename to enabled/_92_project_entities_vitrage_panel.py index 9375a89..e81333a 100644 --- a/vitragedashboard/enabled/_92_project_entities_vitrage_panel.py +++ b/enabled/_92_project_entities_vitrage_panel.py @@ -18,9 +18,9 @@ PANEL_DASHBOARD = 'project' PANEL_GROUP = 'vitrage_panel_group' # Python panel class of the PANEL to be added. -ADD_PANEL = 'vitrageentities.panel.EntitiesVitrage' +ADD_PANEL = 'vitrage_dashboard.entities.panel.EntitiesVitrage' -ADD_INSTALLED_APPS = ['vitrageentities'] +ADD_INSTALLED_APPS = ['vitrage_dashboard.entities'] ADD_ANGULAR_MODULES = ['horizon.dashboard.project.vitrage'] diff --git a/vitragedashboard/enabled/_93_project_template_vitrage_panel.py b/enabled/_93_project_template_vitrage_panel.py similarity index 89% rename from vitragedashboard/enabled/_93_project_template_vitrage_panel.py rename to enabled/_93_project_template_vitrage_panel.py index bd86762..7c651fa 100644 --- a/vitragedashboard/enabled/_93_project_template_vitrage_panel.py +++ b/enabled/_93_project_template_vitrage_panel.py @@ -18,9 +18,9 @@ PANEL_DASHBOARD = 'project' PANEL_GROUP = 'vitrage_panel_group' # Python panel class of the PANEL to be added. -ADD_PANEL = 'vitragetemplates.panel.TemplatesVitrage' +ADD_PANEL = 'vitrage_dashboard.templates.panel.TemplatesVitrage' -ADD_INSTALLED_APPS = ['vitragetemplates'] +ADD_INSTALLED_APPS = ['vitrage_dashboard.templates'] ADD_ANGULAR_MODULES = ['horizon.dashboard.project.vitrage'] diff --git a/setup.cfg b/setup.cfg index 9ac1185..a77e125 100644 --- a/setup.cfg +++ b/setup.cfg @@ -21,10 +21,7 @@ classifier = [files] packages = - vitrageentities - vitragealarms - vitragetemplates - vitragedashboard + vitrage-dashboard [build_sphinx] @@ -36,15 +33,15 @@ all_files = 1 upload-dir = doc/build/html [compile_catalog] -directory = vitragedashboard/locale +directory = vitrage_dashboard/locale domain = vitrage-dashboard [update_catalog] domain = vitrage-dashboard -output_dir = vitragedashboard/locale -input_file = vitragedashboard/locale/vitrage-dashboard.pot +output_dir = vitrage_dashboard/dashboard/locale +input_file = vitrage_dashboard/dashboard/locale/vitrage-dashboard.pot [extract_messages] keywords = _ gettext ngettext l_ lazy_gettext mapping_file = babel.cfg -output_file = vitragedashboard/locale/vitrage-dashboard.pot +output_file = vitrage_dashboard/dashboard/locale/vitrage-dashboard.pot diff --git a/vitragedashboard/tests/__init__.py b/vitrage_dashboard/__init__.py similarity index 100% rename from vitragedashboard/tests/__init__.py rename to vitrage_dashboard/__init__.py diff --git a/vitragealarms/__init__.py b/vitrage_dashboard/alarms/__init__.py similarity index 100% rename from vitragealarms/__init__.py rename to vitrage_dashboard/alarms/__init__.py diff --git a/vitragealarms/panel.py b/vitrage_dashboard/alarms/panel.py similarity index 100% rename from vitragealarms/panel.py rename to vitrage_dashboard/alarms/panel.py diff --git a/vitragealarms/templates/alarms/index.html b/vitrage_dashboard/alarms/templates/alarms/index.html similarity index 100% rename from vitragealarms/templates/alarms/index.html rename to vitrage_dashboard/alarms/templates/alarms/index.html diff --git a/vitragealarms/urls.py b/vitrage_dashboard/alarms/urls.py similarity index 94% rename from vitragealarms/urls.py rename to vitrage_dashboard/alarms/urls.py index 4179e70..d314540 100644 --- a/vitragealarms/urls.py +++ b/vitrage_dashboard/alarms/urls.py @@ -14,7 +14,7 @@ from django.conf import urls -from vitragealarms import views +from vitrage_dashboard.alarms import views urlpatterns = urls.patterns( '', diff --git a/vitragealarms/version.py b/vitrage_dashboard/alarms/version.py similarity index 100% rename from vitragealarms/version.py rename to vitrage_dashboard/alarms/version.py diff --git a/vitragealarms/views.py b/vitrage_dashboard/alarms/views.py similarity index 100% rename from vitragealarms/views.py rename to vitrage_dashboard/alarms/views.py diff --git a/vitrage_dashboard/api/__init__.py b/vitrage_dashboard/api/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/vitrageclient/api/vitrage.py b/vitrage_dashboard/api/vitrage.py similarity index 100% rename from vitrageclient/api/vitrage.py rename to vitrage_dashboard/api/vitrage.py diff --git a/vitrageclient/api/rest/vitrage.py b/vitrage_dashboard/api/vitrage_rest_api.py similarity index 89% rename from vitrageclient/api/rest/vitrage.py rename to vitrage_dashboard/api/vitrage_rest_api.py index eb95e3b..3f16976 100644 --- a/vitrageclient/api/rest/vitrage.py +++ b/vitrage_dashboard/api/vitrage_rest_api.py @@ -15,11 +15,13 @@ from django.views import generic -from openstack_dashboard import api + from openstack_dashboard.api.rest import utils as rest_utils from openstack_dashboard.api.rest import urls +from vitrage_dashboard.api import vitrage + @urls.register class Topolgy(generic.View): @@ -56,9 +58,9 @@ class Topolgy(generic.View): '{"==": {"type": "nova.host"}},' \ '{"==": {"type": "nova.zone"}}]}]}' - return api.vitrage.topology(request=request, - query=query, - graph_type=graph_type) + return vitrage.topology(request=request, + query=query, + graph_type=graph_type) @urls.register @@ -78,7 +80,7 @@ class Alarms(generic.View): The result is a alarms object. """ - return api.vitrage.alarms(request, vitrage_id) + return vitrage.alarms(request, vitrage_id) @urls.register @@ -96,7 +98,7 @@ class Rca(generic.View): The result is an rca graph. """ - return api.vitrage.rca(request, alarm_id) + return vitrage.rca(request, alarm_id) @urls.register @@ -116,4 +118,4 @@ class Templates(generic.View): The result is a template object. """ - return api.vitrage.templates(request, template_id) + return vitrage.templates(request, template_id) diff --git a/vitragedashboard/__init__.py b/vitrage_dashboard/dashboard/__init__.py similarity index 100% rename from vitragedashboard/__init__.py rename to vitrage_dashboard/dashboard/__init__.py diff --git a/vitragedashboard/panel.py b/vitrage_dashboard/dashboard/panel.py similarity index 100% rename from vitragedashboard/panel.py rename to vitrage_dashboard/dashboard/panel.py diff --git a/vitragedashboard/static/app/core/openstack-service-api/vitrage.service.js b/vitrage_dashboard/dashboard/static/app/core/openstack-service-api/vitrage.service.js similarity index 100% rename from vitragedashboard/static/app/core/openstack-service-api/vitrage.service.js rename to vitrage_dashboard/dashboard/static/app/core/openstack-service-api/vitrage.service.js diff --git a/vitragedashboard/static/app/core/openstack-service-api/vitrage.service.spec.js b/vitrage_dashboard/dashboard/static/app/core/openstack-service-api/vitrage.service.spec.js similarity index 100% rename from vitragedashboard/static/app/core/openstack-service-api/vitrage.service.spec.js rename to vitrage_dashboard/dashboard/static/app/core/openstack-service-api/vitrage.service.spec.js diff --git a/vitragedashboard/static/dashboard/project/alarmList/alarmList.controller.js b/vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.controller.js similarity index 100% rename from vitragedashboard/static/dashboard/project/alarmList/alarmList.controller.js rename to vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.controller.js diff --git a/vitragedashboard/static/dashboard/project/alarmList/alarmList.html b/vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.html similarity index 100% rename from vitragedashboard/static/dashboard/project/alarmList/alarmList.html rename to vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.html diff --git a/vitragedashboard/static/dashboard/project/alarmList/alarmList.scss b/vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.scss similarity index 100% rename from vitragedashboard/static/dashboard/project/alarmList/alarmList.scss rename to vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.scss diff --git a/vitragedashboard/static/dashboard/project/assets/all.png b/vitrage_dashboard/dashboard/static/dashboard/project/assets/all.png similarity index 100% rename from vitragedashboard/static/dashboard/project/assets/all.png rename to vitrage_dashboard/dashboard/static/dashboard/project/assets/all.png diff --git a/vitragedashboard/static/dashboard/project/assets/bell_gray_off.svg b/vitrage_dashboard/dashboard/static/dashboard/project/assets/bell_gray_off.svg similarity index 100% rename from vitragedashboard/static/dashboard/project/assets/bell_gray_off.svg rename to vitrage_dashboard/dashboard/static/dashboard/project/assets/bell_gray_off.svg diff --git a/vitragedashboard/static/dashboard/project/assets/bell_gray_on.svg b/vitrage_dashboard/dashboard/static/dashboard/project/assets/bell_gray_on.svg similarity index 100% rename from vitragedashboard/static/dashboard/project/assets/bell_gray_on.svg rename to vitrage_dashboard/dashboard/static/dashboard/project/assets/bell_gray_on.svg diff --git a/vitragedashboard/static/dashboard/project/assets/bell_green_off.svg b/vitrage_dashboard/dashboard/static/dashboard/project/assets/bell_green_off.svg similarity index 100% rename from vitragedashboard/static/dashboard/project/assets/bell_green_off.svg rename to vitrage_dashboard/dashboard/static/dashboard/project/assets/bell_green_off.svg diff --git a/vitragedashboard/static/dashboard/project/assets/bell_green_on.svg b/vitrage_dashboard/dashboard/static/dashboard/project/assets/bell_green_on.svg similarity index 100% rename from vitragedashboard/static/dashboard/project/assets/bell_green_on.svg rename to vitrage_dashboard/dashboard/static/dashboard/project/assets/bell_green_on.svg diff --git a/vitragedashboard/static/dashboard/project/assets/bell_orange_off.svg b/vitrage_dashboard/dashboard/static/dashboard/project/assets/bell_orange_off.svg similarity index 100% rename from vitragedashboard/static/dashboard/project/assets/bell_orange_off.svg rename to vitrage_dashboard/dashboard/static/dashboard/project/assets/bell_orange_off.svg diff --git a/vitragedashboard/static/dashboard/project/assets/bell_orange_on.svg b/vitrage_dashboard/dashboard/static/dashboard/project/assets/bell_orange_on.svg similarity index 100% rename from vitragedashboard/static/dashboard/project/assets/bell_orange_on.svg rename to vitrage_dashboard/dashboard/static/dashboard/project/assets/bell_orange_on.svg diff --git a/vitragedashboard/static/dashboard/project/assets/bell_red_off.svg b/vitrage_dashboard/dashboard/static/dashboard/project/assets/bell_red_off.svg similarity index 100% rename from vitragedashboard/static/dashboard/project/assets/bell_red_off.svg rename to vitrage_dashboard/dashboard/static/dashboard/project/assets/bell_red_off.svg diff --git a/vitragedashboard/static/dashboard/project/assets/bell_red_on.svg b/vitrage_dashboard/dashboard/static/dashboard/project/assets/bell_red_on.svg similarity index 100% rename from vitragedashboard/static/dashboard/project/assets/bell_red_on.svg rename to vitrage_dashboard/dashboard/static/dashboard/project/assets/bell_red_on.svg diff --git a/vitragedashboard/static/dashboard/project/assets/bell_yellow_off.svg b/vitrage_dashboard/dashboard/static/dashboard/project/assets/bell_yellow_off.svg similarity index 100% rename from vitragedashboard/static/dashboard/project/assets/bell_yellow_off.svg rename to vitrage_dashboard/dashboard/static/dashboard/project/assets/bell_yellow_off.svg diff --git a/vitragedashboard/static/dashboard/project/assets/bell_yellow_on.svg b/vitrage_dashboard/dashboard/static/dashboard/project/assets/bell_yellow_on.svg similarity index 100% rename from vitragedashboard/static/dashboard/project/assets/bell_yellow_on.svg rename to vitrage_dashboard/dashboard/static/dashboard/project/assets/bell_yellow_on.svg diff --git a/vitragedashboard/static/dashboard/project/assets/cluster.png b/vitrage_dashboard/dashboard/static/dashboard/project/assets/cluster.png similarity index 100% rename from vitragedashboard/static/dashboard/project/assets/cluster.png rename to vitrage_dashboard/dashboard/static/dashboard/project/assets/cluster.png diff --git a/vitragedashboard/static/dashboard/project/assets/host.png b/vitrage_dashboard/dashboard/static/dashboard/project/assets/host.png similarity index 100% rename from vitragedashboard/static/dashboard/project/assets/host.png rename to vitrage_dashboard/dashboard/static/dashboard/project/assets/host.png diff --git a/vitragedashboard/static/dashboard/project/assets/vm.png b/vitrage_dashboard/dashboard/static/dashboard/project/assets/vm.png similarity index 100% rename from vitragedashboard/static/dashboard/project/assets/vm.png rename to vitrage_dashboard/dashboard/static/dashboard/project/assets/vm.png diff --git a/vitragedashboard/static/dashboard/project/assets/zone.png b/vitrage_dashboard/dashboard/static/dashboard/project/assets/zone.png similarity index 100% rename from vitragedashboard/static/dashboard/project/assets/zone.png rename to vitrage_dashboard/dashboard/static/dashboard/project/assets/zone.png diff --git a/vitragedashboard/static/dashboard/project/components/alarms/alarms.directive.js b/vitrage_dashboard/dashboard/static/dashboard/project/components/alarms/alarms.directive.js similarity index 100% rename from vitragedashboard/static/dashboard/project/components/alarms/alarms.directive.js rename to vitrage_dashboard/dashboard/static/dashboard/project/components/alarms/alarms.directive.js diff --git a/vitragedashboard/static/dashboard/project/components/alarms/alarms.html b/vitrage_dashboard/dashboard/static/dashboard/project/components/alarms/alarms.html similarity index 100% rename from vitragedashboard/static/dashboard/project/components/alarms/alarms.html rename to vitrage_dashboard/dashboard/static/dashboard/project/components/alarms/alarms.html diff --git a/vitragedashboard/static/dashboard/project/components/alarms/alarms.scss b/vitrage_dashboard/dashboard/static/dashboard/project/components/alarms/alarms.scss similarity index 100% rename from vitragedashboard/static/dashboard/project/components/alarms/alarms.scss rename to vitrage_dashboard/dashboard/static/dashboard/project/components/alarms/alarms.scss diff --git a/vitragedashboard/static/dashboard/project/components/information/information.directive.js b/vitrage_dashboard/dashboard/static/dashboard/project/components/information/information.directive.js similarity index 100% rename from vitragedashboard/static/dashboard/project/components/information/information.directive.js rename to vitrage_dashboard/dashboard/static/dashboard/project/components/information/information.directive.js diff --git a/vitragedashboard/static/dashboard/project/components/information/information.html b/vitrage_dashboard/dashboard/static/dashboard/project/components/information/information.html similarity index 100% rename from vitragedashboard/static/dashboard/project/components/information/information.html rename to vitrage_dashboard/dashboard/static/dashboard/project/components/information/information.html diff --git a/vitragedashboard/static/dashboard/project/components/information/information.scss b/vitrage_dashboard/dashboard/static/dashboard/project/components/information/information.scss similarity index 100% rename from vitragedashboard/static/dashboard/project/components/information/information.scss rename to vitrage_dashboard/dashboard/static/dashboard/project/components/information/information.scss diff --git a/vitragedashboard/static/dashboard/project/components/rca/rcaContainer.controller.js b/vitrage_dashboard/dashboard/static/dashboard/project/components/rca/rcaContainer.controller.js similarity index 100% rename from vitragedashboard/static/dashboard/project/components/rca/rcaContainer.controller.js rename to vitrage_dashboard/dashboard/static/dashboard/project/components/rca/rcaContainer.controller.js diff --git a/vitragedashboard/static/dashboard/project/components/rca/rcaContainer.html b/vitrage_dashboard/dashboard/static/dashboard/project/components/rca/rcaContainer.html similarity index 100% rename from vitragedashboard/static/dashboard/project/components/rca/rcaContainer.html rename to vitrage_dashboard/dashboard/static/dashboard/project/components/rca/rcaContainer.html diff --git a/vitragedashboard/static/dashboard/project/components/rca/rcaContainer.scss b/vitrage_dashboard/dashboard/static/dashboard/project/components/rca/rcaContainer.scss similarity index 100% rename from vitragedashboard/static/dashboard/project/components/rca/rcaContainer.scss rename to vitrage_dashboard/dashboard/static/dashboard/project/components/rca/rcaContainer.scss diff --git a/vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.directive.js b/vitrage_dashboard/dashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.directive.js similarity index 100% rename from vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.directive.js rename to vitrage_dashboard/dashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.directive.js diff --git a/vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.html b/vitrage_dashboard/dashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.html similarity index 100% rename from vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.html rename to vitrage_dashboard/dashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.html diff --git a/vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.scss b/vitrage_dashboard/dashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.scss similarity index 100% rename from vitragedashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.scss rename to vitrage_dashboard/dashboard/static/dashboard/project/components/rca/rootCauseAnalysisGraph.scss diff --git a/vitragedashboard/static/dashboard/project/components/stacks/stacks.directive.js b/vitrage_dashboard/dashboard/static/dashboard/project/components/stacks/stacks.directive.js similarity index 100% rename from vitragedashboard/static/dashboard/project/components/stacks/stacks.directive.js rename to vitrage_dashboard/dashboard/static/dashboard/project/components/stacks/stacks.directive.js diff --git a/vitragedashboard/static/dashboard/project/components/stacks/stacks.html b/vitrage_dashboard/dashboard/static/dashboard/project/components/stacks/stacks.html similarity index 100% rename from vitragedashboard/static/dashboard/project/components/stacks/stacks.html rename to vitrage_dashboard/dashboard/static/dashboard/project/components/stacks/stacks.html diff --git a/vitragedashboard/static/dashboard/project/components/stacks/stacks.scss b/vitrage_dashboard/dashboard/static/dashboard/project/components/stacks/stacks.scss similarity index 100% rename from vitragedashboard/static/dashboard/project/components/stacks/stacks.scss rename to vitrage_dashboard/dashboard/static/dashboard/project/components/stacks/stacks.scss diff --git a/vitragedashboard/static/dashboard/project/components/sunburst-minimap/sunburst-minimap.directive.js b/vitrage_dashboard/dashboard/static/dashboard/project/components/sunburst-minimap/sunburst-minimap.directive.js similarity index 100% rename from vitragedashboard/static/dashboard/project/components/sunburst-minimap/sunburst-minimap.directive.js rename to vitrage_dashboard/dashboard/static/dashboard/project/components/sunburst-minimap/sunburst-minimap.directive.js diff --git a/vitragedashboard/static/dashboard/project/components/sunburst-minimap/sunburst-minimap.html b/vitrage_dashboard/dashboard/static/dashboard/project/components/sunburst-minimap/sunburst-minimap.html similarity index 100% rename from vitragedashboard/static/dashboard/project/components/sunburst-minimap/sunburst-minimap.html rename to vitrage_dashboard/dashboard/static/dashboard/project/components/sunburst-minimap/sunburst-minimap.html diff --git a/vitragedashboard/static/dashboard/project/components/sunburst/sunburst.directive.js b/vitrage_dashboard/dashboard/static/dashboard/project/components/sunburst/sunburst.directive.js similarity index 100% rename from vitragedashboard/static/dashboard/project/components/sunburst/sunburst.directive.js rename to vitrage_dashboard/dashboard/static/dashboard/project/components/sunburst/sunburst.directive.js diff --git a/vitragedashboard/static/dashboard/project/components/sunburst/sunburst.html b/vitrage_dashboard/dashboard/static/dashboard/project/components/sunburst/sunburst.html similarity index 100% rename from vitragedashboard/static/dashboard/project/components/sunburst/sunburst.html rename to vitrage_dashboard/dashboard/static/dashboard/project/components/sunburst/sunburst.html diff --git a/vitragedashboard/static/dashboard/project/components/sunburst/sunburst.scss b/vitrage_dashboard/dashboard/static/dashboard/project/components/sunburst/sunburst.scss similarity index 100% rename from vitragedashboard/static/dashboard/project/components/sunburst/sunburst.scss rename to vitrage_dashboard/dashboard/static/dashboard/project/components/sunburst/sunburst.scss diff --git a/vitragedashboard/static/dashboard/project/components/sunburst/sunburst.test.js b/vitrage_dashboard/dashboard/static/dashboard/project/components/sunburst/sunburst.test.js similarity index 100% rename from vitragedashboard/static/dashboard/project/components/sunburst/sunburst.test.js rename to vitrage_dashboard/dashboard/static/dashboard/project/components/sunburst/sunburst.test.js diff --git a/vitragedashboard/static/dashboard/project/components/template/templateContainer.controller.js b/vitrage_dashboard/dashboard/static/dashboard/project/components/template/templateContainer.controller.js similarity index 100% rename from vitragedashboard/static/dashboard/project/components/template/templateContainer.controller.js rename to vitrage_dashboard/dashboard/static/dashboard/project/components/template/templateContainer.controller.js diff --git a/vitragedashboard/static/dashboard/project/components/template/templateContainer.html b/vitrage_dashboard/dashboard/static/dashboard/project/components/template/templateContainer.html similarity index 100% rename from vitragedashboard/static/dashboard/project/components/template/templateContainer.html rename to vitrage_dashboard/dashboard/static/dashboard/project/components/template/templateContainer.html diff --git a/vitragedashboard/static/dashboard/project/components/template/templateContainer.scss b/vitrage_dashboard/dashboard/static/dashboard/project/components/template/templateContainer.scss similarity index 100% rename from vitragedashboard/static/dashboard/project/components/template/templateContainer.scss rename to vitrage_dashboard/dashboard/static/dashboard/project/components/template/templateContainer.scss diff --git a/vitragedashboard/static/dashboard/project/components/vms/vms.directive.js b/vitrage_dashboard/dashboard/static/dashboard/project/components/vms/vms.directive.js similarity index 100% rename from vitragedashboard/static/dashboard/project/components/vms/vms.directive.js rename to vitrage_dashboard/dashboard/static/dashboard/project/components/vms/vms.directive.js diff --git a/vitragedashboard/static/dashboard/project/components/vms/vms.html b/vitrage_dashboard/dashboard/static/dashboard/project/components/vms/vms.html similarity index 100% rename from vitragedashboard/static/dashboard/project/components/vms/vms.html rename to vitrage_dashboard/dashboard/static/dashboard/project/components/vms/vms.html diff --git a/vitragedashboard/static/dashboard/project/components/vms/vms.scss b/vitrage_dashboard/dashboard/static/dashboard/project/components/vms/vms.scss similarity index 100% rename from vitragedashboard/static/dashboard/project/components/vms/vms.scss rename to vitrage_dashboard/dashboard/static/dashboard/project/components/vms/vms.scss diff --git a/vitragedashboard/static/dashboard/project/entities/entities.controller.js b/vitrage_dashboard/dashboard/static/dashboard/project/entities/entities.controller.js similarity index 100% rename from vitragedashboard/static/dashboard/project/entities/entities.controller.js rename to vitrage_dashboard/dashboard/static/dashboard/project/entities/entities.controller.js diff --git a/vitragedashboard/static/dashboard/project/entities/entities.html b/vitrage_dashboard/dashboard/static/dashboard/project/entities/entities.html similarity index 100% rename from vitragedashboard/static/dashboard/project/entities/entities.html rename to vitrage_dashboard/dashboard/static/dashboard/project/entities/entities.html diff --git a/vitragedashboard/static/dashboard/project/entities/entities.scss b/vitrage_dashboard/dashboard/static/dashboard/project/entities/entities.scss similarity index 100% rename from vitragedashboard/static/dashboard/project/entities/entities.scss rename to vitrage_dashboard/dashboard/static/dashboard/project/entities/entities.scss diff --git a/vitragedashboard/static/dashboard/project/entities/graph/entities-graph.directive.js b/vitrage_dashboard/dashboard/static/dashboard/project/entities/graph/entities-graph.directive.js similarity index 100% rename from vitragedashboard/static/dashboard/project/entities/graph/entities-graph.directive.js rename to vitrage_dashboard/dashboard/static/dashboard/project/entities/graph/entities-graph.directive.js diff --git a/vitragedashboard/static/dashboard/project/entities/graph/entities-graph.html b/vitrage_dashboard/dashboard/static/dashboard/project/entities/graph/entities-graph.html similarity index 100% rename from vitragedashboard/static/dashboard/project/entities/graph/entities-graph.html rename to vitrage_dashboard/dashboard/static/dashboard/project/entities/graph/entities-graph.html diff --git a/vitragedashboard/static/dashboard/project/entities/graph/entities-graph.scss b/vitrage_dashboard/dashboard/static/dashboard/project/entities/graph/entities-graph.scss similarity index 100% rename from vitragedashboard/static/dashboard/project/entities/graph/entities-graph.scss rename to vitrage_dashboard/dashboard/static/dashboard/project/entities/graph/entities-graph.scss diff --git a/vitragedashboard/static/dashboard/project/entities/info/entities-info.directive.js b/vitrage_dashboard/dashboard/static/dashboard/project/entities/info/entities-info.directive.js similarity index 100% rename from vitragedashboard/static/dashboard/project/entities/info/entities-info.directive.js rename to vitrage_dashboard/dashboard/static/dashboard/project/entities/info/entities-info.directive.js diff --git a/vitragedashboard/static/dashboard/project/entities/info/entities-info.html b/vitrage_dashboard/dashboard/static/dashboard/project/entities/info/entities-info.html similarity index 100% rename from vitragedashboard/static/dashboard/project/entities/info/entities-info.html rename to vitrage_dashboard/dashboard/static/dashboard/project/entities/info/entities-info.html diff --git a/vitragedashboard/static/dashboard/project/entities/info/entities-info.scss b/vitrage_dashboard/dashboard/static/dashboard/project/entities/info/entities-info.scss similarity index 100% rename from vitragedashboard/static/dashboard/project/entities/info/entities-info.scss rename to vitrage_dashboard/dashboard/static/dashboard/project/entities/info/entities-info.scss diff --git a/vitragedashboard/static/dashboard/project/entities/toolbox/entities-toolbox.directive.js b/vitrage_dashboard/dashboard/static/dashboard/project/entities/toolbox/entities-toolbox.directive.js similarity index 100% rename from vitragedashboard/static/dashboard/project/entities/toolbox/entities-toolbox.directive.js rename to vitrage_dashboard/dashboard/static/dashboard/project/entities/toolbox/entities-toolbox.directive.js diff --git a/vitragedashboard/static/dashboard/project/entities/toolbox/entities-toolbox.html b/vitrage_dashboard/dashboard/static/dashboard/project/entities/toolbox/entities-toolbox.html similarity index 100% rename from vitragedashboard/static/dashboard/project/entities/toolbox/entities-toolbox.html rename to vitrage_dashboard/dashboard/static/dashboard/project/entities/toolbox/entities-toolbox.html diff --git a/vitragedashboard/static/dashboard/project/entities/toolbox/entities-toolbox.scss b/vitrage_dashboard/dashboard/static/dashboard/project/entities/toolbox/entities-toolbox.scss similarity index 100% rename from vitragedashboard/static/dashboard/project/entities/toolbox/entities-toolbox.scss rename to vitrage_dashboard/dashboard/static/dashboard/project/entities/toolbox/entities-toolbox.scss diff --git a/vitragedashboard/static/dashboard/project/filters/titleCase.filter.js b/vitrage_dashboard/dashboard/static/dashboard/project/filters/titleCase.filter.js similarity index 100% rename from vitragedashboard/static/dashboard/project/filters/titleCase.filter.js rename to vitrage_dashboard/dashboard/static/dashboard/project/filters/titleCase.filter.js diff --git a/vitragedashboard/static/dashboard/project/layout/main/compute/compute.directive.js b/vitrage_dashboard/dashboard/static/dashboard/project/layout/main/compute/compute.directive.js similarity index 100% rename from vitragedashboard/static/dashboard/project/layout/main/compute/compute.directive.js rename to vitrage_dashboard/dashboard/static/dashboard/project/layout/main/compute/compute.directive.js diff --git a/vitragedashboard/static/dashboard/project/layout/main/compute/compute.html b/vitrage_dashboard/dashboard/static/dashboard/project/layout/main/compute/compute.html similarity index 100% rename from vitragedashboard/static/dashboard/project/layout/main/compute/compute.html rename to vitrage_dashboard/dashboard/static/dashboard/project/layout/main/compute/compute.html diff --git a/vitragedashboard/static/dashboard/project/layout/main/compute/compute.scss b/vitrage_dashboard/dashboard/static/dashboard/project/layout/main/compute/compute.scss similarity index 100% rename from vitragedashboard/static/dashboard/project/layout/main/compute/compute.scss rename to vitrage_dashboard/dashboard/static/dashboard/project/layout/main/compute/compute.scss diff --git a/vitragedashboard/static/dashboard/project/layout/main/main.controller.js b/vitrage_dashboard/dashboard/static/dashboard/project/layout/main/main.controller.js similarity index 100% rename from vitragedashboard/static/dashboard/project/layout/main/main.controller.js rename to vitrage_dashboard/dashboard/static/dashboard/project/layout/main/main.controller.js diff --git a/vitragedashboard/static/dashboard/project/layout/main/main.html b/vitrage_dashboard/dashboard/static/dashboard/project/layout/main/main.html similarity index 100% rename from vitragedashboard/static/dashboard/project/layout/main/main.html rename to vitrage_dashboard/dashboard/static/dashboard/project/layout/main/main.html diff --git a/vitragedashboard/static/dashboard/project/layout/main/main.scss b/vitrage_dashboard/dashboard/static/dashboard/project/layout/main/main.scss similarity index 100% rename from vitragedashboard/static/dashboard/project/layout/main/main.scss rename to vitrage_dashboard/dashboard/static/dashboard/project/layout/main/main.scss diff --git a/vitragedashboard/static/dashboard/project/layout/main/network/network.directive.js b/vitrage_dashboard/dashboard/static/dashboard/project/layout/main/network/network.directive.js similarity index 100% rename from vitragedashboard/static/dashboard/project/layout/main/network/network.directive.js rename to vitrage_dashboard/dashboard/static/dashboard/project/layout/main/network/network.directive.js diff --git a/vitragedashboard/static/dashboard/project/layout/main/network/network.html b/vitrage_dashboard/dashboard/static/dashboard/project/layout/main/network/network.html similarity index 100% rename from vitragedashboard/static/dashboard/project/layout/main/network/network.html rename to vitrage_dashboard/dashboard/static/dashboard/project/layout/main/network/network.html diff --git a/vitragedashboard/static/dashboard/project/layout/main/network/network.scss b/vitrage_dashboard/dashboard/static/dashboard/project/layout/main/network/network.scss similarity index 100% rename from vitragedashboard/static/dashboard/project/layout/main/network/network.scss rename to vitrage_dashboard/dashboard/static/dashboard/project/layout/main/network/network.scss diff --git a/vitragedashboard/static/dashboard/project/layout/main/storage/storage.directive.js b/vitrage_dashboard/dashboard/static/dashboard/project/layout/main/storage/storage.directive.js similarity index 100% rename from vitragedashboard/static/dashboard/project/layout/main/storage/storage.directive.js rename to vitrage_dashboard/dashboard/static/dashboard/project/layout/main/storage/storage.directive.js diff --git a/vitragedashboard/static/dashboard/project/layout/main/storage/storage.html b/vitrage_dashboard/dashboard/static/dashboard/project/layout/main/storage/storage.html similarity index 100% rename from vitragedashboard/static/dashboard/project/layout/main/storage/storage.html rename to vitrage_dashboard/dashboard/static/dashboard/project/layout/main/storage/storage.html diff --git a/vitragedashboard/static/dashboard/project/layout/main/storage/storage.scss b/vitrage_dashboard/dashboard/static/dashboard/project/layout/main/storage/storage.scss similarity index 100% rename from vitragedashboard/static/dashboard/project/layout/main/storage/storage.scss rename to vitrage_dashboard/dashboard/static/dashboard/project/layout/main/storage/storage.scss diff --git a/vitragedashboard/static/dashboard/project/services/modal.service.js b/vitrage_dashboard/dashboard/static/dashboard/project/services/modal.service.js similarity index 100% rename from vitragedashboard/static/dashboard/project/services/modal.service.js rename to vitrage_dashboard/dashboard/static/dashboard/project/services/modal.service.js diff --git a/vitragedashboard/static/dashboard/project/services/vitrage_topology.service.js b/vitrage_dashboard/dashboard/static/dashboard/project/services/vitrage_topology.service.js similarity index 100% rename from vitragedashboard/static/dashboard/project/services/vitrage_topology.service.js rename to vitrage_dashboard/dashboard/static/dashboard/project/services/vitrage_topology.service.js diff --git a/vitragedashboard/static/dashboard/project/templateList/templateList.controller.js b/vitrage_dashboard/dashboard/static/dashboard/project/templateList/templateList.controller.js similarity index 100% rename from vitragedashboard/static/dashboard/project/templateList/templateList.controller.js rename to vitrage_dashboard/dashboard/static/dashboard/project/templateList/templateList.controller.js diff --git a/vitragedashboard/static/dashboard/project/templateList/templateList.html b/vitrage_dashboard/dashboard/static/dashboard/project/templateList/templateList.html similarity index 100% rename from vitragedashboard/static/dashboard/project/templateList/templateList.html rename to vitrage_dashboard/dashboard/static/dashboard/project/templateList/templateList.html diff --git a/vitragedashboard/static/dashboard/project/templateList/templateList.scss b/vitrage_dashboard/dashboard/static/dashboard/project/templateList/templateList.scss similarity index 100% rename from vitragedashboard/static/dashboard/project/templateList/templateList.scss rename to vitrage_dashboard/dashboard/static/dashboard/project/templateList/templateList.scss diff --git a/vitragedashboard/static/dashboard/project/topology/graph.json b/vitrage_dashboard/dashboard/static/dashboard/project/topology/graph.json similarity index 100% rename from vitragedashboard/static/dashboard/project/topology/graph.json rename to vitrage_dashboard/dashboard/static/dashboard/project/topology/graph.json diff --git a/vitragedashboard/static/dashboard/project/topology/graph.sample.json b/vitrage_dashboard/dashboard/static/dashboard/project/topology/graph.sample.json similarity index 100% rename from vitragedashboard/static/dashboard/project/topology/graph.sample.json rename to vitrage_dashboard/dashboard/static/dashboard/project/topology/graph.sample.json diff --git a/vitragedashboard/static/dashboard/project/vitrage.module.js b/vitrage_dashboard/dashboard/static/dashboard/project/vitrage.module.js similarity index 100% rename from vitragedashboard/static/dashboard/project/vitrage.module.js rename to vitrage_dashboard/dashboard/static/dashboard/project/vitrage.module.js diff --git a/vitragedashboard/static/dashboard/project/vitrage.scss b/vitrage_dashboard/dashboard/static/dashboard/project/vitrage.scss similarity index 100% rename from vitragedashboard/static/dashboard/project/vitrage.scss rename to vitrage_dashboard/dashboard/static/dashboard/project/vitrage.scss diff --git a/vitragedashboard/static/vendor/d3/.bower.json b/vitrage_dashboard/dashboard/static/vendor/d3/.bower.json similarity index 100% rename from vitragedashboard/static/vendor/d3/.bower.json rename to vitrage_dashboard/dashboard/static/vendor/d3/.bower.json diff --git a/vitragedashboard/static/vendor/d3/.spmignore b/vitrage_dashboard/dashboard/static/vendor/d3/.spmignore similarity index 100% rename from vitragedashboard/static/vendor/d3/.spmignore rename to vitrage_dashboard/dashboard/static/vendor/d3/.spmignore diff --git a/vitragedashboard/static/vendor/d3/CONTRIBUTING.md b/vitrage_dashboard/dashboard/static/vendor/d3/CONTRIBUTING.md similarity index 100% rename from vitragedashboard/static/vendor/d3/CONTRIBUTING.md rename to vitrage_dashboard/dashboard/static/vendor/d3/CONTRIBUTING.md diff --git a/vitragedashboard/static/vendor/d3/LICENSE b/vitrage_dashboard/dashboard/static/vendor/d3/LICENSE similarity index 100% rename from vitragedashboard/static/vendor/d3/LICENSE rename to vitrage_dashboard/dashboard/static/vendor/d3/LICENSE diff --git a/vitragedashboard/static/vendor/d3/README.md b/vitrage_dashboard/dashboard/static/vendor/d3/README.md similarity index 100% rename from vitragedashboard/static/vendor/d3/README.md rename to vitrage_dashboard/dashboard/static/vendor/d3/README.md diff --git a/vitragedashboard/static/vendor/d3/bower.json b/vitrage_dashboard/dashboard/static/vendor/d3/bower.json similarity index 100% rename from vitragedashboard/static/vendor/d3/bower.json rename to vitrage_dashboard/dashboard/static/vendor/d3/bower.json diff --git a/vitragedashboard/static/vendor/d3/composer.json b/vitrage_dashboard/dashboard/static/vendor/d3/composer.json similarity index 100% rename from vitragedashboard/static/vendor/d3/composer.json rename to vitrage_dashboard/dashboard/static/vendor/d3/composer.json diff --git a/vitragedashboard/static/vendor/d3/d3.js b/vitrage_dashboard/dashboard/static/vendor/d3/d3.js similarity index 100% rename from vitragedashboard/static/vendor/d3/d3.js rename to vitrage_dashboard/dashboard/static/vendor/d3/d3.js diff --git a/vitragedashboard/static/vendor/d3/d3.min.js b/vitrage_dashboard/dashboard/static/vendor/d3/d3.min.js similarity index 100% rename from vitragedashboard/static/vendor/d3/d3.min.js rename to vitrage_dashboard/dashboard/static/vendor/d3/d3.min.js diff --git a/vitragedashboard/static/vendor/dagre-d3/.bower.json b/vitrage_dashboard/dashboard/static/vendor/dagre-d3/.bower.json similarity index 100% rename from vitragedashboard/static/vendor/dagre-d3/.bower.json rename to vitrage_dashboard/dashboard/static/vendor/dagre-d3/.bower.json diff --git a/vitragedashboard/static/vendor/dagre-d3/LICENSE b/vitrage_dashboard/dashboard/static/vendor/dagre-d3/LICENSE similarity index 100% rename from vitragedashboard/static/vendor/dagre-d3/LICENSE rename to vitrage_dashboard/dashboard/static/vendor/dagre-d3/LICENSE diff --git a/vitragedashboard/static/vendor/dagre-d3/bower.json b/vitrage_dashboard/dashboard/static/vendor/dagre-d3/bower.json similarity index 100% rename from vitragedashboard/static/vendor/dagre-d3/bower.json rename to vitrage_dashboard/dashboard/static/vendor/dagre-d3/bower.json diff --git a/vitragedashboard/static/vendor/dagre-d3/dist/dagre-d3.core.js b/vitrage_dashboard/dashboard/static/vendor/dagre-d3/dist/dagre-d3.core.js similarity index 100% rename from vitragedashboard/static/vendor/dagre-d3/dist/dagre-d3.core.js rename to vitrage_dashboard/dashboard/static/vendor/dagre-d3/dist/dagre-d3.core.js diff --git a/vitragedashboard/static/vendor/dagre-d3/dist/dagre-d3.core.min.js b/vitrage_dashboard/dashboard/static/vendor/dagre-d3/dist/dagre-d3.core.min.js similarity index 100% rename from vitragedashboard/static/vendor/dagre-d3/dist/dagre-d3.core.min.js rename to vitrage_dashboard/dashboard/static/vendor/dagre-d3/dist/dagre-d3.core.min.js diff --git a/vitragedashboard/static/vendor/dagre/.bower.json b/vitrage_dashboard/dashboard/static/vendor/dagre/.bower.json similarity index 100% rename from vitragedashboard/static/vendor/dagre/.bower.json rename to vitrage_dashboard/dashboard/static/vendor/dagre/.bower.json diff --git a/vitragedashboard/static/vendor/dagre/LICENSE b/vitrage_dashboard/dashboard/static/vendor/dagre/LICENSE similarity index 100% rename from vitragedashboard/static/vendor/dagre/LICENSE rename to vitrage_dashboard/dashboard/static/vendor/dagre/LICENSE diff --git a/vitragedashboard/static/vendor/dagre/bower.json b/vitrage_dashboard/dashboard/static/vendor/dagre/bower.json similarity index 100% rename from vitragedashboard/static/vendor/dagre/bower.json rename to vitrage_dashboard/dashboard/static/vendor/dagre/bower.json diff --git a/vitragedashboard/static/vendor/dagre/dist/dagre.core.js b/vitrage_dashboard/dashboard/static/vendor/dagre/dist/dagre.core.js similarity index 100% rename from vitragedashboard/static/vendor/dagre/dist/dagre.core.js rename to vitrage_dashboard/dashboard/static/vendor/dagre/dist/dagre.core.js diff --git a/vitragedashboard/static/vendor/dagre/dist/dagre.core.min.js b/vitrage_dashboard/dashboard/static/vendor/dagre/dist/dagre.core.min.js similarity index 100% rename from vitragedashboard/static/vendor/dagre/dist/dagre.core.min.js rename to vitrage_dashboard/dashboard/static/vendor/dagre/dist/dagre.core.min.js diff --git a/vitragedashboard/static/vendor/graphlib/.bower.json b/vitrage_dashboard/dashboard/static/vendor/graphlib/.bower.json similarity index 100% rename from vitragedashboard/static/vendor/graphlib/.bower.json rename to vitrage_dashboard/dashboard/static/vendor/graphlib/.bower.json diff --git a/vitragedashboard/static/vendor/graphlib/LICENSE b/vitrage_dashboard/dashboard/static/vendor/graphlib/LICENSE similarity index 100% rename from vitragedashboard/static/vendor/graphlib/LICENSE rename to vitrage_dashboard/dashboard/static/vendor/graphlib/LICENSE diff --git a/vitragedashboard/static/vendor/graphlib/bower.json b/vitrage_dashboard/dashboard/static/vendor/graphlib/bower.json similarity index 100% rename from vitragedashboard/static/vendor/graphlib/bower.json rename to vitrage_dashboard/dashboard/static/vendor/graphlib/bower.json diff --git a/vitragedashboard/static/vendor/graphlib/dist/graphlib.core.js b/vitrage_dashboard/dashboard/static/vendor/graphlib/dist/graphlib.core.js similarity index 100% rename from vitragedashboard/static/vendor/graphlib/dist/graphlib.core.js rename to vitrage_dashboard/dashboard/static/vendor/graphlib/dist/graphlib.core.js diff --git a/vitragedashboard/static/vendor/graphlib/dist/graphlib.core.min.js b/vitrage_dashboard/dashboard/static/vendor/graphlib/dist/graphlib.core.min.js similarity index 100% rename from vitragedashboard/static/vendor/graphlib/dist/graphlib.core.min.js rename to vitrage_dashboard/dashboard/static/vendor/graphlib/dist/graphlib.core.min.js diff --git a/vitragedashboard/static/vendor/lodash/.bower.json b/vitrage_dashboard/dashboard/static/vendor/lodash/.bower.json similarity index 100% rename from vitragedashboard/static/vendor/lodash/.bower.json rename to vitrage_dashboard/dashboard/static/vendor/lodash/.bower.json diff --git a/vitragedashboard/static/vendor/lodash/LICENSE.txt b/vitrage_dashboard/dashboard/static/vendor/lodash/LICENSE.txt similarity index 100% rename from vitragedashboard/static/vendor/lodash/LICENSE.txt rename to vitrage_dashboard/dashboard/static/vendor/lodash/LICENSE.txt diff --git a/vitragedashboard/static/vendor/lodash/bower.json b/vitrage_dashboard/dashboard/static/vendor/lodash/bower.json similarity index 100% rename from vitragedashboard/static/vendor/lodash/bower.json rename to vitrage_dashboard/dashboard/static/vendor/lodash/bower.json diff --git a/vitragedashboard/static/vendor/lodash/dist/lodash.compat.js b/vitrage_dashboard/dashboard/static/vendor/lodash/dist/lodash.compat.js similarity index 100% rename from vitragedashboard/static/vendor/lodash/dist/lodash.compat.js rename to vitrage_dashboard/dashboard/static/vendor/lodash/dist/lodash.compat.js diff --git a/vitragedashboard/static/vendor/lodash/dist/lodash.compat.min.js b/vitrage_dashboard/dashboard/static/vendor/lodash/dist/lodash.compat.min.js similarity index 100% rename from vitragedashboard/static/vendor/lodash/dist/lodash.compat.min.js rename to vitrage_dashboard/dashboard/static/vendor/lodash/dist/lodash.compat.min.js diff --git a/vitragedashboard/static/vendor/lodash/dist/lodash.js b/vitrage_dashboard/dashboard/static/vendor/lodash/dist/lodash.js similarity index 100% rename from vitragedashboard/static/vendor/lodash/dist/lodash.js rename to vitrage_dashboard/dashboard/static/vendor/lodash/dist/lodash.js diff --git a/vitragedashboard/static/vendor/lodash/dist/lodash.min.js b/vitrage_dashboard/dashboard/static/vendor/lodash/dist/lodash.min.js similarity index 100% rename from vitragedashboard/static/vendor/lodash/dist/lodash.min.js rename to vitrage_dashboard/dashboard/static/vendor/lodash/dist/lodash.min.js diff --git a/vitragedashboard/static/vendor/lodash/dist/lodash.underscore.js b/vitrage_dashboard/dashboard/static/vendor/lodash/dist/lodash.underscore.js similarity index 100% rename from vitragedashboard/static/vendor/lodash/dist/lodash.underscore.js rename to vitrage_dashboard/dashboard/static/vendor/lodash/dist/lodash.underscore.js diff --git a/vitragedashboard/static/vendor/lodash/dist/lodash.underscore.min.js b/vitrage_dashboard/dashboard/static/vendor/lodash/dist/lodash.underscore.min.js similarity index 100% rename from vitragedashboard/static/vendor/lodash/dist/lodash.underscore.min.js rename to vitrage_dashboard/dashboard/static/vendor/lodash/dist/lodash.underscore.min.js diff --git a/vitragedashboard/templates/topology/index.html b/vitrage_dashboard/dashboard/templates/topology/index.html similarity index 100% rename from vitragedashboard/templates/topology/index.html rename to vitrage_dashboard/dashboard/templates/topology/index.html diff --git a/vitrage_dashboard/dashboard/tests/__init__.py b/vitrage_dashboard/dashboard/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/vitragedashboard/tests/base.py b/vitrage_dashboard/dashboard/tests/base.py similarity index 100% rename from vitragedashboard/tests/base.py rename to vitrage_dashboard/dashboard/tests/base.py diff --git a/vitragedashboard/tests/test_vitragedashboard.py b/vitrage_dashboard/dashboard/tests/test_vitragedashboard.py similarity index 93% rename from vitragedashboard/tests/test_vitragedashboard.py rename to vitrage_dashboard/dashboard/tests/test_vitragedashboard.py index 446bef2..6598d06 100644 --- a/vitragedashboard/tests/test_vitragedashboard.py +++ b/vitrage_dashboard/dashboard/tests/test_vitragedashboard.py @@ -19,7 +19,7 @@ test_vitragedashboard Tests for `vitragedashboard` module. """ -from vitragedashboard.tests import base +from vitrage_dashboard.dashboard.tests import base class TestVitragedashboard(base.TestCase): diff --git a/vitrageentities/urls.py b/vitrage_dashboard/dashboard/urls.py similarity index 87% rename from vitrageentities/urls.py rename to vitrage_dashboard/dashboard/urls.py index 280cfee..98f5d96 100644 --- a/vitrageentities/urls.py +++ b/vitrage_dashboard/dashboard/urls.py @@ -14,7 +14,8 @@ from django.conf import urls -from vitrageentities import views +import vitrage_dashboard.api.vitrage_rest_api # noqa +from vitrage_dashboard.dashboard import views urlpatterns = urls.patterns( '', diff --git a/vitragedashboard/version.py b/vitrage_dashboard/dashboard/version.py similarity index 100% rename from vitragedashboard/version.py rename to vitrage_dashboard/dashboard/version.py diff --git a/vitragedashboard/views.py b/vitrage_dashboard/dashboard/views.py similarity index 100% rename from vitragedashboard/views.py rename to vitrage_dashboard/dashboard/views.py diff --git a/vitrageentities/__init__.py b/vitrage_dashboard/entities/__init__.py similarity index 100% rename from vitrageentities/__init__.py rename to vitrage_dashboard/entities/__init__.py diff --git a/vitrageentities/panel.py b/vitrage_dashboard/entities/panel.py similarity index 100% rename from vitrageentities/panel.py rename to vitrage_dashboard/entities/panel.py diff --git a/vitrageentities/templates/entities/index.html b/vitrage_dashboard/entities/templates/entities/index.html similarity index 100% rename from vitrageentities/templates/entities/index.html rename to vitrage_dashboard/entities/templates/entities/index.html diff --git a/vitragedashboard/urls.py b/vitrage_dashboard/entities/urls.py similarity index 94% rename from vitragedashboard/urls.py rename to vitrage_dashboard/entities/urls.py index 0851eb6..fb94c78 100644 --- a/vitragedashboard/urls.py +++ b/vitrage_dashboard/entities/urls.py @@ -14,7 +14,7 @@ from django.conf import urls -from vitragedashboard import views +from vitrage_dashboard.entities import views urlpatterns = urls.patterns( '', diff --git a/vitrageentities/version.py b/vitrage_dashboard/entities/version.py similarity index 100% rename from vitrageentities/version.py rename to vitrage_dashboard/entities/version.py diff --git a/vitrageentities/views.py b/vitrage_dashboard/entities/views.py similarity index 100% rename from vitrageentities/views.py rename to vitrage_dashboard/entities/views.py diff --git a/vitragetemplates/__init__.py b/vitrage_dashboard/templates/__init__.py similarity index 100% rename from vitragetemplates/__init__.py rename to vitrage_dashboard/templates/__init__.py diff --git a/vitragetemplates/panel.py b/vitrage_dashboard/templates/panel.py similarity index 100% rename from vitragetemplates/panel.py rename to vitrage_dashboard/templates/panel.py diff --git a/vitragetemplates/templates/templates/index.html b/vitrage_dashboard/templates/templates/templates/index.html similarity index 100% rename from vitragetemplates/templates/templates/index.html rename to vitrage_dashboard/templates/templates/templates/index.html diff --git a/vitragetemplates/urls.py b/vitrage_dashboard/templates/urls.py similarity index 93% rename from vitragetemplates/urls.py rename to vitrage_dashboard/templates/urls.py index a401b89..472495c 100644 --- a/vitragetemplates/urls.py +++ b/vitrage_dashboard/templates/urls.py @@ -14,7 +14,7 @@ from django.conf import urls -from vitragetemplates import views +from vitrage_dashboard.templates import views urlpatterns = urls.patterns( '', diff --git a/vitragetemplates/version.py b/vitrage_dashboard/templates/version.py similarity index 100% rename from vitragetemplates/version.py rename to vitrage_dashboard/templates/version.py diff --git a/vitragetemplates/views.py b/vitrage_dashboard/templates/views.py similarity index 100% rename from vitragetemplates/views.py rename to vitrage_dashboard/templates/views.py diff --git a/vitrageclient/api/__init__.py b/vitrageclient/api/__init__.py deleted file mode 100644 index dd2c867..0000000 --- a/vitrageclient/api/__init__.py +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 2012 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# All Rights Reserved. -# -# Copyright 2012 Nebula, Inc. -# Copyright 2013 Big Switch Networks -# -# 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. - -""" -Methods and interface objects used to interact with external APIs. - -API method calls return objects that are in many cases objects with -attributes that are direct maps to the data returned from the API http call. -Unfortunately, these objects are also often constructed dynamically, making -it difficult to know what data is available from the API object. Because of -this, all API calls should wrap their returned object in one defined here, -using only explicitly defined attributes and/or methods. - -In other words, Horizon developers not working on openstack_dashboard.api -shouldn't need to understand the finer details of APIs for -Keystone/Nova/Glance/Swift et. al. -""" -from openstack_dashboard.api import base -from openstack_dashboard.api import ceilometer -from openstack_dashboard.api import cinder -from openstack_dashboard.api import fwaas -from openstack_dashboard.api import glance -from openstack_dashboard.api import heat -from openstack_dashboard.api import keystone -from openstack_dashboard.api import lbaas -from openstack_dashboard.api import network -from openstack_dashboard.api import neutron -from openstack_dashboard.api import nova -from openstack_dashboard.api import swift -from openstack_dashboard.api import vitrage -from openstack_dashboard.api import vpn - - -__all__ = [ - "base", - "cinder", - "fwaas", - "glance", - "heat", - "keystone", - "lbaas", - "network", - "neutron", - "nova", - "swift", - "ceilometer", - "vpn", - "vitrage" -] diff --git a/vitrageclient/api/rest/__init__.py b/vitrageclient/api/rest/__init__.py deleted file mode 100644 index 5df3298..0000000 --- a/vitrageclient/api/rest/__init__.py +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2014, Rackspace, US, 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. -"""This package holds the REST API that supports the Horizon dashboard -Javascript code. - -It is not intended to be used outside of Horizon, and makes no promises of -stability or fitness for purpose outside of that scope. - -It does not promise to adhere to the general OpenStack API Guidelines set out -in https://wiki.openstack.org/wiki/APIChangeGuidelines. -""" - -# import REST API modules here -from . import cinder #flake8: noqa -from . import config #flake8: noqa -from . import glance #flake8: noqa -from . import heat #flake8: noqa -from . import keystone #flake8: noqa -from . import network #flake8: noqa -from . import neutron #flake8: noqa -from . import nova #flake8: noqa -from . import policy #flake8: noqa -from . import vitrage #flake8: noqa