Merge lp:~zulcss/ubuntu/precise/horizon/trunk into lp:~ubuntu-cloud-archive/ubuntu/precise/horizon/trunk

[Chuck Short]

horizon g1

[James Page (james-page)]

LGTM; uploaded to grizzly staging.

review: Approve

=== removed file '.bzrignore'
--- .bzrignore	2012-07-06 11:38:55 +0000
+++ .bzrignore	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-horizon/.installed.cfg
-horizon/bin
-horizon/develop-eggs/
-horizon/downloads/
-horizon/eggs/
-horizon/parts/
-horizon/src/django_nova.egg-info
-horizon/src/django_openstack.egg-info
-django-nova-syspanel/src/django_nova_syspanel.egg-info
-openstack-dashboard/.dashboard-venv
-openstack-dashboard/local/dashboard_openstack.sqlite3
-openstack-dashboard/local/local_settings.py
 
=== removed directory '.pc'
=== removed file '.pc/.quilt_patches'
--- .pc/.quilt_patches	2012-07-06 11:38:55 +0000
+++ .pc/.quilt_patches	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/patches
 
=== removed file '.pc/.quilt_series'
--- .pc/.quilt_series	2012-07-06 11:38:55 +0000
+++ .pc/.quilt_series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-series
 
=== removed file '.pc/.version'
--- .pc/.version	2011-12-02 16:21:52 +0000
+++ .pc/.version	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2
 
=== removed directory '.pc/add_juju_settings_panel.patch'
=== removed directory '.pc/add_juju_settings_panel.patch/horizon'
=== removed directory '.pc/add_juju_settings_panel.patch/horizon/dashboards'
=== removed directory '.pc/add_juju_settings_panel.patch/horizon/dashboards/settings'
=== removed file '.pc/add_juju_settings_panel.patch/horizon/dashboards/settings/dashboard.py'
--- .pc/add_juju_settings_panel.patch/horizon/dashboards/settings/dashboard.py	2012-10-09 09:59:55 +0000
+++ .pc/add_juju_settings_panel.patch/horizon/dashboards/settings/dashboard.py	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2012 Openstack, LLC
-# 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 _
-
-import horizon
-
-
-class Settings(horizon.Dashboard):
-    name = _("Settings")
-    slug = "settings"
-    panels = ('user', 'project', 'ec2')
-    default_panel = 'user'
-    nav = False
-
-
-horizon.register(Settings)
 
=== removed directory '.pc/add_juju_settings_panel.patch/horizon/dashboards/settings/juju'
=== removed file '.pc/add_juju_settings_panel.patch/horizon/dashboards/settings/juju/__init__.py'
=== removed file '.pc/add_juju_settings_panel.patch/horizon/dashboards/settings/juju/forms.py'
=== removed file '.pc/add_juju_settings_panel.patch/horizon/dashboards/settings/juju/panel.py'
=== removed file '.pc/add_juju_settings_panel.patch/horizon/dashboards/settings/juju/urls.py'
=== removed file '.pc/add_juju_settings_panel.patch/horizon/dashboards/settings/juju/views.py'
=== removed directory '.pc/add_juju_settings_panel.patch/horizon/dashboards/settings/templates'
=== removed directory '.pc/add_juju_settings_panel.patch/horizon/dashboards/settings/templates/settings'
=== removed directory '.pc/add_juju_settings_panel.patch/horizon/dashboards/settings/templates/settings/juju'
=== removed file '.pc/add_juju_settings_panel.patch/horizon/dashboards/settings/templates/settings/juju/download_form.html'
=== removed file '.pc/add_juju_settings_panel.patch/horizon/dashboards/settings/templates/settings/juju/environments.yaml.template'
=== removed file '.pc/add_juju_settings_panel.patch/horizon/dashboards/settings/templates/settings/juju/index.html'
=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2012-10-09 09:59:55 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-fix-dashboard-django-wsgi.patch
-fix-dashboard-manage.patch
-add_juju_settings_panel.patch
-fix-ubuntu-tests.patch
-ubuntu_local_settings.patch
 
=== removed directory '.pc/fix-dashboard-django-wsgi.patch'
=== removed directory '.pc/fix-dashboard-django-wsgi.patch/openstack_dashboard'
=== removed directory '.pc/fix-dashboard-django-wsgi.patch/openstack_dashboard/wsgi'
=== removed file '.pc/fix-dashboard-django-wsgi.patch/openstack_dashboard/wsgi/django.wsgi'
--- .pc/fix-dashboard-django-wsgi.patch/openstack_dashboard/wsgi/django.wsgi	2012-03-02 12:11:59 +0000
+++ .pc/fix-dashboard-django-wsgi.patch/openstack_dashboard/wsgi/django.wsgi	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-import logging
-import os
-import sys
-import django.core.handlers.wsgi
-from django.conf import settings
-
-# Add this file path to sys.path in order to import settings
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)), '../..'))
-os.environ['DJANGO_SETTINGS_MODULE'] = 'openstack_dashboard.settings'
-sys.stdout = sys.stderr
-
-DEBUG = False
-
-application = django.core.handlers.wsgi.WSGIHandler()
-
 
=== removed directory '.pc/fix-dashboard-manage.patch'
=== removed file '.pc/fix-dashboard-manage.patch/manage.py'
--- .pc/fix-dashboard-manage.patch/manage.py	2012-09-07 12:35:36 +0000
+++ .pc/fix-dashboard-manage.patch/manage.py	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import sys
-
-from django.core.management import execute_from_command_line
-
-if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE",
-                          "openstack_dashboard.settings")
-    execute_from_command_line(sys.argv)
 
=== removed directory '.pc/fix-ubuntu-tests.patch'
=== removed directory '.pc/fix-ubuntu-tests.patch/horizon'
=== removed directory '.pc/fix-ubuntu-tests.patch/horizon/tests'
=== removed file '.pc/fix-ubuntu-tests.patch/horizon/tests/testsettings.py'
--- .pc/fix-ubuntu-tests.patch/horizon/tests/testsettings.py	2012-08-16 14:01:33 +0000
+++ .pc/fix-ubuntu-tests.patch/horizon/tests/testsettings.py	1970-01-01 00:00:00 +0000
@@ -1,197 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2012 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
-# All Rights Reserved.
-#
-# 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.
-
-import os
-import socket
-
-from django.utils.translation import ugettext_lazy as _
-
-from openstack_dashboard.exceptions import UNAUTHORIZED, RECOVERABLE, NOT_FOUND
-
-socket.setdefaulttimeout(1)
-
-LOGIN_URL = '/auth/login/'
-LOGOUT_URL = '/auth/logout/'
-LOGIN_REDIRECT_URL = '/'
-
-ROOT_PATH = os.path.dirname(os.path.abspath(__file__))
-DEBUG = False
-TEMPLATE_DEBUG = DEBUG
-TESTSERVER = 'http://testserver'
-
-USE_I18N = True
-USE_L10N = True
-USE_TZ = True
-
-DATABASES = {'default': {'ENGINE': 'django.db.backends.sqlite3'}}
-
-DEFAULT_EXCEPTION_REPORTER_FILTER = 'horizon.exceptions.HorizonReporterFilter'
-
-INSTALLED_APPS = (
-    'django.contrib.sessions',
-    'django.contrib.staticfiles',
-    'django.contrib.messages',
-    'django.contrib.humanize',
-    'django_nose',
-    'openstack_auth',
-    'compressor',
-    'horizon',
-    'horizon.tests',
-    'horizon.dashboards.nova',
-    'horizon.dashboards.syspanel',
-    'horizon.dashboards.settings',
-    'horizon.tests.test_dashboards.cats',
-    'horizon.tests.test_dashboards.dogs'
-)
-
-MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.doc.XViewMiddleware',
-    'django.middleware.locale.LocaleMiddleware',
-    'horizon.middleware.HorizonMiddleware')
-
-TEMPLATE_CONTEXT_PROCESSORS = (
-    'django.core.context_processors.debug',
-    'django.core.context_processors.i18n',
-    'django.core.context_processors.request',
-    'django.core.context_processors.media',
-    'django.core.context_processors.static',
-    'django.contrib.messages.context_processors.messages',
-    'horizon.context_processors.horizon')
-
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-    'horizon.loaders.TemplateLoader'
-)
-
-STATIC_URL = '/static/'
-
-MESSAGE_STORAGE = 'django.contrib.messages.storage.cookie.CookieStorage'
-
-ROOT_URLCONF = 'horizon.tests.testurls'
-TEMPLATE_DIRS = (os.path.join(ROOT_PATH, 'tests', 'templates'))
-SITE_ID = 1
-SITE_BRANDING = 'OpenStack'
-
-TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
-NOSE_ARGS = ['--nocapture',
-             '--nologcapture',
-             '--exclude-dir=horizon/conf/',
-             '--cover-package=horizon',
-             '--cover-inclusive']
-
-EMAIL_BACKEND = 'django.core.mail.backends.locmem.EmailBackend'
-SESSION_ENGINE = 'django.contrib.sessions.backends.signed_cookies'
-SESSION_COOKIE_HTTPONLY = True
-SESSION_EXPIRE_AT_BROWSER_CLOSE = True
-SESSION_COOKIE_SECURE = False
-
-AUTHENTICATION_BACKENDS = ('openstack_auth.backend.KeystoneBackend',)
-
-HORIZON_CONFIG = {
-    'dashboards': ('nova', 'syspanel', 'settings'),
-    'default_dashboard': 'nova',
-    "password_validator": {
-        "regex": '^.{8,18}$',
-        "help_text": _("Password must be between 8 and 18 characters.")
-    },
-    'user_home': None,
-    'help_url': "http://docs.openstack.org",
-    'exceptions': {'recoverable': RECOVERABLE,
-                   'not_found': NOT_FOUND,
-                   'unauthorized': UNAUTHORIZED},
-}
-
-COMPRESS_ENABLED = False
-COMPRESS_OFFLINE = False
-COMPRESS_ROOT = "/tmp/"
-
-STATICFILES_FINDERS = (
-    'django.contrib.staticfiles.finders.FileSystemFinder',
-    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-    'compressor.finders.CompressorFinder',
-)
-
-AVAILABLE_REGIONS = [
-    ('http://localhost:5000/v2.0', 'local'),
-    ('http://remote:5000/v2.0', 'remote'),
-]
-
-OPENSTACK_KEYSTONE_URL = "http://localhost:5000/v2.0"
-OPENSTACK_KEYSTONE_DEFAULT_ROLE = "Member"
-
-OPENSTACK_KEYSTONE_BACKEND = {
-    'name': 'native',
-    'can_edit_user': True
-}
-
-OPENSTACK_HYPERVISOR_FEATURES = {
-    'can_set_mount_point': True
-}
-
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'handlers': {
-        'null': {
-            'level': 'DEBUG',
-            'class': 'django.utils.log.NullHandler',
-        },
-        'test': {
-            'level': 'DEBUG',
-            'class': 'logging.StreamHandler',
-        }
-    },
-    'loggers': {
-        'django.db.backends': {
-            'handlers': ['null'],
-            'propagate': False,
-        },
-        'horizon': {
-            'handlers': ['test'],
-            'propagate': False,
-        },
-        'novaclient': {
-            'handlers': ['test'],
-            'propagate': False,
-        },
-        'keystoneclient': {
-            'handlers': ['test'],
-            'propagate': False,
-        },
-        'glanceclient': {
-            'handlers': ['test'],
-            'propagate': False,
-        },
-        'quantum': {
-            'handlers': ['test'],
-            'propagate': False,
-        },
-        'nose.plugins.manager': {
-            'handlers': ['null'],
-            'propagate': False,
-        }
-    }
-}
 
=== removed file '.pc/fix-ubuntu-tests.patch/run_tests.sh'
--- .pc/fix-ubuntu-tests.patch/run_tests.sh	2012-09-21 08:03:36 +0000
+++ .pc/fix-ubuntu-tests.patch/run_tests.sh	1970-01-01 00:00:00 +0000
@@ -1,427 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-
-# ---------------UPDATE ME-------------------------------#
-# Increment me any time the environment should be rebuilt.
-# This includes dependncy changes, directory renames, etc.
-# Simple integer secuence: 1, 2, 3...
-environment_version=27
-#--------------------------------------------------------#
-
-function usage {
-  echo "Usage: $0 [OPTION]..."
-  echo "Run Horizon's test suite(s)"
-  echo ""
-  echo "  -V, --virtual-env        Always use virtualenv.  Install automatically"
-  echo "                           if not present"
-  echo "  -N, --no-virtual-env     Don't use virtualenv.  Run tests in local"
-  echo "                           environment"
-  echo "  -c, --coverage           Generate reports using Coverage"
-  echo "  -f, --force              Force a clean re-build of the virtual"
-  echo "                           environment. Useful when dependencies have"
-  echo "                           been added."
-  echo "  -m, --manage             Run a Django management command."
-  echo "  --makemessages           Update all translation files."
-  echo "  --compilemessages        Compile all translation files."
-  echo "  -p, --pep8               Just run pep8"
-  echo "  -t, --tabs               Check for tab characters in files."
-  echo "  -y, --pylint             Just run pylint"
-  echo "  -q, --quiet              Run non-interactively. (Relatively) quiet."
-  echo "                           Implies -V if -N is not set."
-  echo "  --only-selenium          Run only the Selenium unit tests"
-  echo "  --with-selenium          Run unit tests including Selenium tests"
-  echo "  --runserver              Run the Django development server for"
-  echo "                           openstack_dashboard in the virtual"
-  echo "                           environment."
-  echo "  --docs                   Just build the documentation"
-  echo "  --backup-environment     Make a backup of the environment on exit"
-  echo "  --restore-environment    Restore the environment before running"
-  echo "  --destroy-environment    DEstroy the environment and exit"
-  echo "  -h, --help               Print this usage message"
-  echo ""
-  echo "Note: with no options specified, the script will try to run the tests in"
-  echo "  a virtual environment,  If no virtualenv is found, the script will ask"
-  echo "  if you would like to create one.  If you prefer to run tests NOT in a"
-  echo "  virtual environment, simply pass the -N option."
-  exit
-}
-
-# DEFAULTS FOR RUN_TESTS.SH
-#
-root=`pwd`
-venv=$root/.venv
-with_venv=tools/with_venv.sh
-included_dirs="openstack_dashboard horizon"
-
-always_venv=0
-backup_env=0
-command_wrapper=""
-destroy=0
-force=0
-just_pep8=0
-just_pylint=0
-just_docs=0
-just_tabs=0
-never_venv=0
-quiet=0
-restore_env=0
-runserver=0
-only_selenium=0
-with_selenium=0
-testargs=""
-with_coverage=0
-makemessages=0
-compilemessages=0
-manage=0
-
-# Jenkins sets a "JOB_NAME" variable, if it's not set, we'll make it "default"
-[ "$JOB_NAME" ] || JOB_NAME="default"
-
-function process_option {
-  case "$1" in
-    -h|--help) usage;;
-    -V|--virtual-env) always_venv=1; never_venv=0;;
-    -N|--no-virtual-env) always_venv=0; never_venv=1;;
-    -p|--pep8) just_pep8=1;;
-    -y|--pylint) just_pylint=1;;
-    -f|--force) force=1;;
-    -t|--tabs) just_tabs=1;;
-    -q|--quiet) quiet=1;;
-    -c|--coverage) with_coverage=1;;
-    -m|--manage) manage=1;;
-    --makemessages) makemessages=1;;
-    --compilemessages) compilemessages=1;;
-    --only-selenium) only_selenium=1;;
-    --with-selenium) with_selenium=1;;
-    --docs) just_docs=1;;
-    --runserver) runserver=1;;
-    --backup-environment) backup_env=1;;
-    --restore-environment) restore_env=1;;
-    --destroy-environment) destroy=1;;
-    *) testargs="$testargs $1"
-  esac
-}
-
-function run_management_command {
-  ${command_wrapper} python $root/manage.py $testargs
-}
-
-function run_server {
-  echo "Starting Django development server..."
-  ${command_wrapper} python $root/manage.py runserver $testargs
-  echo "Server stopped."
-}
-
-function run_pylint {
-  echo "Running pylint ..."
-  PYTHONPATH=$root ${command_wrapper} pylint --rcfile=.pylintrc -f parseable $included_dirs > pylint.txt || true
-  CODE=$?
-  grep Global -A2 pylint.txt
-  if [ $CODE -lt 32 ]; then
-      echo "Completed successfully."
-      exit 0
-  else
-      echo "Completed with problems."
-      exit $CODE
-  fi
-}
-
-function run_pep8 {
-  echo "Running pep8 ..."
-  ${command_wrapper} pep8 $included_dirs || true
-}
-
-function run_sphinx {
-    echo "Building sphinx..."
-    export DJANGO_SETTINGS_MODULE=openstack_dashboard.settings
-    ${command_wrapper} sphinx-build -b html doc/source doc/build/html
-    echo "Build complete."
-}
-
-function tab_check {
-  TAB_VIOLATIONS=`find $included_dirs -type f -regex ".*\.\(css\|js\|py\|html\)" -print0 | xargs -0 awk '/\t/' | wc -l`
-  if [ $TAB_VIOLATIONS -gt 0 ]; then
-    echo "TABS! $TAB_VIOLATIONS of them! Oh no!"
-    HORIZON_FILES=`find $included_dirs -type f -regex ".*\.\(css\|js\|py|\html\)"`
-    for TABBED_FILE in $HORIZON_FILES
-    do
-      TAB_COUNT=`awk '/\t/' $TABBED_FILE | wc -l`
-      if [ $TAB_COUNT -gt 0 ]; then
-        echo "$TABBED_FILE: $TAB_COUNT"
-      fi
-    done
-  fi
-  return $TAB_VIOLATIONS;
-}
-
-function destroy_venv {
-  echo "Cleaning environment..."
-  echo "Removing virtualenv..."
-  rm -rf $venv
-  echo "Virtualenv removed."
-  rm -f .environment_version
-  echo "Environment cleaned."
-}
-
-function environment_check {
-  echo "Checking environment."
-  if [ -f .environment_version ]; then
-    ENV_VERS=`cat .environment_version`
-    if [ $ENV_VERS -eq $environment_version ]; then
-      if [ -e ${venv} ]; then
-        # If the environment exists and is up-to-date then set our variables
-        command_wrapper="${root}/${with_venv}"
-        echo "Environment is up to date."
-        return 0
-      fi
-    fi
-  fi
-
-  if [ $always_venv -eq 1 ]; then
-    install_venv
-  else
-    if [ ! -e ${venv} ]; then
-      echo -e "Environment not found. Install? (Y/n) \c"
-    else
-      echo -e "Your environment appears to be out of date. Update? (Y/n) \c"
-    fi
-    read update_env
-    if [ "x$update_env" = "xY" -o "x$update_env" = "x" -o "x$update_env" = "xy" ]; then
-      install_venv
-    else
-      # Set our command wrapper anyway.
-      command_wrapper="${root}/${with_venv}"
-    fi
-  fi
-}
-
-function sanity_check {
-  # Anything that should be determined prior to running the tests, server, etc.
-  # Don't sanity-check anything environment-related in -N flag is set
-  if [ $never_venv -eq 0 ]; then
-    if [ ! -e ${venv} ]; then
-      echo "Virtualenv not found at $venv. Did install_venv.py succeed?"
-      exit 1
-    fi
-  fi
-  # Remove .pyc files. This is sanity checking because they can linger
-  # after old files are deleted.
-  find . -name "*.pyc" -exec rm -rf {} \;
-}
-
-function backup_environment {
-  if [ $backup_env -eq 1 ]; then
-    echo "Backing up environment \"$JOB_NAME\"..."
-    if [ ! -e ${venv} ]; then
-      echo "Environment not installed. Cannot back up."
-      return 0
-    fi
-    if [ -d /tmp/.horizon_environment/$JOB_NAME ]; then
-      mv /tmp/.horizon_environment/$JOB_NAME /tmp/.horizon_environment/$JOB_NAME.old
-      rm -rf /tmp/.horizon_environment/$JOB_NAME
-    fi
-    mkdir -p /tmp/.horizon_environment/$JOB_NAME
-    cp -r $venv /tmp/.horizon_environment/$JOB_NAME/
-    cp .environment_version /tmp/.horizon_environment/$JOB_NAME/
-    # Remove the backup now that we've completed successfully
-    rm -rf /tmp/.horizon_environment/$JOB_NAME.old
-    echo "Backup completed"
-  fi
-}
-
-function restore_environment {
-  if [ $restore_env -eq 1 ]; then
-    echo "Restoring environment from backup..."
-    if [ ! -d /tmp/.horizon_environment/$JOB_NAME ]; then
-      echo "No backup to restore from."
-      return 0
-    fi
-
-    cp -r /tmp/.horizon_environment/$JOB_NAME/.venv ./ || true
-    cp -r /tmp/.horizon_environment/$JOB_NAME/.environment_version ./ || true
-
-    echo "Environment restored successfully."
-  fi
-}
-
-function install_venv {
-  # Install with install_venv.py
-  export PIP_DOWNLOAD_CACHE=${PIP_DOWNLOAD_CACHE-/tmp/.pip_download_cache}
-  export PIP_USE_MIRRORS=true
-  if [ $quiet -eq 1 ]; then
-    export PIP_NO_INPUT=true
-  fi
-  echo "Fetching new src packages..."
-  rm -rf $venv/src
-  python tools/install_venv.py
-  command_wrapper="$root/${with_venv}"
-  # Make sure it worked and record the environment version
-  sanity_check
-  chmod -R 754 $venv
-  echo $environment_version > .environment_version
-}
-
-function run_tests {
-  sanity_check
-
-  if [ $with_selenium -eq 1 ]; then
-    export WITH_SELENIUM=1
-  elif [ $only_selenium -eq 1 ]; then
-    export WITH_SELENIUM=1
-    export SKIP_UNITTESTS=1
-  fi
-
-  echo "Running Horizon application tests"
-  export NOSE_XUNIT_FILE=horizon/nosetests.xml
-  if [ "$NOSE_WITH_HTML_OUTPUT" = '1' ]; then
-    export NOSE_HTML_OUT_FILE='horizon_nose_results.html'
-  fi
-  ${command_wrapper} coverage erase
-  ${command_wrapper} coverage run -p $root/manage.py test horizon --settings=horizon.tests.testsettings $testargs
-  # get results of the Horizon tests
-  HORIZON_RESULT=$?
-
-  echo "Running openstack_dashboard tests"
-  export NOSE_XUNIT_FILE=openstack_dashboard/nosetests.xml
-  if [ "$NOSE_WITH_HTML_OUTPUT" = '1' ]; then
-    export NOSE_HTML_OUT_FILE='dashboard_nose_results.html'
-  fi
-  ${command_wrapper} coverage run -p $root/manage.py test openstack_dashboard --settings=openstack_dashboard.test.settings $testargs
-  # get results of the openstack_dashboard tests
-  DASHBOARD_RESULT=$?
-
-  if [ $with_coverage -eq 1 ]; then
-    echo "Generating coverage reports"
-    ${command_wrapper} coverage combine
-    ${command_wrapper} coverage xml -i --omit='/usr*,setup.py,*egg*,.venv/*'
-    ${command_wrapper} coverage html -i --omit='/usr*,setup.py,*egg*,.venv/*' -d reports
-  fi
-  # Remove the leftover coverage files from the -p flag earlier.
-  rm -f .coverage.*
-
-  if [ $(($HORIZON_RESULT || $DASHBOARD_RESULT)) -eq 0 ]; then
-    echo "Tests completed successfully."
-  else
-    echo "Tests failed."
-  fi
-  exit $(($HORIZON_RESULT || $DASHBOARD_RESULT))
-}
-
-function run_makemessages {
-  cd horizon
-  ${command_wrapper} $root/manage.py makemessages --all --no-obsolete
-  HORIZON_PY_RESULT=$?
-  ${command_wrapper} $root/manage.py makemessages -d djangojs --all --no-obsolete
-  HORIZON_JS_RESULT=$?
-  cd ../openstack_dashboard
-  ${command_wrapper} $root/manage.py makemessages --all --no-obsolete
-  DASHBOARD_RESULT=$?
-  cd ..
-  exit $(($HORIZON_PY_RESULT || $HORIZON_JS_RESULT || $DASHBOARD_RESULT))
-}
-
-function run_compilemessages {
-  cd horizon
-  ${command_wrapper} $root/manage.py compilemessages
-  HORIZON_PY_RESULT=$?
-  cd ../openstack_dashboard
-  ${command_wrapper} $root/manage.py compilemessages
-  DASHBOARD_RESULT=$?
-  cd ..
-  exit $(($HORIZON_PY_RESULT || $DASHBOARD_RESULT))
-}
-
-
-# ---------PREPARE THE ENVIRONMENT------------ #
-
-# PROCESS ARGUMENTS, OVERRIDE DEFAULTS
-for arg in "$@"; do
-    process_option $arg
-done
-
-if [ $quiet -eq 1 ] && [ $never_venv -eq 0 ] && [ $always_venv -eq 0 ]
-then
-  always_venv=1
-fi
-
-# If destroy is set, just blow it away and exit.
-if [ $destroy -eq 1 ]; then
-  destroy_venv
-  exit 0
-fi
-
-# Ignore all of this if the -N flag was set
-if [ $never_venv -eq 0 ]; then
-
-  # Restore previous environment if desired
-  if [ $restore_env -eq 1 ]; then
-    restore_environment
-  fi
-
-  # Remove the virtual environment if --force used
-  if [ $force -eq 1 ]; then
-    destroy_venv
-  fi
-
-  # Then check if it's up-to-date
-  environment_check
-
-  # Create a backup of the up-to-date environment if desired
-  if [ $backup_env -eq 1 ]; then
-    backup_environment
-  fi
-fi
-
-# ---------EXERCISE THE CODE------------ #
-
-# Run management commands
-if [ $manage -eq 1 ]; then
-    run_management_command
-    exit $?
-fi
-
-# Build the docs
-if [ $just_docs -eq 1 ]; then
-    run_sphinx
-    exit $?
-fi
-
-# Update translation files
-if [ $makemessages -eq 1 ]; then
-    run_makemessages
-    exit $?
-fi
-
-# Compile translation files
-if [ $compilemessages -eq 1 ]; then
-    run_compilemessages
-    exit $?
-fi
-
-# PEP8
-if [ $just_pep8 -eq 1 ]; then
-    run_pep8
-    exit $?
-fi
-
-# Pylint
-if [ $just_pylint -eq 1 ]; then
-    run_pylint
-    exit $?
-fi
-
-# Tab checker
-if [ $just_tabs -eq 1 ]; then
-    tab_check
-    exit $?
-fi
-
-# Django development server
-if [ $runserver -eq 1 ]; then
-    run_server
-    exit $?
-fi
-
-# Full test suite
-run_tests || exit
 
=== removed directory '.pc/ubuntu_local_settings.patch'
=== removed directory '.pc/ubuntu_local_settings.patch/openstack_dashboard'
=== removed directory '.pc/ubuntu_local_settings.patch/openstack_dashboard/local'
=== removed file '.pc/ubuntu_local_settings.patch/openstack_dashboard/local/local_settings.py.example'
--- .pc/ubuntu_local_settings.patch/openstack_dashboard/local/local_settings.py.example	2012-09-12 12:21:33 +0000
+++ .pc/ubuntu_local_settings.patch/openstack_dashboard/local/local_settings.py.example	1970-01-01 00:00:00 +0000
@@ -1,147 +0,0 @@
-import os
-
-from django.utils.translation import ugettext_lazy as _
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-# Set SSL proxy settings:
-# For Django 1.4+ pass this header from the proxy after terminating the SSL,
-# and don't forget to strip it from the client's request.
-# For more information see:
-# https://docs.djangoproject.com/en/1.4/ref/settings/#secure-proxy-ssl-header
-# SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https')
-
-# Specify a regular expression to validate user passwords.
-# HORIZON_CONFIG = {
-#     "password_validator": {
-#         "regex": '.*',
-#         "help_text": _("Your password does not meet the requirements.")
-#     },
-#    'help_url': "http://docs.openstack.org"
-# }
-
-LOCAL_PATH = os.path.dirname(os.path.abspath(__file__))
-
-# Set custom secret key:
-# You can either set it to a specific value or you can let horizion generate a
-# default secret key that is unique on this machine, e.i. regardless of the
-# amount of Python WSGI workers (if used behind Apache+mod_wsgi): However, there
-# may be situations where you would want to set this explicitly, e.g. when
-# multiple dashboard instances are distributed on different machines (usually
-# behind a load-balancer). Either you have to make sure that a session gets all
-# requests routed to the same dashboard instance or you set the same SECRET_KEY
-# for all of them.
-# from horizon.utils import secret_key
-# SECRET_KEY = secret_key.generate_or_read_from_file(os.path.join(LOCAL_PATH, '.secret_key_store'))
-
-# We recommend you use memcached for development; otherwise after every reload
-# of the django development server, you will have to login again. To use
-# memcached set CACHE_BACKED to something like 'memcached://127.0.0.1:11211/'
-CACHE_BACKEND = 'locmem://'
-
-# Send email to the console by default
-EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
-# Or send them to /dev/null
-#EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'
-
-# Configure these for your outgoing email host
-# EMAIL_HOST = 'smtp.my-company.com'
-# EMAIL_PORT = 25
-# EMAIL_HOST_USER = 'djangomail'
-# EMAIL_HOST_PASSWORD = 'top-secret!'
-
-# For multiple regions uncomment this configuration, and add (endpoint, title).
-# AVAILABLE_REGIONS = [
-#     ('http://cluster1.example.com:5000/v2.0', 'cluster1'),
-#     ('http://cluster2.example.com:5000/v2.0', 'cluster2'),
-# ]
-
-OPENSTACK_HOST = "127.0.0.1"
-OPENSTACK_KEYSTONE_URL = "http://%s:5000/v2.0" % OPENSTACK_HOST
-OPENSTACK_KEYSTONE_DEFAULT_ROLE = "Member"
-
-# Disable SSL certificate checks (useful for self-signed certificates):
-# OPENSTACK_SSL_NO_VERIFY = True
-
-# The OPENSTACK_KEYSTONE_BACKEND settings can be used to identify the
-# capabilities of the auth backend for Keystone.
-# If Keystone has been configured to use LDAP as the auth backend then set
-# can_edit_user to False and name to 'ldap'.
-#
-# TODO(tres): Remove these once Keystone has an API to identify auth backend.
-OPENSTACK_KEYSTONE_BACKEND = {
-    'name': 'native',
-    'can_edit_user': True
-}
-
-OPENSTACK_HYPERVISOR_FEATURES = {
-    'can_set_mount_point': True
-}
-
-# OPENSTACK_ENDPOINT_TYPE specifies the endpoint type to use for the endpoints
-# in the Keystone service catalog. Use this setting when Horizon is running
-# external to the OpenStack environment. The default is 'internalURL'.
-#OPENSTACK_ENDPOINT_TYPE = "publicURL"
-
-# The number of objects (Swift containers/objects or images) to display
-# on a single page before providing a paging element (a "more" link)
-# to paginate results.
-API_RESULT_LIMIT = 1000
-API_RESULT_PAGE_SIZE = 20
-
-# The timezone of the server. This should correspond with the timezone
-# of your entire OpenStack installation, and hopefully be in UTC.
-TIME_ZONE = "UTC"
-
-LOGGING = {
-        'version': 1,
-        # When set to True this will disable all logging except
-        # for loggers specified in this configuration dictionary. Note that
-        # if nothing is specified here and disable_existing_loggers is True,
-        # django.db.backends will still log unless it is disabled explicitly.
-        'disable_existing_loggers': False,
-        'handlers': {
-            'null': {
-                'level': 'DEBUG',
-                'class': 'django.utils.log.NullHandler',
-                },
-            'console': {
-                # Set the level to "DEBUG" for verbose output logging.
-                'level': 'INFO',
-                'class': 'logging.StreamHandler',
-                },
-            },
-        'loggers': {
-            # Logging from django.db.backends is VERY verbose, send to null
-            # by default.
-            'django.db.backends': {
-                'handlers': ['null'],
-                'propagate': False,
-                },
-            'horizon': {
-                'handlers': ['console'],
-                'propagate': False,
-            },
-            'openstack_dashboard': {
-                'handlers': ['console'],
-                'propagate': False,
-            },
-            'novaclient': {
-                'handlers': ['console'],
-                'propagate': False,
-            },
-            'keystoneclient': {
-                'handlers': ['console'],
-                'propagate': False,
-            },
-            'glanceclient': {
-                'handlers': ['console'],
-                'propagate': False,
-            },
-            'nose.plugins.manager': {
-                'handlers': ['console'],
-                'propagate': False,
-            }
-        }
-}
 
