openstack/trove-dashboard
Code Issues Proposed changes

Merge "py3: Replace unicode with six.text_type"

Browse Source
This commit is contained in:
Jenkins 2015-08-28 02:10:33 +00:00 committed by Gerrit Code Review
commit a7213078c7
3 changed files with 26 additions and 21 deletions
openstack_dashboard/contrib/trove/content
database_backups
tests.py
databases
tests.pyviews.py

7
openstack_dashboard/contrib/trove/content/database_backups/tests.py

@ -15,6 +15,7 @@
from django.core.urlresolvers import reverse
from django import http
from mox3.mox import IsA # noqa
import six
from openstack_dashboard.contrib.trove import api
from openstack_dashboard.test import helpers as test
@ -139,7 +140,7 @@ class DatabasesBackupsTests(test.TestCase):
@test.create_stubs({api.trove: ('backup_get', 'instance_get')})
def test_detail_backup(self):
api.trove.backup_get(IsA(http.HttpRequest),
IsA(unicode))\
IsA(six.text_type))\
.AndReturn(self.database_backups.first())
api.trove.instance_get(IsA(http.HttpRequest),
@ -155,7 +156,7 @@ class DatabasesBackupsTests(test.TestCase):
@test.create_stubs({api.trove: ('backup_get',)})
def test_detail_backup_notfound(self):
api.trove.backup_get(IsA(http.HttpRequest),
IsA(unicode))\
IsA(six.text_type))\
.AndRaise(self.exceptions.trove)
self.mox.ReplayAll()
@ -168,7 +169,7 @@ class DatabasesBackupsTests(test.TestCase):
incr_backup = self.database_backups.list()[2]
parent_backup = self.database_backups.list()[1]
api.trove.backup_get(IsA(http.HttpRequest), IsA(unicode))\
api.trove.backup_get(IsA(http.HttpRequest), IsA(six.text_type))\
.AndReturn(incr_backup)
api.trove.backup_get(IsA(http.HttpRequest), incr_backup.parent_id) \
.AndReturn(parent_backup)

35
openstack_dashboard/contrib/trove/content/databases/tests.py

@ -21,6 +21,7 @@ from django import http
from django.utils import unittest
from mox3.mox import IsA # noqa
import six
from horizon import exceptions
from openstack_dashboard import api as dash_api
@ -222,12 +223,12 @@ class DatabaseTests(test.TestCase):
# Actual create database call
api.trove.instance_create(
IsA(http.HttpRequest),
IsA(unicode),
IsA(six.text_type),
IsA(int),
IsA(unicode),
IsA(six.text_type),
databases=None,
datastore=IsA(unicode),
datastore_version=IsA(unicode),
datastore=IsA(six.text_type),
datastore_version=IsA(six.text_type),
restore_point=None,
replica_of=None,
users=None,
@ -283,12 +284,12 @@ class DatabaseTests(test.TestCase):
# Actual create database call
api.trove.instance_create(
IsA(http.HttpRequest),
IsA(unicode),
IsA(six.text_type),
IsA(int),
IsA(unicode),
IsA(six.text_type),
databases=None,
datastore=IsA(unicode),
datastore_version=IsA(unicode),
datastore=IsA(six.text_type),
datastore_version=IsA(six.text_type),
restore_point=None,
replica_of=None,
users=None,
@ -309,7 +310,7 @@ class DatabaseTests(test.TestCase):
@test.create_stubs(
{api.trove: ('instance_get', 'flavor_get',)})
def _test_details(self, database, with_designate=False):
api.trove.instance_get(IsA(http.HttpRequest), IsA(unicode))\
api.trove.instance_get(IsA(http.HttpRequest), IsA(six.text_type))\
.AndReturn(database)
api.trove.flavor_get(IsA(http.HttpRequest), IsA(str))\
.AndReturn(self.flavors.first())
@ -343,7 +344,7 @@ class DatabaseTests(test.TestCase):
user_id = user.name
# views.py: DetailView.get_data
api.trove.instance_get(IsA(http.HttpRequest), IsA(unicode))\
api.trove.instance_get(IsA(http.HttpRequest), IsA(six.text_type))\
.AndReturn(database)
api.trove.flavor_get(IsA(http.HttpRequest), IsA(str))\
.AndReturn(self.flavors.first())
@ -378,7 +379,7 @@ class DatabaseTests(test.TestCase):
database_size = database.volume.get('size')
# views.py: DetailView.get_data
api.trove.instance_get(IsA(http.HttpRequest), IsA(unicode))\
api.trove.instance_get(IsA(http.HttpRequest), IsA(six.text_type))\
.AndReturn(database)
# forms.py: ResizeVolumeForm.handle
@ -405,7 +406,7 @@ class DatabaseTests(test.TestCase):
database_size = database.volume.get('size')
# views.py: DetailView.get_data
api.trove.instance_get(IsA(http.HttpRequest), IsA(unicode))\
api.trove.instance_get(IsA(http.HttpRequest), IsA(six.text_type))\
.AndReturn(database)
self.mox.ReplayAll()
@ -511,18 +512,18 @@ class DatabaseTests(test.TestCase):
nics = [{"net-id": self.networks.first().id, "v4-fixed-ip": ''}]
api.trove.instance_get(IsA(http.HttpRequest), IsA(unicode))\
api.trove.instance_get(IsA(http.HttpRequest), IsA(six.text_type))\
.AndReturn(self.databases.first())
# Actual create database call
api.trove.instance_create(
IsA(http.HttpRequest),
IsA(unicode),
IsA(six.text_type),
IsA(int),
IsA(unicode),
IsA(six.text_type),
databases=None,
datastore=IsA(unicode),
datastore_version=IsA(unicode),
datastore=IsA(six.text_type),
datastore_version=IsA(six.text_type),
restore_point=None,
replica_of=self.databases.first().id,
users=None,

5
openstack_dashboard/contrib/trove/content/databases/views.py

@ -22,6 +22,8 @@ from django.core.urlresolvers import reverse_lazy
from django.utils.datastructures import SortedDict
from django.utils.translation import ugettext_lazy as _
import six
from horizon import exceptions
from horizon import forms as horizon_forms
from horizon import tables as horizon_tables
@ -58,7 +60,8 @@ class IndexView(horizon_tables.DataTableView):
flavors = []
msg = _('Unable to retrieve database size information.')
exceptions.handle(self.request, msg)
return SortedDict((unicode(flavor.id), flavor) for flavor in flavors)
return SortedDict((six.text_type(flavor.id), flavor)
for flavor in flavors)
def _extra_data(self, instance):
flavor = self.get_flavors().get(instance.flavor["id"])