x/tuskar-ui
Code Issues Proposed changes

Initial implementation of deployment detail pages

Browse Source 
This implementation creates api calls to Tuskar for
the Overcloud and Resource Categories; mock data is
returned.

Additional work will be needed to bring the pages
in line with wireframes.

Change-Id: I8eb99879d87b2216ff58d1d469584b7799721734
Implements: blueprint tripleo-deployment-overview
This commit is contained in:
Tzu-Mainn Chen 2014-01-16 15:45:27 -05:00
parent 4dac7ca38f
commit 9422ced4aa
11 changed files with 342 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
tuskar_ui/api.py
View File

@ -40,8 +40,10 @@ def tuskarclient(request):
return c
class Overcloud(base.APIResourceWrapper):
_attrs = ('id', 'stack_name', 'stack_status')
# TODO(Tzu-Mainn Chen): change this to APIResourceWrapper once
# ResourceCategory object exists in tuskar
class Overcloud(base.APIDictWrapper):
_attrs = ('id', 'stack_id', 'name', 'description')
@classmethod
def create(cls, request, overcloud_sizing):
@ -64,43 +66,42 @@ class Overcloud(base.APIResourceWrapper):
# overcloud = tuskarclient(request).overclouds.create(
# 'overcloud',
# overcloud_sizing)
overcloud = test_data().heatclient_stacks.first()
overcloud = test_data().tuskarclient_overclouds.first()
return cls(overcloud)
@classmethod
def get(cls, request):
# Assumptions:
# * hard-coded stack name ('overcloud')
def list(cls, request):
# Return:
# * a list of Overclouds in Tuskar
# TODO(Tzu-Mainn Chen): remove test data when possible
# ocs = tuskarclient(request).overclouds.list()
ocs = test_data().tuskarclient_overclouds.list()
return [cls(oc) for oc in ocs]
@classmethod
def get(cls, request, overcloud_id):
# Required:
# * overcloud_id
# Return:
# * the 'overcloud' stack object
# TODO(Tzu-Mainn Chen): remove test data when possible
# overcloud = heatclient(request).stacks.get('overcloud')
overcloud = test_data().heatclient_stacks.first()
# overcloud = tuskarclient(request).overclouds.get(overcloud_id)
overcloud = test_data().tuskarclient_overclouds.first()
return cls(overcloud)
@cached_property
def resources(self):
# Assumptions:
# * hard-coded stack name ('overcloud')
def stack(self, request):
# Return:
# * a list of Resources associated with the Overcloud
# * the Heat stack associated with this overcoud
# TODO(Tzu-Mainn Chen): remove test data when possible
# resources = heatclient(request).resources.list(self.id)
resources = test_data().heatclient_resources.list
return [Resource(r) for r in resources]
@cached_property
def nodes(self):
# Assumptions:
# * hard-coded stack name ('overcloud')
# Return:
# * a list of Nodes indirectly associated with the Overcloud
return [resource.node for resource in self.resources]
# stack = heatclient(request).stacks.get(self.stack_id)
stack = test_data().heatclient_stacks.first()
return stack
@cached_property
def is_deployed(self):
@ -256,20 +257,22 @@ class Resource(base.APIResourceWrapper):
if self.physical_resource_id == n.instance_uuid),
None)
@cached_property
def resource_category(self):
# Questions:
# * is a resource_type mapped directly to a ResourceCategory?
# * can we assume that the resource_type equals the category
# name?
# TODO(Tzu-Mainn Chen): change this to APIResourceWrapper once
# ResourceCategory object exists in tuskar
class ResourceCategory(base.APIDictWrapper):
_attrs = ('id', 'name', 'description', 'image_id')
@classmethod
def list(cls, request):
# Return:
# * the ResourceCategory matching this resource
# * a list of Resource Categories in Tuskar.
return ResourceCategory({'name': self.resource_type})
# TODO(Tzu-Mainn Chen): remove test data when possible
# categories = tuskarclient(request).resource_categories.list()
class ResourceCategory(base.APIResourceWrapper):
_attrs = ('name')
rcs = test_data().tuskarclient_resource_categories.list()
return [cls(rc) for rc in rcs]
@cached_property
def image(self):
@ -284,15 +287,37 @@ class ResourceCategory(base.APIResourceWrapper):
return "image_name"
@cached_property
def resources(self, overcloud):
# Questions:
# * can we assume that the resource_type equals the
# category name?
# Required:
# * overcloud
# Return:
# * the resources within the stack that match the
# resource category
return [r for r in overcloud.resources if r.resource_type == self.name]
# TODO(Tzu-Mainn Chen): uncomment when possible
#resources = tuskarclient(request).overclouds.get_resources(
# overcloud.id, self.id)
return [r for r in test_data().heatclient_resources.list()
if r.logical_resource_id == self.name]
def instances(self, overcloud):
# Required:
# * overcloud
# Return:
# * the instances corresponding to the resources within the
# stack that match the resource category
#resources = tuskarclient(request).overclouds.get_resources(
# overcloud.id, self.id)
# TODO(Tzu-Mainn Chen): uncomment real api calls and remove test
# data when possible
instances = []
all_instances = test_data().novaclient_servers.list()
for r in self.resources(overcloud):
#instance = novaclient(request).servers.get(r.physical_resource_id)
instance = next((i for i in all_instances
if i.id == r.physical_resource_id),
None)
instances.append(instance)
return instances