=== modified file 'AUTHORS'
--- AUTHORS	2012-09-12 12:21:33 +0000
+++ AUTHORS	2012-11-26 19:56:34 +0000
@@ -17,6 +17,7 @@
 Dean Troyer <[e-mail]>
 Devin Carlen <[e-mail]>
 Doug Doan <[e-mail]>
+Doug Hellmann <[e-mail]>
 Duncan McGreggor <[e-mail]>
 Emma Steimann <[e-mail]>
 Erwan Gallen <[e-mail]>
@@ -44,22 +45,29 @@
 Joseph Heck <[e-mail]>
 Joshua McKenty <[e-mail]>
 Julien Danjou <[e-mail]>
+Julie Pichon <[e-mail]>
 Julie Pichon <[e-mail]>
 Kelsey Tripp <[e-mail]>
 Ken Pepple <[e-mail]>
 Ke Wu <[e-mail]>
 Ke WU <[e-mail]>
+Kieran Spear <[e-mail]>
+Kylin CG <[e-mail]>
 Lin Hua Cheng <[e-mail]>
 lrqrun <[e-mail]>
 lzyeval <[e-mail]>
+Malini Bhandaru <[e-mail]>
 Mark Gius <[e-mail]>
 Mark McLoughlin <[e-mail]>
+Matthias Runge <[e-mail]>
 Matt Joyce <[e-mail]>
+Michael Still <[e-mail]>
 Michael Szilagyi <[e-mail]>
 Mike Perez <[e-mail]>
 Mike Scherbakov <[e-mail]>
 Monty Taylor <[e-mail]>
 Neil Johnston <[e-mail]>
+Nicolas Simonds <[e-mail]>
 Paul McMillan <[e-mail]>
 Rafi Khardalian <[e-mail]>
 Ray Chen <[e-mail]>
 
