Merge "Implement horizon plugin model"

congress_dashboard/README.md

@@ -0,0 +1,25 @@
+Congress Dashboard
+------------------
+
+Congress Dashboard is an extension for OpenStack Dashboard that provides a UI
+for Congress. With congress-dashboard, a user is able to easily write the
+policies and rules for governance of cloud.
+
+Setup Instructions
+------------------
+
+This instruction assumes that Horizon is already installed and its
+installation folder is <horizon>. Detailed information on how to install
+Horizon can be found at
+http://docs.openstack.org/developer/horizon/quickstart.html#setup.
+
+To integrate congress with horizon, copy the files in
+<congress_dashboard>/enabled to <horizon>/openstack_dashboard/local/enabled/
+
+$ cp -b <congress_dashboard>/enabled/_50_policy.py <horizon>/openstack_dashboard/local/enabled/
+$ cp -b <congress_dashboard>/enabled/_60_policies.py <horizon>/openstack_dashboard/local/enabled/
+$ cp -b <congress_dashboard>/enabled/_70_datasources.py <horizon>/openstack_dashboard/local/enabled/
+
+Restart Apache server
+sudo service apache2 restart
+

congress_dashboard/api/congress.py

@@ -14,8 +14,8 @@
 
 from oslo_log import log as logging
 
-from django.conf import settings
 from congressclient.v1 import client as congress_client
+from django.conf import settings
 import keystoneclient
 from openstack_dashboard.api import base
 

congress_dashboard/datasources/tables.py

@@ -31,7 +31,7 @@ class DataSourcesTablesTable(tables.DataTable):
     datasource_driver = tables.Column("datasource_driver",
                                       verbose_name=_("Driver"))
 
-    class Meta:
+    class Meta(object):
         name = "datasources_tables"
         verbose_name = _("Service Data")
         hidden_title = False
@@ -55,14 +55,14 @@ class PoliciesTablesTable(tables.DataTable):
     policy_owner_id = tables.Column("policy_owner_id",
                                     verbose_name=_("Owner ID"))
 
-    class Meta:
+    class Meta(object):
         name = "policies_tables"
         verbose_name = _("Policy Data")
         hidden_title = False
 
 
 class DataSourceRowsTable(tables.DataTable):
-    class Meta:
+    class Meta(object):
         name = "datasource_rows"
         verbose_name = _("Rows")
         hidden_title = False
@@ -83,7 +83,7 @@ class DataSourceStatusesTable(tables.DataTable):
     number_of_updates = tables.Column("number_of_updates",
                                       verbose_name=_("Number of Updates"))
 
-    class Meta:
+    class Meta(object):
         name = "service_status"
         verbose_name = _("Service Status")
         hidden_title = False

congress_dashboard/datasources/templates/datasources/_detail_overview.html

@@ -2,8 +2,8 @@
 
 <h3>{% trans "Table Overview" %}</h3>
 
-<div class="info detail">
+<div class="detail">
-  <dl>
+  <dl class="dl-horizontal">
     <dt>{{ datasource_type }} {% trans "Data Source" %}</dt>
     <dd>{{ datasource_name }}</dd>
     <dt>{% trans "Name" %}</dt>

congress_dashboard/datasources/urls.py

@@ -14,7 +14,8 @@
 
 from django.conf.urls import patterns
 from django.conf.urls import url