77
tuskar_ui/infrastructure/overcloud/tabs.py Normal file
View File

@ -0,0 +1,77 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2012 Nebula, 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.
from django.utils.translation import ugettext_lazy as _
from horizon import exceptions
from horizon import tabs
from tuskar_ui import api
class OverviewTab(tabs.Tab):
name = _("Overview")
slug = "overview"
template_name = ("infrastructure/overcloud/_detail_overview.html")
def get_context_data(self, request):
context = {}
overcloud = self.tab_group.kwargs['overcloud']
try:
categories = api.ResourceCategory.list(request)
except Exception:
categories = {}
exceptions.handle(request,
_('Unable to retrieve resource categories.'))
context['categories'] = []
for category in categories:
context['categories'].append(
self._get_category_data(overcloud, category))
# also get expected instance counts
return context
def _get_category_data(self, overcloud, category):
instances = category.instances(overcloud)
category.instance_count = len(instances)
if category.instance_count > 0:
category.running_instance_count = len(
[i for i in instances if i.status == 'ACTIVE'])
category.error_instance_count = len(
[i for i in instances if i.status == 'ERROR'])
category.other_instance_count = category.instance_count - \
(category.running_instance_count +
category.error_instance_count)
category.running_instance_percentage = 100 * \
category.running_instance_count / category.instance_count
return category
class ConfigurationTab(tabs.Tab):
name = _("Configuration")
slug = "configuration"
template_name = ("infrastructure/overcloud/_detail_configuration.html")
def get_context_data(self, request):
return {}
class DetailTabs(tabs.TabGroup):
slug = "detail"
tabs = (OverviewTab, ConfigurationTab)
sticky = True

5
tuskar_ui/infrastructure/overcloud/templates/overcloud/_detail_configuration.html Normal file
View File

@ -0,0 +1,5 @@
{% load i18n %}
{% load url from future%}
<div class="row-fluid"><div class="span12">
</div></div>

28
tuskar_ui/infrastructure/overcloud/templates/overcloud/_detail_overview.html Normal file
View File

@ -0,0 +1,28 @@
{% load i18n %}
{% load url from future%}
<div class="row-fluid">
<div class="span6">
<h3>{% trans "Resource Categories" %}</h3>
<hr />
{% for category in categories %}
<h4>{{ category.instance_count }} {{ category.name }}</h4>
{% if category.error_instance_count > 0 %}
{{ category.error_instance_count }} {% trans "instances are down" %}
<br />
{% endif %}
{% if category.other_instance_count > 0 %}
{{ category.other_instance_count }} {% trans "instances are building" %}
<br />
{% endif %}
{% if category.running_instance_percentage %}
{{ category.running_instance_percentage }} {% trans "% of instances are running" %}
<br />
{% endif %}
<hr />
{% endfor %}
</div>
<div class="span6">
<h3>{% trans "Resource Categories Distribution" %}</h3>
</div>
</div>