=== modified file 'ChangeLog'
--- ChangeLog	2012-09-21 08:03:36 +0000
+++ ChangeLog	2012-11-26 19:56:34 +0000
@@ -1,24 +1,2458 @@
-commit cee6b626d372c8d420b439038a3fe0580d8fcc89
-Merge: fcba390 d842573
-Author: Jenkins <[e-mail]>
-Date:   Wed Sep 19 09:21:36 2012 +0000
-
-    Merge "Final translations for Folsom." into milestone-proposed
-
-commit fcba390aa03b4373478e7138045e2d6050871ec7
-Author: Gabriel Hurley <[e-mail]>
-Date:   Tue Sep 18 14:17:51 2012 -0700
-
-    Fixes error when clicking OpenStack logo.
-    
-    Fixes bug 1052677.
-    
-    Change-Id: I796f23c4e9c5439b7263957cb4ec1b8fa864f398
-
- openstack_dashboard/settings.py |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-commit d8425738e0023f20db08c3fc46f7322664be79d9
+commit 8734ea4977b03a2862615f5e0289b57269fee24d
+Merge: e6d3c23 dcda694
+Author: Jenkins <[e-mail]>
+Date:   Wed Nov 21 20:07:43 2012 +0000
+
+    Merge "Return a friendly error at flavor creation"
+
+commit e6d3c23943a11357ffc755f8052894e15d8dfc1a
+Merge: 76ef256 86427b8
+Author: Jenkins <[e-mail]>
+Date:   Wed Nov 21 20:07:26 2012 +0000
+
+    Merge "Adds transitional deprecation code for old dashboard names."
+
+commit dcda6940263a43344bf98aa1776cce34d25ff927
+Author: Matthias Runge <[e-mail]>
+Date:   Mon Nov 19 13:14:02 2012 +0100
+
+    Return a friendly error at flavor creation
+    
+    When trying to create a flavor with an Id/Name that is already in use, the
+    operation fails and no error message is being displayed
+    
+    Change-Id: I92db8b52bc4e63e5e5ce4d90169944e484baeddd
+    Fixes: bug #1079155
+
+ .../dashboards/admin/flavors/forms.py              |   21 ++++++++++++++++++++
+ .../dashboards/admin/flavors/tests.py              |    1 +
+ 2 files changed, 22 insertions(+)
+
+commit 86427b83d668837b7b6ea4b9c3783e9049777dd4
+Author: Gabriel Hurley <[e-mail]>
+Date:   Tue Nov 20 20:33:09 2012 -0800
+
+    Adds transitional deprecation code for old dashboard names.
+    
+    This code allows users who upgrade from Folsom to Grizzly to
+    continue using their old settings file until H.
+    
+    The code is in the settings file because it must be run prior
+    to the modules listed in INSTALLED_APPS being loaded into the
+    python path.
+    
+    Fixes bug 1071444.
+    
+    Change-Id: I7ac30b731be3cdc7513e3d6bc34d624963bbea9b
+
+ openstack_dashboard/settings.py |   36 ++++++++++++++++++++++++++++++++++--
+ 1 file changed, 34 insertions(+), 2 deletions(-)
+
+commit 76ef256dc47b590f205aa95c2d439282fb62c962
+Author: Kieran Spear <[e-mail]>
+Date:   Wed Nov 14 18:30:39 2012 +1100
+
+    Don't inherit from base.html in 500 error page
+    
+    For server errors, the context passed to the template is empty,
+    so things like STATIC_URL and context processors don't work.
+    
+    Fixes bug 1067206.
+    
+    Change-Id: Ia1801afaecd6a23fbcc6054552d0fd313597d1c1
+
+ horizon/templatetags/horizon.py               |    6 ++
+ openstack_dashboard/templates/500.html        |  103 +++++++++++++++++++------
+ openstack_dashboard/test/error_pages_urls.py  |    7 ++
+ openstack_dashboard/test/tests/error_pages.py |   34 ++++++++
+ openstack_dashboard/urls.py                   |    5 ++
+ 5 files changed, 131 insertions(+), 24 deletions(-)
+
+commit 699469827b3ad6372e046d608477898e093bb512
+Merge: f9c9e9b 0d305a6
+Author: Jenkins <[e-mail]>
+Date:   Tue Nov 20 23:12:19 2012 +0000
+
+    Merge "Fixes for missing files in MANIFEST."
+
+commit f9c9e9b9546f82a1625fcfd8a9092a7ed5316280
+Merge: 5a23ee9 2f98bef
+Author: Jenkins <[e-mail]>
+Date:   Tue Nov 20 23:12:01 2012 +0000
+
+    Merge "Reworks quotas and services panels into System Info panel."
+
+commit 5a23ee90975bc3c5f2a64d46df0404db8ccbeb50
+Merge: 73cf169 0065e66
+Author: Jenkins <[e-mail]>
+Date:   Tue Nov 20 23:08:02 2012 +0000
+
+    Merge "Unifies Horizon conf."
+
+commit 73cf169eade2f6254d48eb52cfb72aec72295186
+Merge: ccb0b2c 3fbe68f
+Author: Jenkins <[e-mail]>
+Date:   Tue Nov 20 22:45:27 2012 +0000
+
+    Merge "Honour LOGIN_URL when redirecting to login page"
+
+commit 0d305a62f169c1f52c125a65b92d5380547b7f55
+Author: Gabriel Hurley <[e-mail]>
+Date:   Tue Nov 20 14:40:13 2012 -0800
+
+    Fixes for missing files in MANIFEST.
+    
+    Fixes bug 1079621.
+    
+    Change-Id: Ic7f16ff86033e3e53e6682bd494b907f396490ce
+
+ MANIFEST.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit ccb0b2c0040fe0dae4bf6ea0f44d844914d14a7d
+Merge: aec9884 16fd3c9
+Author: Jenkins <[e-mail]>
+Date:   Tue Nov 20 22:37:58 2012 +0000
+
+    Merge "Allow running tests individually"
+
+commit aec98844ca9892919e243dfe9216604e0ac4eb46
+Merge: ffb98f1 2205300
+Author: Jenkins <[e-mail]>
+Date:   Tue Nov 20 22:35:30 2012 +0000
+
+    Merge "use addHorizonLoadEvent() method instead of $(document).ready()"
+
+commit 0065e6642dafe2a43480d1e6280bff1128b33775
+Author: Gabriel Hurley <[e-mail]>
+Date:   Sat Nov 17 16:54:48 2012 -0800
+
+    Unifies Horizon conf.
+    
+    Centralizes all of Horizon's configuration options so that
+    they're all uniformly accesible from a single place and always
+    guaranteed to exist.
+    
+    Implements blueprint unify-config.
+    
+    Change-Id: I3279b7ccd58302fcff4f0d273f89f282a285c442
+
+ horizon/base.py                                    |   32 +++++-------------
+ horizon/conf/__init__.py                           |   35 ++++++++++++++++++++
+ horizon/conf/default.py                            |   30 +++++++++++++++++
+ horizon/context_processors.py                      |    4 +--
+ horizon/exceptions.py                              |   10 +++---
+ horizon/static/horizon/js/horizon.communication.js |    2 +-
+ horizon/tables/base.py                             |    5 +--
+ horizon/utils/validators.py                        |    9 ++---
+ openstack_dashboard/api/nova.py                    |    3 +-
+ .../local/local_settings.py.example                |   25 ++++++++++----
+ openstack_dashboard/test/settings.py               |    1 -
+ openstack_dashboard/test/test_data/exceptions.py   |    2 +-
+ 12 files changed, 107 insertions(+), 51 deletions(-)
+
+commit ffb98f19e6f5e66f9d9b4036ded446f5e15eb32a
+Author: Julie Pichon <[e-mail]>
+Date:   Fri Nov 16 21:12:09 2012 +0000
+
+    Client-side validation of password/confirmation match
+    
+    Fixes bug 1055234
+    
+    Change-Id: I25a3e8463894f0fb08e26e502f1baf0822d90437
+
+ horizon/static/horizon/js/horizon.users.js         |   31 ++++++++++++
+ horizon/templates/horizon/_scripts.html            |    1 +
+ .../admin/users/templates/users/_create.html       |   10 ++++
+ .../admin/users/templates/users/_update.html       |   10 ++++
+ .../dashboards/admin/users/tests.py                |   51 +++++++++++++++++++
+ openstack_dashboard/test/helpers.py                |   52 ++++++++++++++++++++
+ 6 files changed, 155 insertions(+)
+
+commit 241c63b94c7d66bfd8ce569380e85c6e9f60f8dc
+Merge: 0e32899 9c12d23
+Author: Jenkins <[e-mail]>
+Date:   Tue Nov 20 00:48:22 2012 +0000
+
+    Merge "Move netaddr to pip-requires"
+
+commit 3fbe68f690f86a9e07d054daafedf980217827e9
+Author: Kieran Spear <[e-mail]>
+Date:   Fri Nov 16 17:20:51 2012 +1100
+
+    Honour LOGIN_URL when redirecting to login page
+    
+    Currently the redirect is always made to the url of the 'login' view.
+    This change makes redirects go to LOGIN_URL, so the default login view
+    can be replaced with a view at another url/name.
+    
+    Fixes bug 1079444.
+    
+    Change-Id: Ib56200679668dd053d3c6ac24807d2a2affc0df8
+
+ horizon/middleware.py            |   17 +++++++++++------
+ horizon/test/tests/base.py       |    7 +++----
+ horizon/test/tests/middleware.py |   34 ++++++++++++++++++++++++++++++++++
+ 3 files changed, 48 insertions(+), 10 deletions(-)
+
+commit 2f98befe3ffc07922c02b4cb0d0c400e9c361922
+Author: Gabriel Hurley <[e-mail]>
+Date:   Sat Nov 17 15:49:17 2012 -0800
+
+    Reworks quotas and services panels into System Info panel.
+    
+    This is a step towards combining all the "read only" data about
+    an OpenStack cloud into one place for admin inspection.
+    
+    Implements blueprint system-info-panel.
+    
+    Change-Id: I2dc52a855c1c8a488fb9c66b82e0faca765b3812
+
+ openstack_dashboard/api/nova.py                    |    3 +-
+ openstack_dashboard/dashboards/admin/dashboard.py  |    4 +-
+ openstack_dashboard/dashboards/admin/info/panel.py |   33 ++++++++
+ .../dashboards/admin/info/tables.py                |   79 ++++++++++++++++++++
+ openstack_dashboard/dashboards/admin/info/tabs.py  |   62 +++++++++++++++
+ .../admin/info/templates/info/index.html           |   15 ++++
+ openstack_dashboard/dashboards/admin/info/tests.py |   71 ++++++++++++++++++
+ openstack_dashboard/dashboards/admin/info/urls.py  |   27 +++++++
+ openstack_dashboard/dashboards/admin/info/views.py |   33 ++++++++
+ .../dashboards/admin/quotas/panel.py               |   33 --------
+ .../dashboards/admin/quotas/tables.py              |   38 ----------
+ .../admin/quotas/templates/quotas/index.html       |   13 ----
+ .../dashboards/admin/quotas/tests.py               |    1 -
+ .../dashboards/admin/quotas/urls.py                |   27 -------
+ .../dashboards/admin/quotas/views.py               |   47 ------------
+ .../dashboards/admin/services/panel.py             |   33 --------
+ .../dashboards/admin/services/tables.py            |   50 -------------
+ .../admin/services/templates/services/index.html   |   14 ----
+ .../dashboards/admin/services/tests.py             |   36 ---------
+ .../dashboards/admin/services/urls.py              |   27 -------
+ .../dashboards/admin/services/views.py             |   41 ----------
+ openstack_dashboard/test/test_data/nova_data.py    |    1 +
+ 22 files changed, 325 insertions(+), 363 deletions(-)
+
+commit 22053000b18006339a0950af430d5bc66fc85b95
+Author: Nicolas Simonds <[e-mail]>
+Date:   Thu Nov 15 15:47:28 2012 -0800
+
+    use addHorizonLoadEvent() method instead of $(document).ready()
+    
+    These pages load all the scripts at the end, which means jQuery
+    isn't loaded yet, which means there is no $ variable, which means
+    the page throws errors when attempting to resize the iframe.  Oops.
+    
+    There's a special method defined for doing what is being tried here,
+    called addHorizonLoadEvent(), so use it instead.  Confirmed working
+    correctly in DevStack.
+    
+    Fixes Bug 1050316
+    
+    Change-Id: Ia6a90485acc2454ff0320abcd51860423282a659
+
+ .../instances/templates/instances/_detail_vnc.html |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 16fd3c9ebb2a267f7a13961a500628ee2db0f356
+Author: Kieran Spear <[e-mail]>
+Date:   Thu Nov 15 14:40:25 2012 +1100
+
+    Allow running tests individually
+    
+    If there is a non-zero number of arguments, run_tests.sh now
+    passes through the arguments to `manage.py test`, skipping the
+    default horizon/openstack_dashboard suites.
+    
+    The correct settings module is chosen based on the first module
+    given in the argument. E.g., horizon.test.tests.tables chooses
+    the horizon.test.settings module.
+    
+    Change-Id: I5321e87bec6831fb7574e045a82de06086b1d0d0
+
+ doc/source/ref/run_tests.rst |   19 +++++++++++++++++++
+ doc/source/testing.rst       |    2 ++
+ run_tests.sh                 |   23 +++++++++++++++++++----
+ 3 files changed, 40 insertions(+), 4 deletions(-)
+
+commit 0e328995ec3fa8a04af8b687d2a7462fd8029f1c
+Merge: 241ee81 4c88b9b
+Author: Jenkins <[e-mail]>
+Date:   Tue Nov 13 21:29:14 2012 +0000
+
+    Merge "Added a check for volume service in quota functions"
+
+commit 241ee819f1a7094ea59ec3783706c15457c2f857
+Merge: 220f99e 9249a5d
+Author: Jenkins <[e-mail]>
+Date:   Tue Nov 13 13:15:15 2012 +0000
+
+    Merge "Report correct return value from pep8 check"
+
+commit 9c12d2386831d0f4f4a5644c1e0947c9889f692a
+Author: Kieran Spear <[e-mail]>
+Date:   Tue Nov 13 18:37:34 2012 +1100
+
+    Move netaddr to pip-requires
+    
+    Change-Id: I3620689e8407055234e9a2bcbab896f2394c4fc4
+
+ tools/pip-requires  |    1 +
+ tools/test-requires |    1 -
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+
+commit 4c88b9b5977c50525771876b2a8624fa586b8f6e
+Author: Tihomir Trifonov <[e-mail]>
+Date:   Fri Nov 9 14:55:23 2012 +0200
+
+    Added a check for volume service in quota functions
+    
+    When displaying the quotas, we have to check if
+    volume service is present in the service catalog.
+    If not - then to remove the volume quotas from
+    the result object.
+    
+    Fixes bug 1075319
+    
+    Change-Id: Icd049a5b147cac039add1570a166d775fd0d6ec4
+
+ .../templates/horizon/common/_quota_summary.html   |    8 +++++
+ openstack_dashboard/test/tests/quotas.py           |   36 ++++++++++++++++++++
+ openstack_dashboard/usage/quotas.py                |   31 ++++++++++-------
+ 3 files changed, 63 insertions(+), 12 deletions(-)
+
+commit 220f99e3c72fb780935afc57e8db496c9d86b2df
+Merge: fc075fa e202400
+Author: Jenkins <[e-mail]>
+Date:   Fri Nov 9 01:38:46 2012 +0000
+
+    Merge "When editing an image, correctly set the 'is_public' checkbox."
+
+commit fc075fa12fdd29dc7208e24d668aeb92a867a2de
+Merge: 89904e6 e837b10
+Author: Jenkins <[e-mail]>
+Date:   Fri Nov 9 01:38:19 2012 +0000
+
+    Merge "Changed "Delete volume" success message text"
+
+commit 89904e6f6c1b147ced238276d65ced2ac70ede2b
+Author: Brian Waldon <[e-mail]>
+Date:   Wed Oct 31 12:45:15 2012 -0700
+
+    Remove superfluous slash from admin usage.csv template
+    
+    The forward-slash is unnecessary in the Admin usage.csv template
+    and it diverges from the corresponding Project template. This
+    patch removes it.
+    
+    Change-Id: I8c1305c0d11bedc3635f41524e8ef62841b70f1a
+
+ .../admin/overview/templates/overview/usage.csv    |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit a7ad523d5a77447410192e1d92f5c0ba19e1d0bd
+Merge: 82c19ae 92510f1
+Author: Jenkins <[e-mail]>
+Date:   Thu Nov 8 21:07:04 2012 +0000
+
+    Merge "Wrap a project list call with exception handler."
+
+commit e2024001c774deae8cb53bdb3a9bb86925bc1960
+Author: Julie Pichon <[e-mail]>
+Date:   Thu Nov 8 16:48:42 2012 +0000
+
+    When editing an image, correctly set the 'is_public' checkbox.
+    
+    Fixes bug 1076216.
+    
+    Change-Id: Ie185f110a18593295ed0712cd848a3f14a13f2b0
+
+ .../project/images_and_snapshots/images/tests.py   |   22 ++++++++++++++++++++
+ .../project/images_and_snapshots/images/views.py   |    2 +-
+ 2 files changed, 23 insertions(+), 1 deletion(-)
+
+commit e837b105e8bcfa772d3b83c80411a9f897e74232
+Author: Tihomir Trifonov <[e-mail]>
+Date:   Thu Nov 8 17:32:25 2012 +0200
+
+    Changed "Delete volume" success message text
+    
+    As deletion of volume/snapshot is performed
+    asynchronous, the success label should not be
+    'Deleted', but 'Scheduled for deletion', as it
+    is for Instances ('Scheduled for termination').
+    
+    Fixes bug 1073718
+    
+    Change-Id: Ia7884b5b82fea225cfc559309346e73683c4cb3e
+
+ .../volume_snapshots/tables.py                     |    1 +
+ .../images_and_snapshots/volume_snapshots/tests.py |   31 ++++++++++++++++++++
+ .../dashboards/project/volumes/tables.py           |    1 +
+ .../dashboards/project/volumes/tests.py            |    3 +-
+ openstack_dashboard/test/test_data/nova_data.py    |   12 ++++----
+ 5 files changed, 41 insertions(+), 7 deletions(-)
+
+commit 82c19aee05211bed46a99ddeafab05599bc71ccf
+Author: Malini Bhandaru <[e-mail]>
+Date:   Sat Oct 13 05:18:13 2012 -0700
+
+    Flavor Extra Specs support.
+    
+    Special thanks:
+    
+      * Preserves extra specs on flavor edit (Tihomir Trifonov)
+      * Displays flavor name on extra specs pages (Vinay Bannai)
+      * Extras specs table close (Don Dugger & Gabriel).
+      * Final cleanup (Gabriel Hurley)
+    
+    Change-Id: I6acb1176e5c0ca6987abc758fc45335870c55d57
+
+ horizon/templates/horizon/common/_modal.html       |   10 +++
+ openstack_dashboard/api/nova.py                    |   30 +++++++
+ .../dashboards/admin/flavors/extras/forms.py       |   66 ++++++++++++++
+ .../dashboards/admin/flavors/extras/tables.py      |   75 ++++++++++++++++
+ .../dashboards/admin/flavors/extras/tests.py       |   65 ++++++++++++++
+ .../dashboards/admin/flavors/extras/urls.py        |   29 ++++++
+ .../dashboards/admin/flavors/extras/views.py       |   93 ++++++++++++++++++++
+ .../dashboards/admin/flavors/forms.py              |    9 +-
+ .../dashboards/admin/flavors/tables.py             |    9 +-
+ .../flavors/templates/flavors/extras/_create.html  |   27 ++++++
+ .../flavors/templates/flavors/extras/_edit.html    |   27 ++++++
+ .../flavors/templates/flavors/extras/_index.html   |   14 +++
+ .../flavors/templates/flavors/extras/create.html   |   12 +++
+ .../flavors/templates/flavors/extras/edit.html     |   12 +++
+ .../flavors/templates/flavors/extras/index.html    |   12 +++
+ .../dashboards/admin/flavors/tests.py              |    8 +-
+ .../dashboards/admin/flavors/urls.py               |    7 +-
+ 17 files changed, 499 insertions(+), 6 deletions(-)
+
+commit 92510f1a380a24efda318d6d8594e7dde6744168
+Author: Gabriel Hurley <[e-mail]>
+Date:   Mon Nov 5 11:10:03 2012 -0800
+
+    Wrap a project list call with exception handler.
+    
+    Change-Id: I3bb531e54b517282121b08d49c5fe9775b52b990
+
+ .../dashboards/settings/project/forms.py           |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+commit c61c5e28cc629c65166bcff2d974a622310f32b5
+Author: Gabriel Hurley <[e-mail]>
+Date:   Fri Nov 2 15:10:43 2012 -0700
+
+    Enforce use of latest django_openstack_auth for PKI compat.
+    
+    The latest django_openstack_auth supports PKI-signed tokens by
+    using Keystone's "is_ans1_token" function to determine if PKI
+    tokens are in use and react approriately if so.
+    
+    Fixes bug 1071865
+    
+    Change-Id: I62ba6370de829345d3214d80011a58e4ac6cd218
+
+ run_tests.sh       |    2 +-
+ tools/pip-requires |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 4c05d9ff12ef6c9bb1e840fced1a695a33338760
+Merge: ec5d7fd 046f012
+Author: Jenkins <[e-mail]>
+Date:   Fri Nov 2 18:38:04 2012 +0000
+
+    Merge "Remove unused usage.csv template"
+
+commit ec5d7fdd1a530aedd79cd08fedbdee9b87e9af1c
+Merge: 9eda3da 0c12faa
+Author: Jenkins <[e-mail]>
+Date:   Fri Nov 2 18:37:48 2012 +0000
+
+    Merge "Update all usage.csv templates to use 2 decimal places"
+
+commit 9eda3da97894181cbbaf618a7a252b7b3649f132
+Merge: 7a7c89c 68db72b
+Author: Jenkins <[e-mail]>
+Date:   Fri Nov 2 18:37:23 2012 +0000
+
+    Merge "Dynamically size the noVNC iframe, fix typos in copy"
+
+commit 68db72b95f71a9cfa9feacfda0018e32d5a673c0
+Author: Nicolas Simonds <[e-mail]>
+Date:   Mon Oct 29 13:48:19 2012 -0700
+
+    Dynamically size the noVNC iframe, fix typos in copy
+    
+    The iframe for the noVNC console is too small for some users who
+    like to use GUI on the console.  Leaving the sizes off completely
+    and letting the browser figure it out causes hilarity to ensue, so
+    explicitly set the height and width to quasi-sensible values.
+    
+    Also, the "unavailable" error says "unavailabe"  Fixed.
+    
+    Fixes Bug 1050316 ?
+    
+    Addendum:
+    
+    add an identifier to the iframe rather than using the auto-generated selector
+    
+    Change-Id: I17cfa97cdc69f4b58e18d02451da2197c663e0d3
+
+ .../instances/templates/instances/_detail_vnc.html |   13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+commit 7a7c89c293432242d4aa7a44f340e7dc78ab2ed0
+Merge: b21617a 70ac5bd
+Author: Jenkins <[e-mail]>
+Date:   Fri Nov 2 09:21:26 2012 +0000
+
+    Merge "Add newline between rows of Admin usage.csv"
+
+commit 046f012e926b1ccfee31e8993237a5381083a571
+Author: Brian Waldon <[e-mail]>
+Date:   Wed Oct 31 12:32:18 2012 -0700
+
+    Remove unused usage.csv template
+    
+    Change-Id: I08f3c16e2da60bdaa8e04c60ed4a4d867c0947f4
+
+ .../admin/projects/templates/projects/usage.csv    |   11 -----------
+ 1 file changed, 11 deletions(-)
+
+commit 0c12faa7dd7c35ae96e525abc7eeb8a0b917bdb4
+Author: Brian Waldon <[e-mail]>
+Date:   Wed Oct 31 12:39:02 2012 -0700
+
+    Update all usage.csv templates to use 2 decimal places
+    
+    Change-Id: I54694beb39fdee39d59e9032e72201a520a9fcd1
+
+ .../admin/overview/templates/overview/usage.csv    |    4 ++--
+ .../project/overview/templates/overview/usage.csv  |    6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 70ac5bd4a7eb6d7271ce86fda5f29ba51ab1121d
+Author: Brian Waldon <[e-mail]>
+Date:   Wed Oct 31 12:34:42 2012 -0700
+
+    Add newline between rows of Admin usage.csv
+    
+    For some reason, we must also specify precision for vcpu hours
+    in this change. Adding the newline caused the default behavior
+    to change.
+    
+    Fix bug 1073677
+    
+    Change-Id: Id9a90e787de50f775ed17b15f185273cebba64e8
+
+ .../admin/overview/templates/overview/usage.csv    |    3 ++-
+ .../dashboards/admin/overview/tests.py             |   16 ++++++++--------
+ 2 files changed, 10 insertions(+), 9 deletions(-)
+
+commit b21617a5ba72a7d4645d33ff0a7ef9377884971b
+Author: Brian Waldon <[e-mail]>
+Date:   Tue Oct 30 15:43:37 2012 -0700
+
+    Adding volume owner (project) to admin table.
+    
+    Change-Id: I40174eefa191312e77da41d6f55fffec7a1d6d90
+
+ .../dashboards/admin/instances/tables.py           |    4 ++--
+ .../dashboards/admin/volumes/tables.py             |    3 +++
+ .../dashboards/admin/volumes/tests.py              |   11 +++++++++--
+ .../dashboards/admin/volumes/views.py              |   17 +++++++++++++++++
+ 4 files changed, 31 insertions(+), 4 deletions(-)
+
+commit 9249a5da2765fa03e5799f82c77bed15d9bccde1
+Author: Brian Waldon <[e-mail]>
+Date:   Tue Oct 30 17:25:07 2012 -0700
+
+    Report correct return value from pep8 check
+    
+    Remove the '|| true' appended to the pep8 command to allow
+    the non-zero status to be returned properly.
+    
+    Fix bug 1073380.
+    
+    Change-Id: I1e212a9d596eb448ee7f6ac40106a05650b70473
+
+ run_tests.sh |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 069c3f545ab497284a5fea034ef7d899f3902fa2
+Author: Gabriel Hurley <[e-mail]>
+Date:   Mon Oct 29 15:26:05 2012 -0700
+
+    Adding volume host to admin table.
+    
+    Change-Id: Id01a7e884113f67839ba3e8086df55dc8b1c5df3
+
+ .../dashboards/admin/volumes/tables.py             |    1 +
+ 1 file changed, 1 insertion(+)
+
+commit 057d891f31f3901f7f933d12401aebc53759aff0
+Author: Tihomir Trifonov <[e-mail]>
+Date:   Thu Oct 25 14:48:27 2012 +0300
+
+    Added support for volume types
+    
+    As cinder already supports volume types, it's time
+    to be added in Horizon. The types are added in admin panel.
+    A volume can either have a *valid* type, or None.
+    
+    There are two minor issues:
+    1. When a type is deleted, if there is a volume with
+       this type, the type is returned as the id,
+       instead of the name. Which is good as consistency,
+       but maybe a type should not be deleted if used by a volume?
+    2. If no vol type is passed(None) value, the type is being
+       assigned as 'None', and returned as a string('None')
+    3. In the create volume type form, the 'Description' is
+       empty at the moment, I couldn't find any help info
+       to add for volume types...
+    
+    Implements blueprint volume-types
+    
+    Tested with n-cinder and n-vol services. Since Folsom both
+    support volume-types. I'm not sure if it is possible a grizzly
+    Dashboard to work with essex nova, which could be a problem.
+    Dashboard doesn't seem to provide permissions based on tables,
+    so if it needs to check if a service is available to show/hide
+    volume types, this will need some more effors to implement
+    permissions on table/action level. Or maybe this needs to be
+    added as a standalone panel?
+    
+    Patch set 2: implemented suggestions, added one more thing:
+    When creating a volume from a snapshot, set the volume type
+    initial as the type of the original volume from which
+    the snapshot is being created.
+    
+    Patch Set 3: Updated the description of volume types,
+    based on the notes from:
+    https://etherpad.openstack.org/grizzly-cinder-volumetypes
+    https://etherpad.openstack.org/cinder-usecases
+    Any feedback on the description is welcome.
+    
+    Change-Id: Ib0c136c5c8cd9fbd34ce1dd346260f404c96f667
+
+ openstack_dashboard/api/cinder.py                  |   18 ++-
+ .../dashboards/admin/volumes/forms.py              |   44 ++++++
+ .../dashboards/admin/volumes/tables.py             |   33 ++++
+ .../templates/volumes/_create_volume_type.html     |   29 ++++
+ .../templates/volumes/create_volume_type.html      |   11 ++
+ .../admin/volumes/templates/volumes/index.html     |   10 +-
+ .../dashboards/admin/volumes/tests.py              |   54 ++++++-
+ .../dashboards/admin/volumes/urls.py               |    3 +-
+ .../dashboards/admin/volumes/views.py              |   36 ++++-
+ .../images_and_snapshots/volume_snapshots/tests.py |   14 +-
+ .../dashboards/project/volumes/forms.py            |   43 ++++--
+ .../dashboards/project/volumes/tables.py           |   12 +-
+ .../dashboards/project/volumes/tests.py            |  157 ++++++++++++--------
+ .../dashboards/project/volumes/views.py            |   18 ++-
+ openstack_dashboard/test/test_data/nova_data.py    |   15 +-
+ 15 files changed, 389 insertions(+), 108 deletions(-)
+
+commit cd70bc92841dc69eb9fe22ef7d776c5469635912
+Merge: 7e132e3 ef4e931
+Author: Jenkins <[e-mail]>
+Date:   Wed Oct 24 22:35:59 2012 +0000
+
+    Merge "Use UUIDs for flavor create/edit."
+
+commit 7e132e385acb633398630813136de05b945d8ae5
+Merge: f48600e cdcd8e3
+Author: Jenkins <[e-mail]>
+Date:   Wed Oct 24 21:51:38 2012 +0000
+
+    Merge "Enable quota data from multiple sources."
+
+commit ef4e9314eb880238642e3122ae699f553b98db0e
+Author: Gabriel Hurley <[e-mail]>
+Date:   Wed Oct 24 14:03:17 2012 -0700
+
+    Use UUIDs for flavor create/edit.
+    
+    Now that Nova accepts strings as flavor IDs we can just use UUIDs
+    on our end and get rid of the horrors of trying to guess the next
+    integer ID. This fixes all the instability in flavor editing.
+    
+    Fixes bug 1057799.
+    
+    Change-Id: I55eb1d7408655fd27e81cc1196f15ceb3659a7b4
+
+ .../dashboards/admin/flavors/forms.py              |   21 +++-----------------
+ .../dashboards/admin/flavors/tests.py              |   11 ++++------
+ 2 files changed, 7 insertions(+), 25 deletions(-)
+
+commit f48600e9476d03c91d8dc9f827f70f790aa4c41e
+Merge: 1aa63dc acef935
+Author: Jenkins <[e-mail]>
+Date:   Wed Oct 24 20:45:36 2012 +0000
+
+    Merge "Update common."
+
+commit 1aa63dc1eaee88055b8153cc1e8d65c8cf64f784
+Merge: 6258553 811ee7b
+Author: Jenkins <[e-mail]>
+Date:   Wed Oct 24 20:43:44 2012 +0000
+
+    Merge "Fixed url pattern for project:instances:detail page"
+
+commit 62585536140bcb3ba6a316256ba72f6c81f4f930
+Merge: a0ad0d4 3e0f69d
+Author: Jenkins <[e-mail]>
+Date:   Wed Oct 24 20:43:04 2012 +0000
+
+    Merge "Show message when user has no permissions"
+
+commit cdcd8e3df6ee143cc96b5e2a2d849e9ae8e86148
+Author: Gabriel Hurley <[e-mail]>
+Date:   Tue Oct 23 22:25:18 2012 -0700
+
+    Enable quota data from multiple sources.
+    
+    Now that there are multiple projects with quota data (cinder, quantum)
+    we need to accommodate that data being aggregated in a centralized
+    fashion. This commit takes care of that for nova + cinder, and paves
+    the way for quantum later.
+    
+    Fixes bug 1070022.
+    
+    Change-Id: Ifc68c2dc681b2a7b4e7787e0b1a7dca1a970fc36
+
+ horizon/static/horizon/js/horizon.quota.js         |    2 +-
+ horizon/utils/memoized.py                          |    3 +
+ openstack_dashboard/api/__init__.py                |    1 +
+ openstack_dashboard/api/base.py                    |   57 ++++++
+ openstack_dashboard/api/cinder.py                  |  115 ++++++++++++
+ openstack_dashboard/api/nova.py                    |  186 +++-----------------
+ .../dashboards/admin/overview/tests.py             |   19 +-
+ .../dashboards/admin/projects/tests.py             |  104 ++++++-----
+ .../dashboards/admin/projects/views.py             |   10 +-
+ .../dashboards/admin/projects/workflows.py         |   32 ++--
+ .../dashboards/admin/quotas/views.py               |    2 +-
+ .../access_and_security/floating_ips/views.py      |    3 +-
+ .../volume_snapshots/tables.py                     |    3 +-
+ .../images_and_snapshots/volume_snapshots/tabs.py  |    6 +-
+ .../dashboards/project/instances/tests.py          |  114 ++++++------
+ .../dashboards/project/instances/views.py          |    4 +-
+ .../dashboards/project/instances/workflows.py      |    8 +-
+ .../dashboards/project/overview/tests.py           |   39 ++--
+ .../dashboards/project/volumes/forms.py            |   14 +-
+ .../dashboards/project/volumes/tables.py           |    4 +-
+ .../dashboards/project/volumes/tabs.py             |    7 +-
+ .../dashboards/project/volumes/tests.py            |   57 +++---
+ .../dashboards/project/volumes/views.py            |    3 +-
+ openstack_dashboard/test/api_tests/nova_tests.py   |   52 +-----
+ openstack_dashboard/test/test_data/nova_data.py    |   30 ++--
+ openstack_dashboard/test/tests/quotas.py           |   69 ++++++++
+ openstack_dashboard/usage/base.py                  |    3 +-
+ openstack_dashboard/usage/quotas.py                |  108 ++++++++++++
+ 28 files changed, 625 insertions(+), 430 deletions(-)
+
+commit 811ee7b58aec6186d88b10a2e6184381f4b3ec5c
+Author: Tihomir Trifonov <[e-mail]>
+Date:   Tue Oct 23 11:33:32 2012 +0300
+
+    Fixed url pattern for project:instances:detail page
+    
+    Removed obsolete :nova: namespace
+    
+    Fixes bug 1070230
+    
+    Change-Id: Ia56ef9ebf1a9bfe90b02491125821742ee840baa
+
+ openstack_dashboard/usage/tables.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit a0ad0d49a97da8a0fcee1636dce00c1ae940d6f9
+Merge: baf8b68 0c85d72
+Author: Jenkins <[e-mail]>
+Date:   Tue Oct 23 08:32:36 2012 +0000
+
+    Merge "Fixes JavaScript count bug in tables."
+
+commit baf8b685dc5f5b2d0c780a26ed227217496a8f29
+Author: Doug Hellmann <[e-mail]>
+Date:   Mon Oct 22 18:30:34 2012 -0400
+
+    Add OpenStack trove classifier for PyPI
+    
+    Add trove classifier to have horizon listed among the
+    other OpenStack-related projets on PyPI.
+    
+    Change-Id: I70a2b3dedf437fbfd03d4c2d605af6d6c2ef98c6
+    Signed-off-by: Doug Hellmann <[e-mail]>
+
+ setup.py |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit acef935c12bca0f544940f54dea4086ac25a0ea4
+Author: Michael Still <[e-mail]>
+Date:   Thu Oct 18 11:43:17 2012 -0700
+
+    Update common.
+    
+    policy.py is not updated as it causes test failures. I will investigate
+    that separately.
+    
+    Change-Id: I0970cbc67835a18c0114457c1bb07c700e0dfe88
+
+ openstack_dashboard/openstack/common/setup.py |  258 ++++++++++++++++++++-----
+ 1 file changed, 209 insertions(+), 49 deletions(-)
+
+commit 0c85d7214e992fe83cad1f00dbeebc2f3a58d1eb
+Author: Matthias Runge <[e-mail]>
+Date:   Mon Oct 15 09:52:32 2012 +0200
+
+    Fixes JavaScript count bug in tables.
+    
+    When showing tables, and you had the summary, "No items to display",
+    the counter at table footer says "Displaying 1 items". This commit fixes
+    the inclusion of the empty line into line count.
+    Affected sub-pages: Instances, Volumes, Images & Snapshots, etc.
+    
+    Change-Id: I24da50d506be477dffdbb0f497d88b1bd3ceacdc
+
+ horizon/static/horizon/js/horizon.tables.js |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 3e0f69da7544c4ce92056db27191984bdffb75c8
+Author: Tihomir Trifonov <[e-mail]>
+Date:   Sun Oct 14 12:08:11 2012 +0300
+
+    Show message when user has no permissions
+    
+    Shows a warning messages to users who try to access
+    restricted page.
+    
+    This bug can be simply fixed in middleware.py:
+    
+        if isinstance(exception, (exceptions.NotAuthorized,
+                                  exceptions.NotAuthenticated)):
+            if request.user.is_authenticated() and 'next' in request.GET:
+                # a logged-in users gets NotAuthorized exception,
+                # then just redirect to user_home instead of '?next='
+    
+    But in the case when an user uses different logins(e.g for
+    different projects), and wants to switch fast between them,
+    trying to load an admin-only(or other restricted) page,
+    then Dashboard will redirect them to their home page,
+    and the user will have to sign-out first, then login again
+    and load the desired page.
+    
+    With this fix however, the user will see a message, giving them a choice
+    to login as different user, or to go to their 'home page' if
+    they landed on the restricted page by error, allowing fast-switching
+    between multiple accounts.
+    Also, this will work fine with bookmarked pages.
+    
+    P.S. The html repr of the error message will
+    probably need some improvements...
+    
+    Fixes bug 1053698
+    
+    Change-Id: Id458af6c7bd90081fc95d339b32a3654878a927d
+
+ horizon/templates/auth/_login.html |    9 +++++++++
+ horizon/test/tests/base.py         |    6 ++++++
+ horizon/test/urls.py               |    3 +++
+ 3 files changed, 18 insertions(+)
+
+commit 28f9edb2c3aeb8761634a3d96d083351c31afeed
+Merge: 76e6740 35a6708
+Author: Jenkins <[e-mail]>
+Date:   Sat Oct 13 18:47:32 2012 +0000
+
+    Merge "User shouldn't remove their own roles on project"
+
+commit 76e67407b9dcbbe5d8253067dbe44dc35dba5f38
+Merge: 5422c93 c681c93
+Author: Jenkins <[e-mail]>
+Date:   Sat Oct 13 08:52:59 2012 +0000
+
+    Merge "Adding ephemeral disk to instance details"
+
+commit 5422c93525976b547bcfd61dda4ce57a1e06080b
+Merge: 6f990c9 5eac426
+Author: Jenkins <[e-mail]>
+Date:   Sat Oct 13 08:52:25 2012 +0000
+
+    Merge "Fix bug 1055929 - Can not display usage data for Quota Summary."
+
+commit 35a6708dccdc71d69a147daf0b0c2fde17489d4b
+Author: Tihomir Trifonov <[e-mail]>
+Date:   Wed Oct 10 17:29:20 2012 +0300
+
+    User shouldn't remove their own roles on project
+    
+    Added a check if the user is trying to delete their
+    own 'admin' role on the current project. This is added
+    to prevent the users from locking their own
+    access to Dashboard. Also, if the 'admin' role on the
+    current project is removed, Dashboard automatically
+    switches to another project for which the user has 'admin'
+    role, but the previous project still is displayed as current.
+    
+    Fixes bug 1046538
+    
+    Also improved the unit test scenarios a bit.
+    
+    Change-Id: I1e60a11d628d6490ad24a8149b43ac307afb4780
+
+ .../dashboards/admin/projects/tests.py             |  186 +++++++++-----------
+ .../dashboards/admin/projects/workflows.py         |   38 ++--
+ .../test/test_data/keystone_data.py                |   20 ++-
+ 3 files changed, 124 insertions(+), 120 deletions(-)
+
+commit 6f990c9ce4fe716b2ca9d136c65de9fad46bc7bb
+Author: Gabriel Hurley <[e-mail]>
+Date:   Fri Oct 12 15:35:19 2012 -0700
+
+    Readding bin dir which was mistakenly deleted.
+    
+    Change-Id: Ia8989da47a55f7c932115a976b6d799714b8dc56
+
+ bin/less/lessc                  |  139 ++++
+ bin/lib/less/browser.js         |  380 +++++++++++
+ bin/lib/less/colors.js          |  152 +++++
+ bin/lib/less/cssmin.js          |  355 +++++++++++
+ bin/lib/less/functions.js       |  228 +++++++
+ bin/lib/less/index.js           |  148 +++++
+ bin/lib/less/parser.js          | 1334 +++++++++++++++++++++++++++++++++++++++
+ bin/lib/less/rhino.js           |   62 ++
+ bin/lib/less/tree.js            |   17 +
+ bin/lib/less/tree/alpha.js      |   17 +
+ bin/lib/less/tree/anonymous.js  |   13 +
+ bin/lib/less/tree/assignment.js |   17 +
+ bin/lib/less/tree/call.js       |   48 ++
+ bin/lib/less/tree/color.js      |  101 +++
+ bin/lib/less/tree/comment.js    |   14 +
+ bin/lib/less/tree/condition.js  |   42 ++
+ bin/lib/less/tree/dimension.js  |   49 ++
+ bin/lib/less/tree/directive.js  |   35 +
+ bin/lib/less/tree/element.js    |   52 ++
+ bin/lib/less/tree/expression.js |   23 +
+ bin/lib/less/tree/import.js     |   83 +++
+ bin/lib/less/tree/javascript.js |   51 ++
+ bin/lib/less/tree/keyword.js    |   19 +
+ bin/lib/less/tree/media.js      |  114 ++++
+ bin/lib/less/tree/mixin.js      |  146 +++++
+ bin/lib/less/tree/operation.js  |   32 +
+ bin/lib/less/tree/paren.js      |   16 +
+ bin/lib/less/tree/quoted.js     |   29 +
+ bin/lib/less/tree/rule.js       |   42 ++
+ bin/lib/less/tree/ruleset.js    |  225 +++++++
+ bin/lib/less/tree/selector.js   |   42 ++
+ bin/lib/less/tree/url.js        |   25 +
+ bin/lib/less/tree/value.js      |   24 +
+ bin/lib/less/tree/variable.js   |   26 +
+ 34 files changed, 4100 insertions(+)
+
+commit 5eac426a2a1304b166f85cd68086a1b1abeafd23
+Author: Kylin CG <[e-mail]>
+Date:   Fri Oct 12 17:04:40 2012 +0800
+
+    Fix bug 1055929 - Can not display usage data for Quota Summary.
+    
+    Change-Id: I051e97f14375714d22303ad44a9f0b16aa7d6c51
+
+ .../templates/horizon/common/_quota_summary.html   |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+commit c681c936cfd3ef3926025ba4530a0f342cef3cd8
+Author: Tihomir Trifonov <[e-mail]>
+Date:   Tue Jul 24 16:20:40 2012 +0300
+
+    Adding ephemeral disk to instance details
+    
+    If the flavor allows ephemeral disk, it is now
+    displayed in the instance details page.
+    
+    Fixes bug 1007395
+    
+    Rebased
+    
+    Change-Id: I84eb0231c57ad839025cca8370b34dd9b899ca5a
+
+ .../templates/instances/_detail_overview.html      |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit cb8e7c1f8f0b238b88253cd6d82092cbe530ba9e
+Author: Gabriel Hurley <[e-mail]>
+Date:   Thu Oct 4 15:43:40 2012 -0700
+
+    Splits OpenStack Dashboard bits from framework app code.
+    
+    Moves everything OpenStack-specific (dashboards, apis, etc.)
+    into the openstack_dashboard project, achieving a much
+    cleaner separation between the project-specific code and
+    the generic Horizon framework code.
+    
+    Change-Id: I7235b41d449b26c980668fc3eb4360b24508717b
+
+ .bzrignore                                         |   12 -
+ bin/less/lessc                                     |  139 -
+ bin/lib/less/browser.js                            |  380 --
+ bin/lib/less/colors.js                             |  152 -
+ bin/lib/less/cssmin.js                             |  355 --
+ bin/lib/less/functions.js                          |  228 --
+ bin/lib/less/index.js                              |  148 -
+ bin/lib/less/parser.js                             | 1334 -------
+ bin/lib/less/rhino.js                              |   62 -
+ bin/lib/less/tree.js                               |   17 -
+ bin/lib/less/tree/alpha.js                         |   17 -
+ bin/lib/less/tree/anonymous.js                     |   13 -
+ bin/lib/less/tree/assignment.js                    |   17 -
+ bin/lib/less/tree/call.js                          |   48 -
+ bin/lib/less/tree/color.js                         |  101 -
+ bin/lib/less/tree/comment.js                       |   14 -
+ bin/lib/less/tree/condition.js                     |   42 -
+ bin/lib/less/tree/dimension.js                     |   49 -
+ bin/lib/less/tree/directive.js                     |   35 -
+ bin/lib/less/tree/element.js                       |   52 -
+ bin/lib/less/tree/expression.js                    |   23 -
+ bin/lib/less/tree/import.js                        |   83 -
+ bin/lib/less/tree/javascript.js                    |   51 -
+ bin/lib/less/tree/keyword.js                       |   19 -
+ bin/lib/less/tree/media.js                         |  114 -
+ bin/lib/less/tree/mixin.js                         |  146 -
+ bin/lib/less/tree/operation.js                     |   32 -
+ bin/lib/less/tree/paren.js                         |   16 -
+ bin/lib/less/tree/quoted.js                        |   29 -
+ bin/lib/less/tree/rule.js                          |   42 -
+ bin/lib/less/tree/ruleset.js                       |  225 --
+ bin/lib/less/tree/selector.js                      |   42 -
+ bin/lib/less/tree/url.js                           |   25 -
+ bin/lib/less/tree/value.js                         |   24 -
+ bin/lib/less/tree/variable.js                      |   26 -
+ doc/source/ref/test.rst                            |   14 +-
+ doc/source/topics/testing.rst                      |   30 +-
+ horizon/__init__.py                                |    2 +-
+ horizon/api/__init__.py                            |   39 -
+ horizon/api/base.py                                |  118 -
+ horizon/api/glance.py                              |   98 -
+ horizon/api/keystone.py                            |  290 --
+ horizon/api/nova.py                                |  585 ----
+ horizon/api/quantum.py                             |  261 --
+ horizon/api/swift.py                               |  264 --
+ horizon/conf/panel_template/tests.py.tmpl          |    2 +-
+ horizon/conf/panel_template/urls.py                |    1 +
+ horizon/context_processors.py                      |   36 +-
+ horizon/dashboards/admin/dashboard.py              |   37 -
+ horizon/dashboards/admin/flavors/forms.py          |   95 -
+ horizon/dashboards/admin/flavors/panel.py          |   32 -
+ horizon/dashboards/admin/flavors/tables.py         |   53 -
+ .../admin/flavors/templates/flavors/_create.html   |   25 -
+ .../admin/flavors/templates/flavors/_edit.html     |   26 -
+ .../admin/flavors/templates/flavors/create.html    |   11 -
+ .../admin/flavors/templates/flavors/edit.html      |   11 -
+ .../admin/flavors/templates/flavors/index.html     |   11 -
+ horizon/dashboards/admin/flavors/tests.py          |   81 -
+ horizon/dashboards/admin/flavors/urls.py           |   28 -
+ horizon/dashboards/admin/flavors/views.py          |   81 -
+ horizon/dashboards/admin/images/forms.py           |   25 -
+ horizon/dashboards/admin/images/panel.py           |   32 -
+ horizon/dashboards/admin/images/tables.py          |   45 -
+ .../admin/images/templates/images/_update.html     |   25 -
+ .../admin/images/templates/images/index.html       |   11 -
+ .../admin/images/templates/images/update.html      |   12 -
+ horizon/dashboards/admin/images/tests.py           |   97 -
+ horizon/dashboards/admin/images/urls.py            |   30 -
+ horizon/dashboards/admin/images/views.py           |   66 -
+ horizon/dashboards/admin/instances/panel.py        |   33 -
+ horizon/dashboards/admin/instances/tables.py       |   99 -
+ .../admin/instances/templates/instances/index.html |   11 -
+ horizon/dashboards/admin/instances/tests.py        |  142 -
+ horizon/dashboards/admin/instances/urls.py         |   34 -
+ horizon/dashboards/admin/instances/views.py        |   81 -
+ horizon/dashboards/admin/models.py                 |   23 -
+ horizon/dashboards/admin/networks/forms.py         |   89 -
+ horizon/dashboards/admin/networks/panel.py         |   28 -
+ horizon/dashboards/admin/networks/ports/forms.py   |   92 -
+ horizon/dashboards/admin/networks/ports/tables.py  |   85 -
+ horizon/dashboards/admin/networks/ports/tabs.py    |   46 -
+ horizon/dashboards/admin/networks/ports/urls.py    |   24 -
+ horizon/dashboards/admin/networks/ports/views.py   |   98 -
+ horizon/dashboards/admin/networks/subnets/forms.py |   52 -
+ .../dashboards/admin/networks/subnets/tables.py    |   82 -
+ horizon/dashboards/admin/networks/subnets/urls.py  |   24 -
+ horizon/dashboards/admin/networks/subnets/views.py |  101 -
+ horizon/dashboards/admin/networks/tables.py        |   82 -
+ .../admin/networks/templates/networks/_create.html |   25 -
+ .../admin/networks/templates/networks/_update.html |   24 -
+ .../admin/networks/templates/networks/create.html  |   11 -
+ .../admin/networks/templates/networks/index.html   |   21 -
+ .../networks/templates/networks/ports/_create.html |   25 -
+ .../networks/templates/networks/ports/_update.html |   29 -
+ .../networks/templates/networks/ports/create.html  |   11 -
+ .../networks/templates/networks/ports/update.html  |   11 -
+ .../templates/networks/subnets/_create.html        |   25 -
+ .../templates/networks/subnets/_update.html        |   33 -
+ .../templates/networks/subnets/create.html         |   11 -
+ .../networks/templates/networks/subnets/index.html |   11 -
+ .../templates/networks/subnets/update.html         |   11 -
+ .../admin/networks/templates/networks/update.html  |   11 -
+ horizon/dashboards/admin/networks/tests.py         |  805 -----
+ horizon/dashboards/admin/networks/urls.py          |   45 -
+ horizon/dashboards/admin/networks/views.py         |  140 -
+ horizon/dashboards/admin/overview/panel.py         |   33 -
+ .../admin/overview/templates/overview/usage.csv    |    9 -
+ .../admin/overview/templates/overview/usage.html   |   22 -
+ horizon/dashboards/admin/overview/tests.py         |   95 -
+ horizon/dashboards/admin/overview/urls.py          |   28 -
+ horizon/dashboards/admin/overview/views.py         |   48 -
+ horizon/dashboards/admin/projects/forms.py         |   33 -
+ horizon/dashboards/admin/projects/panel.py         |   32 -
+ horizon/dashboards/admin/projects/tables.py        |  157 -
+ .../projects/templates/projects/_add_user.html     |   25 -
+ .../admin/projects/templates/projects/_create.html |   25 -
+ .../projects/templates/projects/_create_user.html  |   25 -
+ .../admin/projects/templates/projects/_quotas.html |   24 -
+ .../admin/projects/templates/projects/_update.html |   25 -
+ .../templates/projects/_update_members.html        |   39 -
+ .../projects/templates/projects/add_user.html      |   11 -
+ .../admin/projects/templates/projects/create.html  |   12 -
+ .../projects/templates/projects/create_user.html   |   12 -
+ .../admin/projects/templates/projects/index.html   |   13 -
+ .../admin/projects/templates/projects/quotas.html  |   11 -
+ .../admin/projects/templates/projects/update.html  |   12 -
+ .../admin/projects/templates/projects/usage.csv    |   11 -
+ .../admin/projects/templates/projects/usage.html   |   14 -
+ .../admin/projects/templates/projects/users.html   |   18 -
+ horizon/dashboards/admin/projects/tests.py         |  842 -----
+ horizon/dashboards/admin/projects/urls.py          |   37 -
+ horizon/dashboards/admin/projects/views.py         |  203 --
+ horizon/dashboards/admin/projects/workflows.py     |  364 --
+ horizon/dashboards/admin/quotas/panel.py           |   32 -
+ horizon/dashboards/admin/quotas/tables.py          |   38 -
+ .../admin/quotas/templates/quotas/index.html       |   13 -
+ horizon/dashboards/admin/quotas/urls.py            |   27 -
+ horizon/dashboards/admin/quotas/views.py           |   46 -
+ horizon/dashboards/admin/services/panel.py         |   32 -
+ horizon/dashboards/admin/services/tables.py        |   50 -
+ .../admin/services/templates/services/index.html   |   14 -
+ horizon/dashboards/admin/services/tests.py         |   36 -
+ horizon/dashboards/admin/services/urls.py          |   27 -
+ horizon/dashboards/admin/services/views.py         |   40 -
+ horizon/dashboards/admin/users/forms.py            |  195 --
+ horizon/dashboards/admin/users/panel.py            |   32 -
+ horizon/dashboards/admin/users/tables.py           |  123 -
+ .../admin/users/templates/users/_create.html       |   24 -
+ .../admin/users/templates/users/_update.html       |   24 -
+ .../admin/users/templates/users/create.html        |   12 -
+ .../admin/users/templates/users/index.html         |   13 -
+ .../admin/users/templates/users/update.html        |   12 -
+ horizon/dashboards/admin/users/tests.py            |  356 --
+ horizon/dashboards/admin/users/urls.py             |   28 -
+ horizon/dashboards/admin/users/views.py            |  111 -
+ horizon/dashboards/admin/volumes/panel.py          |   14 -
+ horizon/dashboards/admin/volumes/tables.py         |   19 -
+ .../admin/volumes/templates/volumes/detail.html    |   15 -
+ .../admin/volumes/templates/volumes/index.html     |   13 -
+ horizon/dashboards/admin/volumes/tests.py          |   39 -
+ horizon/dashboards/admin/volumes/urls.py           |    8 -
+ horizon/dashboards/admin/volumes/views.py          |   39 -
+ .../access_and_security/floating_ips/forms.py      |   46 -
+ .../access_and_security/floating_ips/tables.py     |  129 -
+ .../access_and_security/floating_ips/tests.py      |  176 -
+ .../access_and_security/floating_ips/urls.py       |   29 -
+ .../access_and_security/floating_ips/views.py      |   68 -
+ .../access_and_security/floating_ips/workflows.py  |  114 -
+ .../project/access_and_security/keypairs/forms.py  |   65 -
+ .../project/access_and_security/keypairs/tables.py |   61 -
+ .../project/access_and_security/keypairs/tests.py  |  162 -
+ .../project/access_and_security/keypairs/urls.py   |   33 -
+ .../project/access_and_security/keypairs/views.py  |   81 -
+ .../project/access_and_security/panel.py           |   29 -
+ .../access_and_security/security_groups/forms.py   |  173 -
+ .../access_and_security/security_groups/tables.py  |  108 -
+ .../access_and_security/security_groups/tests.py   |  374 --
+ .../access_and_security/security_groups/urls.py    |   30 -
+ .../access_and_security/security_groups/views.py   |  120 -
+ .../floating_ips/_allocate.html                    |   33 -
+ .../access_and_security/floating_ips/allocate.html |    7 -
+ .../floating_ips/associate.html                    |   11 -
+ .../templates/access_and_security/index.html       |   21 -
+ .../access_and_security/keypairs/_create.html      |   25 -
+ .../access_and_security/keypairs/_import.html      |   25 -
+ .../access_and_security/keypairs/create.html       |   12 -
+ .../access_and_security/keypairs/download.html     |   21 -
+ .../access_and_security/keypairs/import.html       |   12 -
+ .../security_groups/_create.html                   |   25 -
+ .../security_groups/_edit_rules.html               |   21 -
+ .../security_groups/create.html                    |   11 -
+ .../security_groups/edit_rules.html                |   11 -
+ .../project/access_and_security/tests.py           |   86 -
+ .../dashboards/project/access_and_security/urls.py |   34 -
+ .../project/access_and_security/views.py           |   83 -
+ horizon/dashboards/project/containers/browsers.py  |   37 -
+ horizon/dashboards/project/containers/forms.py     |  164 -
+ horizon/dashboards/project/containers/panel.py     |   32 -
+ horizon/dashboards/project/containers/tables.py    |  269 --
+ .../containers/templates/containers/_copy.html     |   24 -
+ .../containers/templates/containers/_create.html   |   24 -
+ .../containers/templates/containers/_upload.html   |   25 -
+ .../containers/templates/containers/copy.html      |   13 -
+ .../containers/templates/containers/create.html    |   11 -
+ .../containers/templates/containers/index.html     |   13 -
+ .../containers/templates/containers/upload.html    |   15 -
+ horizon/dashboards/project/containers/tests.py     |  237 --
+ horizon/dashboards/project/containers/urls.py      |   48 -
+ horizon/dashboards/project/containers/views.py     |  217 --
+ horizon/dashboards/project/dashboard.py            |   47 -
+ .../project/images_and_snapshots/images/forms.py   |  164 -
+ .../project/images_and_snapshots/images/panel.py   |   30 -
+ .../project/images_and_snapshots/images/tables.py  |  134 -
+ .../project/images_and_snapshots/images/tabs.py    |   44 -
+ .../project/images_and_snapshots/images/tests.py   |   96 -
+ .../project/images_and_snapshots/images/urls.py    |   32 -
+ .../project/images_and_snapshots/images/views.py   |   83 -
+ .../project/images_and_snapshots/panel.py          |   29 -
+ .../images_and_snapshots/snapshots/forms.py        |   56 -
+ .../images_and_snapshots/snapshots/panel.py        |   30 -
+ .../images_and_snapshots/snapshots/tables.py       |   59 -
+ .../images_and_snapshots/snapshots/tests.py        |   97 -
+ .../project/images_and_snapshots/snapshots/urls.py |   30 -
+ .../images_and_snapshots/snapshots/views.py        |   62 -
+ .../images_and_snapshots/images/_create.html       |   33 -
+ .../images/_detail_overview.html                   |   68 -
+ .../images_and_snapshots/images/_update.html       |   24 -
+ .../images_and_snapshots/images/create.html        |   11 -
+ .../images_and_snapshots/images/detail.html        |   16 -
+ .../images_and_snapshots/images/update.html        |   11 -
+ .../templates/images_and_snapshots/index.html      |   19 -
+ .../images_and_snapshots/snapshots/_create.html    |   25 -
+ .../snapshots/_detail_overview.html                |   42 -
+ .../images_and_snapshots/snapshots/create.html     |   11 -
+ .../images_and_snapshots/snapshots/detail.html     |   15 -
+ .../project/images_and_snapshots/tests.py          |  169 -
+ .../project/images_and_snapshots/urls.py           |   35 -
+ .../project/images_and_snapshots/views.py          |   88 -
+ .../images_and_snapshots/volume_snapshots/panel.py |   26 -
+ .../volume_snapshots/tables.py                     |   88 -
+ .../images_and_snapshots/volume_snapshots/tabs.py  |   48 -
+ .../images_and_snapshots/volume_snapshots/tests.py |   61 -
+ horizon/dashboards/project/instances/forms.py      |   50 -
+ horizon/dashboards/project/instances/panel.py      |   28 -
+ horizon/dashboards/project/instances/tables.py     |  319 --
+ horizon/dashboards/project/instances/tabs.py       |   77 -
+ .../instances/templates/instances/_detail_log.html |   17 -
+ .../templates/instances/_detail_overview.html      |   98 -
+ .../instances/templates/instances/_detail_vnc.html |   10 -
+ .../templates/instances/_instance_ips.html         |   10 -
+ .../instances/_launch_customize_help.html          |    3 -
+ .../templates/instances/_launch_details_help.html  |   53 -
+ .../templates/instances/_launch_volumes_help.html  |    3 -
+ .../instances/templates/instances/_update.html     |   24 -
+ .../instances/templates/instances/detail.html      |   15 -
+ .../instances/templates/instances/index.html       |   11 -
+ .../instances/templates/instances/launch.html      |   11 -
+ .../instances/templates/instances/update.html      |   11 -
+ horizon/dashboards/project/instances/tests.py      |  980 ------
+ horizon/dashboards/project/instances/urls.py       |   36 -
+ horizon/dashboards/project/instances/views.py      |  186 -
+ horizon/dashboards/project/instances/workflows.py  |  510 ---
+ horizon/dashboards/project/models.py               |   23 -
+ horizon/dashboards/project/networks/forms.py       |   55 -
+ horizon/dashboards/project/networks/panel.py       |   28 -
+ .../dashboards/project/networks/ports/tables.py    |   53 -
+ horizon/dashboards/project/networks/ports/tabs.py  |   46 -
+ horizon/dashboards/project/networks/ports/urls.py  |   24 -
+ horizon/dashboards/project/networks/ports/views.py |   28 -
+ .../dashboards/project/networks/subnets/forms.py   |  138 -
+ .../dashboards/project/networks/subnets/tables.py  |  105 -
+ .../dashboards/project/networks/subnets/tabs.py    |   48 -
+ .../dashboards/project/networks/subnets/urls.py    |   24 -
+ .../dashboards/project/networks/subnets/views.py   |  109 -
+ horizon/dashboards/project/networks/tables.py      |  107 -
+ .../networks/templates/networks/_create.html       |   24 -
+ .../templates/networks/_detail_overview.html       |   20 -
+ .../networks/templates/networks/_network_ips.html  |   10 -
+ .../networks/templates/networks/_update.html       |   24 -
+ .../networks/templates/networks/create.html        |   11 -
+ .../networks/templates/networks/detail.html        |   18 -
+ .../project/networks/templates/networks/index.html |   11 -
+ .../templates/networks/ports/_detail_overview.html |   41 -
+ .../templates/networks/ports/_port_ips.html        |    7 -
+ .../networks/templates/networks/ports/detail.html  |   15 -
+ .../templates/networks/subnets/_create.html        |   25 -
+ .../networks/subnets/_detail_overview.html         |   29 -
+ .../templates/networks/subnets/_update.html        |   33 -
+ .../templates/networks/subnets/create.html         |   11 -
+ .../templates/networks/subnets/detail.html         |   15 -
+ .../networks/templates/networks/subnets/index.html |   11 -
+ .../templates/networks/subnets/update.html         |   11 -
+ .../networks/templates/networks/update.html        |   11 -
+ horizon/dashboards/project/networks/tests.py       |  782 -----
+ horizon/dashboards/project/networks/urls.py        |   37 -
+ horizon/dashboards/project/networks/views.py       |  143 -
+ horizon/dashboards/project/networks/workflows.py   |  161 -
+ horizon/dashboards/project/overview/panel.py       |   32 -
+ .../project/overview/templates/overview/usage.csv  |   11 -
+ .../project/overview/templates/overview/usage.html |   13 -
+ horizon/dashboards/project/overview/tests.py       |  143 -
+ horizon/dashboards/project/overview/urls.py        |   29 -
+ horizon/dashboards/project/overview/views.py       |   37 -
+ horizon/dashboards/project/volumes/forms.py        |  219 --
+ horizon/dashboards/project/volumes/panel.py        |   29 -
+ horizon/dashboards/project/volumes/tables.py       |  226 --
+ horizon/dashboards/project/volumes/tabs.py         |   48 -
+ .../project/volumes/templates/volumes/_attach.html |   25 -
+ .../project/volumes/templates/volumes/_create.html |   57 -
+ .../templates/volumes/_create_snapshot.html        |   25 -
+ .../templates/volumes/_detail_overview.html        |   49 -
+ .../project/volumes/templates/volumes/attach.html  |   11 -
+ .../project/volumes/templates/volumes/create.html  |   11 -
+ .../volumes/templates/volumes/create_snapshot.html |   11 -
+ .../project/volumes/templates/volumes/detail.html  |   15 -
+ .../project/volumes/templates/volumes/index.html   |   11 -
+ horizon/dashboards/project/volumes/tests.py        |  328 --
+ horizon/dashboards/project/volumes/urls.py         |   35 -
+ horizon/dashboards/project/volumes/views.py        |  184 -
+ horizon/dashboards/settings/dashboard.py           |   31 -
+ horizon/dashboards/settings/ec2/forms.py           |  109 -
+ horizon/dashboards/settings/ec2/panel.py           |   28 -
+ .../settings/ec2/templates/ec2/download_form.html  |   25 -
+ .../settings/ec2/templates/ec2/ec2rc.sh.template   |   15 -
+ .../settings/ec2/templates/ec2/index.html          |   11 -
+ horizon/dashboards/settings/ec2/tests.py           |   69 -
+ horizon/dashboards/settings/ec2/urls.py            |   23 -
+ horizon/dashboards/settings/ec2/views.py           |   31 -
+ horizon/dashboards/settings/models.py              |   23 -
+ horizon/dashboards/settings/project/forms.py       |   71 -
+ horizon/dashboards/settings/project/panel.py       |   28 -
+ horizon/dashboards/settings/project/tables.py      |   33 -
+ .../project/templates/project/_openrc.html         |   32 -
+ .../project/templates/project/openrc.sh.template   |   24 -
+ .../project/templates/project/settings.html        |   11 -
+ horizon/dashboards/settings/project/urls.py        |   23 -
+ horizon/dashboards/settings/project/views.py       |   44 -
+ horizon/dashboards/settings/user/forms.py          |   59 -
+ horizon/dashboards/settings/user/panel.py          |   28 -
+ .../settings/user/templates/user/_settings.html    |   26 -
+ .../settings/user/templates/user/settings.html     |   11 -
+ horizon/dashboards/settings/user/urls.py           |   23 -
+ horizon/dashboards/settings/user/views.py          |   31 -
+ horizon/decorators.py                              |    4 +-
+ horizon/forms/__init__.py                          |    3 +-
+ horizon/forms/views.py                             |    4 +-
+ horizon/locale/bg_BG/LC_MESSAGES/django.mo         |  Bin 25231 -> 2950 bytes
+ horizon/locale/bg_BG/LC_MESSAGES/django.po         | 3454 +-----------------
+ horizon/locale/bg_BG/LC_MESSAGES/djangojs.mo       |  Bin 378 -> 378 bytes
+ horizon/locale/bg_BG/LC_MESSAGES/djangojs.po       |    2 +-
+ horizon/locale/en/LC_MESSAGES/django.mo            |  Bin 42492 -> 4746 bytes
+ horizon/locale/en/LC_MESSAGES/django.po            | 3516 +------------------
+ horizon/locale/en/LC_MESSAGES/djangojs.mo          |  Bin 378 -> 378 bytes
+ horizon/locale/en/LC_MESSAGES/djangojs.po          |    2 +-
+ horizon/locale/es/LC_MESSAGES/django.mo            |  Bin 60209 -> 5039 bytes
+ horizon/locale/es/LC_MESSAGES/django.po            | 3568 +------------------
+ horizon/locale/es/LC_MESSAGES/djangojs.mo          |  Bin 420 -> 420 bytes
+ horizon/locale/es/LC_MESSAGES/djangojs.po          |    2 +-
+ horizon/locale/fr/LC_MESSAGES/django.mo            |  Bin 414 -> 414 bytes
+ horizon/locale/fr/LC_MESSAGES/django.po            | 3421 +-----------------
+ horizon/locale/fr/LC_MESSAGES/djangojs.mo          |  Bin 419 -> 419 bytes
+ horizon/locale/fr/LC_MESSAGES/djangojs.po          |    2 +-
+ horizon/locale/it/LC_MESSAGES/django.mo            |  Bin 28544 -> 2838 bytes
+ horizon/locale/it/LC_MESSAGES/django.po            | 3477 +-----------------
+ horizon/locale/it/LC_MESSAGES/djangojs.mo          |  Bin 420 -> 420 bytes
+ horizon/locale/it/LC_MESSAGES/djangojs.po          |    2 +-
+ horizon/locale/ja/LC_MESSAGES/django.mo            |  Bin 69010 -> 6233 bytes
+ horizon/locale/ja/LC_MESSAGES/django.po            | 3555 +------------------
+ horizon/locale/ja/LC_MESSAGES/djangojs.mo          |  Bin 413 -> 413 bytes
+ horizon/locale/ja/LC_MESSAGES/djangojs.po          |    2 +-
+ horizon/locale/ko_KR/LC_MESSAGES/django.mo         |  Bin 1765 -> 731 bytes
+ horizon/locale/ko_KR/LC_MESSAGES/django.po         | 3424 +-----------------
+ horizon/locale/ko_KR/LC_MESSAGES/djangojs.mo       |  Bin 378 -> 378 bytes
+ horizon/locale/ko_KR/LC_MESSAGES/djangojs.po       |    2 +-
+ horizon/locale/nl_NL/LC_MESSAGES/django.mo         |  Bin 10792 -> 2887 bytes
+ horizon/locale/nl_NL/LC_MESSAGES/django.po         | 3430 +-----------------
+ horizon/locale/nl_NL/LC_MESSAGES/djangojs.mo       |  Bin 378 -> 378 bytes
+ horizon/locale/nl_NL/LC_MESSAGES/djangojs.po       |    2 +-
+ horizon/locale/pl/LC_MESSAGES/django.mo            |  Bin 904 -> 572 bytes
+ horizon/locale/pl/LC_MESSAGES/django.po            | 3673 +-------------------
+ horizon/locale/pl/LC_MESSAGES/djangojs.mo          |  Bin 478 -> 478 bytes
+ horizon/locale/pl/LC_MESSAGES/djangojs.po          |    2 +-
+ horizon/locale/pt/LC_MESSAGES/django.mo            |  Bin 33028 -> 4355 bytes
+ horizon/locale/pt/LC_MESSAGES/django.po            | 3490 +------------------
+ horizon/locale/pt/LC_MESSAGES/djangojs.mo          |  Bin 420 -> 420 bytes
+ horizon/locale/pt/LC_MESSAGES/djangojs.po          |    2 +-
+ horizon/locale/pt_BR/LC_MESSAGES/django.mo         |  Bin 39484 -> 4507 bytes
+ horizon/locale/pt_BR/LC_MESSAGES/django.po         | 3480 +------------------
+ horizon/locale/pt_BR/LC_MESSAGES/djangojs.mo       |  Bin 419 -> 419 bytes
+ horizon/locale/pt_BR/LC_MESSAGES/djangojs.po       |    2 +-
+ horizon/locale/ru/LC_MESSAGES/django.mo            |  Bin 585 -> 585 bytes
+ horizon/locale/ru/LC_MESSAGES/django.po            | 3421 +-----------------
+ horizon/locale/ru/LC_MESSAGES/djangojs.mo          |  Bin 494 -> 494 bytes
+ horizon/locale/ru/LC_MESSAGES/djangojs.po          |    2 +-
+ horizon/locale/zh_CN/LC_MESSAGES/django.mo         |  Bin 13474 -> 875 bytes
+ horizon/locale/zh_CN/LC_MESSAGES/django.po         | 3434 +-----------------
+ horizon/locale/zh_CN/LC_MESSAGES/djangojs.mo       |  Bin 413 -> 413 bytes
+ horizon/locale/zh_CN/LC_MESSAGES/djangojs.po       |    2 +-
+ horizon/locale/zh_TW/LC_MESSAGES/django.mo         |  Bin 50037 -> 5020 bytes
+ horizon/locale/zh_TW/LC_MESSAGES/django.po         | 3469 +-----------------
+ horizon/locale/zh_TW/LC_MESSAGES/djangojs.mo       |  Bin 413 -> 413 bytes
+ horizon/locale/zh_TW/LC_MESSAGES/djangojs.po       |    2 +-
+ horizon/management/commands/startpanel.py          |    3 +-
+ horizon/middleware.py                              |    4 +-
+ horizon/openstack/common/jsonutils.py              |  144 -
+ horizon/openstack/common/setup.py                  |  200 --
+ horizon/site_urls.py                               |    1 +
+ horizon/templates/_header.html                     |    2 -
+ horizon/templates/_stylesheets.html                |    1 +
+ horizon/test.py                                    |  363 --
+ horizon/test/helpers.py                            |  170 +
+ horizon/test/settings.py                           |  177 +
+ horizon/test/templates/_tab.html                   |    1 +
+ horizon/test/templates/tab_group.html              |    1 +
+ horizon/test/templates/workflow.html               |    1 +
+ horizon/test/test_dashboards/cats/dashboard.py     |   25 +
+ .../test/test_dashboards/cats/kittens/models.py    |    3 +
+ horizon/test/test_dashboards/cats/kittens/panel.py |   14 +
+ .../cats/kittens/templates/kittens/index.html      |   12 +
+ horizon/test/test_dashboards/cats/kittens/urls.py  |    7 +
+ horizon/test/test_dashboards/cats/kittens/views.py |   10 +
+ horizon/test/test_dashboards/cats/models.py        |    3 +
+ .../test_dashboards/cats/static/cats/css/cats.css  |    1 +
+ .../test_dashboards/cats/static/cats/js/cats.js    |    1 +
+ .../test_dashboards/cats/templates/cats/base.html  |   11 +
+ horizon/test/test_dashboards/cats/tigers/models.py |    3 +
+ horizon/test/test_dashboards/cats/tigers/panel.py  |   14 +
+ .../cats/tigers/templates/tigers/index.html        |   12 +
+ horizon/test/test_dashboards/cats/tigers/urls.py   |    7 +
+ horizon/test/test_dashboards/cats/tigers/views.py  |   10 +
+ horizon/test/test_dashboards/dogs/dashboard.py     |   13 +
+ horizon/test/test_dashboards/dogs/models.py        |    3 +
+ .../test/test_dashboards/dogs/puppies/models.py    |    3 +
+ horizon/test/test_dashboards/dogs/puppies/panel.py |   13 +
+ .../dogs/puppies/templates/puppies/index.html      |   12 +
+ horizon/test/test_dashboards/dogs/puppies/urls.py  |    7 +
+ horizon/test/test_dashboards/dogs/puppies/views.py |   10 +
+ .../test_dashboards/dogs/static/dogs/css/dogs.css  |    1 +
+ .../test_dashboards/dogs/static/dogs/js/dogs.js    |    1 +
+ .../test_dashboards/dogs/templates/dogs/base.html  |   11 +
+ horizon/test/tests/base.py                         |  289 ++
+ horizon/test/tests/messages.py                     |   41 +
+ horizon/test/tests/selenium.py                     |   31 +
+ horizon/test/tests/tables.py                       |  675 ++++
+ horizon/test/tests/tabs.py                         |  306 ++
+ horizon/test/tests/templatetags.py                 |   49 +
+ horizon/test/tests/utils.py                        |  196 ++
+ horizon/test/tests/workflows.py                    |  266 ++
+ horizon/test/urls.py                               |   40 +
+ horizon/tests/__init__.py                          |   21 -
+ horizon/tests/api_tests/base_tests.py              |  148 -
+ horizon/tests/api_tests/glance_tests.py            |   67 -
+ horizon/tests/api_tests/keystone_tests.py          |   98 -
+ horizon/tests/api_tests/nova_tests.py              |  206 --
+ horizon/tests/api_tests/quantum_tests.py           |  205 --
+ horizon/tests/api_tests/swift_tests.py             |  120 -
+ horizon/tests/base_tests.py                        |  341 --
+ horizon/tests/message_tests.py                     |   40 -
+ horizon/tests/selenium_tests.py                    |   38 -
+ horizon/tests/table_tests.py                       |  675 ----
+ horizon/tests/tabs_tests.py                        |  306 --
+ horizon/tests/templates/_tab.html                  |    1 -
+ horizon/tests/templates/tab_group.html             |    1 -
+ horizon/tests/templates/workflow.html              |    1 -
+ horizon/tests/templatetag_tests.py                 |   50 -
+ horizon/tests/test_dashboards/cats/dashboard.py    |   25 -
+ .../tests/test_dashboards/cats/kittens/models.py   |    3 -
+ .../tests/test_dashboards/cats/kittens/panel.py    |   14 -
+ .../cats/kittens/templates/kittens/index.html      |   12 -
+ .../tests/test_dashboards/cats/kittens/tests.py    |    7 -
+ horizon/tests/test_dashboards/cats/kittens/urls.py |    7 -
+ .../tests/test_dashboards/cats/kittens/views.py    |   10 -
+ horizon/tests/test_dashboards/cats/models.py       |    3 -
+ .../test_dashboards/cats/static/cats/css/cats.css  |    1 -
+ .../test_dashboards/cats/static/cats/js/cats.js    |    1 -
+ .../test_dashboards/cats/templates/cats/base.html  |   11 -
+ .../tests/test_dashboards/cats/tigers/models.py    |    3 -
+ horizon/tests/test_dashboards/cats/tigers/panel.py |   14 -
+ .../cats/tigers/templates/tigers/index.html        |   12 -
+ horizon/tests/test_dashboards/cats/tigers/tests.py |    7 -
+ horizon/tests/test_dashboards/cats/tigers/urls.py  |    7 -
+ horizon/tests/test_dashboards/cats/tigers/views.py |   10 -
+ horizon/tests/test_dashboards/dogs/dashboard.py    |   13 -
+ horizon/tests/test_dashboards/dogs/models.py       |    3 -
+ .../tests/test_dashboards/dogs/puppies/models.py   |    3 -
+ .../tests/test_dashboards/dogs/puppies/panel.py    |   13 -
+ .../dogs/puppies/templates/puppies/index.html      |   12 -
+ .../tests/test_dashboards/dogs/puppies/tests.py    |    7 -
+ horizon/tests/test_dashboards/dogs/puppies/urls.py |    7 -
+ .../tests/test_dashboards/dogs/puppies/views.py    |   10 -
+ .../test_dashboards/dogs/static/dogs/css/dogs.css  |    1 -
+ .../test_dashboards/dogs/static/dogs/js/dogs.js    |    1 -
+ .../test_dashboards/dogs/templates/dogs/base.html  |   11 -
+ horizon/tests/test_data/exceptions.py              |   67 -
+ horizon/tests/test_data/glance_data.py             |   89 -
+ horizon/tests/test_data/keystone_data.py           |  160 -
+ horizon/tests/test_data/nova_data.py               |  343 --
+ horizon/tests/test_data/quantum_data.py            |  111 -
+ horizon/tests/test_data/swift_data.py              |   39 -
+ horizon/tests/test_data/utils.py                   |  126 -
+ horizon/tests/testsettings.py                      |  197 --
+ horizon/tests/testurls.py                          |   41 -
+ horizon/tests/utils_tests.py                       |  195 --
+ horizon/tests/workflows_tests.py                   |  261 --
+ horizon/usage/__init__.py                          |   19 -
+ horizon/usage/base.py                              |  155 -
+ horizon/usage/tables.py                            |   71 -
+ horizon/usage/views.py                             |   54 -
+ horizon/views.py                                   |   53 +
+ horizon/views/__init__.py                          |   17 -
+ horizon/views/base.py                              |   72 -
+ horizon/workflows/views.py                         |    4 +-
+ openstack-common.conf                              |    4 +-
+ openstack_dashboard/api/__init__.py                |   39 +
+ openstack_dashboard/api/base.py                    |  118 +
+ openstack_dashboard/api/glance.py                  |   98 +
+ openstack_dashboard/api/keystone.py                |  291 ++
+ openstack_dashboard/api/nova.py                    |  587 ++++
+ openstack_dashboard/api/quantum.py                 |  261 ++
+ openstack_dashboard/api/swift.py                   |  265 ++
+ openstack_dashboard/context_processors.py          |   63 +
+ openstack_dashboard/dashboards/admin/dashboard.py  |   37 +
+ .../dashboards/admin/flavors/forms.py              |   96 +
+ .../dashboards/admin/flavors/panel.py              |   33 +
+ .../dashboards/admin/flavors/tables.py             |   54 +
+ .../admin/flavors/templates/flavors/_create.html   |   25 +
+ .../admin/flavors/templates/flavors/_edit.html     |   26 +
+ .../admin/flavors/templates/flavors/create.html    |   11 +
+ .../admin/flavors/templates/flavors/edit.html      |   11 +
+ .../admin/flavors/templates/flavors/index.html     |   11 +
+ .../dashboards/admin/flavors/tests.py              |   81 +
+ .../dashboards/admin/flavors/urls.py               |   29 +
+ .../dashboards/admin/flavors/views.py              |   82 +
+ .../dashboards/admin/images/forms.py               |   26 +
+ .../dashboards/admin/images/panel.py               |   33 +
+ .../dashboards/admin/images/tables.py              |   46 +
+ .../admin/images/templates/images/_update.html     |   25 +
+ .../admin/images/templates/images/index.html       |   11 +
+ .../admin/images/templates/images/update.html      |   12 +
+ .../dashboards/admin/images/tests.py               |   97 +
+ .../dashboards/admin/images/urls.py                |   30 +
+ .../dashboards/admin/images/views.py               |   68 +
+ .../dashboards/admin/instances/panel.py            |   34 +
+ .../dashboards/admin/instances/tables.py           |  100 +
+ .../admin/instances/templates/instances/index.html |   11 +
+ .../dashboards/admin/instances/tests.py            |  140 +
+ .../dashboards/admin/instances/urls.py             |   34 +
+ .../dashboards/admin/instances/views.py            |   84 +
+ openstack_dashboard/dashboards/admin/models.py     |   23 +
+ .../dashboards/admin/networks/forms.py             |   90 +
+ .../dashboards/admin/networks/panel.py             |   29 +
+ .../dashboards/admin/networks/ports/forms.py       |   93 +
+ .../dashboards/admin/networks/ports/tables.py      |   85 +
+ .../dashboards/admin/networks/ports/tabs.py        |   49 +
+ .../dashboards/admin/networks/ports/urls.py        |   28 +
+ .../dashboards/admin/networks/ports/views.py       |   99 +
+ .../dashboards/admin/networks/subnets/forms.py     |   53 +
+ .../dashboards/admin/networks/subnets/tables.py    |   83 +
+ .../dashboards/admin/networks/subnets/urls.py      |   29 +
+ .../dashboards/admin/networks/subnets/views.py     |  103 +
+ .../dashboards/admin/networks/tables.py            |   82 +
+ .../admin/networks/templates/networks/_create.html |   25 +
+ .../admin/networks/templates/networks/_update.html |   24 +
+ .../admin/networks/templates/networks/create.html  |   11 +
+ .../admin/networks/templates/networks/index.html   |   21 +
+ .../networks/templates/networks/ports/_create.html |   25 +
+ .../networks/templates/networks/ports/_update.html |   29 +
+ .../networks/templates/networks/ports/create.html  |   11 +
+ .../networks/templates/networks/ports/update.html  |   11 +
+ .../templates/networks/subnets/_create.html        |   25 +
+ .../templates/networks/subnets/_update.html        |   33 +
+ .../templates/networks/subnets/create.html         |   11 +
+ .../networks/templates/networks/subnets/index.html |   11 +
+ .../templates/networks/subnets/update.html         |   11 +
+ .../admin/networks/templates/networks/update.html  |   11 +
+ .../dashboards/admin/networks/tests.py             |  805 +++++
+ .../dashboards/admin/networks/urls.py              |   47 +
+ .../dashboards/admin/networks/views.py             |  140 +
+ .../dashboards/admin/overview/panel.py             |   34 +
+ .../admin/overview/templates/overview/usage.csv    |    9 +
+ .../admin/overview/templates/overview/usage.html   |   22 +
+ .../dashboards/admin/overview/tests.py             |   97 +
+ .../dashboards/admin/overview/urls.py              |   29 +
+ .../dashboards/admin/overview/views.py             |   48 +
+ .../dashboards/admin/projects/forms.py             |   33 +
+ .../dashboards/admin/projects/panel.py             |   33 +
+ .../dashboards/admin/projects/tables.py            |  157 +
+ .../projects/templates/projects/_add_user.html     |   25 +
+ .../admin/projects/templates/projects/_create.html |   25 +
+ .../projects/templates/projects/_create_user.html  |   25 +
+ .../admin/projects/templates/projects/_quotas.html |   24 +
+ .../admin/projects/templates/projects/_update.html |   25 +
+ .../templates/projects/_update_members.html        |   39 +
+ .../projects/templates/projects/add_user.html      |   11 +
+ .../admin/projects/templates/projects/create.html  |   12 +
+ .../projects/templates/projects/create_user.html   |   12 +
+ .../admin/projects/templates/projects/index.html   |   13 +
+ .../admin/projects/templates/projects/quotas.html  |   11 +
+ .../admin/projects/templates/projects/update.html  |   12 +
+ .../admin/projects/templates/projects/usage.csv    |   11 +
+ .../admin/projects/templates/projects/usage.html   |   14 +
+ .../admin/projects/templates/projects/users.html   |   18 +
+ .../dashboards/admin/projects/tests.py             |  842 +++++
+ .../dashboards/admin/projects/urls.py              |   37 +
+ .../dashboards/admin/projects/views.py             |  203 ++
+ .../dashboards/admin/projects/workflows.py         |  366 ++
+ .../dashboards/admin/quotas/panel.py               |   33 +
+ .../dashboards/admin/quotas/tables.py              |   38 +
+ .../admin/quotas/templates/quotas/index.html       |   13 +
+ .../dashboards/admin/quotas/tests.py               |    1 +
+ .../dashboards/admin/quotas/urls.py                |   27 +
+ .../dashboards/admin/quotas/views.py               |   47 +
+ .../dashboards/admin/services/panel.py             |   33 +
+ .../dashboards/admin/services/tables.py            |   50 +
+ .../admin/services/templates/services/index.html   |   14 +
+ .../dashboards/admin/services/tests.py             |   36 +
+ .../dashboards/admin/services/urls.py              |   27 +
+ .../dashboards/admin/services/views.py             |   41 +
+ .../dashboards/admin/users/forms.py                |  196 ++
+ .../dashboards/admin/users/panel.py                |   33 +
+ .../dashboards/admin/users/tables.py               |  124 +
+ .../admin/users/templates/users/_create.html       |   24 +
+ .../admin/users/templates/users/_update.html       |   24 +
+ .../admin/users/templates/users/create.html        |   12 +
+ .../admin/users/templates/users/index.html         |   13 +
+ .../admin/users/templates/users/update.html        |   12 +
+ .../dashboards/admin/users/tests.py                |  357 ++
+ openstack_dashboard/dashboards/admin/users/urls.py |   28 +
+ .../dashboards/admin/users/views.py                |  112 +
+ .../dashboards/admin/volumes/panel.py              |   14 +
+ .../dashboards/admin/volumes/tables.py             |   19 +
+ .../admin/volumes/templates/volumes/detail.html    |   15 +
+ .../admin/volumes/templates/volumes/index.html     |   13 +
+ .../dashboards/admin/volumes/tests.py              |   39 +
+ .../dashboards/admin/volumes/urls.py               |    8 +
+ .../dashboards/admin/volumes/views.py              |   39 +
+ .../access_and_security/floating_ips/forms.py      |   47 +
+ .../access_and_security/floating_ips/tables.py     |  130 +
+ .../access_and_security/floating_ips/tests.py      |  177 +
+ .../access_and_security/floating_ips/urls.py       |   29 +
+ .../access_and_security/floating_ips/views.py      |   69 +
+ .../access_and_security/floating_ips/workflows.py  |  115 +
+ .../project/access_and_security/keypairs/forms.py  |   66 +
+ .../project/access_and_security/keypairs/tables.py |   62 +
+ .../project/access_and_security/keypairs/tests.py  |  163 +
+ .../project/access_and_security/keypairs/urls.py   |   33 +
+ .../project/access_and_security/keypairs/views.py  |   82 +
+ .../project/access_and_security/panel.py           |   30 +
+ .../access_and_security/security_groups/forms.py   |  174 +
+ .../access_and_security/security_groups/tables.py  |  109 +
+ .../access_and_security/security_groups/tests.py   |  375 ++
+ .../access_and_security/security_groups/urls.py    |   30 +
+ .../access_and_security/security_groups/views.py   |  121 +
+ .../floating_ips/_allocate.html                    |   33 +
+ .../access_and_security/floating_ips/allocate.html |    7 +
+ .../floating_ips/associate.html                    |   11 +
+ .../templates/access_and_security/index.html       |   21 +
+ .../access_and_security/keypairs/_create.html      |   25 +
+ .../access_and_security/keypairs/_import.html      |   25 +
+ .../access_and_security/keypairs/create.html       |   12 +
+ .../access_and_security/keypairs/download.html     |   21 +
+ .../access_and_security/keypairs/import.html       |   12 +
+ .../security_groups/_create.html                   |   25 +
+ .../security_groups/_edit_rules.html               |   21 +
+ .../security_groups/create.html                    |   11 +
+ .../security_groups/edit_rules.html                |   11 +
+ .../project/access_and_security/tests.py           |   88 +
+ .../dashboards/project/access_and_security/urls.py |   35 +
+ .../project/access_and_security/views.py           |   84 +
+ .../dashboards/project/containers/browsers.py      |   33 +
+ .../dashboards/project/containers/forms.py         |  164 +
+ .../dashboards/project/containers/panel.py         |   33 +
+ .../dashboards/project/containers/tables.py        |  270 ++
+ .../containers/templates/containers/_copy.html     |   24 +
+ .../containers/templates/containers/_create.html   |   24 +
+ .../containers/templates/containers/_upload.html   |   25 +
+ .../containers/templates/containers/copy.html      |   13 +
+ .../containers/templates/containers/create.html    |   11 +
+ .../containers/templates/containers/index.html     |   13 +
+ .../containers/templates/containers/upload.html    |   15 +
+ .../dashboards/project/containers/tests.py         |  238 ++
+ .../dashboards/project/containers/urls.py          |   50 +
+ .../dashboards/project/containers/views.py         |  218 ++
+ .../dashboards/project/dashboard.py                |   47 +
+ .../project/images_and_snapshots/images/forms.py   |  165 +
+ .../project/images_and_snapshots/images/tables.py  |  135 +
+ .../project/images_and_snapshots/images/tabs.py    |   45 +
+ .../project/images_and_snapshots/images/tests.py   |   96 +
+ .../project/images_and_snapshots/images/urls.py    |   34 +
+ .../project/images_and_snapshots/images/views.py   |   84 +
+ .../project/images_and_snapshots/panel.py          |   30 +
+ .../images_and_snapshots/snapshots/forms.py        |   57 +
+ .../images_and_snapshots/snapshots/tables.py       |   60 +
+ .../images_and_snapshots/snapshots/tests.py        |   98 +
+ .../project/images_and_snapshots/snapshots/urls.py |   30 +
+ .../images_and_snapshots/snapshots/views.py        |   63 +
+ .../images_and_snapshots/images/_create.html       |   33 +
+ .../images/_detail_overview.html                   |   68 +
+ .../images_and_snapshots/images/_update.html       |   24 +
+ .../images_and_snapshots/images/create.html        |   11 +
+ .../images_and_snapshots/images/detail.html        |   16 +
+ .../images_and_snapshots/images/update.html        |   11 +
+ .../templates/images_and_snapshots/index.html      |   19 +
+ .../images_and_snapshots/snapshots/_create.html    |   25 +
+ .../snapshots/_detail_overview.html                |   42 +
+ .../images_and_snapshots/snapshots/create.html     |   11 +
+ .../images_and_snapshots/snapshots/detail.html     |   15 +
+ .../project/images_and_snapshots/tests.py          |  170 +
+ .../project/images_and_snapshots/urls.py           |   35 +
+ .../project/images_and_snapshots/views.py          |   89 +
+ .../volume_snapshots/tables.py                     |   89 +
+ .../images_and_snapshots/volume_snapshots/tabs.py  |   49 +
+ .../images_and_snapshots/volume_snapshots/tests.py |   61 +
+ .../dashboards/project/instances/forms.py          |   51 +
+ .../dashboards/project/instances/panel.py          |   29 +
+ .../dashboards/project/instances/tables.py         |  319 ++
+ .../dashboards/project/instances/tabs.py           |   78 +
+ .../instances/templates/instances/_detail_log.html |   17 +
+ .../templates/instances/_detail_overview.html      |   98 +
+ .../instances/templates/instances/_detail_vnc.html |   10 +
+ .../templates/instances/_instance_ips.html         |   10 +
+ .../instances/_launch_customize_help.html          |    3 +
+ .../templates/instances/_launch_details_help.html  |   53 +
+ .../templates/instances/_launch_volumes_help.html  |    3 +
+ .../instances/templates/instances/_update.html     |   24 +
+ .../instances/templates/instances/detail.html      |   15 +
+ .../instances/templates/instances/index.html       |   11 +
+ .../instances/templates/instances/launch.html      |   11 +
+ .../instances/templates/instances/update.html      |   11 +
+ .../dashboards/project/instances/tests.py          |  980 ++++++
+ .../dashboards/project/instances/urls.py           |   37 +
+ .../dashboards/project/instances/views.py          |  187 +
+ .../dashboards/project/instances/workflows.py      |  511 +++
+ openstack_dashboard/dashboards/project/models.py   |   23 +
+ .../dashboards/project/networks/forms.py           |   56 +
+ .../dashboards/project/networks/panel.py           |   29 +
+ .../dashboards/project/networks/ports/tables.py    |   53 +
+ .../dashboards/project/networks/ports/tabs.py      |   49 +
+ .../dashboards/project/networks/ports/urls.py      |   28 +
+ .../dashboards/project/networks/ports/views.py     |   24 +
+ .../dashboards/project/networks/subnets/forms.py   |  139 +
+ .../dashboards/project/networks/subnets/tables.py  |  106 +
+ .../dashboards/project/networks/subnets/tabs.py    |   49 +
+ .../dashboards/project/networks/subnets/urls.py    |   28 +
+ .../dashboards/project/networks/subnets/views.py   |  111 +
+ .../dashboards/project/networks/tables.py          |  108 +
+ .../networks/templates/networks/_create.html       |   24 +
+ .../templates/networks/_detail_overview.html       |   20 +
+ .../networks/templates/networks/_network_ips.html  |   10 +
+ .../networks/templates/networks/_update.html       |   24 +
+ .../networks/templates/networks/create.html        |   11 +
+ .../networks/templates/networks/detail.html        |   18 +
+ .../project/networks/templates/networks/index.html |   11 +
+ .../templates/networks/ports/_detail_overview.html |   41 +
+ .../templates/networks/ports/_port_ips.html        |    7 +
+ .../networks/templates/networks/ports/detail.html  |   15 +
+ .../templates/networks/subnets/_create.html        |   25 +
+ .../networks/subnets/_detail_overview.html         |   29 +
+ .../templates/networks/subnets/_update.html        |   33 +
+ .../templates/networks/subnets/create.html         |   11 +
+ .../templates/networks/subnets/detail.html         |   15 +
+ .../networks/templates/networks/subnets/index.html |   11 +
+ .../templates/networks/subnets/update.html         |   11 +
+ .../networks/templates/networks/update.html        |   11 +
+ .../dashboards/project/networks/tests.py           |  782 +++++
+ .../dashboards/project/networks/urls.py            |   39 +
+ .../dashboards/project/networks/views.py           |  143 +
+ .../dashboards/project/networks/workflows.py       |  162 +
+ .../dashboards/project/overview/panel.py           |   33 +
+ .../project/overview/templates/overview/usage.csv  |   11 +
+ .../project/overview/templates/overview/usage.html |   13 +
+ .../dashboards/project/overview/tests.py           |  144 +
+ .../dashboards/project/overview/urls.py            |   30 +
+ .../dashboards/project/overview/views.py           |   37 +
+ .../dashboards/project/volumes/forms.py            |  219 ++
+ .../dashboards/project/volumes/panel.py            |   30 +
+ .../dashboards/project/volumes/tables.py           |  227 ++
+ .../dashboards/project/volumes/tabs.py             |   49 +
+ .../project/volumes/templates/volumes/_attach.html |   25 +
+ .../project/volumes/templates/volumes/_create.html |   57 +
+ .../templates/volumes/_create_snapshot.html        |   25 +
+ .../templates/volumes/_detail_overview.html        |   49 +
+ .../project/volumes/templates/volumes/attach.html  |   11 +
+ .../project/volumes/templates/volumes/create.html  |   11 +
+ .../volumes/templates/volumes/create_snapshot.html |   11 +
+ .../project/volumes/templates/volumes/detail.html  |   15 +
+ .../project/volumes/templates/volumes/index.html   |   11 +
+ .../dashboards/project/volumes/tests.py            |  329 ++
+ .../dashboards/project/volumes/urls.py             |   35 +
+ .../dashboards/project/volumes/views.py            |  184 +
+ .../dashboards/settings/dashboard.py               |   31 +
+ .../dashboards/settings/ec2/forms.py               |  110 +
+ .../dashboards/settings/ec2/panel.py               |   29 +
+ .../settings/ec2/templates/ec2/download_form.html  |   25 +
+ .../settings/ec2/templates/ec2/ec2rc.sh.template   |   15 +
+ .../settings/ec2/templates/ec2/index.html          |   11 +
+ .../dashboards/settings/ec2/tests.py               |   70 +
+ .../dashboards/settings/ec2/urls.py                |   23 +
+ .../dashboards/settings/ec2/views.py               |   32 +
+ openstack_dashboard/dashboards/settings/models.py  |   23 +
+ .../dashboards/settings/project/forms.py           |   72 +
+ .../dashboards/settings/project/panel.py           |   29 +
+ .../dashboards/settings/project/tables.py          |   33 +
+ .../project/templates/project/_openrc.html         |   32 +
+ .../project/templates/project/openrc.sh.template   |   24 +
+ .../project/templates/project/settings.html        |   11 +
+ .../dashboards/settings/project/urls.py            |   23 +
+ .../dashboards/settings/project/views.py           |   44 +
+ .../dashboards/settings/user/forms.py              |   59 +
+ .../dashboards/settings/user/panel.py              |   29 +
+ .../settings/user/templates/user/_settings.html    |   26 +
+ .../settings/user/templates/user/settings.html     |   11 +
+ .../dashboards/settings/user/urls.py               |   23 +
+ .../dashboards/settings/user/views.py              |   31 +
+ .../locale/bg_BG/LC_MESSAGES/django.mo             |  Bin 1821 -> 24445 bytes
+ .../locale/bg_BG/LC_MESSAGES/django.po             | 3292 +++++++++++++++++-
+ .../locale/cs/LC_MESSAGES/django.mo                |  Bin 1588 -> 1588 bytes
+ .../locale/cs/LC_MESSAGES/django.po                | 3284 ++++++++++++++++-
+ .../locale/en/LC_MESSAGES/django.mo                |  Bin 1566 -> 36006 bytes
+ .../locale/en/LC_MESSAGES/django.po                | 3330 +++++++++++++++++-
+ .../locale/es/LC_MESSAGES/django.mo                |  Bin 1564 -> 53340 bytes
+ .../locale/es/LC_MESSAGES/django.po                | 3373 +++++++++++++++++-
+ .../locale/fr/LC_MESSAGES/django.mo                |  Bin 1577 -> 1520 bytes
+ .../locale/fr/LC_MESSAGES/django.po                | 3269 ++++++++++++++++-
+ .../locale/it/LC_MESSAGES/django.mo                |  Bin 0 -> 26275 bytes
+ .../locale/it/LC_MESSAGES/django.po                | 3347 ++++++++++++++++++
+ .../locale/ja/LC_MESSAGES/django.mo                |  Bin 1724 -> 60197 bytes
+ .../locale/ja/LC_MESSAGES/django.po                | 3361 +++++++++++++++++-
+ .../locale/ko_KR/LC_MESSAGES/django.mo             |  Bin 1634 -> 2705 bytes
+ .../locale/ko_KR/LC_MESSAGES/django.po             | 3268 ++++++++++++++++-
+ .../locale/nl_NL/LC_MESSAGES/django.mo             |  Bin 1577 -> 9678 bytes
+ .../locale/nl_NL/LC_MESSAGES/django.po             | 3264 ++++++++++++++++-
+ .../locale/pl/LC_MESSAGES/django.mo                |  Bin 478 -> 810 bytes
+ .../locale/pl/LC_MESSAGES/django.po                | 3489 ++++++++++++++++++-
+ .../locale/pt/LC_MESSAGES/django.mo                |  Bin 1549 -> 30497 bytes
+ .../locale/pt/LC_MESSAGES/django.po                | 3326 +++++++++++++++++-
+ .../locale/pt_BR/LC_MESSAGES/django.mo             |  Bin 1554 -> 36757 bytes
+ .../locale/pt_BR/LC_MESSAGES/django.po             | 3314 +++++++++++++++++-
+ .../locale/ru/LC_MESSAGES/django.mo                |  Bin 0 -> 494 bytes
+ .../locale/ru/LC_MESSAGES/django.po                | 3297 ++++++++++++++++++
+ .../locale/zh_CN/LC_MESSAGES/django.mo             |  Bin 1468 -> 14112 bytes
+ .../locale/zh_CN/LC_MESSAGES/django.po             | 3276 ++++++++++++++++-
+ .../locale/zh_TW/LC_MESSAGES/django.mo             |  Bin 1516 -> 45327 bytes
+ .../locale/zh_TW/LC_MESSAGES/django.po             | 3293 +++++++++++++++++-
+ openstack_dashboard/openstack/common/setup.py      |  200 ++
+ openstack_dashboard/settings.py                    |    9 +-
+ openstack_dashboard/templates/_header.html         |   10 +
+ openstack_dashboard/test/api_tests/base_tests.py   |  149 +
+ openstack_dashboard/test/api_tests/glance_tests.py |   67 +
+ .../test/api_tests/keystone_tests.py               |   98 +
+ openstack_dashboard/test/api_tests/nova_tests.py   |  206 ++
+ .../test/api_tests/quantum_tests.py                |  205 ++
+ openstack_dashboard/test/api_tests/swift_tests.py  |  120 +
+ openstack_dashboard/test/helpers.py                |  298 ++
+ openstack_dashboard/test/settings.py               |   79 +-
+ openstack_dashboard/test/templates/404.html        |    1 +
+ openstack_dashboard/test/templates/500.html        |    1 +
+ openstack_dashboard/test/templates/_tab.html       |    1 +
+ openstack_dashboard/test/templates/tab_group.html  |    1 +
+ openstack_dashboard/test/templates/workflow.html   |    1 +
+ openstack_dashboard/test/test_data/exceptions.py   |   67 +
+ openstack_dashboard/test/test_data/glance_data.py  |   89 +
+ .../test/test_data/keystone_data.py                |  160 +
+ openstack_dashboard/test/test_data/nova_data.py    |  343 ++
+ openstack_dashboard/test/test_data/quantum_data.py |  111 +
+ openstack_dashboard/test/test_data/swift_data.py   |   39 +
+ openstack_dashboard/test/test_data/utils.py        |  126 +
+ openstack_dashboard/test/tests/selenium.py         |   24 +
+ openstack_dashboard/urls.py                        |    5 +-
+ openstack_dashboard/usage/__init__.py              |   19 +
+ openstack_dashboard/usage/base.py                  |  156 +
+ openstack_dashboard/usage/tables.py                |   71 +
+ openstack_dashboard/usage/views.py                 |   54 +
+ openstack_dashboard/views.py                       |   38 +
+ run_tests.sh                                       |    2 +-
+ setup.py                                           |    2 +-
+ 876 files changed, 76759 insertions(+), 78266 deletions(-)
+
+commit ef1e1d9b7a1fd4140518318ead8b7174a6a434ab
+Author: Gabriel Hurley <[e-mail]>
+Date:   Fri Oct 5 12:05:08 2012 -0700
+
+    Corrects an error in the EC2 form choices.
+    
+    Fixes bug 1062490.
+    
+    Change-Id: I1b8bd0fa362c3ddb67a7d4127211adf969b8c48c
+
+ horizon/dashboards/settings/ec2/forms.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit a058bfc1d61a033c8403524d95422a394b2a4d0d
+Author: Gabriel Hurley <[e-mail]>
+Date:   Wed Oct 3 14:29:24 2012 -0700
+
+    Renames legacy dashboards.
+    
+    The "Nova" dashboard is now "Project" and the "Syspanel" dashboard
+    is now "Admin" to match the current real names of the dashboards
+    which better match their purposes.
+    
+    Implements blueprint fix-legacy-dashboard-names
+    
+    Change-Id: I702aa0d54c4e3b0ac10db46e6d6ed32803919b7b
+
+ horizon/dashboards/admin/dashboard.py              |   37 +
+ horizon/dashboards/admin/flavors/forms.py          |   95 ++
+ horizon/dashboards/admin/flavors/panel.py          |   32 +
+ horizon/dashboards/admin/flavors/tables.py         |   53 ++
+ .../admin/flavors/templates/flavors/_create.html   |   25 +
+ .../admin/flavors/templates/flavors/_edit.html     |   26 +
+ .../admin/flavors/templates/flavors/create.html    |   11 +
+ .../admin/flavors/templates/flavors/edit.html      |   11 +
+ .../admin/flavors/templates/flavors/index.html     |   11 +
+ horizon/dashboards/admin/flavors/tests.py          |   81 ++
+ horizon/dashboards/admin/flavors/urls.py           |   28 +
+ horizon/dashboards/admin/flavors/views.py          |   81 ++
+ horizon/dashboards/admin/images/forms.py           |   25 +
+ horizon/dashboards/admin/images/panel.py           |   32 +
+ horizon/dashboards/admin/images/tables.py          |   45 +
+ .../admin/images/templates/images/_update.html     |   25 +
+ .../admin/images/templates/images/index.html       |   11 +
+ .../admin/images/templates/images/update.html      |   12 +
+ horizon/dashboards/admin/images/tests.py           |   97 ++
+ horizon/dashboards/admin/images/urls.py            |   30 +
+ horizon/dashboards/admin/images/views.py           |   66 ++
+ horizon/dashboards/admin/instances/panel.py        |   33 +
+ horizon/dashboards/admin/instances/tables.py       |   99 ++
+ .../admin/instances/templates/instances/index.html |   11 +
+ horizon/dashboards/admin/instances/tests.py        |  142 +++
+ horizon/dashboards/admin/instances/urls.py         |   34 +
+ horizon/dashboards/admin/instances/views.py        |   81 ++
+ horizon/dashboards/admin/models.py                 |   23 +
+ horizon/dashboards/admin/networks/forms.py         |   89 ++
+ horizon/dashboards/admin/networks/panel.py         |   28 +
+ horizon/dashboards/admin/networks/ports/forms.py   |   92 ++
+ horizon/dashboards/admin/networks/ports/tables.py  |   85 ++
+ horizon/dashboards/admin/networks/ports/tabs.py    |   46 +
+ horizon/dashboards/admin/networks/ports/urls.py    |   24 +
+ horizon/dashboards/admin/networks/ports/views.py   |   98 ++
+ horizon/dashboards/admin/networks/subnets/forms.py |   52 ++
+ .../dashboards/admin/networks/subnets/tables.py    |   82 ++
+ horizon/dashboards/admin/networks/subnets/urls.py  |   24 +
+ horizon/dashboards/admin/networks/subnets/views.py |  101 ++
+ horizon/dashboards/admin/networks/tables.py        |   82 ++
+ .../admin/networks/templates/networks/_create.html |   25 +
+ .../admin/networks/templates/networks/_update.html |   24 +
+ .../admin/networks/templates/networks/create.html  |   11 +
+ .../admin/networks/templates/networks/index.html   |   21 +
+ .../networks/templates/networks/ports/_create.html |   25 +
+ .../networks/templates/networks/ports/_update.html |   29 +
+ .../networks/templates/networks/ports/create.html  |   11 +
+ .../networks/templates/networks/ports/update.html  |   11 +
+ .../templates/networks/subnets/_create.html        |   25 +
+ .../templates/networks/subnets/_update.html        |   33 +
+ .../templates/networks/subnets/create.html         |   11 +
+ .../networks/templates/networks/subnets/index.html |   11 +
+ .../templates/networks/subnets/update.html         |   11 +
+ .../admin/networks/templates/networks/update.html  |   11 +
+ horizon/dashboards/admin/networks/tests.py         |  805 ++++++++++++++++
+ horizon/dashboards/admin/networks/urls.py          |   45 +
+ horizon/dashboards/admin/networks/views.py         |  140 +++
+ horizon/dashboards/admin/overview/panel.py         |   33 +
+ .../admin/overview/templates/overview/usage.csv    |    9 +
+ .../admin/overview/templates/overview/usage.html   |   22 +
+ horizon/dashboards/admin/overview/tests.py         |   95 ++
+ horizon/dashboards/admin/overview/urls.py          |   28 +
+ horizon/dashboards/admin/overview/views.py         |   48 +
+ horizon/dashboards/admin/projects/forms.py         |   33 +
+ horizon/dashboards/admin/projects/panel.py         |   32 +
+ horizon/dashboards/admin/projects/tables.py        |  157 ++++
+ .../projects/templates/projects/_add_user.html     |   25 +
+ .../admin/projects/templates/projects/_create.html |   25 +
+ .../projects/templates/projects/_create_user.html  |   25 +
+ .../admin/projects/templates/projects/_quotas.html |   24 +
+ .../admin/projects/templates/projects/_update.html |   25 +
+ .../templates/projects/_update_members.html        |   39 +
+ .../projects/templates/projects/add_user.html      |   11 +
+ .../admin/projects/templates/projects/create.html  |   12 +
+ .../projects/templates/projects/create_user.html   |   12 +
+ .../admin/projects/templates/projects/index.html   |   13 +
+ .../admin/projects/templates/projects/quotas.html  |   11 +
+ .../admin/projects/templates/projects/update.html  |   12 +
+ .../admin/projects/templates/projects/usage.csv    |   11 +
+ .../admin/projects/templates/projects/usage.html   |   14 +
+ .../admin/projects/templates/projects/users.html   |   18 +
+ horizon/dashboards/admin/projects/tests.py         |  842 +++++++++++++++++
+ horizon/dashboards/admin/projects/urls.py          |   37 +
+ horizon/dashboards/admin/projects/views.py         |  203 ++++
+ horizon/dashboards/admin/projects/workflows.py     |  364 ++++++++
+ horizon/dashboards/admin/quotas/panel.py           |   32 +
+ horizon/dashboards/admin/quotas/tables.py          |   38 +
+ .../admin/quotas/templates/quotas/index.html       |   13 +
+ horizon/dashboards/admin/quotas/urls.py            |   27 +
+ horizon/dashboards/admin/quotas/views.py           |   46 +
+ horizon/dashboards/admin/services/panel.py         |   32 +
+ horizon/dashboards/admin/services/tables.py        |   50 +
+ .../admin/services/templates/services/index.html   |   14 +
+ horizon/dashboards/admin/services/tests.py         |   36 +
+ horizon/dashboards/admin/services/urls.py          |   27 +
+ horizon/dashboards/admin/services/views.py         |   40 +
+ horizon/dashboards/admin/users/forms.py            |  195 ++++
+ horizon/dashboards/admin/users/panel.py            |   32 +
+ horizon/dashboards/admin/users/tables.py           |  123 +++
+ .../admin/users/templates/users/_create.html       |   24 +
+ .../admin/users/templates/users/_update.html       |   24 +
+ .../admin/users/templates/users/create.html        |   12 +
+ .../admin/users/templates/users/index.html         |   13 +
+ .../admin/users/templates/users/update.html        |   12 +
+ horizon/dashboards/admin/users/tests.py            |  356 +++++++
+ horizon/dashboards/admin/users/urls.py             |   28 +
+ horizon/dashboards/admin/users/views.py            |  111 +++
+ horizon/dashboards/admin/volumes/panel.py          |   14 +
+ horizon/dashboards/admin/volumes/tables.py         |   19 +
+ .../admin/volumes/templates/volumes/detail.html    |   15 +
+ .../admin/volumes/templates/volumes/index.html     |   13 +
+ horizon/dashboards/admin/volumes/tests.py          |   39 +
+ horizon/dashboards/admin/volumes/urls.py           |    8 +
+ horizon/dashboards/admin/volumes/views.py          |   39 +
+ .../nova/access_and_security/floating_ips/forms.py |   46 -
+ .../access_and_security/floating_ips/tables.py     |  129 ---
+ .../nova/access_and_security/floating_ips/tests.py |  176 ----
+ .../nova/access_and_security/floating_ips/urls.py  |   29 -
+ .../nova/access_and_security/floating_ips/views.py |   68 --
+ .../access_and_security/floating_ips/workflows.py  |  114 ---
+ .../nova/access_and_security/keypairs/forms.py     |   66 --
+ .../nova/access_and_security/keypairs/tables.py    |   61 --
+ .../nova/access_and_security/keypairs/tests.py     |  162 ----
+ .../nova/access_and_security/keypairs/urls.py      |   33 -
+ .../nova/access_and_security/keypairs/views.py     |   81 --
+ .../dashboards/nova/access_and_security/panel.py   |   29 -
+ .../access_and_security/security_groups/forms.py   |  173 ----
+ .../access_and_security/security_groups/tables.py  |  108 ---
+ .../access_and_security/security_groups/tests.py   |  374 --------
+ .../access_and_security/security_groups/urls.py    |   30 -
+ .../access_and_security/security_groups/views.py   |  119 ---
+ .../floating_ips/_allocate.html                    |   33 -
+ .../access_and_security/floating_ips/allocate.html |    7 -
+ .../floating_ips/associate.html                    |   11 -
+ .../templates/access_and_security/index.html       |   21 -
+ .../access_and_security/keypairs/_create.html      |   25 -
+ .../access_and_security/keypairs/_import.html      |   25 -
+ .../access_and_security/keypairs/create.html       |   12 -
+ .../access_and_security/keypairs/download.html     |   21 -
+ .../access_and_security/keypairs/import.html       |   12 -
+ .../security_groups/_create.html                   |   25 -
+ .../security_groups/_edit_rules.html               |   21 -
+ .../security_groups/create.html                    |   11 -
+ .../security_groups/edit_rules.html                |   11 -
+ .../dashboards/nova/access_and_security/tests.py   |   86 --
+ .../dashboards/nova/access_and_security/urls.py    |   34 -
+ .../dashboards/nova/access_and_security/views.py   |   83 --
+ horizon/dashboards/nova/containers/browsers.py     |   37 -
+ horizon/dashboards/nova/containers/forms.py        |  164 ----
+ horizon/dashboards/nova/containers/panel.py        |   32 -
+ horizon/dashboards/nova/containers/tables.py       |  269 ------
+ .../containers/templates/containers/_copy.html     |   24 -
+ .../containers/templates/containers/_create.html   |   24 -
+ .../containers/templates/containers/_upload.html   |   25 -
+ .../nova/containers/templates/containers/copy.html |   13 -
+ .../containers/templates/containers/create.html    |   11 -
+ .../containers/templates/containers/index.html     |   13 -
+ .../containers/templates/containers/upload.html    |   15 -
+ horizon/dashboards/nova/containers/tests.py        |  237 -----
+ horizon/dashboards/nova/containers/urls.py         |   48 -
+ horizon/dashboards/nova/containers/views.py        |  217 -----
+ horizon/dashboards/nova/dashboard.py               |   47 -
+ .../nova/images_and_snapshots/images/forms.py      |  164 ----
+ .../nova/images_and_snapshots/images/panel.py      |   30 -
+ .../nova/images_and_snapshots/images/tables.py     |  134 ---
+ .../nova/images_and_snapshots/images/tabs.py       |   44 -
+ .../nova/images_and_snapshots/images/tests.py      |   96 --
+ .../nova/images_and_snapshots/images/urls.py       |   32 -
+ .../nova/images_and_snapshots/images/views.py      |   83 --
+ .../dashboards/nova/images_and_snapshots/panel.py  |   29 -
+ .../nova/images_and_snapshots/snapshots/forms.py   |   56 --
+ .../nova/images_and_snapshots/snapshots/panel.py   |   30 -
+ .../nova/images_and_snapshots/snapshots/tables.py  |   59 --
+ .../nova/images_and_snapshots/snapshots/tests.py   |   97 --
+ .../nova/images_and_snapshots/snapshots/urls.py    |   30 -
+ .../nova/images_and_snapshots/snapshots/views.py   |   62 --
+ .../images_and_snapshots/images/_create.html       |   33 -
+ .../images/_detail_overview.html                   |   68 --
+ .../images_and_snapshots/images/_update.html       |   24 -
+ .../images_and_snapshots/images/create.html        |   11 -
+ .../images_and_snapshots/images/detail.html        |   16 -
+ .../images_and_snapshots/images/update.html        |   11 -
+ .../templates/images_and_snapshots/index.html      |   19 -
+ .../images_and_snapshots/snapshots/_create.html    |   25 -
+ .../snapshots/_detail_overview.html                |   42 -
+ .../images_and_snapshots/snapshots/create.html     |   11 -
+ .../images_and_snapshots/snapshots/detail.html     |   15 -
+ .../dashboards/nova/images_and_snapshots/tests.py  |  169 ----
+ .../dashboards/nova/images_and_snapshots/urls.py   |   35 -
+ .../dashboards/nova/images_and_snapshots/views.py  |   88 --
+ .../images_and_snapshots/volume_snapshots/panel.py |   26 -
+ .../volume_snapshots/tables.py                     |   88 --
+ .../images_and_snapshots/volume_snapshots/tabs.py  |   48 -
+ .../images_and_snapshots/volume_snapshots/tests.py |   59 --
+ horizon/dashboards/nova/instances/forms.py         |   50 -
+ horizon/dashboards/nova/instances/panel.py         |   28 -
+ horizon/dashboards/nova/instances/tables.py        |  319 -------
+ horizon/dashboards/nova/instances/tabs.py          |   77 --
+ .../instances/templates/instances/_detail_log.html |   17 -
+ .../templates/instances/_detail_overview.html      |   98 --
+ .../instances/templates/instances/_detail_vnc.html |   10 -
+ .../templates/instances/_instance_ips.html         |   10 -
+ .../instances/_launch_customize_help.html          |    3 -
+ .../templates/instances/_launch_details_help.html  |   53 --
+ .../templates/instances/_launch_volumes_help.html  |    3 -
+ .../instances/templates/instances/_update.html     |   24 -
+ .../nova/instances/templates/instances/detail.html |   15 -
+ .../nova/instances/templates/instances/index.html  |   11 -
+ .../nova/instances/templates/instances/launch.html |   11 -
+ .../nova/instances/templates/instances/update.html |   11 -
+ horizon/dashboards/nova/instances/tests.py         |  982 --------------------
+ horizon/dashboards/nova/instances/urls.py          |   36 -
+ horizon/dashboards/nova/instances/views.py         |  186 ----
+ horizon/dashboards/nova/instances/workflows.py     |  510 ----------
+ horizon/dashboards/nova/models.py                  |   23 -
+ horizon/dashboards/nova/networks/forms.py          |   55 --
+ horizon/dashboards/nova/networks/panel.py          |   28 -
+ horizon/dashboards/nova/networks/ports/tables.py   |   53 --
+ horizon/dashboards/nova/networks/ports/tabs.py     |   46 -
+ horizon/dashboards/nova/networks/ports/urls.py     |   24 -
+ horizon/dashboards/nova/networks/ports/views.py    |   28 -
+ horizon/dashboards/nova/networks/subnets/forms.py  |  138 ---
+ horizon/dashboards/nova/networks/subnets/tables.py |  105 ---
+ horizon/dashboards/nova/networks/subnets/tabs.py   |   48 -
+ horizon/dashboards/nova/networks/subnets/urls.py   |   24 -
+ horizon/dashboards/nova/networks/subnets/views.py  |  109 ---
+ horizon/dashboards/nova/networks/tables.py         |  107 ---
+ .../nova/networks/templates/networks/_create.html  |   24 -
+ .../templates/networks/_detail_overview.html       |   20 -
+ .../networks/templates/networks/_network_ips.html  |   10 -
+ .../nova/networks/templates/networks/_update.html  |   24 -
+ .../nova/networks/templates/networks/create.html   |   11 -
+ .../nova/networks/templates/networks/detail.html   |   18 -
+ .../nova/networks/templates/networks/index.html    |   11 -
+ .../templates/networks/ports/_detail_overview.html |   41 -
+ .../templates/networks/ports/_port_ips.html        |    7 -
+ .../networks/templates/networks/ports/detail.html  |   15 -
+ .../templates/networks/subnets/_create.html        |   25 -
+ .../networks/subnets/_detail_overview.html         |   29 -
+ .../templates/networks/subnets/_update.html        |   33 -
+ .../templates/networks/subnets/create.html         |   11 -
+ .../templates/networks/subnets/detail.html         |   15 -
+ .../networks/templates/networks/subnets/index.html |   11 -
+ .../templates/networks/subnets/update.html         |   11 -
+ .../nova/networks/templates/networks/update.html   |   11 -
+ horizon/dashboards/nova/networks/tests.py          |  783 ----------------
+ horizon/dashboards/nova/networks/urls.py           |   37 -
+ horizon/dashboards/nova/networks/views.py          |  143 ---
+ horizon/dashboards/nova/networks/workflows.py      |  161 ----
+ horizon/dashboards/nova/overview/panel.py          |   32 -
+ .../nova/overview/templates/overview/usage.csv     |   11 -
+ .../nova/overview/templates/overview/usage.html    |   13 -
+ horizon/dashboards/nova/overview/tests.py          |  143 ---
+ horizon/dashboards/nova/overview/urls.py           |   29 -
+ horizon/dashboards/nova/overview/views.py          |   37 -
+ .../dashboards/nova/templates/nova/_warning.html   |   32 -
+ horizon/dashboards/nova/volumes/forms.py           |  219 -----
+ horizon/dashboards/nova/volumes/panel.py           |   29 -
+ horizon/dashboards/nova/volumes/tables.py          |  226 -----
+ horizon/dashboards/nova/volumes/tabs.py            |   48 -
+ .../nova/volumes/templates/volumes/_attach.html    |   25 -
+ .../nova/volumes/templates/volumes/_create.html    |   57 --
+ .../templates/volumes/_create_snapshot.html        |   25 -
+ .../templates/volumes/_detail_overview.html        |   49 -
+ .../nova/volumes/templates/volumes/attach.html     |   11 -
+ .../nova/volumes/templates/volumes/create.html     |   11 -
+ .../volumes/templates/volumes/create_snapshot.html |   11 -
+ .../nova/volumes/templates/volumes/detail.html     |   15 -
+ .../nova/volumes/templates/volumes/index.html      |   11 -
+ horizon/dashboards/nova/volumes/tests.py           |  328 -------
+ horizon/dashboards/nova/volumes/urls.py            |   35 -
+ horizon/dashboards/nova/volumes/views.py           |  184 ----
+ .../access_and_security/floating_ips/forms.py      |   46 +
+ .../access_and_security/floating_ips/tables.py     |  129 +++
+ .../access_and_security/floating_ips/tests.py      |  176 ++++
+ .../access_and_security/floating_ips/urls.py       |   29 +
+ .../access_and_security/floating_ips/views.py      |   68 ++
+ .../access_and_security/floating_ips/workflows.py  |  114 +++
+ .../project/access_and_security/keypairs/forms.py  |   65 ++
+ .../project/access_and_security/keypairs/tables.py |   61 ++
+ .../project/access_and_security/keypairs/tests.py  |  162 ++++
+ .../project/access_and_security/keypairs/urls.py   |   33 +
+ .../project/access_and_security/keypairs/views.py  |   81 ++
+ .../project/access_and_security/panel.py           |   29 +
+ .../access_and_security/security_groups/forms.py   |  173 ++++
+ .../access_and_security/security_groups/tables.py  |  108 +++
+ .../access_and_security/security_groups/tests.py   |  374 ++++++++
+ .../access_and_security/security_groups/urls.py    |   30 +
+ .../access_and_security/security_groups/views.py   |  120 +++
+ .../floating_ips/_allocate.html                    |   33 +
+ .../access_and_security/floating_ips/allocate.html |    7 +
+ .../floating_ips/associate.html                    |   11 +
+ .../templates/access_and_security/index.html       |   21 +
+ .../access_and_security/keypairs/_create.html      |   25 +
+ .../access_and_security/keypairs/_import.html      |   25 +
+ .../access_and_security/keypairs/create.html       |   12 +
+ .../access_and_security/keypairs/download.html     |   21 +
+ .../access_and_security/keypairs/import.html       |   12 +
+ .../security_groups/_create.html                   |   25 +
+ .../security_groups/_edit_rules.html               |   21 +
+ .../security_groups/create.html                    |   11 +
+ .../security_groups/edit_rules.html                |   11 +
+ .../project/access_and_security/tests.py           |   86 ++
+ .../dashboards/project/access_and_security/urls.py |   34 +
+ .../project/access_and_security/views.py           |   83 ++
+ horizon/dashboards/project/containers/browsers.py  |   37 +
+ horizon/dashboards/project/containers/forms.py     |  164 ++++
+ horizon/dashboards/project/containers/panel.py     |   32 +
+ horizon/dashboards/project/containers/tables.py    |  269 ++++++
+ .../containers/templates/containers/_copy.html     |   24 +
+ .../containers/templates/containers/_create.html   |   24 +
+ .../containers/templates/containers/_upload.html   |   25 +
+ .../containers/templates/containers/copy.html      |   13 +
+ .../containers/templates/containers/create.html    |   11 +
+ .../containers/templates/containers/index.html     |   13 +
+ .../containers/templates/containers/upload.html    |   15 +
+ horizon/dashboards/project/containers/tests.py     |  237 +++++
+ horizon/dashboards/project/containers/urls.py      |   48 +
+ horizon/dashboards/project/containers/views.py     |  217 +++++
+ horizon/dashboards/project/dashboard.py            |   47 +
+ .../project/images_and_snapshots/images/forms.py   |  164 ++++
+ .../project/images_and_snapshots/images/panel.py   |   30 +
+ .../project/images_and_snapshots/images/tables.py  |  134 +++
+ .../project/images_and_snapshots/images/tabs.py    |   44 +
+ .../project/images_and_snapshots/images/tests.py   |   96 ++
+ .../project/images_and_snapshots/images/urls.py    |   32 +
+ .../project/images_and_snapshots/images/views.py   |   83 ++
+ .../project/images_and_snapshots/panel.py          |   29 +
+ .../images_and_snapshots/snapshots/forms.py        |   56 ++
+ .../images_and_snapshots/snapshots/panel.py        |   30 +
+ .../images_and_snapshots/snapshots/tables.py       |   59 ++
+ .../images_and_snapshots/snapshots/tests.py        |   97 ++
+ .../project/images_and_snapshots/snapshots/urls.py |   30 +
+ .../images_and_snapshots/snapshots/views.py        |   62 ++
+ .../images_and_snapshots/images/_create.html       |   33 +
+ .../images/_detail_overview.html                   |   68 ++
+ .../images_and_snapshots/images/_update.html       |   24 +
+ .../images_and_snapshots/images/create.html        |   11 +
+ .../images_and_snapshots/images/detail.html        |   16 +
+ .../images_and_snapshots/images/update.html        |   11 +
+ .../templates/images_and_snapshots/index.html      |   19 +
+ .../images_and_snapshots/snapshots/_create.html    |   25 +
+ .../snapshots/_detail_overview.html                |   42 +
+ .../images_and_snapshots/snapshots/create.html     |   11 +
+ .../images_and_snapshots/snapshots/detail.html     |   15 +
+ .../project/images_and_snapshots/tests.py          |  169 ++++
+ .../project/images_and_snapshots/urls.py           |   35 +
+ .../project/images_and_snapshots/views.py          |   88 ++
+ .../images_and_snapshots/volume_snapshots/panel.py |   26 +
+ .../volume_snapshots/tables.py                     |   88 ++
+ .../images_and_snapshots/volume_snapshots/tabs.py  |   48 +
+ .../images_and_snapshots/volume_snapshots/tests.py |   61 ++
+ horizon/dashboards/project/instances/forms.py      |   50 +
+ horizon/dashboards/project/instances/panel.py      |   28 +
+ horizon/dashboards/project/instances/tables.py     |  319 +++++++
+ horizon/dashboards/project/instances/tabs.py       |   77 ++
+ .../instances/templates/instances/_detail_log.html |   17 +
+ .../templates/instances/_detail_overview.html      |   98 ++
+ .../instances/templates/instances/_detail_vnc.html |   10 +
+ .../templates/instances/_instance_ips.html         |   10 +
+ .../instances/_launch_customize_help.html          |    3 +
+ .../templates/instances/_launch_details_help.html  |   53 ++
+ .../templates/instances/_launch_volumes_help.html  |    3 +
+ .../instances/templates/instances/_update.html     |   24 +
+ .../instances/templates/instances/detail.html      |   15 +
+ .../instances/templates/instances/index.html       |   11 +
+ .../instances/templates/instances/launch.html      |   11 +
+ .../instances/templates/instances/update.html      |   11 +
+ horizon/dashboards/project/instances/tests.py      |  980 +++++++++++++++++++
+ horizon/dashboards/project/instances/urls.py       |   36 +
+ horizon/dashboards/project/instances/views.py      |  186 ++++
+ horizon/dashboards/project/instances/workflows.py  |  510 ++++++++++
+ horizon/dashboards/project/models.py               |   23 +
+ horizon/dashboards/project/networks/forms.py       |   55 ++
+ horizon/dashboards/project/networks/panel.py       |   28 +
+ .../dashboards/project/networks/ports/tables.py    |   53 ++
+ horizon/dashboards/project/networks/ports/tabs.py  |   46 +
+ horizon/dashboards/project/networks/ports/urls.py  |   24 +
+ horizon/dashboards/project/networks/ports/views.py |   28 +
+ .../dashboards/project/networks/subnets/forms.py   |  138 +++
+ .../dashboards/project/networks/subnets/tables.py  |  105 +++
+ .../dashboards/project/networks/subnets/tabs.py    |   48 +
+ .../dashboards/project/networks/subnets/urls.py    |   24 +
+ .../dashboards/project/networks/subnets/views.py   |  109 +++
+ horizon/dashboards/project/networks/tables.py      |  107 +++
+ .../networks/templates/networks/_create.html       |   24 +
+ .../templates/networks/_detail_overview.html       |   20 +
+ .../networks/templates/networks/_network_ips.html  |   10 +
+ .../networks/templates/networks/_update.html       |   24 +
+ .../networks/templates/networks/create.html        |   11 +
+ .../networks/templates/networks/detail.html        |   18 +
+ .../project/networks/templates/networks/index.html |   11 +
+ .../templates/networks/ports/_detail_overview.html |   41 +
+ .../templates/networks/ports/_port_ips.html        |    7 +
+ .../networks/templates/networks/ports/detail.html  |   15 +
+ .../templates/networks/subnets/_create.html        |   25 +
+ .../networks/subnets/_detail_overview.html         |   29 +
+ .../templates/networks/subnets/_update.html        |   33 +
+ .../templates/networks/subnets/create.html         |   11 +
+ .../templates/networks/subnets/detail.html         |   15 +
+ .../networks/templates/networks/subnets/index.html |   11 +
+ .../templates/networks/subnets/update.html         |   11 +
+ .../networks/templates/networks/update.html        |   11 +
+ horizon/dashboards/project/networks/tests.py       |  782 ++++++++++++++++
+ horizon/dashboards/project/networks/urls.py        |   37 +
+ horizon/dashboards/project/networks/views.py       |  143 +++
+ horizon/dashboards/project/networks/workflows.py   |  161 ++++
+ horizon/dashboards/project/overview/panel.py       |   32 +
+ .../project/overview/templates/overview/usage.csv  |   11 +
+ .../project/overview/templates/overview/usage.html |   13 +
+ horizon/dashboards/project/overview/tests.py       |  143 +++
+ horizon/dashboards/project/overview/urls.py        |   29 +
+ horizon/dashboards/project/overview/views.py       |   37 +
+ horizon/dashboards/project/volumes/forms.py        |  219 +++++
+ horizon/dashboards/project/volumes/panel.py        |   29 +
+ horizon/dashboards/project/volumes/tables.py       |  226 +++++
+ horizon/dashboards/project/volumes/tabs.py         |   48 +
+ .../project/volumes/templates/volumes/_attach.html |   25 +
+ .../project/volumes/templates/volumes/_create.html |   57 ++
+ .../templates/volumes/_create_snapshot.html        |   25 +
+ .../templates/volumes/_detail_overview.html        |   49 +
+ .../project/volumes/templates/volumes/attach.html  |   11 +
+ .../project/volumes/templates/volumes/create.html  |   11 +
+ .../volumes/templates/volumes/create_snapshot.html |   11 +
+ .../project/volumes/templates/volumes/detail.html  |   15 +
+ .../project/volumes/templates/volumes/index.html   |   11 +
+ horizon/dashboards/project/volumes/tests.py        |  328 +++++++
+ horizon/dashboards/project/volumes/urls.py         |   35 +
+ horizon/dashboards/project/volumes/views.py        |  184 ++++
+ horizon/dashboards/syspanel/dashboard.py           |   37 -
+ horizon/dashboards/syspanel/flavors/forms.py       |   95 --
+ horizon/dashboards/syspanel/flavors/panel.py       |   32 -
+ horizon/dashboards/syspanel/flavors/tables.py      |   53 --
+ .../flavors/templates/flavors/_create.html         |   25 -
+ .../syspanel/flavors/templates/flavors/_edit.html  |   26 -
+ .../syspanel/flavors/templates/flavors/create.html |   11 -
+ .../syspanel/flavors/templates/flavors/edit.html   |   11 -
+ .../syspanel/flavors/templates/flavors/index.html  |   11 -
+ horizon/dashboards/syspanel/flavors/tests.py       |   81 --
+ horizon/dashboards/syspanel/flavors/urls.py        |   28 -
+ horizon/dashboards/syspanel/flavors/views.py       |   81 --
+ horizon/dashboards/syspanel/images/forms.py        |   25 -
+ horizon/dashboards/syspanel/images/panel.py        |   32 -
+ horizon/dashboards/syspanel/images/tables.py       |   45 -
+ .../syspanel/images/templates/images/_update.html  |   25 -
+ .../syspanel/images/templates/images/index.html    |   11 -
+ .../syspanel/images/templates/images/update.html   |   12 -
+ horizon/dashboards/syspanel/images/tests.py        |   97 --
+ horizon/dashboards/syspanel/images/urls.py         |   30 -
+ horizon/dashboards/syspanel/images/views.py        |   66 --
+ horizon/dashboards/syspanel/instances/panel.py     |   33 -
+ horizon/dashboards/syspanel/instances/tables.py    |   99 --
+ .../instances/templates/instances/index.html       |   11 -
+ horizon/dashboards/syspanel/instances/tests.py     |  142 ---
+ horizon/dashboards/syspanel/instances/urls.py      |   34 -
+ horizon/dashboards/syspanel/instances/views.py     |   81 --
+ horizon/dashboards/syspanel/models.py              |   23 -
+ horizon/dashboards/syspanel/networks/forms.py      |   89 --
+ horizon/dashboards/syspanel/networks/panel.py      |   28 -
+ .../dashboards/syspanel/networks/ports/forms.py    |   92 --
+ .../dashboards/syspanel/networks/ports/tables.py   |   85 --
+ horizon/dashboards/syspanel/networks/ports/tabs.py |   46 -
+ horizon/dashboards/syspanel/networks/ports/urls.py |   24 -
+ .../dashboards/syspanel/networks/ports/views.py    |   98 --
+ .../dashboards/syspanel/networks/subnets/forms.py  |   52 --
+ .../dashboards/syspanel/networks/subnets/tables.py |   82 --
+ .../dashboards/syspanel/networks/subnets/urls.py   |   24 -
+ .../dashboards/syspanel/networks/subnets/views.py  |  101 --
+ horizon/dashboards/syspanel/networks/tables.py     |   82 --
+ .../networks/templates/networks/_create.html       |   25 -
+ .../networks/templates/networks/_update.html       |   24 -
+ .../networks/templates/networks/create.html        |   11 -
+ .../networks/templates/networks/index.html         |   21 -
+ .../networks/templates/networks/ports/_create.html |   25 -
+ .../networks/templates/networks/ports/_update.html |   29 -
+ .../networks/templates/networks/ports/create.html  |   11 -
+ .../networks/templates/networks/ports/update.html  |   11 -
+ .../templates/networks/subnets/_create.html        |   25 -
+ .../templates/networks/subnets/_update.html        |   33 -
+ .../templates/networks/subnets/create.html         |   11 -
+ .../networks/templates/networks/subnets/index.html |   11 -
+ .../templates/networks/subnets/update.html         |   11 -
+ .../networks/templates/networks/update.html        |   11 -
+ horizon/dashboards/syspanel/networks/tests.py      |  805 ----------------
+ horizon/dashboards/syspanel/networks/urls.py       |   45 -
+ horizon/dashboards/syspanel/networks/views.py      |  140 ---
+ horizon/dashboards/syspanel/overview/panel.py      |   33 -
+ .../syspanel/overview/templates/overview/usage.csv |    9 -
+ .../overview/templates/overview/usage.html         |   22 -
+ horizon/dashboards/syspanel/overview/tests.py      |   95 --
+ horizon/dashboards/syspanel/overview/urls.py       |   28 -
+ horizon/dashboards/syspanel/overview/views.py      |   48 -
+ horizon/dashboards/syspanel/projects/forms.py      |   33 -
+ horizon/dashboards/syspanel/projects/panel.py      |   32 -
+ horizon/dashboards/syspanel/projects/tables.py     |  157 ----
+ .../projects/templates/projects/_add_user.html     |   25 -
+ .../projects/templates/projects/_create.html       |   25 -
+ .../projects/templates/projects/_create_user.html  |   25 -
+ .../projects/templates/projects/_quotas.html       |   24 -
+ .../projects/templates/projects/_update.html       |   25 -
+ .../templates/projects/_update_members.html        |   39 -
+ .../projects/templates/projects/add_user.html      |   11 -
+ .../projects/templates/projects/create.html        |   12 -
+ .../projects/templates/projects/create_user.html   |   12 -
+ .../projects/templates/projects/index.html         |   13 -
+ .../projects/templates/projects/quotas.html        |   11 -
+ .../projects/templates/projects/update.html        |   12 -
+ .../syspanel/projects/templates/projects/usage.csv |   11 -
+ .../projects/templates/projects/usage.html         |   14 -
+ .../projects/templates/projects/users.html         |   18 -
+ horizon/dashboards/syspanel/projects/tests.py      |  842 -----------------
+ horizon/dashboards/syspanel/projects/urls.py       |   37 -
+ horizon/dashboards/syspanel/projects/views.py      |  203 ----
+ horizon/dashboards/syspanel/projects/workflows.py  |  364 --------
+ horizon/dashboards/syspanel/quotas/panel.py        |   32 -
+ horizon/dashboards/syspanel/quotas/tables.py       |   38 -
+ .../syspanel/quotas/templates/quotas/index.html    |   13 -
+ horizon/dashboards/syspanel/quotas/urls.py         |   27 -
+ horizon/dashboards/syspanel/quotas/views.py        |   46 -
+ horizon/dashboards/syspanel/services/panel.py      |   32 -
+ horizon/dashboards/syspanel/services/tables.py     |   50 -
+ .../services/templates/services/index.html         |   14 -
+ horizon/dashboards/syspanel/services/tests.py      |   36 -
+ horizon/dashboards/syspanel/services/urls.py       |   27 -
+ horizon/dashboards/syspanel/services/views.py      |   40 -
+ horizon/dashboards/syspanel/users/forms.py         |  195 ----
+ horizon/dashboards/syspanel/users/panel.py         |   32 -
+ horizon/dashboards/syspanel/users/tables.py        |  123 ---
+ .../syspanel/users/templates/users/_create.html    |   24 -
+ .../syspanel/users/templates/users/_update.html    |   24 -
+ .../syspanel/users/templates/users/create.html     |   12 -
+ .../syspanel/users/templates/users/index.html      |   13 -
+ .../syspanel/users/templates/users/update.html     |   12 -
+ horizon/dashboards/syspanel/users/tests.py         |  356 -------
+ horizon/dashboards/syspanel/users/urls.py          |   28 -
+ horizon/dashboards/syspanel/users/views.py         |  111 ---
+ horizon/dashboards/syspanel/volumes/panel.py       |   14 -
+ horizon/dashboards/syspanel/volumes/tables.py      |   19 -
+ .../syspanel/volumes/templates/volumes/detail.html |   15 -
+ .../syspanel/volumes/templates/volumes/index.html  |   13 -
+ horizon/dashboards/syspanel/volumes/tests.py       |   39 -
+ horizon/dashboards/syspanel/volumes/urls.py        |    8 -
+ horizon/dashboards/syspanel/volumes/views.py       |   39 -
+ horizon/templates/base.html                        |   12 -
+ horizon/tests/base_tests.py                        |   12 +-
+ horizon/tests/testsettings.py                      |    8 +-
+ horizon/views/base.py                              |    4 +-
+ openstack_dashboard/settings.py                    |    8 +-
+ 548 files changed, 18324 insertions(+), 18369 deletions(-)
+
+commit b8c2634f658cbfb67703fa9e78e794110a25ef4e
+Merge: afd29ac 175efb4
+Author: Jenkins <[e-mail]>
+Date:   Wed Sep 19 08:28:16 2012 +0000
+
+    Merge "Final translations for Folsom."
+
+commit 175efb4f735a181b60d5ed18d72b5e37b139c14b
 Author: Gabriel Hurley <[e-mail]>
 Date:   Tue Sep 18 15:26:19 2012 -0700
 
