From 7ebff515a77be484bbdd6d66624f9e98e97be858 Mon Sep 17 00:00:00 2001 From: Shu Muto Date: Tue, 16 Oct 2018 17:11:34 +0900 Subject: [PATCH] Add hosts panel This patch adds hosts panel that includes index view. Change-Id: I1c51961ba33ed4117774df83cad7d5bc6f076f69 Partial-Implements: blueprint add-host-panel --- zun_ui/content/container/hosts/__init__.py | 0 zun_ui/content/container/hosts/panel.py | 19 +++ zun_ui/content/container/hosts/urls.py | 20 +++ .../_2332_admin_container_hosts_panel.py | 21 +++ .../dashboard/container/container.module.js | 1 + .../dashboard/container/hosts/drawer.html | 5 + .../dashboard/container/hosts/hosts.module.js | 129 ++++++++++++++++++ .../container/hosts/hosts.service.js | 60 ++++++++ .../dashboard/container/hosts/panel.html | 4 + 9 files changed, 259 insertions(+) create mode 100644 zun_ui/content/container/hosts/__init__.py create mode 100644 zun_ui/content/container/hosts/panel.py create mode 100644 zun_ui/content/container/hosts/urls.py create mode 100644 zun_ui/enabled/_2332_admin_container_hosts_panel.py create mode 100644 zun_ui/static/dashboard/container/hosts/drawer.html create mode 100644 zun_ui/static/dashboard/container/hosts/hosts.module.js create mode 100644 zun_ui/static/dashboard/container/hosts/hosts.service.js create mode 100644 zun_ui/static/dashboard/container/hosts/panel.html diff --git a/zun_ui/content/container/hosts/__init__.py b/zun_ui/content/container/hosts/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/zun_ui/content/container/hosts/panel.py b/zun_ui/content/container/hosts/panel.py new file mode 100644 index 0000000..9fc83f0 --- /dev/null +++ b/zun_ui/content/container/hosts/panel.py @@ -0,0 +1,19 @@ +# 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 Hosts(horizon.Panel): + name = _("Hosts") + slug = "container.hosts" diff --git a/zun_ui/content/container/hosts/urls.py b/zun_ui/content/container/hosts/urls.py new file mode 100644 index 0000000..c1e1ef5 --- /dev/null +++ b/zun_ui/content/container/hosts/urls.py @@ -0,0 +1,20 @@ +# 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.urls import url +from django.utils.translation import ugettext_lazy as _ +from horizon.browsers import views + +title = _("Hosts") +urlpatterns = [ + url('', views.AngularIndexView.as_view(title=title), name='index'), +] diff --git a/zun_ui/enabled/_2332_admin_container_hosts_panel.py b/zun_ui/enabled/_2332_admin_container_hosts_panel.py new file mode 100644 index 0000000..065d7b1 --- /dev/null +++ b/zun_ui/enabled/_2332_admin_container_hosts_panel.py @@ -0,0 +1,21 @@ +# 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. + +# The slug of the panel to be added to HORIZON_CONFIG. Required. +PANEL = 'container.hosts' +# The slug of the panel group the PANEL is associated with. +PANEL_GROUP = 'container' +# The slug of the dashboard the PANEL associated with. Required. +PANEL_DASHBOARD = 'admin' + +# Python panel class of the PANEL to be added. +ADD_PANEL = 'zun_ui.content.container.hosts.panel.Hosts' diff --git a/zun_ui/static/dashboard/container/container.module.js b/zun_ui/static/dashboard/container/container.module.js index cd341c2..9294747 100644 --- a/zun_ui/static/dashboard/container/container.module.js +++ b/zun_ui/static/dashboard/container/container.module.js @@ -26,6 +26,7 @@ 'horizon.dashboard.container.containers', 'horizon.dashboard.container.capsules', 'horizon.dashboard.container.images', + 'horizon.dashboard.container.hosts', 'ngRoute' ]) .config(config); diff --git a/zun_ui/static/dashboard/container/hosts/drawer.html b/zun_ui/static/dashboard/container/hosts/drawer.html new file mode 100644 index 0000000..fbb75c8 --- /dev/null +++ b/zun_ui/static/dashboard/container/hosts/drawer.html @@ -0,0 +1,5 @@ + + diff --git a/zun_ui/static/dashboard/container/hosts/hosts.module.js b/zun_ui/static/dashboard/container/hosts/hosts.module.js new file mode 100644 index 0000000..1ba6ab9 --- /dev/null +++ b/zun_ui/static/dashboard/container/hosts/hosts.module.js @@ -0,0 +1,129 @@ +/** + * 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'; + + /** + * @ngdoc overview + * @name horizon.dashboard.container.hosts + * @ngModule + * @description + * Provides all the services and widgets require to display the hosts + * panel + */ + angular + .module('horizon.dashboard.container.hosts', [ + 'ngRoute' + ]) + .constant('horizon.dashboard.container.hosts.resourceType', 'OS::Zun::Host') + .run(run) + .config(config); + + run.$inject = [ + 'horizon.framework.conf.resource-type-registry.service', + 'horizon.app.core.openstack-service-api.zun', + 'horizon.dashboard.container.hosts.basePath', + 'horizon.dashboard.container.hosts.resourceType', + 'horizon.dashboard.container.hosts.service' + ]; + + function run(registry, zun, basePath, resourceType, hostService) { + registry.getResourceType(resourceType) + .setNames(gettext('Host'), gettext('Hosts')) + // for detail summary view on table row. + .setSummaryTemplateUrl(basePath + 'drawer.html') + // for table row items and detail summary view. + .setProperties(hostProperties()) + .setListFunction(hostService.getHostsPromise) + .tableColumns + .append({ + id: 'id', + priority: 3 + }) + .append({ + id: 'hostname', + priority: 1, + sortDefault: true + }) + .append({ + id: 'mem_total', + priority: 2 + }) + .append({ + id: 'cpus', + priority: 2 + }) + .append({ + id: 'disk_total', + priority: 2 + }); + // for magic-search + registry.getResourceType(resourceType).filterFacets + .append({ + 'label': gettext('Hostname'), + 'name': 'repo', + 'singleton': true + }) + .append({ + 'label': gettext('ID'), + 'name': 'id', + 'singleton': true + }); + } + + function hostProperties() { + return { + 'id': {label: gettext('ID'), filters: ['noValue'] }, + 'hostname': { label: gettext('Hostname'), filters: ['noValue'] }, + 'mem_total': { label: gettext('Memory Total'), filters: ['noValue', 'mb'] }, + 'mem_used': { label: gettext('Memory Used'), filters: ['noValue', 'mb'] }, + 'cpus': { label: gettext('CPU Total'), filters: ['noValue'] }, + 'cpu_used': { label: gettext('CPU Used'), filters: ['noValue'] }, + 'disk_total': { label: gettext('Disk Total'), filters: ['noValue', 'gb'] }, + 'disk_used': { label: gettext('Disk Used'), filters: ['noValue', 'gb'] }, + 'disk_quota_supported': { label: gettext('Disk Quota Supported'), + filters: ['noValue', 'yesno'] }, + 'total_containers': { label: gettext('Disk Used'), filters: ['noValue'] }, + 'os': { label: gettext('OS'), filters: ['noValue'] }, + 'os_type': { label: gettext('OS Type'), filters: ['noValue'] }, + 'architecture': { label: gettext('Architecture'), filters: ['noValue'] }, + 'kernel_version': { label: gettext('Kernel Version'), filters: ['noValue'] }, + 'runtimes': { label: gettext('Runtimes'), filters: ['noValue'] }, + 'labels': { label: gettext('Labels'), filters: ['noValue'] } + }; + } + + config.$inject = [ + '$provide', + '$windowProvider', + '$routeProvider' + ]; + + /** + * @name config + * @param {Object} $provide + * @param {Object} $windowProvider + * @param {Object} $routeProvider + * @description Routes used by this module. + * @returns {undefined} Returns nothing + */ + function config($provide, $windowProvider, $routeProvider) { + var path = $windowProvider.$get().STATIC_URL + 'dashboard/container/hosts/'; + $provide.constant('horizon.dashboard.container.hosts.basePath', path); + $routeProvider.when('/admin/container/hosts', { + templateUrl: path + 'panel.html' + }); + } +})(); diff --git a/zun_ui/static/dashboard/container/hosts/hosts.service.js b/zun_ui/static/dashboard/container/hosts/hosts.service.js new file mode 100644 index 0000000..964335e --- /dev/null +++ b/zun_ui/static/dashboard/container/hosts/hosts.service.js @@ -0,0 +1,60 @@ +/* + * 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('horizon.dashboard.container.hosts') + .factory('horizon.dashboard.container.hosts.service', hostsService); + + hostsService.$inject = [ + 'horizon.app.core.detailRoute', + 'horizon.app.core.openstack-service-api.zun' + ]; + + /* + * @ngdoc factory + * @name horizon.dashboard.container.hosts.service + * + * @description + * This service provides functions that are used through + * the hosts of container features. + */ + function hostsService(detailRoute, zun) { + return { + getHostsPromise: getHostsPromise + }; + + /* + * @ngdoc function + * @name getHostsPromise + * @description + * Given filter/query parameters, returns a promise for the matching + * hosts. This is used in displaying lists of hosts. + */ + function getHostsPromise(params) { + return zun.getHosts(params).then(modifyResponse); + } + + function modifyResponse(response) { + return {data: {items: response.data.items.map(modifyItem)}}; + + function modifyItem(item) { + var timestamp = new Date(); + item.trackBy = item.id.concat(timestamp.getTime()); + return item; + } + } + } +})(); diff --git a/zun_ui/static/dashboard/container/hosts/panel.html b/zun_ui/static/dashboard/container/hosts/panel.html new file mode 100644 index 0000000..066a97a --- /dev/null +++ b/zun_ui/static/dashboard/container/hosts/panel.html @@ -0,0 +1,4 @@ + + +