16
tuskar_ui/infrastructure/overcloud/templates/overcloud/detail.html Normal file
View File

@ -0,0 +1,16 @@
{% extends 'infrastructure/base.html' %}
{% load i18n %}
{% load url from future %}
{% block title %}{% trans 'My Openstack Deployment' %}{% endblock %}
{% block page_header %}
{% include 'horizon/common/_domain_page_header.html' with title=_('My Openstack Deployment') %}
{% endblock page_header %}
{% block main %}
<div class="row-fluid">
<div class="span12">
{{ tab_group.render }}
</div>
</div>
{% endblock %}

14
tuskar_ui/infrastructure/overcloud/tests.py
View File

@ -34,28 +34,30 @@ tuskar_data.data(TEST_DATA)
class OvercloudTests(test.BaseAdminViewTests):
def test_index_overcloud_undeployed(self):
stack = api.Overcloud(TEST_DATA.heatclient_stacks.first)
oc = api.Overcloud(TEST_DATA.tuskarclient_overclouds.first())
with patch('tuskar_ui.api.Overcloud', **{
'spec_set': ['get', 'is_deployed'],
'is_deployed': False,
'get.return_value': stack,
'get.return_value': oc,
}) as Overcloud:
res = self.client.get(INDEX_URL)
request = Overcloud.get.call_args_list[0][0][0] # This is a hack.
self.assertListEqual(Overcloud.get.call_args_list, [call(request)])
self.assertListEqual(Overcloud.get.call_args_list,
[call(request, 1)])
self.assertRedirectsNoFollow(res, CREATE_URL)
def test_index_overcloud_deployed(self):
stack = api.Overcloud(TEST_DATA.heatclient_stacks.first)
oc = api.Overcloud(TEST_DATA.tuskarclient_overclouds.first())
with patch('tuskar_ui.api.Overcloud', **{
'spec_set': ['get', 'is_deployed'],
'is_deployed': True,
'get.return_value': stack,
'get.return_value': oc,
}) as Overcloud:
res = self.client.get(INDEX_URL)
request = Overcloud.get.call_args_list[0][0][0] # This is a hack.
self.assertListEqual(Overcloud.get.call_args_list, [call(request)])
self.assertListEqual(Overcloud.get.call_args_list,
[call(request, 1)])
self.assertRedirectsNoFollow(res, DETAIL_URL)

26
tuskar_ui/infrastructure/overcloud/views.py
View File

@ -13,12 +13,15 @@
# under the License.
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext_lazy as _
from django.views.generic import base as base_views
from horizon import exceptions
from horizon import tabs as horizon_tabs
import horizon.workflows
from tuskar_ui import api
from tuskar_ui.infrastructure.overcloud.workflows import deployed
from tuskar_ui.infrastructure.overcloud import tabs
from tuskar_ui.infrastructure.overcloud.workflows import undeployed
@ -26,7 +29,7 @@ class IndexView(base_views.RedirectView):
permanent = False
def get_redirect_url(self):
overcloud = api.Overcloud.get(self.request)
overcloud = api.Overcloud.get(self.request, 1)
if overcloud is not None and overcloud.is_deployed:
redirect = reverse('horizon:infrastructure:overcloud:detail',
args=(overcloud.id,))
@ -40,6 +43,19 @@ class CreateView(horizon.workflows.WorkflowView):
template_name = 'infrastructure/_fullscreen_workflow_base.html'
class DetailView(horizon.workflows.WorkflowView):
workflow_class = deployed.Workflow
template_name = 'infrastructure/_fullscreen_workflow_base.html'
class DetailView(horizon_tabs.TabView):
tab_group_class = tabs.DetailTabs
template_name = 'infrastructure/overcloud/detail.html'
def get_data(self, request, **kwargs):
overcloud_id = kwargs['overcloud_id']
try:
return api.Overcloud.get(request, overcloud_id)
except Exception:
msg = _("Unable to retrieve deployment.")
redirect = reverse('horizon:infrastructure:overcloud:index')
exceptions.handle(request, msg, redirect=redirect)
def get_tabs(self, request, **kwargs):
overcloud = self.get_data(request, **kwargs)
return self.tab_group_class(request, overcloud=overcloud, **kwargs)