@@ -119,28 +2553,39 @@
  run_tests.sh                                       |   20 +
  85 files changed, 30425 insertions(+), 6818 deletions(-)
 
-commit a925885d794594d218e0112f2d6c28d28ca41ef5
+commit afd29ac41c36d66b97f0809b699e51fe788947e0
+Author: Gabriel Hurley <[e-mail]>
+Date:   Tue Sep 18 14:17:51 2012 -0700
+
+    Fixes error when clicking OpenStack logo.
+    
+    Fixes bug 1052677.
+    
+    Change-Id: I796f23c4e9c5439b7263957cb4ec1b8fa864f398
+
+ openstack_dashboard/settings.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 6a57296d652e90aff105fea4b0d224ee0b2d1dc1
 Author: Brian Waldon <[e-mail]>
 Date:   Thu Sep 13 13:48:18 2012 -0700
 
     Allow any python-swiftclient v1.1 through v1.X
     
-    Fixes bug 1050670
-    
     Change-Id: I86c29764e43b204b4eea361c9b3b6519a2ab1d24
 
  tools/pip-requires |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-commit 55002fddefc25ac3c075e96c450316997a45d456
+commit 0ba2753953f065ffed0cb254ac1d1dc473cefd97
 Author: Thierry Carrez <[e-mail]>
