commit 1269abc535e76e52f8b6562a4d5b1bf657487f2d Author: Kevin Fox Date: Wed Jul 29 12:44:51 2015 -0700 Initial commit of separated plugin. diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..68c771a --- /dev/null +++ b/LICENSE @@ -0,0 +1,176 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..a8c2323 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,5 @@ +include setup.py + +recursive-include app_catalog/static * +recursive-include app_catalog/templates * +recursive-include component_catalog/templates * diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..51547c4 --- /dev/null +++ b/README.rst @@ -0,0 +1,30 @@ +=============== +apps-catalog-ui +=============== + +This makes the Appications and Components stored in the OpenStack Application +Catalog available to users in their own Cloud's Horizon UI. + + +Requirements +============ + +apps-catalog-ui is intended to use only on systems running Horizon + + +How to try this package +======================= + +:: + git clone http://github.com/openstack/horizon.git + git clone http://github.com/kfox1111/apps-catalog-ui.git + cd horizon + git fetch https://review.openstack.org/openstack/horizon refs/changes/73/206773/2 && git checkout FETCH_HEAD + ./run_tests.sh -f --docs + cp ./openstack_dashboard/local/local_settings.py.example ./openstack_dashboard/local/local_settings.py + pushd ../apps-catalog-ui + ../horizon/tools/with_venv.sh pip install --upgrade . + cp -a enabled/* ../horizon/openstack_dashboard/enabled/ + popd + ./run_tests.sh --runserver 127.0.0.1:18000 + diff --git a/app_catalog/__init__.py b/app_catalog/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/app_catalog/panel.py b/app_catalog/panel.py new file mode 100644 index 0000000..49aa85c --- /dev/null +++ b/app_catalog/panel.py @@ -0,0 +1,22 @@ +# Copyright 2015 IBM Corp. +# +# 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. + +from django.utils.translation import ugettext_lazy as _ + +import horizon + + +class AppCatalog(horizon.Panel): + name = _("Applications") + slug = "app_catalog" diff --git a/app_catalog/static/dashboard/project/app_catalog/app_catalog.js b/app_catalog/static/dashboard/project/app_catalog/app_catalog.js new file mode 100644 index 0000000..57d1314 --- /dev/null +++ b/app_catalog/static/dashboard/project/app_catalog/app_catalog.js @@ -0,0 +1,112 @@ +/* + * Copyright 2015 IBM Corp. + * Copyright 2015 Kevin Fox. + * + * 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. + */ + +(function() { + 'use strict'; + + angular + .module('hz.dashboard.project.app_catalog', ['hz.dashboard']) + .filter('encodeURIComponent', function() { + return window.encodeURIComponent; + }) + .controller('appCatalogTableCtrl', [ + '$scope', + '$http', + 'horizon.openstack-service-api.heat', + appCatalogTableCtrl + ]).controller('appComponentCatalogTableCtrl', [ + '$scope', + '$http', + 'horizon.openstack-service-api.glance', + appComponentCatalogTableCtrl + ]).directive('stars', stars); + + function appCatalogTableCtrl($scope, $http, heatAPI) { + var req = { + url: 'http://apps.openstack.org/static/heat_templates.json', + headers: {'X-Requested-With': undefined} + } + $http(req).success(function(data) { + $scope.templates = data.templates; + for (var i in $scope.templates){ + var process = function(template, url) { + var url = template.attributes.url; + heatAPI.validate({'template_url': url}).success(function(data){ + template.validated = true; + }).error(function(data, status){ + var str = 'ERROR: Could not retrieve template:' + template.validated = 'unsupported'; + if(status == 400 && data.slice(0, str.length) == str) { + template.validated = 'error' + } + }); + } + process($scope.templates[i]); + } + }); + } + + function update_found_images($scope) { + if('images' in $scope && 'glance_names' in $scope){ + for (var i in $scope.images){ + var name = $scope.images[i].name; + var is_installed = name in $scope.glance_names; + $scope.images[i].installed = is_installed; + if(is_installed){ + $scope.images[i].installed_id = $scope.glance_names[name]['id']; + } + } + } + } + + function appComponentCatalogTableCtrl($scope, $http, glanceAPI) { + var req = { + url: 'http://apps.openstack.org/static/glance_images.json', + headers: {'X-Requested-With': undefined} + } + glanceAPI.getImages().success(function(data) { + $scope.glance_images = data; + var glance_names = {} + for (var i in data.items){ + var name = data.items[i]['name']; + glance_names[name] = {'id': data.items[i]['id']}; + } + $scope.glance_names = glance_names; + update_found_images($scope) + }); + $http(req).success(function(data) { + $scope.images = data.images; + update_found_images($scope); + }); + } + + function stars() { + var star = angular.element(''); + star.addClass('fa fa-star'); + star.css({ color: 'goldenrod' }); + return { + restrict: 'E', + scope: { value: '=' }, + link: function(scope, element){ + for (var i = 0; i < scope.value; i++){ + element.append(star.clone()); + } + } + }; + } + +})(); diff --git a/app_catalog/templates/app_catalog/index.html b/app_catalog/templates/app_catalog/index.html new file mode 100644 index 0000000..73a2b46 --- /dev/null +++ b/app_catalog/templates/app_catalog/index.html @@ -0,0 +1,54 @@ +{% extends 'base.html' %} +{% load i18n %} +{% block title %}{% trans "Application Catalog" %}{% endblock %} + +{% block page_header %} + {% include "horizon/common/_page_header.html" with title=_("Application Catalog") %} +{% endblock page_header %} + +{% block main %} + + + + + + + + + + + + + + + + + + + + + + + + + +
NameLicense
+ + {$ template.name $}{$ template.license $} + Checking + Error + Unsupported + Launch +
+
+
Name
+
{$ template.name $}
+
Description
+
{$ template.description $}
+
+
+ +{% endblock %} + diff --git a/app_catalog/tests.py b/app_catalog/tests.py new file mode 100644 index 0000000..5736aae --- /dev/null +++ b/app_catalog/tests.py @@ -0,0 +1,7 @@ +from horizon.test import helpers as test + + +class FivecircleTests(test.TestCase): + # Unit tests for AppCatalog. + def test_me(self): + self.assertTrue(1 + 1 == 2) diff --git a/app_catalog/urls.py b/app_catalog/urls.py new file mode 100644 index 0000000..112506f --- /dev/null +++ b/app_catalog/urls.py @@ -0,0 +1,22 @@ +# Copyright 2015 IBM Corp. +# +# 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. + +from django.conf import urls + +from app_catalog import views + +urlpatterns = urls.patterns( + '', + urls.url(r'^$', views.IndexView.as_view(), name='index'), +) diff --git a/app_catalog/views.py b/app_catalog/views.py new file mode 100644 index 0000000..67dc3d8 --- /dev/null +++ b/app_catalog/views.py @@ -0,0 +1,10 @@ +from horizon import views + + +class IndexView(views.APIView): + # A very simple class-based view... + template_name = 'app_catalog/index.html' + + def get_data(self, request, context, *args, **kwargs): + # Add data to the context here... + return context diff --git a/component_catalog/__init__.py b/component_catalog/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/component_catalog/panel.py b/component_catalog/panel.py new file mode 100644 index 0000000..cb13231 --- /dev/null +++ b/component_catalog/panel.py @@ -0,0 +1,22 @@ +# Copyright 2015 IBM Corp. +# +# 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. + +from django.utils.translation import ugettext_lazy as _ + +import horizon + + +class ComponentCatalog(horizon.Panel): + name = _("Components") + slug = "component_catalog" diff --git a/component_catalog/templates/component_catalog/index.html b/component_catalog/templates/component_catalog/index.html new file mode 100644 index 0000000..7b24483 --- /dev/null +++ b/component_catalog/templates/component_catalog/index.html @@ -0,0 +1,64 @@ +{% extends 'base.html' %} +{% load i18n %} +{% block title %}{% trans "Component Catalog" %}{% endblock %} + +{% block page_header %} + {% include "horizon/common/_page_header.html" with title=_("Component Catalog ") %} +{% endblock page_header %} + +{% block main %} + + + + + + + + + + + + + + + + + + + + + + + + + +
NameLicense
+ + {$ image.name $}{$ image.license $} + Install Instructions +
+ Checking + Install + Launch + +
+
+
+
Name
+
{$ image.name $}
+
Description
+
{$ image.description $}
+
Company
+
{$ image.provided_by.company $}
+
+
+ License Details +
+
+
+
+ +{% endblock %} + diff --git a/component_catalog/tests.py b/component_catalog/tests.py new file mode 100644 index 0000000..5736aae --- /dev/null +++ b/component_catalog/tests.py @@ -0,0 +1,7 @@ +from horizon.test import helpers as test + + +class FivecircleTests(test.TestCase): + # Unit tests for AppCatalog. + def test_me(self): + self.assertTrue(1 + 1 == 2) diff --git a/component_catalog/urls.py b/component_catalog/urls.py new file mode 100644 index 0000000..174629d --- /dev/null +++ b/component_catalog/urls.py @@ -0,0 +1,22 @@ +# Copyright 2015 IBM Corp. +# +# 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. + +from django.conf import urls + +from component_catalog import views + +urlpatterns = urls.patterns( + '', + urls.url(r'^$', views.IndexView.as_view(), name='index'), +) diff --git a/component_catalog/views.py b/component_catalog/views.py new file mode 100644 index 0000000..83890bd --- /dev/null +++ b/component_catalog/views.py @@ -0,0 +1,11 @@ +from horizon import views + + +class IndexView(views.APIView): + # A very simple class-based view... + template_name = 'component_catalog/index.html' + + def get_data(self, request, context, *args, **kwargs): + # Add data to the context here... + return context + diff --git a/enabled/_80_project_catalog_panel_group.py b/enabled/_80_project_catalog_panel_group.py new file mode 100644 index 0000000..4863e0b --- /dev/null +++ b/enabled/_80_project_catalog_panel_group.py @@ -0,0 +1,7 @@ +# The name of the panel group to be added to HORIZON_CONFIG. Required. +PANEL_GROUP = 'catalog_panel_group' +# The display name of the PANEL_GROUP. Required. +PANEL_GROUP_NAME = 'Catalog' +# The name of the dashboard the PANEL_GROUP associated with. Required. +PANEL_GROUP_DASHBOARD = 'project' + diff --git a/enabled/_90_project_app_catalog_panel.py b/enabled/_90_project_app_catalog_panel.py new file mode 100644 index 0000000..167eca8 --- /dev/null +++ b/enabled/_90_project_app_catalog_panel.py @@ -0,0 +1,17 @@ +# The name of the panel to be added to HORIZON_CONFIG. Required. +PANEL = 'app_catalog_panel' +# The name of the dashboard the PANEL associated with. Required. +PANEL_DASHBOARD = 'project' +# The name of the panel group the PANEL is associated with. +PANEL_GROUP = 'catalog_panel_group' + +# Python panel class of the PANEL to be added. +ADD_PANEL = 'app_catalog.panel.AppCatalog' + +ADD_INSTALLED_APPS = ['app_catalog'] + +ADD_ANGULAR_MODULES = ['hz.dashboard.project.app_catalog'] + +ADD_JS_FILES = [ + 'dashboard/project/app_catalog/app_catalog.js' +] diff --git a/enabled/_91_project_component_catalog_panel.py b/enabled/_91_project_component_catalog_panel.py new file mode 100644 index 0000000..d33ae2d --- /dev/null +++ b/enabled/_91_project_component_catalog_panel.py @@ -0,0 +1,11 @@ +# The name of the panel to be added to HORIZON_CONFIG. Required. +PANEL = 'component_catalog_panel' +# The name of the dashboard the PANEL associated with. Required. +PANEL_DASHBOARD = 'project' +# The name of the panel group the PANEL is associated with. +PANEL_GROUP = 'catalog_panel_group' + +# Python panel class of the PANEL to be added. +ADD_PANEL = 'component_catalog.panel.ComponentCatalog' + +ADD_INSTALLED_APPS = ['component_catalog'] diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..657ebd2 --- /dev/null +++ b/setup.py @@ -0,0 +1,41 @@ +#! /usr/bin/env python +# +# 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. + +from setuptools import setup, find_packages + +setup( + name = 'apps-catalog-ui', + version = '0.0.1', + description = 'OpenStack Application Catalog for OpenStack Dashboard', + author = 'Kevin Fox', + author_email = 'kevin@efox.cc', + classifiers = [ + 'Environment :: OpenStack', + 'Framework :: Django', + 'Intended Audience :: Developers', + 'Intended Audience :: System Administrators', + 'License :: OSI Approved :: Apache Software License', + 'Operating System :: OS Independent', + 'Operating System :: POSIX :: Linux', + 'Programming Language :: Python', + 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 2.7', + 'Topic :: Internet :: WWW/HTTP', + ], + packages=find_packages(), + include_package_data = True, +) + +