34
tuskar_ui/infrastructure/overcloud/workflows/deployed.py
View File

@ -1,34 +0,0 @@
# -*- coding: utf8 -*-
#
# 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.workflows
from tuskar_ui.infrastructure.overcloud.workflows import deployed_configuration
from tuskar_ui.infrastructure.overcloud.workflows import deployed_overview
class Workflow(horizon.workflows.Workflow):
slug = 'deployed_overcloud'
name = _("My Openstack Deployment")
default_steps = (
deployed_overview.Step,
deployed_configuration.Step,
)
finalize_button_name = _("Scale Deployment")
# TODO(rdopierqalski) Point this to the scaling forms.
success_url = 'horizon:infrastructure:overcloud:index'
def handle(self, request, context):
pass

27
tuskar_ui/infrastructure/overcloud/workflows/deployed_configuration.py
View File

@ -1,27 +0,0 @@
# -*- coding: utf8 -*-
#
# 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.workflows
class Action(horizon.workflows.Action):
class Meta:
slug = 'deployed_configuration'
name = _("Configuration")
class Step(horizon.workflows.Step):
action_class = Action
contributes = ()

27
tuskar_ui/infrastructure/overcloud/workflows/deployed_overview.py
View File

@ -1,27 +0,0 @@
# -*- coding: utf8 -*-
#
# 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.workflows
class Action(horizon.workflows.Action):
class Meta:
slug = 'deployed_overview'
name = _("Overview")
class Step(horizon.workflows.Step):
action_class = Action
contributes = ()

128
tuskar_ui/test/test_data/tuskar_data.py
View File

@ -16,6 +16,7 @@ from heatclient.v1 import resources
from heatclient.v1 import stacks
from ironicclient.v1 import node
from ironicclient.v1 import port
from novaclient.v1_1 import servers
def data(TEST):
@ -24,7 +25,7 @@ def data(TEST):
TEST.heatclient_stacks = test_data_utils.TestDataContainer()
stack_1 = stacks.Stack(
stacks.StackManager(None),
{'id': '1',
{'id': 'stack-id-1',
'stack_name': 'overcloud',
'stack_status': 'RUNNING'})
TEST.heatclient_stacks.add(stack_1)
@ -79,7 +80,39 @@ def data(TEST):
'local_disk': '1',
},
'power_state': 'rebooting'})
TEST.ironicclient_nodes.add(node_1, node_2, node_3)
node_4 = node.Node(
node.NodeManager(None),
{'uuid': 'cc-44',
'instance_uuid': 'cc',
'driver': 'pxe_ipmitool',
'driver_info': {
'ipmi_address': '4.4.4.4',
'ipmi_username': 'admin',
'ipmi_password': 'password',
},
'properties': {
'cpu': '8',
'ram': '16',
'local_disk': '10',
},
'power_state': 'on'})
node_5 = node.Node(
node.NodeManager(None),
{'uuid': 'dd-55',
'instance_uuid': 'dd',
'driver': 'pxe_ipmitool',
'driver_info': {
'ipmi_address': '5.5.5.5',
'ipmi_username': 'admin',
'ipmi_password': 'password',
},
'properties': {
'cpu': '8',
'ram': '16',
'local_disk': '10',
},
'power_state': 'on'})
TEST.ironicclient_nodes.add(node_1, node_2, node_3, node_4, node_5)
# Ports
TEST.ironicclient_ports = test_data_utils.TestDataContainer()
@ -109,7 +142,8 @@ def data(TEST):
TEST.heatclient_resources = test_data_utils.TestDataContainer()
resource_1 = resources.Resource(
resources.ResourceManager(None),
{'stack_id': '1',
{'id': '1-resource-id',
'stack_id': 'stack-id-1',
'resource_name': 'Compute',
'logical_resource_id': 'Compute',
'physical_resource_id': 'aa',
@ -117,12 +151,92 @@ def data(TEST):
'resource_type': 'AWS::EC2::Instance'})
resource_2 = resources.Resource(
resources.ResourceManager(None),
{'stack_id': '1',
'resource_name': 'Control',
'logical_resource_id': 'Control',
{'id': '2-resource-id',
'stack_id': 'stack-id-1',
'resource_name': 'Controller',
'logical_resource_id': 'Controller',
'physical_resource_id': 'bb',
'resource_status': 'CREATE_COMPLETE',
'resource_type': 'AWS::EC2::Instance'})
TEST.heatclient_resources.add(resource_1, resource_2)
resource_3 = resources.Resource(
resources.ResourceManager(None),
{'id': '3-resource-id',
'stack_id': 'stack-id-1',
'resource_name': 'Compute',
'logical_resource_id': 'Compute',
'physical_resource_id': 'cc',
'resource_status': 'CREATE_COMPLETE',
'resource_type': 'AWS::EC2::Instance'})
resource_4 = resources.Resource(
resources.ResourceManager(None),
{'id': '4-resource-id',
'stack_id': 'stack-id-4',
'resource_name': 'Compute',
'logical_resource_id': 'Compute',
'physical_resource_id': 'dd',
'resource_status': 'CREATE_COMPLETE',
'resource_type': 'AWS::EC2::Instance'})
TEST.heatclient_resources.add(resource_1,
resource_2,
resource_3,
resource_4)
# Server
TEST.novaclient_servers = test_data_utils.TestDataContainer()
s_1 = servers.Server(
servers.ServerManager(None),
{'id': 'aa',
'name': 'Compute',
'image': 'compute-image',
'status': 'ACTIVE'})
s_2 = servers.Server(
servers.ServerManager(None),
{'id': 'bb',
'name': 'Controller',
'image': 'controller-image',
'status': 'ACTIVE'})
s_3 = servers.Server(
servers.ServerManager(None),
{'id': 'cc',
'name': 'Compute',
'image': 'compute-image',
'status': 'BUILD'})
s_4 = servers.Server(
servers.ServerManager(None),
{'id': 'dd',
'name': 'Compute',
'image': 'compute-image',
'status': 'ERROR'})
TEST.novaclient_servers.add(s_1, s_2, s_3, s_4)
# Overcloud
TEST.tuskarclient_overclouds = test_data_utils.TestDataContainer()
# TODO(Tzu-Mainn Chen): fix these to create Tuskar Overcloud objects
# once the api supports it
oc_1 = {'id': 1,
'stack_id': 'stack-id-1',
'name': 'overcloud',
'description': 'overcloud'}
TEST.tuskarclient_overclouds.add(oc_1)
# ResourceCategory
TEST.tuskarclient_resource_categories = test_data_utils.TestDataContainer()
# TODO(Tzu-Mainn Chen): fix these to create Tuskar ResourceCategory objects
# once the api supports it
rc_1 = {'id': 1,
'name': 'Controller',
'description': 'controller resource category',
'image_id': 'image-id-1'}
rc_2 = {'id': 2,
'name': 'Compute',
'description': 'compute resource category',
'image_id': 'image-id-2'}
rc_3 = {'id': 3,
'name': 'Object Storage',
'description': 'object storage resource category',
'image_id': 'image-id-3'}
rc_4 = {'id': 4,
'name': 'Block Storage',
'description': 'block storage resource category',
'image_id': 'image-id-4'}
TEST.tuskarclient_resource_categories.add(rc_1, rc_2, rc_3, rc_4)