-Date:   Wed Sep 12 00:27:08 2012 +0200
+Date:   Wed Sep 12 00:20:02 2012 +0200
 
-    Set FINAL versioning
-    
-    Set FINAL=True in preparation for RC1 publication
-    
-    Change-Id: Ib4301a63f94f0cfb8cc3556c70a0344434737128
+    Open Grizzly (2013.1)
+    
+    Bump version number on master to open up Grizzly development.
+    
+    Change-Id: I3a71a2aaa0519501ae64d9f00f1b45398502445a
 
  horizon/version.py |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
=== modified file 'MANIFEST.in'
--- MANIFEST.in	2012-08-16 14:01:33 +0000
+++ MANIFEST.in	2012-11-26 19:56:34 +0000
@@ -1,7 +1,7 @@
 recursive-include bin *.js
 recursive-include doc *.py *.rst *.css *.js *.html *.conf *.jpg *.gif *.png *.css_t
 recursive-include horizon *.html *.css *.js *.csv *.template *.tmpl *.mo *.po
-recursive-include openstack_dashboard *.html *.js *.less *.mo *.po *.example *.eot *.svg *.ttf *.woff *.png *.ico *.wsgi *.gif
+recursive-include openstack_dashboard *.html *.js *.less *.mo *.po *.example *.eot *.svg *.ttf *.woff *.png *.ico *.wsgi *.gif *.csv *.template
 recursive-include tools *.py *.sh
 
 include AUTHORS
 