-from openstack_dashboard.dashboards.admin.datasources import views
+
+from congress_dashboard.datasources import views
 
 
 SERVICES = (

congress_dashboard/datasources/utils.py

@@ -14,7 +14,7 @@
 
 import logging
 
-from openstack_dashboard.api import congress
+from congress_dashboard.api import congress
 
 
 LOG = logging.getLogger(__name__)

congress_dashboard/datasources/views.py

@@ -21,9 +21,9 @@ from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import messages
 from horizon import tables
-from openstack_dashboard.api import congress
+
-from openstack_dashboard.dashboards.admin.datasources import (
+from congress_dashboard.api import congress
-    tables as datasources_tables)
+from congress_dashboard.datasources import tables as datasources_tables
 
 
 logger = logging.getLogger(__name__)

congress_dashboard/enabled/_60_policies.py

@@ -0,0 +1,9 @@
+PANEL = 'policies'
+PANEL_DASHBOARD = 'admin'
+PANEL_GROUP = 'policy'
+ADD_PANEL = 'congress_dashboard.policies.panel.Policies'
+ADD_INSTALLED_APPS = [
+    'congress_dashboard',
+]
+AUTO_DISCOVER_STATIC_FILES = True
+ADD_SCSS_FILES = ['congress_dashboard/static/admin/css/policies.css']

congress_dashboard/enabled/_70_datasources.py

@@ -0,0 +1,5 @@
+PANEL = 'datasources'
+PANEL_DASHBOARD = 'admin'
+PANEL_GROUP = 'policy'
+ADD_PANEL = 'congress_dashboard.datasources.panel.DataSources'
+AUTO_DISCOVER_STATIC_FILES = True

congress_dashboard/policies/forms.py

@@ -19,7 +19,8 @@ from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import forms
 from horizon import messages
-from openstack_dashboard.api import congress
+
+from congress_dashboard.api import congress
 
 
 LOG = logging.getLogger(__name__)
@@ -31,6 +32,7 @@ POLICY_KIND_CHOICES = (
     ('materialized', _('Materialized')),
 )
 
+
 class CreatePolicy(forms.SelfHandlingForm):
     name = forms.CharField(max_length=255, label=_("Policy Name"))
     kind = forms.ChoiceField(choices=POLICY_KIND_CHOICES, label=_("Kind"),

congress_dashboard/policies/rules/tables.py

@@ -21,9 +21,10 @@ from django.utils.translation import ungettext_lazy
 from horizon import exceptions
 from horizon import messages
 from horizon import tables
-from openstack_dashboard.api import congress
 from openstack_dashboard import policy
 
+from congress_dashboard.api import congress
+
 
 LOG = logging.getLogger(__name__)
 

congress_dashboard/policies/rules/views.py

@@ -16,8 +16,8 @@ import logging
 
 from django.core.urlresolvers import reverse
 from horizon import workflows
-from openstack_dashboard.dashboards.admin.policies.rules import (
+
-    workflows as rule_workflows)
+from congress_dashboard.policies.rules import workflows as rule_workflows
 
 
 LOG = logging.getLogger(__name__)

congress_dashboard/policies/rules/workflows.py

@@ -15,15 +15,15 @@
 import logging
 import re
 
-import six
-
 from django.core.urlresolvers import reverse
 from django import template
 from django.utils.text import slugify
 from django.utils.translation import ugettext_lazy as _
 from horizon import forms
 from horizon import workflows
-from openstack_dashboard.api import congress
+import six
+
+from congress_dashboard.api import congress
 
 
 COLUMN_FORMAT = '<datasource>%s<table> <column>' % congress.TABLE_SEPARATOR

congress_dashboard/policies/tables.py

@@ -20,9 +20,10 @@ from django.utils.translation import ungettext_lazy
 from horizon import exceptions
 from horizon import messages
 from horizon import tables
-from openstack_dashboard.api import congress
 from openstack_dashboard import policy
 
+from congress_dashboard.api import congress
+
 
 LOG = logging.getLogger(__name__)
 

congress_dashboard/policies/templates/policies/_detail_overview.html

@@ -2,8 +2,8 @@
 
 <h3>{% trans "Policy Overview" %}</h3>
 
-<div class="info detail">
+<div class="detail">
-  <dl>
+  <dl class="dl-horizontal">
     <dt>{% trans "Name" %}</dt>
     <dd>{{ policy.name|default:policy.id }}</dd>
     <dt>{% trans "ID" %}</dt>

congress_dashboard/policies/templates/policies/detail.html

@@ -1,4 +1,4 @@
-{% extends 'admin/base.html' %}
+{% extends 'base.html' %}
 {% load i18n %}
 {% block title %}{% trans "Policy Details" %}{% endblock %}
 

congress_dashboard/policies/urls.py

@@ -14,9 +14,9 @@
 
 from django.conf.urls import patterns
 from django.conf.urls import url
-from openstack_dashboard.dashboards.admin.policies.rules import (
+
-    views as rule_views)
+from congress_dashboard.policies.rules import views as rule_views
-from openstack_dashboard.dashboards.admin.policies import views
+from congress_dashboard.policies import views
 
 
 POLICY = r'^(?P<policy_name>[^/]+)/%s$'

congress_dashboard/policies/views.py

@@ -23,14 +23,12 @@ from horizon import exceptions
 from horizon import forms
 from horizon import messages
 from horizon import tables
-from openstack_dashboard.api import congress
+
-import openstack_dashboard.dashboards.admin.datasources.utils as ds_utils
+from congress_dashboard.api import congress
-from openstack_dashboard.dashboards.admin.policies import (
+import congress_dashboard.datasources.utils as ds_utils
-    forms as policies_forms)
+from congress_dashboard.policies import forms as policies_forms
-from openstack_dashboard.dashboards.admin.policies import (
+from congress_dashboard.policies.rules import tables as rules_tables
-    tables as policies_tables)
+from congress_dashboard.policies import tables as policies_tables
-from openstack_dashboard.dashboards.admin.policies.rules import (
-    tables as rules_tables)
 
 
 LOG = logging.getLogger(__name__)

contrib/horizon/_60_policies.py

@@ -1,4 +0,0 @@
-PANEL = 'policies'
-PANEL_DASHBOARD = 'admin'
-PANEL_GROUP = 'policy'
-ADD_PANEL = 'openstack_dashboard.dashboards.admin.policies.panel.Policies'

contrib/horizon/_70_datasources.py

@@ -1,5 +0,0 @@
-PANEL = 'datasources'
-PANEL_DASHBOARD = 'admin'
-PANEL_GROUP = 'policy'
-DASH_BOARDS = 'openstack_dashboard.dashboards'
-ADD_PANEL = DASH_BOARDS + '.admin.datasources.panel.DataSources'

devstack/plugin.sh

@@ -222,14 +222,9 @@ function _congress_setup_keystone {
 # Set up Horizon integration with Congress
 function _congress_setup_horizon {
     # Dashboard panels
-    cp -r $CONGRESS_HORIZON_DIR/datasources $HORIZON_DIR/openstack_dashboard/dashboards/admin/
+    cp $CONGRESS_HORIZON_DIR/enabled/_50_policy.py $HORIZON_DIR/openstack_dashboard/local/enabled/
-    cp -r $CONGRESS_HORIZON_DIR/policies $HORIZON_DIR/openstack_dashboard/dashboards/admin/
+    cp $CONGRESS_HORIZON_DIR/enabled/_60_policies.py $HORIZON_DIR/openstack_dashboard/local/enabled/
-    cp -r $CONGRESS_HORIZON_DIR/static $HORIZON_DIR/openstack_dashboard/dashboards/admin/
+    cp $CONGRESS_HORIZON_DIR/enabled/_70_datasources.py $HORIZON_DIR/openstack_dashboard/local/enabled/
-    cp -r $CONGRESS_HORIZON_DIR/templates $HORIZON_DIR/openstack_dashboard/dashboards/admin/
-    cp $CONGRESS_HORIZON_DIR/congress.py $HORIZON_DIR/openstack_dashboard/api/
-    cp $CONGRESS_HORIZON_DIR/_50_policy.py $HORIZON_DIR/openstack_dashboard/local/enabled/
-    cp $CONGRESS_HORIZON_DIR/_60_policies.py $HORIZON_DIR/openstack_dashboard/local/enabled/
-    cp $CONGRESS_HORIZON_DIR/_70_datasources.py $HORIZON_DIR/openstack_dashboard/local/enabled/
 
     # For unit tests
     echo "python-congressclient" >> $HORIZON_DIR/requirements.txt

devstack/settings

@@ -8,7 +8,7 @@
 CONGRESS_DIR=$DEST/congress
 CONGRESSCLIENT_DIR=$DEST/python-congressclient
 CONGRESS_AUTH_CACHE_DIR=${CONGRESS_AUTH_CACHE_DIR:-/var/cache/congress}
-CONGRESS_HORIZON_DIR=$CONGRESS_DIR/contrib/horizon
+CONGRESS_HORIZON_DIR=$CONGRESS_DIR/congress_dashboard
 
 # Support entry points installation of console scripts
 if [[ -d $CONGRESS_DIR/bin/congress-server ]]; then

setup.cfg

@@ -23,6 +23,7 @@ classifier =
 packages =
     congress
     congress_tempest_tests
+    congress_dashboard
     antlr3runtime/Python/antlr3
     antlr3runtime/Python3/antlr3