=== modified file 'PKG-INFO'
--- PKG-INFO	2012-07-06 11:38:55 +0000
+++ PKG-INFO	2012-11-26 19:56:34 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: horizon
-Version: 2012.2
+Version: 2013.1
 Summary: The OpenStack Dashboard.
 Home-page: https://github.com/openstack/horizon/
 Author: OpenStack
@@ -140,3 +140,4 @@
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Topic :: Internet :: WWW/HTTP
+Classifier: Environment :: OpenStack
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-10-09 12:42:12 +0000
+++ debian/changelog	2012-11-26 19:56:34 +0000
@@ -1,3 +1,21 @@
+horizon (2013.1~g1-0ubuntu1~cloud0) precise-grizzly; urgency=low
+
+  * New upstream release for the Ubuntu Cloud Archive.
+
+ -- Chuck Short <[e-mail]>  Mon, 26 Nov 2012 13:34:27 -0600
+
+horizon (2013.1~g1-0ubuntu1) raring; urgency=low
+
+  [ Adam Gandelman ]
+  * debian/patches/add_juju_settings_pannel.patch: Disable during
+    Grizzly dev. cycle. 
+
+  [ Chuck Short ]
+  * New upstream relase.
+  * Refreshed patches.
+
+ -- Chuck Short <[e-mail]>  Fri, 23 Nov 2012 08:49:14 -0600
+
 horizon (2012.2-0ubuntu2~cloud0) precise-folsom; urgency=low
 
   * New release candidate for the Ubuntu Cloud Archive.
 
=== modified file 'debian/patches/fix-dashboard-manage.patch'
--- debian/patches/fix-dashboard-manage.patch	2012-09-07 12:35:36 +0000
+++ debian/patches/fix-dashboard-manage.patch	2012-11-26 19:56:34 +0000
@@ -1,8 +1,7 @@
-Index: horizon-2012.2/manage.py
-===================================================================
---- horizon-2012.2.orig/manage.py	2012-09-04 16:32:01.000000000 -0700
-+++ horizon-2012.2/manage.py	2012-09-04 16:32:52.250690667 -0700
-@@ -5,6 +5,8 @@
+diff -Naurp horizon-2013.1.orig/manage.py horizon-2013.1/manage.py
+--- horizon-2013.1.orig/manage.py	2012-11-20 22:59:38.000000000 -0600
++++ horizon-2013.1/manage.py	2012-11-21 12:28:58.773240222 -0600
+@@ -5,6 +5,8 @@ import sys
  
  from django.core.management import execute_from_command_line
  
 
=== modified file 'debian/patches/fix-ubuntu-tests.patch'
--- debian/patches/fix-ubuntu-tests.patch	2012-09-07 12:35:36 +0000
+++ debian/patches/fix-ubuntu-tests.patch	2012-11-26 19:56:34 +0000
@@ -1,15 +1,14 @@
-Index: horizon-2012.2/run_tests.sh
-===================================================================
---- horizon-2012.2.orig/run_tests.sh	2012-08-23 18:52:34.891973319 -0700
-+++ horizon-2012.2/run_tests.sh	2012-08-23 18:53:15.879971813 -0700
-@@ -274,25 +274,25 @@
+diff -Naurp horizon-2013.1.orig/run_tests.sh horizon-2013.1/run_tests.sh
+--- horizon-2013.1.orig/run_tests.sh	2012-11-20 22:59:39.000000000 -0600
++++ horizon-2013.1/run_tests.sh	2012-11-21 12:25:55.197240133 -0600
+@@ -292,25 +292,25 @@ function run_tests_all {
    if [ "$NOSE_WITH_HTML_OUTPUT" = '1' ]; then
      export NOSE_HTML_OUT_FILE='horizon_nose_results.html'
    fi
 -  ${command_wrapper} coverage erase
--  ${command_wrapper} coverage run -p $root/manage.py test horizon --settings=horizon.tests.testsettings $testargs
+-  ${command_wrapper} coverage run -p $root/manage.py test horizon --settings=horizon.test.settings $testopts
 +  ${command_wrapper} python-coverage erase
-+  ${command_wrapper} python-coverage run -p $root/manage.py test horizon --settings=horizon.tests.testsettings $testargs
++  ${command_wrapper} python-coverage run -p $root/manage.py test horizon --settings=horizon.test.settings $testopts
    # get results of the Horizon tests
    HORIZON_RESULT=$?
  
@@ -18,17 +17,16 @@
 -  if [ "$NOSE_WITH_HTML_OUTPUT" = '1' ]; then
 -    export NOSE_HTML_OUT_FILE='dashboard_nose_results.html'
 -  fi
--  ${command_wrapper} coverage run -p $root/manage.py test openstack_dashboard --settings=openstack_dashboard.test.settings $testargs
--  # get results of the openstack_dashboard tests
+-  ${command_wrapper} coverage run -p $root/manage.py test openstack_dashboard --settings=openstack_dashboard.test.settings $testopts
++  #echo "Running openstack_dashboard tests"
++  #export NOSE_XUNIT_FILE=openstack_dashboard/nosetests.xml
++  #if [ "$NOSE_WITH_HTML_OUTPUT" = '1' ]; then
++  #  export NOSE_HTML_OUT_FILE='dashboard_nose_results.html'
++  #fi
++  #${command_wrapper} coverage run -p $root/manage.py test openstack_dashboard --settings=openstack_dashboard.test.settings $testopts
+   # get results of the openstack_dashboard tests
 -  DASHBOARD_RESULT=$?
-+#  echo "Running openstack_dashboard tests"
-+#  export NOSE_XUNIT_FILE=openstack_dashboard/nosetests.xml
-+#  if [ "$NOSE_WITH_HTML_OUTPUT" = '1' ]; then
-+#    export NOSE_HTML_OUT_FILE='dashboard_nose_results.html'
-+#  fi
-+#  ${command_wrapper} python-coverage run -p $root/manage.py test openstack_dashboard --settings=openstack_dashboard.test.settings $testargs
-+#  # get results of the openstack_dashboard tests
-+#  DASHBOARD_RESULT=$?
++  #DASHBOARD_RESULT=$?
  
    if [ $with_coverage -eq 1 ]; then
      echo "Generating coverage reports"
@@ -41,15 +39,3 @@
    fi
    # Remove the leftover coverage files from the -p flag earlier.
    rm -f .coverage.*
-Index: horizon-2012.2/horizon/tests/testsettings.py
-===================================================================
---- horizon-2012.2.orig/horizon/tests/testsettings.py	2012-08-23 18:52:34.647973328 -0700
-+++ horizon-2012.2/horizon/tests/testsettings.py	2012-08-23 18:54:36.615968847 -0700
-@@ -98,7 +98,6 @@
- TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
- NOSE_ARGS = ['--nocapture',
-              '--nologcapture',
--             '--exclude-dir=horizon/conf/',
-              '--cover-package=horizon',
-              '--cover-inclusive']
- 
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-10-09 09:59:55 +0000
+++ debian/patches/series	2012-11-26 19:56:34 +0000
@@ -1,5 +1,8 @@
 fix-dashboard-django-wsgi.patch
 fix-dashboard-manage.patch
-add_juju_settings_panel.patch
+
+# Disabled during Grizzly dev. cycle
+#add_juju_settings_panel.patch
+
 fix-ubuntu-tests.patch
 ubuntu_local_settings.patch
 
=== modified file 'debian/patches/ubuntu_local_settings.patch'
--- debian/patches/ubuntu_local_settings.patch	2012-09-21 08:03:36 +0000
+++ debian/patches/ubuntu_local_settings.patch	2012-11-26 19:56:34 +0000
@@ -1,31 +1,16 @@
-Author: Adam Gandelman <[e-mail]>
-Date: Mon Sep 10 20:53:00 PDT 2012
-Subject: Squash all patches that update the default local_settings.py.example.
-
-This patch combines all previous patches that update local_settings.py.example.
-The example local_settings.py is what gets installed as the default installation
-in Ubuntu package.
-
-Previous patches were:
-    * turn-off-debug.patch
-    * use-memcache.patch (LP: #968850)
-    * set_login_redirects.patch (LP: #1037349)
-    * disable_online_compression.patch (LP: #1024326)
-
-Index: horizon-2013.1/openstack_dashboard/local/local_settings.py.example
-===================================================================
---- horizon-2013.1.orig/openstack_dashboard/local/local_settings.py.example	2012-09-11 21:09:15.000000000 -0700
-+++ horizon-2013.1/openstack_dashboard/local/local_settings.py.example	2012-09-11 21:11:53.957057760 -0700
-@@ -2,7 +2,7 @@
+diff -Naurp horizon-2013.1.orig/openstack_dashboard/local/local_settings.py.example horizon-2013.1/openstack_dashboard/local/local_settings.py.example
+--- horizon-2013.1.orig/openstack_dashboard/local/local_settings.py.example	2012-11-20 22:59:38.000000000 -0600
++++ horizon-2013.1/openstack_dashboard/local/local_settings.py.example	2012-11-21 12:35:19.701240407 -0600
+@@ -4,7 +4,7 @@ from django.utils.translation import uge
  
- from django.utils.translation import ugettext_lazy as _
+ from openstack_dashboard import exceptions
  
 -DEBUG = True
 +DEBUG = False
  TEMPLATE_DEBUG = DEBUG
  
  # Set SSL proxy settings:
-@@ -38,7 +38,7 @@
+@@ -49,13 +49,29 @@ LOCAL_PATH = os.path.dirname(os.path.abs
  # We recommend you use memcached for development; otherwise after every reload
  # of the django development server, you will have to login again. To use
  # memcached set CACHE_BACKED to something like 'memcached://127.0.0.1:11211/'
@@ -34,11 +19,9 @@
  
  # Send email to the console by default
  EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
-@@ -145,3 +145,19 @@
-             }
-         }
- }
-+
+ # Or send them to /dev/null
+ #EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'
+ 
 +# Enable the Ubuntu theme if it is present.
 +try:
 +    from ubuntu_theme import *
@@ -54,3 +37,7 @@
 +# offline compression by default.  To enable online compression, install
 +# the node-less package and enable the following option.
 +COMPRESS_OFFLINE = True
++
+ # Configure these for your outgoing email host
+ # EMAIL_HOST = 'smtp.my-company.com'
+ # EMAIL_PORT = 25
 
=== modified file 'doc/source/ref/run_tests.rst'
--- doc/source/ref/run_tests.rst	2012-07-06 11:38:55 +0000
+++ doc/source/ref/run_tests.rst	2012-11-26 19:56:34 +0000
@@ -43,6 +43,25 @@
 This isn't recommended, but can be a timesaver when you only need to run
 the code tests and not the frontend tests during development.
 
+Running a subset of tests
+-------------------------
+
+Instead of running all tests, you can specify an individual directory, file,
+class, or method that contains test code.
+
+To run the tests in the ``horizon/test/tests/tables.py`` file::
+
+    ./run_tests.sh horizon.test.tests.tables
+
+To run the tests in the `WorkflowsTests` class in
+``horizon/test/tests/workflows``::
+
+    ./run_tests.sh horizon.test.tests.workflows:WorkflowsTests
+
+To run just the `WorkflowsTests.test_workflow_view` test method::
+
+    ./run_tests.sh horizon.test.tests.workflows:WorkflowsTests.test_workflow_view
+
 Using Dashboard and Panel Templates
 ===================================
 
 
=== modified file 'doc/source/ref/test.rst'
--- doc/source/ref/test.rst	2012-07-06 11:38:55 +0000
+++ doc/source/ref/test.rst	2012-11-26 19:56:34 +0000
@@ -2,10 +2,18 @@
 Horizon TestCase Classes
 ========================
 
-.. module:: horizon.test
-
-Horizon provides several useful base classes for testing both views and
-API functions.
+.. module:: horizon.test.helpers
+
+Horizon provides a base test case class which provides several useful
+pre-prepared attributes for testing Horizon components.
+
+.. autoclass:: TestCase
+    :members:
+
+.. module :: openstack_dashboard.test.helpers
+
+The OpenStack Dashboard also provides test case classes for greater
+ease-of-use when testing APIs and OpenStack-specific auth scenarios.
 
 .. autoclass:: TestCase
     :members:
 
=== modified file 'doc/source/testing.rst'
--- doc/source/testing.rst	2012-07-06 11:38:55 +0000
+++ doc/source/testing.rst	2012-11-26 19:56:34 +0000
@@ -19,6 +19,8 @@
 To run the tests::
 
     $ ./run_tests.sh
+   
+It's also possible to :doc:`run a subset of unit tests<ref/run_tests>`.
 
 .. seealso::
 
 
=== modified file 'doc/source/topics/testing.rst'
--- doc/source/topics/testing.rst	2012-07-06 11:38:55 +0000
+++ doc/source/topics/testing.rst	2012-11-26 19:56:34 +0000
@@ -170,12 +170,12 @@
 necessary.
 
 To that end, Horizon includes several custom assertions to make these tasks
-easier. :meth:`~horizon.test.TestCase.assertNoFormErrors`,
-:meth:`~horizon.test.TestCase.assertMessageCount`, and
-:meth:`~horizon.test.TestCase.asertNoMessages` all exist for exactly these
-purposes. Moreover, they provide useful output when things go wrong so you're
-not left scratching your head wondering why your view test didn't redirect
-as expected when you posted a form.
+easier. :meth:`~horizon.test.helpers.TestCase.assertNoFormErrors`,
+:meth:`~horizon.test.helpers.TestCase.assertMessageCount`, and
+:meth:`~horizon.test.helpers.TestCase.asertNoMessages` all exist for exactly
+these purposes. Moreover, they provide useful output when things go wrong so
+you're not left scratching your head wondering why your view test didn't
+redirect as expected when you posted a form.
 
 .. _debugging_unit_tests:
 
@@ -185,14 +185,14 @@
 Tips and tricks
 ---------------
 
-#. Use :meth:`~horizon.test.TestCase.assertNoFormErrors` immediately after
-   your ``client.post`` call for tests that handle form views. This will
+#. Use :meth:`~horizon.test.helpers.TestCase.assertNoFormErrors` immediately
+   after your ``client.post`` call for tests that handle form views. This will
    immediately fail if your form POST failed due to a validation error and
    tell you what the error was.
 
-#. Use :meth:`~horizon.test.TestCase.assertMessageCount` and
-   :meth:`~horizon.test.TestCase.asertNoMessages` when a piece of code is
-   failing inexplicably. Since the core error handlers attach user-facing
+#. Use :meth:`~horizon.test.helpers.TestCase.assertMessageCount` and
+   :meth:`~horizon.test.helpers.TestCase.asertNoMessages` when a piece of code
+   is failing inexplicably. Since the core error handlers attach user-facing
    error messages (and since the core logging is silenced during test runs)
    these methods give you the dual benefit of verifying the output you expect
    while clearly showing you the problematic error message if they fail.
@@ -270,7 +270,7 @@
 This one is the opposite of the unexpected method call. This one means you
 tol mox to expect a call and it didn't happen. This is almost always the
 result of an error in the conditions of the test. Using the
-:meth:`~horizon.test.TestCase.assertNoFormErrors` and
-:meth:`~horizon.test.TestCase.assertMessageCount` will make it readily apparent
-what the problem is in the majority of cases. If not, then use ``pdb`` and
-start interrupting the code flow to see where things are getting off track.
+:meth:`~horizon.test.helpers.TestCase.assertNoFormErrors` and
+:meth:`~horizon.test.helpers.TestCase.assertMessageCount` will make it readily
+apparent what the problem is in the majority of cases. If not, then use ``pdb``
+and start interrupting the code flow to see where things are getting off track.
 
=== modified file 'horizon.egg-info/PKG-INFO'
--- horizon.egg-info/PKG-INFO	2012-07-06 11:38:55 +0000
+++ horizon.egg-info/PKG-INFO	2012-11-26 19:56:34 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: horizon
-Version: 2012.2
+Version: 2013.1
 Summary: The OpenStack Dashboard.
 Home-page: https://github.com/openstack/horizon/
 Author: OpenStack
@@ -140,3 +140,4 @@
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Topic :: Internet :: WWW/HTTP
+Classifier: Environment :: OpenStack
 
=== modified file 'horizon.egg-info/SOURCES.txt'
--- horizon.egg-info/SOURCES.txt	2012-09-21 08:03:36 +0000
+++ horizon.egg-info/SOURCES.txt	2012-11-26 19:56:34 +0000
@@ -1,4 +1,3 @@
-.bzrignore
 .gitignore
 .gitreview
 .mailmap
@@ -100,26 +99,20 @@
 horizon/middleware.py
 horizon/models.py
 horizon/site_urls.py
-horizon/test.py
 horizon/version.py
+horizon/views.py
 horizon.egg-info/PKG-INFO
 horizon.egg-info/SOURCES.txt
 horizon.egg-info/dependency_links.txt
 horizon.egg-info/not-zip-safe
 horizon.egg-info/requires.txt
 horizon.egg-info/top_level.txt
-horizon/api/__init__.py
-horizon/api/base.py
-horizon/api/glance.py
-horizon/api/keystone.py
-horizon/api/nova.py
-horizon/api/quantum.py
-horizon/api/swift.py
 horizon/browsers/__init__.py
 horizon/browsers/base.py
 horizon/browsers/breadcrumb.py
 horizon/browsers/views.py
 horizon/conf/__init__.py
+horizon/conf/default.py
 horizon/conf/dash_template/__init__.py
 horizon/conf/dash_template/dashboard.py.tmpl
 horizon/conf/dash_template/models.py
@@ -133,337 +126,6 @@
 horizon/conf/panel_template/urls.py
 horizon/conf/panel_template/views.py
 horizon/conf/panel_template/templates/panel_name/index.html
-horizon/dashboards/__init__.py
-horizon/dashboards/nova/__init__.py
-horizon/dashboards/nova/dashboard.py
-horizon/dashboards/nova/models.py
-horizon/dashboards/nova/access_and_security/__init__.py
-horizon/dashboards/nova/access_and_security/panel.py
-horizon/dashboards/nova/access_and_security/tests.py
-horizon/dashboards/nova/access_and_security/urls.py
-horizon/dashboards/nova/access_and_security/views.py
-horizon/dashboards/nova/access_and_security/floating_ips/__init__.py
-horizon/dashboards/nova/access_and_security/floating_ips/forms.py
-horizon/dashboards/nova/access_and_security/floating_ips/tables.py
-horizon/dashboards/nova/access_and_security/floating_ips/tests.py
-horizon/dashboards/nova/access_and_security/floating_ips/urls.py
-horizon/dashboards/nova/access_and_security/floating_ips/views.py
-horizon/dashboards/nova/access_and_security/floating_ips/workflows.py
-horizon/dashboards/nova/access_and_security/keypairs/__init__.py
-horizon/dashboards/nova/access_and_security/keypairs/forms.py
-horizon/dashboards/nova/access_and_security/keypairs/tables.py
-horizon/dashboards/nova/access_and_security/keypairs/tests.py
-horizon/dashboards/nova/access_and_security/keypairs/urls.py
-horizon/dashboards/nova/access_and_security/keypairs/views.py
-horizon/dashboards/nova/access_and_security/security_groups/__init__.py
-horizon/dashboards/nova/access_and_security/security_groups/forms.py
-horizon/dashboards/nova/access_and_security/security_groups/tables.py
-horizon/dashboards/nova/access_and_security/security_groups/tests.py
-horizon/dashboards/nova/access_and_security/security_groups/urls.py
-horizon/dashboards/nova/access_and_security/security_groups/views.py
-horizon/dashboards/nova/access_and_security/templates/access_and_security/index.html
-horizon/dashboards/nova/access_and_security/templates/access_and_security/floating_ips/_allocate.html
-horizon/dashboards/nova/access_and_security/templates/access_and_security/floating_ips/allocate.html
-horizon/dashboards/nova/access_and_security/templates/access_and_security/floating_ips/associate.html
-horizon/dashboards/nova/access_and_security/templates/access_and_security/keypairs/_create.html
-horizon/dashboards/nova/access_and_security/templates/access_and_security/keypairs/_import.html
-horizon/dashboards/nova/access_and_security/templates/access_and_security/keypairs/create.html
-horizon/dashboards/nova/access_and_security/templates/access_and_security/keypairs/download.html
-horizon/dashboards/nova/access_and_security/templates/access_and_security/keypairs/import.html
-horizon/dashboards/nova/access_and_security/templates/access_and_security/security_groups/_create.html
-horizon/dashboards/nova/access_and_security/templates/access_and_security/security_groups/_edit_rules.html
-horizon/dashboards/nova/access_and_security/templates/access_and_security/security_groups/create.html
-horizon/dashboards/nova/access_and_security/templates/access_and_security/security_groups/edit_rules.html
-horizon/dashboards/nova/containers/__init__.py
-horizon/dashboards/nova/containers/browsers.py
-horizon/dashboards/nova/containers/forms.py
-horizon/dashboards/nova/containers/panel.py
-horizon/dashboards/nova/containers/tables.py
-horizon/dashboards/nova/containers/tests.py
-horizon/dashboards/nova/containers/urls.py
-horizon/dashboards/nova/containers/views.py
-horizon/dashboards/nova/containers/templates/containers/_copy.html
-horizon/dashboards/nova/containers/templates/containers/_create.html
-horizon/dashboards/nova/containers/templates/containers/_upload.html
-horizon/dashboards/nova/containers/templates/containers/copy.html
-horizon/dashboards/nova/containers/templates/containers/create.html
-horizon/dashboards/nova/containers/templates/containers/index.html
-horizon/dashboards/nova/containers/templates/containers/upload.html
-horizon/dashboards/nova/images_and_snapshots/__init__.py
-horizon/dashboards/nova/images_and_snapshots/panel.py
-horizon/dashboards/nova/images_and_snapshots/tests.py
-horizon/dashboards/nova/images_and_snapshots/urls.py
-horizon/dashboards/nova/images_and_snapshots/views.py
-horizon/dashboards/nova/images_and_snapshots/images/__init__.py
-horizon/dashboards/nova/images_and_snapshots/images/forms.py
-horizon/dashboards/nova/images_and_snapshots/images/panel.py
-horizon/dashboards/nova/images_and_snapshots/images/tables.py
-horizon/dashboards/nova/images_and_snapshots/images/tabs.py
-horizon/dashboards/nova/images_and_snapshots/images/tests.py
-horizon/dashboards/nova/images_and_snapshots/images/urls.py
-horizon/dashboards/nova/images_and_snapshots/images/views.py
-horizon/dashboards/nova/images_and_snapshots/snapshots/__init__.py
-horizon/dashboards/nova/images_and_snapshots/snapshots/forms.py
-horizon/dashboards/nova/images_and_snapshots/snapshots/panel.py
-horizon/dashboards/nova/images_and_snapshots/snapshots/tables.py
-horizon/dashboards/nova/images_and_snapshots/snapshots/tests.py
-horizon/dashboards/nova/images_and_snapshots/snapshots/urls.py
-horizon/dashboards/nova/images_and_snapshots/snapshots/views.py
-horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/index.html
-horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/images/_create.html
-horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/images/_detail_overview.html
-horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/images/_update.html
-horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/images/create.html
-horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/images/detail.html
-horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/images/update.html
-horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/snapshots/_create.html
-horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/snapshots/_detail_overview.html
-horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/snapshots/create.html
-horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/snapshots/detail.html
-horizon/dashboards/nova/images_and_snapshots/volume_snapshots/__init__.py
-horizon/dashboards/nova/images_and_snapshots/volume_snapshots/panel.py
-horizon/dashboards/nova/images_and_snapshots/volume_snapshots/tables.py
-horizon/dashboards/nova/images_and_snapshots/volume_snapshots/tabs.py
-horizon/dashboards/nova/images_and_snapshots/volume_snapshots/tests.py
-horizon/dashboards/nova/instances/__init__.py
-horizon/dashboards/nova/instances/forms.py
-horizon/dashboards/nova/instances/panel.py
-horizon/dashboards/nova/instances/tables.py
-horizon/dashboards/nova/instances/tabs.py
-horizon/dashboards/nova/instances/tests.py
-horizon/dashboards/nova/instances/urls.py
-horizon/dashboards/nova/instances/views.py
-horizon/dashboards/nova/instances/workflows.py
-horizon/dashboards/nova/instances/templates/instances/_detail_log.html
-horizon/dashboards/nova/instances/templates/instances/_detail_overview.html
-horizon/dashboards/nova/instances/templates/instances/_detail_vnc.html
-horizon/dashboards/nova/instances/templates/instances/_instance_ips.html
-horizon/dashboards/nova/instances/templates/instances/_launch_customize_help.html
-horizon/dashboards/nova/instances/templates/instances/_launch_details_help.html
-horizon/dashboards/nova/instances/templates/instances/_launch_volumes_help.html
-horizon/dashboards/nova/instances/templates/instances/_update.html
-horizon/dashboards/nova/instances/templates/instances/detail.html
-horizon/dashboards/nova/instances/templates/instances/index.html
-horizon/dashboards/nova/instances/templates/instances/launch.html
-horizon/dashboards/nova/instances/templates/instances/update.html
-horizon/dashboards/nova/networks/__init__.py
-horizon/dashboards/nova/networks/forms.py
-horizon/dashboards/nova/networks/panel.py
-horizon/dashboards/nova/networks/tables.py
-horizon/dashboards/nova/networks/tests.py
-horizon/dashboards/nova/networks/urls.py
-horizon/dashboards/nova/networks/views.py
-horizon/dashboards/nova/networks/workflows.py
-horizon/dashboards/nova/networks/ports/__init__.py
-horizon/dashboards/nova/networks/ports/tables.py
-horizon/dashboards/nova/networks/ports/tabs.py
-horizon/dashboards/nova/networks/ports/urls.py
-horizon/dashboards/nova/networks/ports/views.py
-horizon/dashboards/nova/networks/subnets/__init__.py
-horizon/dashboards/nova/networks/subnets/forms.py
-horizon/dashboards/nova/networks/subnets/tables.py
-horizon/dashboards/nova/networks/subnets/tabs.py
-horizon/dashboards/nova/networks/subnets/urls.py
-horizon/dashboards/nova/networks/subnets/views.py
-horizon/dashboards/nova/networks/templates/networks/_create.html
-horizon/dashboards/nova/networks/templates/networks/_detail_overview.html
-horizon/dashboards/nova/networks/templates/networks/_network_ips.html
-horizon/dashboards/nova/networks/templates/networks/_update.html
-horizon/dashboards/nova/networks/templates/networks/create.html
-horizon/dashboards/nova/networks/templates/networks/detail.html
-horizon/dashboards/nova/networks/templates/networks/index.html
-horizon/dashboards/nova/networks/templates/networks/update.html
-horizon/dashboards/nova/networks/templates/networks/ports/_detail_overview.html
-horizon/dashboards/nova/networks/templates/networks/ports/_port_ips.html
-horizon/dashboards/nova/networks/templates/networks/ports/detail.html
-horizon/dashboards/nova/networks/templates/networks/subnets/_create.html
-horizon/dashboards/nova/networks/templates/networks/subnets/_detail_overview.html
-horizon/dashboards/nova/networks/templates/networks/subnets/_update.html
-horizon/dashboards/nova/networks/templates/networks/subnets/create.html
-horizon/dashboards/nova/networks/templates/networks/subnets/detail.html
-horizon/dashboards/nova/networks/templates/networks/subnets/index.html
-horizon/dashboards/nova/networks/templates/networks/subnets/update.html
-horizon/dashboards/nova/overview/__init__.py
-horizon/dashboards/nova/overview/panel.py
-horizon/dashboards/nova/overview/tests.py
-horizon/dashboards/nova/overview/urls.py
-horizon/dashboards/nova/overview/views.py
-horizon/dashboards/nova/overview/templates/overview/usage.csv
-horizon/dashboards/nova/overview/templates/overview/usage.html
-horizon/dashboards/nova/templates/nova/_warning.html
-horizon/dashboards/nova/volumes/__init__.py
-horizon/dashboards/nova/volumes/forms.py
-horizon/dashboards/nova/volumes/panel.py
-horizon/dashboards/nova/volumes/tables.py
-horizon/dashboards/nova/volumes/tabs.py
-horizon/dashboards/nova/volumes/tests.py
-horizon/dashboards/nova/volumes/urls.py
-horizon/dashboards/nova/volumes/views.py
-horizon/dashboards/nova/volumes/templates/volumes/_attach.html
-horizon/dashboards/nova/volumes/templates/volumes/_create.html
-horizon/dashboards/nova/volumes/templates/volumes/_create_snapshot.html
-horizon/dashboards/nova/volumes/templates/volumes/_detail_overview.html
-horizon/dashboards/nova/volumes/templates/volumes/attach.html
-horizon/dashboards/nova/volumes/templates/volumes/create.html
-horizon/dashboards/nova/volumes/templates/volumes/create_snapshot.html
-horizon/dashboards/nova/volumes/templates/volumes/detail.html
-horizon/dashboards/nova/volumes/templates/volumes/index.html
-horizon/dashboards/settings/__init__.py
-horizon/dashboards/settings/dashboard.py
-horizon/dashboards/settings/models.py
-horizon/dashboards/settings/ec2/__init__.py
-horizon/dashboards/settings/ec2/forms.py
-horizon/dashboards/settings/ec2/panel.py
-horizon/dashboards/settings/ec2/tests.py
-horizon/dashboards/settings/ec2/urls.py
-horizon/dashboards/settings/ec2/views.py
-horizon/dashboards/settings/ec2/templates/ec2/download_form.html
-horizon/dashboards/settings/ec2/templates/ec2/ec2rc.sh.template
-horizon/dashboards/settings/ec2/templates/ec2/index.html
-horizon/dashboards/settings/project/__init__.py
-horizon/dashboards/settings/project/forms.py
-horizon/dashboards/settings/project/panel.py
-horizon/dashboards/settings/project/tables.py
-horizon/dashboards/settings/project/urls.py
-horizon/dashboards/settings/project/views.py
-horizon/dashboards/settings/project/templates/project/_openrc.html
-horizon/dashboards/settings/project/templates/project/openrc.sh.template
-horizon/dashboards/settings/project/templates/project/settings.html
-horizon/dashboards/settings/user/__init__.py
-horizon/dashboards/settings/user/forms.py
-horizon/dashboards/settings/user/panel.py
-horizon/dashboards/settings/user/urls.py
-horizon/dashboards/settings/user/views.py
-horizon/dashboards/settings/user/templates/user/_settings.html
-horizon/dashboards/settings/user/templates/user/settings.html
-horizon/dashboards/syspanel/__init__.py
-horizon/dashboards/syspanel/dashboard.py
-horizon/dashboards/syspanel/models.py
-horizon/dashboards/syspanel/flavors/__init__.py
-horizon/dashboards/syspanel/flavors/forms.py
-horizon/dashboards/syspanel/flavors/panel.py
-horizon/dashboards/syspanel/flavors/tables.py
-horizon/dashboards/syspanel/flavors/tests.py
-horizon/dashboards/syspanel/flavors/urls.py
-horizon/dashboards/syspanel/flavors/views.py
-horizon/dashboards/syspanel/flavors/templates/flavors/_create.html
-horizon/dashboards/syspanel/flavors/templates/flavors/_edit.html
-horizon/dashboards/syspanel/flavors/templates/flavors/create.html
-horizon/dashboards/syspanel/flavors/templates/flavors/edit.html
-horizon/dashboards/syspanel/flavors/templates/flavors/index.html
-horizon/dashboards/syspanel/images/__init__.py
-horizon/dashboards/syspanel/images/forms.py
-horizon/dashboards/syspanel/images/panel.py
-horizon/dashboards/syspanel/images/tables.py
-horizon/dashboards/syspanel/images/tests.py
-horizon/dashboards/syspanel/images/urls.py
-horizon/dashboards/syspanel/images/views.py
-horizon/dashboards/syspanel/images/templates/images/_update.html
-horizon/dashboards/syspanel/images/templates/images/index.html
-horizon/dashboards/syspanel/images/templates/images/update.html
-horizon/dashboards/syspanel/instances/__init__.py
-horizon/dashboards/syspanel/instances/panel.py
-horizon/dashboards/syspanel/instances/tables.py
-horizon/dashboards/syspanel/instances/tests.py
-horizon/dashboards/syspanel/instances/urls.py
-horizon/dashboards/syspanel/instances/views.py
-horizon/dashboards/syspanel/instances/templates/instances/index.html
-horizon/dashboards/syspanel/networks/__init__.py
-horizon/dashboards/syspanel/networks/forms.py
-horizon/dashboards/syspanel/networks/panel.py
-horizon/dashboards/syspanel/networks/tables.py
-horizon/dashboards/syspanel/networks/tests.py
-horizon/dashboards/syspanel/networks/urls.py
-horizon/dashboards/syspanel/networks/views.py
-horizon/dashboards/syspanel/networks/ports/__init__.py
-horizon/dashboards/syspanel/networks/ports/forms.py
-horizon/dashboards/syspanel/networks/ports/tables.py
-horizon/dashboards/syspanel/networks/ports/tabs.py
-horizon/dashboards/syspanel/networks/ports/urls.py
-horizon/dashboards/syspanel/networks/ports/views.py
-horizon/dashboards/syspanel/networks/subnets/__init__.py
-horizon/dashboards/syspanel/networks/subnets/forms.py
-horizon/dashboards/syspanel/networks/subnets/tables.py
-horizon/dashboards/syspanel/networks/subnets/urls.py
-horizon/dashboards/syspanel/networks/subnets/views.py
-horizon/dashboards/syspanel/networks/templates/networks/_create.html
-horizon/dashboards/syspanel/networks/templates/networks/_update.html
-horizon/dashboards/syspanel/networks/templates/networks/create.html
-horizon/dashboards/syspanel/networks/templates/networks/index.html
-horizon/dashboards/syspanel/networks/templates/networks/update.html
-horizon/dashboards/syspanel/networks/templates/networks/ports/_create.html
-horizon/dashboards/syspanel/networks/templates/networks/ports/_update.html
-horizon/dashboards/syspanel/networks/templates/networks/ports/create.html
-horizon/dashboards/syspanel/networks/templates/networks/ports/update.html
-horizon/dashboards/syspanel/networks/templates/networks/subnets/_create.html
-horizon/dashboards/syspanel/networks/templates/networks/subnets/_update.html
-horizon/dashboards/syspanel/networks/templates/networks/subnets/create.html
-horizon/dashboards/syspanel/networks/templates/networks/subnets/index.html
-horizon/dashboards/syspanel/networks/templates/networks/subnets/update.html
-horizon/dashboards/syspanel/overview/__init__.py
-horizon/dashboards/syspanel/overview/panel.py
-horizon/dashboards/syspanel/overview/tests.py
-horizon/dashboards/syspanel/overview/urls.py
-horizon/dashboards/syspanel/overview/views.py
-horizon/dashboards/syspanel/overview/templates/overview/usage.csv
-horizon/dashboards/syspanel/overview/templates/overview/usage.html
-horizon/dashboards/syspanel/projects/__init__.py
-horizon/dashboards/syspanel/projects/forms.py
-horizon/dashboards/syspanel/projects/panel.py
-horizon/dashboards/syspanel/projects/tables.py
-horizon/dashboards/syspanel/projects/tests.py
-horizon/dashboards/syspanel/projects/urls.py
-horizon/dashboards/syspanel/projects/views.py
-horizon/dashboards/syspanel/projects/workflows.py
-horizon/dashboards/syspanel/projects/templates/projects/_add_user.html
-horizon/dashboards/syspanel/projects/templates/projects/_create.html
-horizon/dashboards/syspanel/projects/templates/projects/_create_user.html
-horizon/dashboards/syspanel/projects/templates/projects/_quotas.html
-horizon/dashboards/syspanel/projects/templates/projects/_update.html
-horizon/dashboards/syspanel/projects/templates/projects/_update_members.html
-horizon/dashboards/syspanel/projects/templates/projects/add_user.html
-horizon/dashboards/syspanel/projects/templates/projects/create.html
-horizon/dashboards/syspanel/projects/templates/projects/create_user.html
-horizon/dashboards/syspanel/projects/templates/projects/index.html
-horizon/dashboards/syspanel/projects/templates/projects/quotas.html
-horizon/dashboards/syspanel/projects/templates/projects/update.html
-horizon/dashboards/syspanel/projects/templates/projects/usage.csv
-horizon/dashboards/syspanel/projects/templates/projects/usage.html
-horizon/dashboards/syspanel/projects/templates/projects/users.html
-horizon/dashboards/syspanel/quotas/__init__.py
-horizon/dashboards/syspanel/quotas/panel.py
-horizon/dashboards/syspanel/quotas/tables.py
-horizon/dashboards/syspanel/quotas/tests.py
-horizon/dashboards/syspanel/quotas/urls.py
-horizon/dashboards/syspanel/quotas/views.py
-horizon/dashboards/syspanel/quotas/templates/quotas/index.html
-horizon/dashboards/syspanel/services/__init__.py
-horizon/dashboards/syspanel/services/panel.py
-horizon/dashboards/syspanel/services/tables.py
-horizon/dashboards/syspanel/services/tests.py
-horizon/dashboards/syspanel/services/urls.py
-horizon/dashboards/syspanel/services/views.py
-horizon/dashboards/syspanel/services/templates/services/index.html
-horizon/dashboards/syspanel/users/__init__.py
-horizon/dashboards/syspanel/users/forms.py
-horizon/dashboards/syspanel/users/panel.py
-horizon/dashboards/syspanel/users/tables.py
-horizon/dashboards/syspanel/users/tests.py
-horizon/dashboards/syspanel/users/urls.py
-horizon/dashboards/syspanel/users/views.py
-horizon/dashboards/syspanel/users/templates/users/_create.html
-horizon/dashboards/syspanel/users/templates/users/_update.html
-horizon/dashboards/syspanel/users/templates/users/create.html
-horizon/dashboards/syspanel/users/templates/users/index.html
-horizon/dashboards/syspanel/users/templates/users/update.html
-horizon/dashboards/syspanel/volumes/__init__.py
-horizon/dashboards/syspanel/volumes/panel.py
-horizon/dashboards/syspanel/volumes/tables.py
-horizon/dashboards/syspanel/volumes/tests.py
-horizon/dashboards/syspanel/volumes/urls.py
-horizon/dashboards/syspanel/volumes/views.py
-horizon/dashboards/syspanel/volumes/templates/volumes/detail.html
-horizon/dashboards/syspanel/volumes/templates/volumes/index.html
 horizon/forms/__init__.py
 horizon/forms/base.py
 horizon/forms/fields.py
@@ -528,10 +190,6 @@
 horizon/management/commands/__init__.py
 horizon/management/commands/startdash.py
 horizon/management/commands/startpanel.py
-horizon/openstack/__init__.py
-horizon/openstack/common/__init__.py
-horizon/openstack/common/jsonutils.py
-horizon/openstack/common/setup.py
 horizon/static/bootstrap/js/bootstrap.js
 horizon/static/bootstrap/js/bootstrap.min.js
 horizon/static/horizon/js/horizon.communication.js
@@ -547,6 +205,7 @@
 horizon/static/horizon/js/horizon.tables.js
 horizon/static/horizon/js/horizon.tabs.js
 horizon/static/horizon/js/horizon.templates.js
+horizon/static/horizon/js/horizon.users.js
 horizon/static/horizon/js/horizon.utils.js
 horizon/static/horizon/lib/hogan-1.0.5.min.js
 horizon/static/horizon/lib/json2.js
@@ -597,6 +256,7 @@
 horizon/templates/horizon/common/_data_table_table_actions.html
 horizon/templates/horizon/common/_detail_table.html
 horizon/templates/horizon/common/_form_fields.html
+horizon/templates/horizon/common/_modal.html
 horizon/templates/horizon/common/_modal_form.html
 horizon/templates/horizon/common/_page_header.html
 horizon/templates/horizon/common/_progress_bar.html
@@ -615,75 +275,57 @@
 horizon/templatetags/parse_date.py
 horizon/templatetags/sizeformat.py
 horizon/templatetags/truncate_filter.py
-horizon/tests/__init__.py
-horizon/tests/base_tests.py
-horizon/tests/message_tests.py
-horizon/tests/selenium_tests.py
-horizon/tests/table_tests.py
-horizon/tests/tabs_tests.py
-horizon/tests/templatetag_tests.py
-horizon/tests/testsettings.py
-horizon/tests/testurls.py
-horizon/tests/utils_tests.py
-horizon/tests/workflows_tests.py
-horizon/tests/api_tests/__init__.py
-horizon/tests/api_tests/base_tests.py
-horizon/tests/api_tests/glance_tests.py
-horizon/tests/api_tests/keystone_tests.py
-horizon/tests/api_tests/nova_tests.py
-horizon/tests/api_tests/quantum_tests.py
-horizon/tests/api_tests/swift_tests.py
-horizon/tests/templates/404.html
-horizon/tests/templates/_tab.html
-horizon/tests/templates/base-sidebar.html
-horizon/tests/templates/tab_group.html
-horizon/tests/templates/workflow.html
-horizon/tests/test_dashboards/__init__.py
-horizon/tests/test_dashboards/cats/__init__.py
-horizon/tests/test_dashboards/cats/dashboard.py
-horizon/tests/test_dashboards/cats/models.py
-horizon/tests/test_dashboards/cats/kittens/__init__.py
-horizon/tests/test_dashboards/cats/kittens/models.py
-horizon/tests/test_dashboards/cats/kittens/panel.py
-horizon/tests/test_dashboards/cats/kittens/tests.py
-horizon/tests/test_dashboards/cats/kittens/urls.py
-horizon/tests/test_dashboards/cats/kittens/views.py
-horizon/tests/test_dashboards/cats/kittens/templates/kittens/index.html
-horizon/tests/test_dashboards/cats/static/cats/css/cats.css
-horizon/tests/test_dashboards/cats/static/cats/js/cats.js
-horizon/tests/test_dashboards/cats/templates/cats/base.html
-horizon/tests/test_dashboards/cats/tigers/__init__.py
-horizon/tests/test_dashboards/cats/tigers/models.py
-horizon/tests/test_dashboards/cats/tigers/panel.py
-horizon/tests/test_dashboards/cats/tigers/tests.py
-horizon/tests/test_dashboards/cats/tigers/urls.py
-horizon/tests/test_dashboards/cats/tigers/views.py
-horizon/tests/test_dashboards/cats/tigers/templates/tigers/index.html
-horizon/tests/test_dashboards/dogs/__init__.py
-horizon/tests/test_dashboards/dogs/dashboard.py
-horizon/tests/test_dashboards/dogs/models.py
-horizon/tests/test_dashboards/dogs/puppies/__init__.py
-horizon/tests/test_dashboards/dogs/puppies/models.py
-horizon/tests/test_dashboards/dogs/puppies/panel.py
-horizon/tests/test_dashboards/dogs/puppies/tests.py
-horizon/tests/test_dashboards/dogs/puppies/urls.py
-horizon/tests/test_dashboards/dogs/puppies/views.py
-horizon/tests/test_dashboards/dogs/puppies/templates/puppies/index.html
-horizon/tests/test_dashboards/dogs/static/dogs/css/dogs.css
-horizon/tests/test_dashboards/dogs/static/dogs/js/dogs.js
-horizon/tests/test_dashboards/dogs/templates/dogs/base.html
-horizon/tests/test_data/__init__.py
-horizon/tests/test_data/exceptions.py
-horizon/tests/test_data/glance_data.py
-horizon/tests/test_data/keystone_data.py
-horizon/tests/test_data/nova_data.py
-horizon/tests/test_data/quantum_data.py
-horizon/tests/test_data/swift_data.py
-horizon/tests/test_data/utils.py
-horizon/usage/__init__.py
-horizon/usage/base.py
-horizon/usage/tables.py
-horizon/usage/views.py
+horizon/test/__init__.py
+horizon/test/helpers.py
+horizon/test/settings.py
+horizon/test/urls.py
+horizon/test/templates/404.html
+horizon/test/templates/_tab.html
+horizon/test/templates/base-sidebar.html
+horizon/test/templates/tab_group.html
+horizon/test/templates/workflow.html
+horizon/test/templates/registration/login.html
+horizon/test/test_dashboards/__init__.py
+horizon/test/test_dashboards/cats/__init__.py
+horizon/test/test_dashboards/cats/dashboard.py
+horizon/test/test_dashboards/cats/models.py
+horizon/test/test_dashboards/cats/kittens/__init__.py
+horizon/test/test_dashboards/cats/kittens/models.py
+horizon/test/test_dashboards/cats/kittens/panel.py
+horizon/test/test_dashboards/cats/kittens/urls.py
+horizon/test/test_dashboards/cats/kittens/views.py
+horizon/test/test_dashboards/cats/kittens/templates/kittens/index.html
+horizon/test/test_dashboards/cats/static/cats/css/cats.css
+horizon/test/test_dashboards/cats/static/cats/js/cats.js
+horizon/test/test_dashboards/cats/templates/cats/base.html
+horizon/test/test_dashboards/cats/tigers/__init__.py
+horizon/test/test_dashboards/cats/tigers/models.py
+horizon/test/test_dashboards/cats/tigers/panel.py
+horizon/test/test_dashboards/cats/tigers/urls.py
+horizon/test/test_dashboards/cats/tigers/views.py
+horizon/test/test_dashboards/cats/tigers/templates/tigers/index.html
+horizon/test/test_dashboards/dogs/__init__.py
+horizon/test/test_dashboards/dogs/dashboard.py
+horizon/test/test_dashboards/dogs/models.py
+horizon/test/test_dashboards/dogs/puppies/__init__.py
+horizon/test/test_dashboards/dogs/puppies/models.py
+horizon/test/test_dashboards/dogs/puppies/panel.py
+horizon/test/test_dashboards/dogs/puppies/urls.py
+horizon/test/test_dashboards/dogs/puppies/views.py
+horizon/test/test_dashboards/dogs/puppies/templates/puppies/index.html
+horizon/test/test_dashboards/dogs/static/dogs/css/dogs.css
+horizon/test/test_dashboards/dogs/static/dogs/js/dogs.js
+horizon/test/test_dashboards/dogs/templates/dogs/base.html
+horizon/test/tests/__init__.py
+horizon/test/tests/base.py
+horizon/test/tests/messages.py
+horizon/test/tests/middleware.py
+horizon/test/tests/selenium.py
+horizon/test/tests/tables.py
+horizon/test/tests/tabs.py
+horizon/test/tests/templatetags.py
+horizon/test/tests/utils.py
+horizon/test/tests/workflows.py
 horizon/utils/__init__.py
 horizon/utils/fields.py
 horizon/utils/filters.py
@@ -692,15 +334,358 @@
 horizon/utils/memoized.py
 horizon/utils/secret_key.py
 horizon/utils/validators.py
-horizon/views/__init__.py
-horizon/views/base.py
 horizon/workflows/__init__.py
 horizon/workflows/base.py
 horizon/workflows/views.py
 openstack_dashboard/__init__.py
+openstack_dashboard/context_processors.py
 openstack_dashboard/exceptions.py
 openstack_dashboard/settings.py
 openstack_dashboard/urls.py
+openstack_dashboard/views.py
+openstack_dashboard/api/__init__.py
+openstack_dashboard/api/base.py
+openstack_dashboard/api/cinder.py
+openstack_dashboard/api/glance.py
+openstack_dashboard/api/keystone.py
+openstack_dashboard/api/nova.py
+openstack_dashboard/api/quantum.py
+openstack_dashboard/api/swift.py
+openstack_dashboard/dashboards/__init__.py
+openstack_dashboard/dashboards/admin/__init__.py
+openstack_dashboard/dashboards/admin/dashboard.py
+openstack_dashboard/dashboards/admin/models.py
+openstack_dashboard/dashboards/admin/flavors/__init__.py
+openstack_dashboard/dashboards/admin/flavors/forms.py
+openstack_dashboard/dashboards/admin/flavors/panel.py
+openstack_dashboard/dashboards/admin/flavors/tables.py
+openstack_dashboard/dashboards/admin/flavors/tests.py
+openstack_dashboard/dashboards/admin/flavors/urls.py
+openstack_dashboard/dashboards/admin/flavors/views.py
+openstack_dashboard/dashboards/admin/flavors/extras/__init__.py
+openstack_dashboard/dashboards/admin/flavors/extras/forms.py
+openstack_dashboard/dashboards/admin/flavors/extras/tables.py
+openstack_dashboard/dashboards/admin/flavors/extras/tests.py
+openstack_dashboard/dashboards/admin/flavors/extras/urls.py
+openstack_dashboard/dashboards/admin/flavors/extras/views.py
+openstack_dashboard/dashboards/admin/flavors/templates/flavors/_create.html
+openstack_dashboard/dashboards/admin/flavors/templates/flavors/_edit.html
+openstack_dashboard/dashboards/admin/flavors/templates/flavors/create.html
+openstack_dashboard/dashboards/admin/flavors/templates/flavors/edit.html
+openstack_dashboard/dashboards/admin/flavors/templates/flavors/index.html
+openstack_dashboard/dashboards/admin/flavors/templates/flavors/extras/_create.html
+openstack_dashboard/dashboards/admin/flavors/templates/flavors/extras/_edit.html
+openstack_dashboard/dashboards/admin/flavors/templates/flavors/extras/_index.html
+openstack_dashboard/dashboards/admin/flavors/templates/flavors/extras/create.html
+openstack_dashboard/dashboards/admin/flavors/templates/flavors/extras/edit.html
+openstack_dashboard/dashboards/admin/flavors/templates/flavors/extras/index.html
+openstack_dashboard/dashboards/admin/images/__init__.py
+openstack_dashboard/dashboards/admin/images/forms.py
+openstack_dashboard/dashboards/admin/images/panel.py
+openstack_dashboard/dashboards/admin/images/tables.py
+openstack_dashboard/dashboards/admin/images/tests.py
+openstack_dashboard/dashboards/admin/images/urls.py
+openstack_dashboard/dashboards/admin/images/views.py
+openstack_dashboard/dashboards/admin/images/templates/images/_update.html
+openstack_dashboard/dashboards/admin/images/templates/images/index.html
+openstack_dashboard/dashboards/admin/images/templates/images/update.html
+openstack_dashboard/dashboards/admin/info/__init__.py
+openstack_dashboard/dashboards/admin/info/panel.py
+openstack_dashboard/dashboards/admin/info/tables.py
+openstack_dashboard/dashboards/admin/info/tabs.py
+openstack_dashboard/dashboards/admin/info/tests.py
+openstack_dashboard/dashboards/admin/info/urls.py
+openstack_dashboard/dashboards/admin/info/views.py
+openstack_dashboard/dashboards/admin/info/templates/info/index.html
+openstack_dashboard/dashboards/admin/instances/__init__.py
+openstack_dashboard/dashboards/admin/instances/panel.py
+openstack_dashboard/dashboards/admin/instances/tables.py
+openstack_dashboard/dashboards/admin/instances/tests.py
+openstack_dashboard/dashboards/admin/instances/urls.py
+openstack_dashboard/dashboards/admin/instances/views.py
+openstack_dashboard/dashboards/admin/instances/templates/instances/index.html
+openstack_dashboard/dashboards/admin/networks/__init__.py
+openstack_dashboard/dashboards/admin/networks/forms.py
+openstack_dashboard/dashboards/admin/networks/panel.py
+openstack_dashboard/dashboards/admin/networks/tables.py
+openstack_dashboard/dashboards/admin/networks/tests.py
+openstack_dashboard/dashboards/admin/networks/urls.py
+openstack_dashboard/dashboards/admin/networks/views.py
+openstack_dashboard/dashboards/admin/networks/ports/__init__.py
+openstack_dashboard/dashboards/admin/networks/ports/forms.py
+openstack_dashboard/dashboards/admin/networks/ports/tables.py
+openstack_dashboard/dashboards/admin/networks/ports/tabs.py
+openstack_dashboard/dashboards/admin/networks/ports/urls.py
+openstack_dashboard/dashboards/admin/networks/ports/views.py
+openstack_dashboard/dashboards/admin/networks/subnets/__init__.py
+openstack_dashboard/dashboards/admin/networks/subnets/forms.py
+openstack_dashboard/dashboards/admin/networks/subnets/tables.py
+openstack_dashboard/dashboards/admin/networks/subnets/urls.py
+openstack_dashboard/dashboards/admin/networks/subnets/views.py
+openstack_dashboard/dashboards/admin/networks/templates/networks/_create.html
+openstack_dashboard/dashboards/admin/networks/templates/networks/_update.html
+openstack_dashboard/dashboards/admin/networks/templates/networks/create.html
+openstack_dashboard/dashboards/admin/networks/templates/networks/index.html
+openstack_dashboard/dashboards/admin/networks/templates/networks/update.html
+openstack_dashboard/dashboards/admin/networks/templates/networks/ports/_create.html
+openstack_dashboard/dashboards/admin/networks/templates/networks/ports/_update.html
+openstack_dashboard/dashboards/admin/networks/templates/networks/ports/create.html
+openstack_dashboard/dashboards/admin/networks/templates/networks/ports/update.html
+openstack_dashboard/dashboards/admin/networks/templates/networks/subnets/_create.html
+openstack_dashboard/dashboards/admin/networks/templates/networks/subnets/_update.html
+openstack_dashboard/dashboards/admin/networks/templates/networks/subnets/create.html
+openstack_dashboard/dashboards/admin/networks/templates/networks/subnets/index.html
+openstack_dashboard/dashboards/admin/networks/templates/networks/subnets/update.html
+openstack_dashboard/dashboards/admin/overview/__init__.py
+openstack_dashboard/dashboards/admin/overview/panel.py
+openstack_dashboard/dashboards/admin/overview/tests.py
+openstack_dashboard/dashboards/admin/overview/urls.py
+openstack_dashboard/dashboards/admin/overview/views.py
+openstack_dashboard/dashboards/admin/overview/templates/overview/usage.csv
+openstack_dashboard/dashboards/admin/overview/templates/overview/usage.html
+openstack_dashboard/dashboards/admin/projects/__init__.py
+openstack_dashboard/dashboards/admin/projects/forms.py
+openstack_dashboard/dashboards/admin/projects/panel.py
+openstack_dashboard/dashboards/admin/projects/tables.py
+openstack_dashboard/dashboards/admin/projects/tests.py
+openstack_dashboard/dashboards/admin/projects/urls.py
+openstack_dashboard/dashboards/admin/projects/views.py
+openstack_dashboard/dashboards/admin/projects/workflows.py
+openstack_dashboard/dashboards/admin/projects/templates/projects/_add_user.html
+openstack_dashboard/dashboards/admin/projects/templates/projects/_create.html
+openstack_dashboard/dashboards/admin/projects/templates/projects/_create_user.html
+openstack_dashboard/dashboards/admin/projects/templates/projects/_quotas.html
+openstack_dashboard/dashboards/admin/projects/templates/projects/_update.html
+openstack_dashboard/dashboards/admin/projects/templates/projects/_update_members.html
+openstack_dashboard/dashboards/admin/projects/templates/projects/add_user.html
+openstack_dashboard/dashboards/admin/projects/templates/projects/create.html
+openstack_dashboard/dashboards/admin/projects/templates/projects/create_user.html
+openstack_dashboard/dashboards/admin/projects/templates/projects/index.html
+openstack_dashboard/dashboards/admin/projects/templates/projects/quotas.html
+openstack_dashboard/dashboards/admin/projects/templates/projects/update.html
+openstack_dashboard/dashboards/admin/projects/templates/projects/usage.html
+openstack_dashboard/dashboards/admin/projects/templates/projects/users.html
+openstack_dashboard/dashboards/admin/users/__init__.py
+openstack_dashboard/dashboards/admin/users/forms.py
+openstack_dashboard/dashboards/admin/users/panel.py
+openstack_dashboard/dashboards/admin/users/tables.py
+openstack_dashboard/dashboards/admin/users/tests.py
+openstack_dashboard/dashboards/admin/users/urls.py
+openstack_dashboard/dashboards/admin/users/views.py
+openstack_dashboard/dashboards/admin/users/templates/users/_create.html
+openstack_dashboard/dashboards/admin/users/templates/users/_update.html
+openstack_dashboard/dashboards/admin/users/templates/users/create.html
+openstack_dashboard/dashboards/admin/users/templates/users/index.html
+openstack_dashboard/dashboards/admin/users/templates/users/update.html
+openstack_dashboard/dashboards/admin/volumes/__init__.py
+openstack_dashboard/dashboards/admin/volumes/forms.py
+openstack_dashboard/dashboards/admin/volumes/panel.py
+openstack_dashboard/dashboards/admin/volumes/tables.py
+openstack_dashboard/dashboards/admin/volumes/tests.py
+openstack_dashboard/dashboards/admin/volumes/urls.py
+openstack_dashboard/dashboards/admin/volumes/views.py
+openstack_dashboard/dashboards/admin/volumes/templates/volumes/_create_volume_type.html
+openstack_dashboard/dashboards/admin/volumes/templates/volumes/create_volume_type.html
+openstack_dashboard/dashboards/admin/volumes/templates/volumes/detail.html
+openstack_dashboard/dashboards/admin/volumes/templates/volumes/index.html
+openstack_dashboard/dashboards/project/__init__.py
+openstack_dashboard/dashboards/project/dashboard.py
+openstack_dashboard/dashboards/project/models.py
+openstack_dashboard/dashboards/project/access_and_security/__init__.py
+openstack_dashboard/dashboards/project/access_and_security/panel.py
+openstack_dashboard/dashboards/project/access_and_security/tests.py
+openstack_dashboard/dashboards/project/access_and_security/urls.py
+openstack_dashboard/dashboards/project/access_and_security/views.py
+openstack_dashboard/dashboards/project/access_and_security/floating_ips/__init__.py
+openstack_dashboard/dashboards/project/access_and_security/floating_ips/forms.py
+openstack_dashboard/dashboards/project/access_and_security/floating_ips/tables.py
+openstack_dashboard/dashboards/project/access_and_security/floating_ips/tests.py
+openstack_dashboard/dashboards/project/access_and_security/floating_ips/urls.py
+openstack_dashboard/dashboards/project/access_and_security/floating_ips/views.py
+openstack_dashboard/dashboards/project/access_and_security/floating_ips/workflows.py
+openstack_dashboard/dashboards/project/access_and_security/keypairs/__init__.py
+openstack_dashboard/dashboards/project/access_and_security/keypairs/forms.py
+openstack_dashboard/dashboards/project/access_and_security/keypairs/tables.py
+openstack_dashboard/dashboards/project/access_and_security/keypairs/tests.py
+openstack_dashboard/dashboards/project/access_and_security/keypairs/urls.py
+openstack_dashboard/dashboards/project/access_and_security/keypairs/views.py
+openstack_dashboard/dashboards/project/access_and_security/security_groups/__init__.py
+openstack_dashboard/dashboards/project/access_and_security/security_groups/forms.py
+openstack_dashboard/dashboards/project/access_and_security/security_groups/tables.py
+openstack_dashboard/dashboards/project/access_and_security/security_groups/tests.py
+openstack_dashboard/dashboards/project/access_and_security/security_groups/urls.py
+openstack_dashboard/dashboards/project/access_and_security/security_groups/views.py
+openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/index.html
+openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/floating_ips/_allocate.html
+openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/floating_ips/allocate.html
+openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/floating_ips/associate.html
+openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/keypairs/_create.html
+openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/keypairs/_import.html
+openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/keypairs/create.html
+openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/keypairs/download.html
+openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/keypairs/import.html
+openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/security_groups/_create.html
+openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/security_groups/_edit_rules.html
+openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/security_groups/create.html
+openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/security_groups/edit_rules.html
+openstack_dashboard/dashboards/project/containers/__init__.py
+openstack_dashboard/dashboards/project/containers/browsers.py
+openstack_dashboard/dashboards/project/containers/forms.py
+openstack_dashboard/dashboards/project/containers/panel.py
+openstack_dashboard/dashboards/project/containers/tables.py
+openstack_dashboard/dashboards/project/containers/tests.py
+openstack_dashboard/dashboards/project/containers/urls.py
+openstack_dashboard/dashboards/project/containers/views.py
+openstack_dashboard/dashboards/project/containers/templates/containers/_copy.html
+openstack_dashboard/dashboards/project/containers/templates/containers/_create.html
+openstack_dashboard/dashboards/project/containers/templates/containers/_upload.html
+openstack_dashboard/dashboards/project/containers/templates/containers/copy.html
+openstack_dashboard/dashboards/project/containers/templates/containers/create.html
+openstack_dashboard/dashboards/project/containers/templates/containers/index.html
+openstack_dashboard/dashboards/project/containers/templates/containers/upload.html
+openstack_dashboard/dashboards/project/images_and_snapshots/__init__.py
+openstack_dashboard/dashboards/project/images_and_snapshots/panel.py
+openstack_dashboard/dashboards/project/images_and_snapshots/tests.py
+openstack_dashboard/dashboards/project/images_and_snapshots/urls.py
+openstack_dashboard/dashboards/project/images_and_snapshots/views.py
+openstack_dashboard/dashboards/project/images_and_snapshots/images/__init__.py
+openstack_dashboard/dashboards/project/images_and_snapshots/images/forms.py
+openstack_dashboard/dashboards/project/images_and_snapshots/images/tables.py
+openstack_dashboard/dashboards/project/images_and_snapshots/images/tabs.py
+openstack_dashboard/dashboards/project/images_and_snapshots/images/tests.py
+openstack_dashboard/dashboards/project/images_and_snapshots/images/urls.py
+openstack_dashboard/dashboards/project/images_and_snapshots/images/views.py
+openstack_dashboard/dashboards/project/images_and_snapshots/snapshots/__init__.py
+openstack_dashboard/dashboards/project/images_and_snapshots/snapshots/forms.py
+openstack_dashboard/dashboards/project/images_and_snapshots/snapshots/tables.py
+openstack_dashboard/dashboards/project/images_and_snapshots/snapshots/tests.py
+openstack_dashboard/dashboards/project/images_and_snapshots/snapshots/urls.py
+openstack_dashboard/dashboards/project/images_and_snapshots/snapshots/views.py
+openstack_dashboard/dashboards/project/images_and_snapshots/templates/images_and_snapshots/index.html
+openstack_dashboard/dashboards/project/images_and_snapshots/templates/images_and_snapshots/images/_create.html
+openstack_dashboard/dashboards/project/images_and_snapshots/templates/images_and_snapshots/images/_detail_overview.html
+openstack_dashboard/dashboards/project/images_and_snapshots/templates/images_and_snapshots/images/_update.html
+openstack_dashboard/dashboards/project/images_and_snapshots/templates/images_and_snapshots/images/create.html
+openstack_dashboard/dashboards/project/images_and_snapshots/templates/images_and_snapshots/images/detail.html
+openstack_dashboard/dashboards/project/images_and_snapshots/templates/images_and_snapshots/images/update.html
+openstack_dashboard/dashboards/project/images_and_snapshots/templates/images_and_snapshots/snapshots/_create.html
+openstack_dashboard/dashboards/project/images_and_snapshots/templates/images_and_snapshots/snapshots/_detail_overview.html
+openstack_dashboard/dashboards/project/images_and_snapshots/templates/images_and_snapshots/snapshots/create.html
+openstack_dashboard/dashboards/project/images_and_snapshots/templates/images_and_snapshots/snapshots/detail.html
+openstack_dashboard/dashboards/project/images_and_snapshots/volume_snapshots/__init__.py
+openstack_dashboard/dashboards/project/images_and_snapshots/volume_snapshots/tables.py
+openstack_dashboard/dashboards/project/images_and_snapshots/volume_snapshots/tabs.py
+openstack_dashboard/dashboards/project/images_and_snapshots/volume_snapshots/tests.py
+openstack_dashboard/dashboards/project/instances/__init__.py
+openstack_dashboard/dashboards/project/instances/forms.py
+openstack_dashboard/dashboards/project/instances/panel.py
+openstack_dashboard/dashboards/project/instances/tables.py
+openstack_dashboard/dashboards/project/instances/tabs.py
+openstack_dashboard/dashboards/project/instances/tests.py
+openstack_dashboard/dashboards/project/instances/urls.py
+openstack_dashboard/dashboards/project/instances/views.py
+openstack_dashboard/dashboards/project/instances/workflows.py
+openstack_dashboard/dashboards/project/instances/templates/instances/_detail_log.html
+openstack_dashboard/dashboards/project/instances/templates/instances/_detail_overview.html
+openstack_dashboard/dashboards/project/instances/templates/instances/_detail_vnc.html
+openstack_dashboard/dashboards/project/instances/templates/instances/_instance_ips.html
+openstack_dashboard/dashboards/project/instances/templates/instances/_launch_customize_help.html
+openstack_dashboard/dashboards/project/instances/templates/instances/_launch_details_help.html
+openstack_dashboard/dashboards/project/instances/templates/instances/_launch_volumes_help.html
+openstack_dashboard/dashboards/project/instances/templates/instances/_update.html
+openstack_dashboard/dashboards/project/instances/templates/instances/detail.html
+openstack_dashboard/dashboards/project/instances/templates/instances/index.html
+openstack_dashboard/dashboards/project/instances/templates/instances/launch.html
+openstack_dashboard/dashboards/project/instances/templates/instances/update.html
+openstack_dashboard/dashboards/project/networks/__init__.py
+openstack_dashboard/dashboards/project/networks/forms.py
+openstack_dashboard/dashboards/project/networks/panel.py
+openstack_dashboard/dashboards/project/networks/tables.py
+openstack_dashboard/dashboards/project/networks/tests.py
+openstack_dashboard/dashboards/project/networks/urls.py
+openstack_dashboard/dashboards/project/networks/views.py
+openstack_dashboard/dashboards/project/networks/workflows.py
+openstack_dashboard/dashboards/project/networks/ports/__init__.py
+openstack_dashboard/dashboards/project/networks/ports/tables.py
+openstack_dashboard/dashboards/project/networks/ports/tabs.py
+openstack_dashboard/dashboards/project/networks/ports/urls.py
+openstack_dashboard/dashboards/project/networks/ports/views.py
+openstack_dashboard/dashboards/project/networks/subnets/__init__.py
+openstack_dashboard/dashboards/project/networks/subnets/forms.py
+openstack_dashboard/dashboards/project/networks/subnets/tables.py
+openstack_dashboard/dashboards/project/networks/subnets/tabs.py
+openstack_dashboard/dashboards/project/networks/subnets/urls.py
+openstack_dashboard/dashboards/project/networks/subnets/views.py
+openstack_dashboard/dashboards/project/networks/templates/networks/_create.html
+openstack_dashboard/dashboards/project/networks/templates/networks/_detail_overview.html
+openstack_dashboard/dashboards/project/networks/templates/networks/_network_ips.html
+openstack_dashboard/dashboards/project/networks/templates/networks/_update.html
+openstack_dashboard/dashboards/project/networks/templates/networks/create.html
+openstack_dashboard/dashboards/project/networks/templates/networks/detail.html
+openstack_dashboard/dashboards/project/networks/templates/networks/index.html
+openstack_dashboard/dashboards/project/networks/templates/networks/update.html
+openstack_dashboard/dashboards/project/networks/templates/networks/ports/_detail_overview.html
+openstack_dashboard/dashboards/project/networks/templates/networks/ports/_port_ips.html
+openstack_dashboard/dashboards/project/networks/templates/networks/ports/detail.html
+openstack_dashboard/dashboards/project/networks/templates/networks/subnets/_create.html
+openstack_dashboard/dashboards/project/networks/templates/networks/subnets/_detail_overview.html
+openstack_dashboard/dashboards/project/networks/templates/networks/subnets/_update.html
+openstack_dashboard/dashboards/project/networks/templates/networks/subnets/create.html
+openstack_dashboard/dashboards/project/networks/templates/networks/subnets/detail.html
+openstack_dashboard/dashboards/project/networks/templates/networks/subnets/index.html
+openstack_dashboard/dashboards/project/networks/templates/networks/subnets/update.html
+openstack_dashboard/dashboards/project/overview/__init__.py
+openstack_dashboard/dashboards/project/overview/panel.py
+openstack_dashboard/dashboards/project/overview/tests.py
+openstack_dashboard/dashboards/project/overview/urls.py
+openstack_dashboard/dashboards/project/overview/views.py
+openstack_dashboard/dashboards/project/overview/templates/overview/usage.csv
+openstack_dashboard/dashboards/project/overview/templates/overview/usage.html
+openstack_dashboard/dashboards/project/volumes/__init__.py
+openstack_dashboard/dashboards/project/volumes/forms.py
+openstack_dashboard/dashboards/project/volumes/panel.py
+openstack_dashboard/dashboards/project/volumes/tables.py
+openstack_dashboard/dashboards/project/volumes/tabs.py
+openstack_dashboard/dashboards/project/volumes/tests.py
+openstack_dashboard/dashboards/project/volumes/urls.py
+openstack_dashboard/dashboards/project/volumes/views.py
+openstack_dashboard/dashboards/project/volumes/templates/volumes/_attach.html
+openstack_dashboard/dashboards/project/volumes/templates/volumes/_create.html
+openstack_dashboard/dashboards/project/volumes/templates/volumes/_create_snapshot.html
+openstack_dashboard/dashboards/project/volumes/templates/volumes/_detail_overview.html
+openstack_dashboard/dashboards/project/volumes/templates/volumes/attach.html
+openstack_dashboard/dashboards/project/volumes/templates/volumes/create.html
+openstack_dashboard/dashboards/project/volumes/templates/volumes/create_snapshot.html
+openstack_dashboard/dashboards/project/volumes/templates/volumes/detail.html
+openstack_dashboard/dashboards/project/volumes/templates/volumes/index.html
+openstack_dashboard/dashboards/settings/__init__.py
+openstack_dashboard/dashboards/settings/dashboard.py
+openstack_dashboard/dashboards/settings/models.py
+openstack_dashboard/dashboards/settings/ec2/__init__.py
+openstack_dashboard/dashboards/settings/ec2/forms.py
+openstack_dashboard/dashboards/settings/ec2/panel.py
+openstack_dashboard/dashboards/settings/ec2/tests.py
+openstack_dashboard/dashboards/settings/ec2/urls.py
+openstack_dashboard/dashboards/settings/ec2/views.py
+openstack_dashboard/dashboards/settings/ec2/templates/ec2/download_form.html
+openstack_dashboard/dashboards/settings/ec2/templates/ec2/ec2rc.sh.template
+openstack_dashboard/dashboards/settings/ec2/templates/ec2/index.html
+openstack_dashboard/dashboards/settings/project/__init__.py
+openstack_dashboard/dashboards/settings/project/forms.py
+openstack_dashboard/dashboards/settings/project/panel.py
+openstack_dashboard/dashboards/settings/project/tables.py
+openstack_dashboard/dashboards/settings/project/urls.py
+openstack_dashboard/dashboards/settings/project/views.py
+openstack_dashboard/dashboards/settings/project/templates/project/_openrc.html
+openstack_dashboard/dashboards/settings/project/templates/project/openrc.sh.template
+openstack_dashboard/dashboards/settings/project/templates/project/settings.html
+openstack_dashboard/dashboards/settings/user/__init__.py
+openstack_dashboard/dashboards/settings/user/forms.py
+openstack_dashboard/dashboards/settings/user/panel.py
+openstack_dashboard/dashboards/settings/user/urls.py
+openstack_dashboard/dashboards/settings/user/views.py
+openstack_dashboard/dashboards/settings/user/templates/user/_settings.html
+openstack_dashboard/dashboards/settings/user/templates/user/settings.html
 openstack_dashboard/local/__init__.py
 openstack_dashboard/local/local_settings.py.example
 openstack_dashboard/locale/bg_BG/LC_MESSAGES/django.mo
@@ -713,6 +698,8 @@
 openstack_dashboard/locale/es/LC_MESSAGES/django.po
 openstack_dashboard/locale/fr/LC_MESSAGES/django.mo
 openstack_dashboard/locale/fr/LC_MESSAGES/django.po
+openstack_dashboard/locale/it/LC_MESSAGES/django.mo
+openstack_dashboard/locale/it/LC_MESSAGES/django.po
 openstack_dashboard/locale/ja/LC_MESSAGES/django.mo
 openstack_dashboard/locale/ja/LC_MESSAGES/django.po
 openstack_dashboard/locale/ko_KR/LC_MESSAGES/django.mo
@@ -725,10 +712,15 @@
 openstack_dashboard/locale/pt/LC_MESSAGES/django.po
 openstack_dashboard/locale/pt_BR/LC_MESSAGES/django.mo
 openstack_dashboard/locale/pt_BR/LC_MESSAGES/django.po
+openstack_dashboard/locale/ru/LC_MESSAGES/django.mo
+openstack_dashboard/locale/ru/LC_MESSAGES/django.po
 openstack_dashboard/locale/zh_CN/LC_MESSAGES/django.mo
 openstack_dashboard/locale/zh_CN/LC_MESSAGES/django.po
 openstack_dashboard/locale/zh_TW/LC_MESSAGES/django.mo
 openstack_dashboard/locale/zh_TW/LC_MESSAGES/django.po
+openstack_dashboard/openstack/__init__.py
+openstack_dashboard/openstack/common/__init__.py
+openstack_dashboard/openstack/common/setup.py
 openstack_dashboard/static/bootstrap/img/glyphicons-halflings-white.png
 openstack_dashboard/static/bootstrap/img/glyphicons-halflings.png
 openstack_dashboard/static/bootstrap/less/accordion.less
@@ -781,9 +773,43 @@
 openstack_dashboard/templates/403.html
 openstack_dashboard/templates/404.html
 openstack_dashboard/templates/500.html
+openstack_dashboard/templates/_header.html
 openstack_dashboard/templates/_stylesheets.html
 openstack_dashboard/test/__init__.py
+openstack_dashboard/test/error_pages_urls.py
+openstack_dashboard/test/helpers.py
 openstack_dashboard/test/settings.py
+openstack_dashboard/test/api_tests/__init__.py
+openstack_dashboard/test/api_tests/base_tests.py
+openstack_dashboard/test/api_tests/glance_tests.py
+openstack_dashboard/test/api_tests/keystone_tests.py
+openstack_dashboard/test/api_tests/nova_tests.py
+openstack_dashboard/test/api_tests/quantum_tests.py
+openstack_dashboard/test/api_tests/swift_tests.py
+openstack_dashboard/test/templates/404.html
+openstack_dashboard/test/templates/500.html
+openstack_dashboard/test/templates/_tab.html
+openstack_dashboard/test/templates/base-sidebar.html
+openstack_dashboard/test/templates/tab_group.html
+openstack_dashboard/test/templates/workflow.html
+openstack_dashboard/test/templates/registration/login.html
+openstack_dashboard/test/test_data/__init__.py
+openstack_dashboard/test/test_data/exceptions.py
+openstack_dashboard/test/test_data/glance_data.py
+openstack_dashboard/test/test_data/keystone_data.py
+openstack_dashboard/test/test_data/nova_data.py
+openstack_dashboard/test/test_data/quantum_data.py
+openstack_dashboard/test/test_data/swift_data.py
+openstack_dashboard/test/test_data/utils.py
+openstack_dashboard/test/tests/__init__.py
+openstack_dashboard/test/tests/error_pages.py
+openstack_dashboard/test/tests/quotas.py
+openstack_dashboard/test/tests/selenium.py
+openstack_dashboard/usage/__init__.py
+openstack_dashboard/usage/base.py
+openstack_dashboard/usage/quotas.py
+openstack_dashboard/usage/tables.py
+openstack_dashboard/usage/views.py
 openstack_dashboard/wsgi/django.wsgi
 tools/install_venv.py
 tools/pip-requires
 
=== modified file 'horizon.egg-info/requires.txt'
--- horizon.egg-info/requires.txt	2012-09-21 08:03:36 +0000
+++ horizon.egg-info/requires.txt	2012-11-26 19:56:34 +0000
@@ -1,6 +1,7 @@
 Django>=1.4
 django_compressor
-django_openstack_auth
+django_openstack_auth>=1.0.3
+netaddr
 python-cinderclient
 python-glanceclient<2
 python-keystoneclient
 
=== modified file 'horizon/__init__.py'
--- horizon/__init__.py	2012-07-06 11:38:55 +0000
+++ horizon/__init__.py	2012-11-26 19:56:34 +0000
@@ -14,7 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-""" The Horizon OpenStack Dashboard interface.
+""" The Horizon interface.
 
 Contains the core Horizon classes--:class:`~horizon.Dashboard` and
 :class:`horizon.Panel`--the dynamic URLconf for Horizon, and common interface
 
=== removed directory 'horizon/api'
=== removed file 'horizon/api/__init__.py'
--- horizon/api/__init__.py	2012-08-16 14:01:33 +0000
+++ horizon/api/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2012 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
-# All Rights Reserved.
-#
-# 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.
-
-"""
-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 atributes and/or methods.
-
-In other words, Horizon developers not working on horizon.api
-shouldn't need to understand the finer details of APIs for
-Keystone/Nova/Glance/Swift et. al.
-"""
-from horizon.api.glance import *
-from horizon.api.keystone import *
-from horizon.api.nova import *
-from horizon.api.swift import *
-from horizon.api.quantum import *
 
=== removed file 'horizon/api/base.py'
--- horizon/api/base.py	2012-07-06 11:38:55 +0000
+++ horizon/api/base.py	1970-01-01 00:00:00 +0000
@@ -1,118 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2012 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
-# All Rights Reserved.
-#
-# 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.
-
-import logging
-
-from django.conf import settings
-
-from horizon import exceptions
-
-
-__all__ = ('APIResourceWrapper', 'APIDictWrapper',
-           'get_service_from_catalog', 'url_for',)
-
-
-LOG = logging.getLogger(__name__)
-
-
-class APIResourceWrapper(object):
-    """ Simple wrapper for api objects
-
-        Define _attrs on the child class and pass in the
-        api object as the only argument to the constructor
-    """
-    _attrs = []
-
-    def __init__(self, apiresource):
-        self._apiresource = apiresource
-
-    def __getattr__(self, attr):
-        if attr in self._attrs:
-            # __getattr__ won't find properties
-            return self._apiresource.__getattribute__(attr)
-        else:
-            msg = ('Attempted to access unknown attribute "%s" on '
-                   'APIResource object of type "%s" wrapping resource of '
-                   'type "%s".') % (attr, self.__class__,
-                                    self._apiresource.__class__)
-            LOG.debug(exceptions.error_color(msg))
-            raise AttributeError(attr)
-
-
-class APIDictWrapper(object):
-    """ Simple wrapper for api dictionaries
-
-        Some api calls return dictionaries.  This class provides identical
-        behavior as APIResourceWrapper, except that it will also behave as a
-        dictionary, in addition to attribute accesses.
-
-        Attribute access is the preferred method of access, to be
-        consistent with api resource objects from novclient.
-    """
-    def __init__(self, apidict):
-        self._apidict = apidict
-
-    def __getattr__(self, attr):
-        try:
-            return self._apidict[attr]
-        except KeyError:
-            msg = 'Unknown attribute "%(attr)s" on APIResource object ' \
-                  'of type "%(cls)s"' % {'attr': attr, 'cls': self.__class__}
-            LOG.debug(exceptions.error_color(msg))
-            raise AttributeError(msg)
-
-    def __getitem__(self, item):
-        try:
-            return self.__getattr__(item)
-        except AttributeError, e:
-            # caller is expecting a KeyError
-            raise KeyError(e)
-
-    def get(self, item, default=None):
-        try:
-            return self.__getattr__(item)
-        except AttributeError:
-            return default
-
-
-def get_service_from_catalog(catalog, service_type):
-    if catalog: