Browse Source

Merge "Move to hacking 0.10"

Jenkins 4 years ago
parent
commit
9d32c18ac8
100 changed files with 194 additions and 194 deletions
  1. 2
    2
      horizon/test/test_dashboards/dogs/puppies/tables.py
  2. 16
    16
      horizon/test/tests/tables.py
  3. 4
    4
      horizon/test/tests/workflows.py
  4. 2
    2
      openstack_dashboard/dashboards/admin/aggregates/tables.py
  5. 3
    3
      openstack_dashboard/dashboards/admin/aggregates/workflows.py
  6. 1
    1
      openstack_dashboard/dashboards/admin/defaults/tables.py
  7. 1
    1
      openstack_dashboard/dashboards/admin/defaults/workflows.py
  8. 1
    1
      openstack_dashboard/dashboards/admin/flavors/tables.py
  9. 3
    3
      openstack_dashboard/dashboards/admin/flavors/workflows.py
  10. 1
    1
      openstack_dashboard/dashboards/admin/hypervisors/compute/tables.py
  11. 2
    2
      openstack_dashboard/dashboards/admin/hypervisors/tables.py
  12. 1
    1
      openstack_dashboard/dashboards/admin/images/tables.py
  13. 4
    4
      openstack_dashboard/dashboards/admin/info/tables.py
  14. 1
    1
      openstack_dashboard/dashboards/admin/instances/tables.py
  15. 1
    1
      openstack_dashboard/dashboards/admin/metadata_defs/panel.py
  16. 1
    1
      openstack_dashboard/dashboards/admin/metadata_defs/tables.py
  17. 2
    2
      openstack_dashboard/dashboards/admin/metering/tables.py
  18. 1
    1
      openstack_dashboard/dashboards/admin/networks/agents/tables.py
  19. 1
    1
      openstack_dashboard/dashboards/admin/networks/ports/tables.py
  20. 1
    1
      openstack_dashboard/dashboards/admin/networks/subnets/tables.py
  21. 1
    1
      openstack_dashboard/dashboards/admin/networks/tables.py
  22. 1
    1
      openstack_dashboard/dashboards/admin/routers/extensions/routerrules/tables.py
  23. 1
    1
      openstack_dashboard/dashboards/admin/routers/ports/tables.py
  24. 1
    1
      openstack_dashboard/dashboards/admin/routers/tables.py
  25. 1
    1
      openstack_dashboard/dashboards/admin/volumes/snapshots/tables.py
  26. 1
    1
      openstack_dashboard/dashboards/admin/volumes/volume_types/extras/tables.py
  27. 1
    1
      openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/forms.py
  28. 1
    1
      openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/tables.py
  29. 2
    2
      openstack_dashboard/dashboards/admin/volumes/volume_types/tables.py
  30. 1
    1
      openstack_dashboard/dashboards/admin/volumes/volumes/tables.py
  31. 1
    1
      openstack_dashboard/dashboards/identity/domains/tables.py
  32. 4
    4
      openstack_dashboard/dashboards/identity/domains/workflows.py
  33. 3
    3
      openstack_dashboard/dashboards/identity/groups/tables.py
  34. 1
    1
      openstack_dashboard/dashboards/identity/projects/tables.py
  35. 6
    6
      openstack_dashboard/dashboards/identity/projects/workflows.py
  36. 1
    1
      openstack_dashboard/dashboards/identity/roles/tables.py
  37. 1
    1
      openstack_dashboard/dashboards/identity/users/tables.py
  38. 1
    1
      openstack_dashboard/dashboards/project/access_and_security/api_access/tables.py
  39. 1
    1
      openstack_dashboard/dashboards/project/access_and_security/floating_ips/tables.py
  40. 1
    1
      openstack_dashboard/dashboards/project/access_and_security/floating_ips/workflows.py
  41. 1
    1
      openstack_dashboard/dashboards/project/access_and_security/keypairs/tables.py
  42. 2
    2
      openstack_dashboard/dashboards/project/access_and_security/security_groups/tables.py
  43. 2
    2
      openstack_dashboard/dashboards/project/containers/tables.py
  44. 1
    1
      openstack_dashboard/dashboards/project/data_processing/cluster_templates/tables.py
  45. 3
    3
      openstack_dashboard/dashboards/project/data_processing/cluster_templates/workflows/create.py
  46. 1
    1
      openstack_dashboard/dashboards/project/data_processing/clusters/tables.py
  47. 1
    1
      openstack_dashboard/dashboards/project/data_processing/clusters/tabs.py
  48. 1
    1
      openstack_dashboard/dashboards/project/data_processing/clusters/tests.py
  49. 2
    2
      openstack_dashboard/dashboards/project/data_processing/clusters/workflows/create.py
  50. 1
    1
      openstack_dashboard/dashboards/project/data_processing/data_image_registry/tables.py
  51. 1
    1
      openstack_dashboard/dashboards/project/data_processing/data_plugins/tables.py
  52. 1
    1
      openstack_dashboard/dashboards/project/data_processing/data_sources/tables.py
  53. 1
    1
      openstack_dashboard/dashboards/project/data_processing/data_sources/workflows/create.py
  54. 1
    1
      openstack_dashboard/dashboards/project/data_processing/job_binaries/forms.py
  55. 1
    1
      openstack_dashboard/dashboards/project/data_processing/job_binaries/tables.py
  56. 1
    1
      openstack_dashboard/dashboards/project/data_processing/job_executions/tables.py
  57. 1
    1
      openstack_dashboard/dashboards/project/data_processing/jobs/tables.py
  58. 2
    2
      openstack_dashboard/dashboards/project/data_processing/jobs/workflows/create.py
  59. 5
    5
      openstack_dashboard/dashboards/project/data_processing/jobs/workflows/launch.py
  60. 1
    1
      openstack_dashboard/dashboards/project/data_processing/nodegroup_templates/tables.py
  61. 3
    3
      openstack_dashboard/dashboards/project/data_processing/nodegroup_templates/workflows/create.py
  62. 1
    1
      openstack_dashboard/dashboards/project/database_backups/tables.py
  63. 1
    1
      openstack_dashboard/dashboards/project/database_backups/workflows/create_backup.py
  64. 4
    4
      openstack_dashboard/dashboards/project/databases/tables.py
  65. 4
    4
      openstack_dashboard/dashboards/project/databases/workflows/create_instance.py
  66. 3
    3
      openstack_dashboard/dashboards/project/firewalls/tables.py
  67. 4
    4
      openstack_dashboard/dashboards/project/firewalls/workflows.py
  68. 1
    1
      openstack_dashboard/dashboards/project/images/images/tables.py
  69. 1
    1
      openstack_dashboard/dashboards/project/instances/audit_tables.py
  70. 1
    1
      openstack_dashboard/dashboards/project/instances/tables.py
  71. 6
    6
      openstack_dashboard/dashboards/project/instances/workflows/create_instance.py
  72. 1
    1
      openstack_dashboard/dashboards/project/instances/workflows/resize_instance.py
  73. 2
    2
      openstack_dashboard/dashboards/project/instances/workflows/update_instance.py
  74. 3
    3
      openstack_dashboard/dashboards/project/loadbalancers/tables.py
  75. 6
    6
      openstack_dashboard/dashboards/project/loadbalancers/workflows.py
  76. 1
    1
      openstack_dashboard/dashboards/project/network_topology/instances/tables.py
  77. 1
    1
      openstack_dashboard/dashboards/project/network_topology/ports/tables.py
  78. 1
    1
      openstack_dashboard/dashboards/project/network_topology/routers/tables.py
  79. 1
    1
      openstack_dashboard/dashboards/project/networks/ports/tables.py
  80. 1
    1
      openstack_dashboard/dashboards/project/networks/subnets/tables.py
  81. 3
    3
      openstack_dashboard/dashboards/project/networks/subnets/workflows.py
  82. 1
    1
      openstack_dashboard/dashboards/project/networks/tables.py
  83. 1
    1
      openstack_dashboard/dashboards/project/networks/tests.py
  84. 3
    3
      openstack_dashboard/dashboards/project/networks/workflows.py
  85. 1
    1
      openstack_dashboard/dashboards/project/routers/extensions/routerrules/tables.py
  86. 1
    1
      openstack_dashboard/dashboards/project/routers/ports/tables.py
  87. 1
    1
      openstack_dashboard/dashboards/project/routers/tables.py
  88. 1
    1
      openstack_dashboard/dashboards/project/routers/tests.py
  89. 4
    4
      openstack_dashboard/dashboards/project/stacks/forms.py
  90. 1
    1
      openstack_dashboard/dashboards/project/stacks/resource_types/tables.py
  91. 3
    3
      openstack_dashboard/dashboards/project/stacks/tables.py
  92. 1
    1
      openstack_dashboard/dashboards/project/volumes/backups/tables.py
  93. 1
    1
      openstack_dashboard/dashboards/project/volumes/snapshots/tables.py
  94. 2
    2
      openstack_dashboard/dashboards/project/volumes/volumes/tables.py
  95. 4
    4
      openstack_dashboard/dashboards/project/vpn/tables.py
  96. 5
    5
      openstack_dashboard/dashboards/project/vpn/workflows.py
  97. 2
    2
      openstack_dashboard/dashboards/router/nexus1000v/tables.py
  98. 1
    1
      openstack_dashboard/test/integration_tests/tests/test_flavors.py
  99. 2
    2
      openstack_dashboard/usage/tables.py
  100. 0
    0
      test-requirements.txt

+ 2
- 2
horizon/test/test_dashboards/dogs/puppies/tables.py View File

@@ -18,7 +18,7 @@ from horizon import tables
18 18
 class EagerPuppiesTable(tables.DataTable):
19 19
     name = tables.Column('name')
20 20
 
21
-    class Meta:
21
+    class Meta(object):
22 22
         name = 'eager_puppies'
23 23
         verbose_name = 'Eager Puppies'
24 24
 
@@ -49,7 +49,7 @@ class SellPuppy(tables.DeleteAction):
49 49
 class LazyPuppiesTable(tables.DataTable):
50 50
     name = tables.Column('name')
51 51
 
52
-    class Meta:
52
+    class Meta(object):
53 53
         name = 'lazy_puppies'
54 54
         verbose_name = 'Lazy Puppies'
55 55
         table_actions = (SellPuppy,)

+ 16
- 16
horizon/test/tests/tables.py View File

@@ -237,7 +237,7 @@ class MyTable(tables.DataTable):
237 237
     optional = tables.Column('optional', empty_value='N/A')
238 238
     excluded = tables.Column('excluded')
239 239
 
240
-    class Meta:
240
+    class Meta(object):
241 241
         name = "my_table"
242 242
         verbose_name = "My Table"
243 243
         status_columns = ["status"]
@@ -251,7 +251,7 @@ class MyTable(tables.DataTable):
251 251
 
252 252
 
253 253
 class MyServerFilterTable(MyTable):
254
-    class Meta:
254
+    class Meta(object):
255 255
         name = "my_table"
256 256
         verbose_name = "My Table"
257 257
         status_columns = ["status"]
@@ -264,7 +264,7 @@ class MyServerFilterTable(MyTable):
264 264
 
265 265
 
266 266
 class MyTableSelectable(MyTable):
267
-    class Meta:
267
+    class Meta(object):
268 268
         name = "my_table"
269 269
         columns = ('id', 'name', 'value', 'status')
270 270
         row_class = MyRowSelectable
@@ -280,7 +280,7 @@ class MyTableNotAllowedInlineEdit(MyTable):
280 280
                          form_field_attributes={'class': 'test'},
281 281
                          update_action=MyUpdateActionNotAllowed)
282 282
 
283
-    class Meta:
283
+    class Meta(object):
284 284
         name = "my_table"
285 285
         columns = ('id', 'name', 'value', 'optional', 'status')
286 286
         row_class = MyRow
@@ -302,7 +302,7 @@ class MyTableWrapList(MyTable):
302 302
 class NoActionsTable(tables.DataTable):
303 303
     id = tables.Column('id')
304 304
 
305
-    class Meta:
305
+    class Meta(object):
306 306
         name = "no_actions_table"
307 307
         verbose_name = "No Actions Table"
308 308
         table_actions = ()
@@ -312,7 +312,7 @@ class NoActionsTable(tables.DataTable):
312 312
 class DisabledActionsTable(tables.DataTable):
313 313
     id = tables.Column('id')
314 314
 
315
-    class Meta:
315
+    class Meta(object):
316 316
         name = "disabled_actions_table"
317 317
         verbose_name = "Disabled Actions Table"
318 318
         table_actions = (MyDisabledAction,)
@@ -381,7 +381,7 @@ class DataTableTests(test.TestCase):
381 381
 
382 382
     def test_table_force_no_multiselect(self):
383 383
         class TempTable(MyTable):
384
-            class Meta:
384
+            class Meta(object):
385 385
                 columns = ('id',)
386 386
                 table_actions = (MyFilterAction, MyAction,)
387 387
                 row_actions = (MyAction, MyLinkAction,)
@@ -393,7 +393,7 @@ class DataTableTests(test.TestCase):
393 393
 
394 394
     def test_table_force_no_actions_column(self):
395 395
         class TempTable(MyTable):
396
-            class Meta:
396
+            class Meta(object):
397 397
                 columns = ('id',)
398 398
                 table_actions = (MyFilterAction, MyAction,)
399 399
                 row_actions = (MyAction, MyLinkAction,)
@@ -409,7 +409,7 @@ class DataTableTests(test.TestCase):
409 409
                                  verbose_name="Verbose Name",
410 410
                                  sortable=True)
411 411
 
412
-            class Meta:
412
+            class Meta(object):
413 413
                 name = "my_table"
414 414
                 columns = ('id', 'name', 'value', 'optional', 'status')
415 415
 
@@ -421,7 +421,7 @@ class DataTableTests(test.TestCase):
421 421
 
422 422
     def test_table_natural_no_actions_column(self):
423 423
         class TempTable(MyTable):
424
-            class Meta:
424
+            class Meta(object):
425 425
                 columns = ('id',)
426 426
                 table_actions = (MyFilterAction, MyAction,)
427 427
         self.table = TempTable(self.request, TEST_DATA)
@@ -431,7 +431,7 @@ class DataTableTests(test.TestCase):
431 431
 
432 432
     def test_table_natural_no_multiselect(self):
433 433
         class TempTable(MyTable):
434
-            class Meta:
434
+            class Meta(object):
435 435
                 columns = ('id',)
436 436
                 row_actions = (MyAction, MyLinkAction,)
437 437
         self.table = TempTable(self.request, TEST_DATA)
@@ -443,7 +443,7 @@ class DataTableTests(test.TestCase):
443 443
         class TempTable(MyTable):
444 444
             extra = tables.Column('extra')
445 445
 
446
-            class Meta:
446
+            class Meta(object):
447 447
                 name = "temp_table"
448 448
                 table_actions = (MyFilterAction, MyAction,)
449 449
                 row_actions = (MyAction, MyLinkAction,)
@@ -754,7 +754,7 @@ class DataTableTests(test.TestCase):
754 754
                                  form_field_attributes={'class': 'test'},
755 755
                                  update_action=MyUpdateAction)
756 756
 
757
-            class Meta:
757
+            class Meta(object):
758 758
                 name = "my_table"
759 759
                 columns = ('id', 'name', 'value', 'optional', 'status')
760 760
 
@@ -791,7 +791,7 @@ class DataTableTests(test.TestCase):
791 791
                                  form_field_attributes={'class': 'test'},
792 792
                                  update_action=MyUpdateAction)
793 793
 
794
-            class Meta:
794
+            class Meta(object):
795 795
                 name = "my_table"
796 796
                 columns = ('id', 'name', 'value', 'optional', 'status')
797 797
 
@@ -1322,7 +1322,7 @@ class APIFilterTableView(SingleTableView):
1322 1322
 class TableWithPermissions(tables.DataTable):
1323 1323
     id = tables.Column('id')
1324 1324
 
1325
-    class Meta:
1325
+    class Meta(object):
1326 1326
         name = "table_with_permissions"
1327 1327
         permissions = ('horizon.test',)
1328 1328
 
@@ -1462,7 +1462,7 @@ class FormsetTableTests(test.TestCase):
1462 1462
             name = tables.Column('name')
1463 1463
             value = tables.Column('value')
1464 1464
 
1465
-            class Meta:
1465
+            class Meta(object):
1466 1466
                 name = 'table'
1467 1467
 
1468 1468
         table = Table(self.request)

+ 4
- 4
horizon/test/tests/workflows.py View File

@@ -40,7 +40,7 @@ class TestActionOne(workflows.Action):
40 40
     project_id = forms.ChoiceField(label="Project")
41 41
     user_id = forms.ChoiceField(label="User")
42 42
 
43
-    class Meta:
43
+    class Meta(object):
44 44
         name = "Test Action One"
45 45
         slug = "test_action_one"
46 46
 
@@ -57,7 +57,7 @@ class TestActionOne(workflows.Action):
57 57
 class TestActionTwo(workflows.Action):
58 58
     instance_id = forms.CharField(label="Instance")
59 59
 
60
-    class Meta:
60
+    class Meta(object):
61 61
         name = "Test Action Two"
62 62
         slug = "test_action_two"
63 63
 
@@ -65,7 +65,7 @@ class TestActionTwo(workflows.Action):
65 65
 class TestActionThree(workflows.Action):
66 66
     extra = forms.CharField(widget=forms.widgets.Textarea)
67 67
 
68
-    class Meta:
68
+    class Meta(object):
69 69
         name = "Test Action Three"
70 70
         slug = "test_action_three"
71 71
 
@@ -73,7 +73,7 @@ class TestActionThree(workflows.Action):
73 73
 class AdminAction(workflows.Action):
74 74
     admin_id = forms.CharField(label="Admin")
75 75
 
76
-    class Meta:
76
+    class Meta(object):
77 77
         name = "Admin Action"
78 78
         slug = "admin_action"
79 79
         permissions = ("horizon.test",)

+ 2
- 2
openstack_dashboard/dashboards/admin/aggregates/tables.py View File

@@ -137,7 +137,7 @@ class HostAggregatesTable(tables.DataTable):
137 137
                              wrap_list=True,
138 138
                              filters=(safe_unordered_list,))
139 139
 
140
-    class Meta:
140
+    class Meta(object):
141 141
         name = "host_aggregates"
142 142
         hidden_title = False
143 143
         verbose_name = _("Host Aggregates")
@@ -165,7 +165,7 @@ class AvailabilityZonesTable(tables.DataTable):
165 165
     def get_object_id(self, zone):
166 166
         return zone.zoneName
167 167
 
168
-    class Meta:
168
+    class Meta(object):
169 169
         name = "availability_zones"
170 170
         hidden_title = False
171 171
         verbose_name = _("Availability Zones")

+ 3
- 3
openstack_dashboard/dashboards/admin/aggregates/workflows.py View File

@@ -27,7 +27,7 @@ class SetAggregateInfoAction(workflows.Action):
27 27
     availability_zone = forms.CharField(label=_("Availability Zone"),
28 28
                                         max_length=255)
29 29
 
30
-    class Meta:
30
+    class Meta(object):
31 31
         name = _("Host Aggregate Information")
32 32
         help_text = _("Host aggregates divide an availability zone into "
33 33
                       "logical units by grouping together hosts. Create a "
@@ -90,7 +90,7 @@ class AddHostsToAggregateAction(workflows.MembershipAction):
90 90
         self.fields[field_name].choices = \
91 91
             [(host_name, host_name) for host_name in host_names]
92 92
 
93
-    class Meta:
93
+    class Meta(object):
94 94
         name = _("Manage Hosts within Aggregate")
95 95
         slug = "add_host_to_aggregate"
96 96
 
@@ -130,7 +130,7 @@ class ManageAggregateHostsAction(workflows.MembershipAction):
130 130
 
131 131
         self.fields[field_name].initial = current_aggregate_hosts
132 132
 
133
-    class Meta:
133
+    class Meta(object):
134 134
         name = _("Manage Hosts within Aggregate")
135 135
 
136 136
 

+ 1
- 1
openstack_dashboard/dashboards/admin/defaults/tables.py View File

@@ -70,7 +70,7 @@ class QuotasTable(tables.DataTable):
70 70
     def get_object_id(self, obj):
71 71
         return obj.name
72 72
 
73
-    class Meta:
73
+    class Meta(object):
74 74
         name = "quotas"
75 75
         verbose_name = _("Quotas")
76 76
         table_actions = (QuotaFilterAction, UpdateDefaultQuotas)

+ 1
- 1
openstack_dashboard/dashboards/admin/defaults/workflows.py View File

@@ -63,7 +63,7 @@ class UpdateDefaultQuotasAction(workflows.Action):
63 63
                 self.fields[field].required = False
64 64
                 self.fields[field].widget = forms.HiddenInput()
65 65
 
66
-    class Meta:
66
+    class Meta(object):
67 67
         name = _("Default Quotas")
68 68
         slug = 'update_default_quotas'
69 69
         help_text = _("From here you can update the default quotas "

+ 1
- 1
openstack_dashboard/dashboards/admin/flavors/tables.py View File

@@ -145,7 +145,7 @@ class FlavorsTable(tables.DataTable):
145 145
                                 empty_value=False,
146 146
                                 filters=(filters.yesno, filters.capfirst))
147 147
 
148
-    class Meta:
148
+    class Meta(object):
149 149
         name = "flavors"
150 150
         verbose_name = _("Flavors")
151 151
         table_actions = (FlavorFilterAction, CreateFlavor, DeleteFlavor)

+ 3
- 3
openstack_dashboard/dashboards/admin/flavors/workflows.py View File

@@ -54,7 +54,7 @@ class CreateFlavorInfoAction(workflows.Action):
54 54
     swap_mb = forms.IntegerField(label=_("Swap Disk (MB)"),
55 55
                                  min_value=0)
56 56
 
57
-    class Meta:
57
+    class Meta(object):
58 58
         name = _("Flavor Information")
59 59
         help_text = _("Flavors define the sizes for RAM, disk, number of "
60 60
                       "cores, and other resources and can be selected when "
@@ -147,7 +147,7 @@ class UpdateFlavorAccessAction(workflows.MembershipAction):
147 147
 
148 148
         self.fields[field_name].initial = flavor_access
149 149
 
150
-    class Meta:
150
+    class Meta(object):
151 151
         name = _("Flavor Access")
152 152
         slug = "update_flavor_access"
153 153
 
@@ -222,7 +222,7 @@ class CreateFlavor(workflows.Workflow):
222 222
 class UpdateFlavorInfoAction(CreateFlavorInfoAction):
223 223
     flavor_id = forms.CharField(widget=forms.widgets.HiddenInput)
224 224
 
225
-    class Meta:
225
+    class Meta(object):
226 226
         name = _("Flavor Information")
227 227
         slug = 'update_info'
228 228
         help_text = _("Edit the flavor details. Flavors define the sizes for "

+ 1
- 1
openstack_dashboard/dashboards/admin/hypervisors/compute/tables.py View File

@@ -106,7 +106,7 @@ class ComputeHostTable(tables.DataTable):
106 106
     def get_object_display(self, obj):
107 107
         return obj.host
108 108
 
109
-    class Meta:
109
+    class Meta(object):
110 110
         name = "compute_host"
111 111
         verbose_name = _("Compute Host")
112 112
         table_actions = (ComputeHostFilterAction,)

+ 2
- 2
openstack_dashboard/dashboards/admin/hypervisors/tables.py View File

@@ -59,7 +59,7 @@ class AdminHypervisorsTable(tables.DataTable):
59 59
     def get_object_id(self, hypervisor):
60 60
         return hypervisor.hypervisor_hostname
61 61
 
62
-    class Meta:
62
+    class Meta(object):
63 63
         name = "hypervisors"
64 64
         verbose_name = _("Hypervisors")
65 65
 
@@ -75,6 +75,6 @@ class AdminHypervisorInstancesTable(tables.DataTable):
75 75
     def get_object_id(self, server):
76 76
         return server['uuid']
77 77
 
78
-    class Meta:
78
+    class Meta(object):
79 79
         name = "hypervisor_instances"
80 80
         verbose_name = _("Hypervisor Instances")

+ 1
- 1
openstack_dashboard/dashboards/admin/images/tables.py View File

@@ -70,7 +70,7 @@ class AdminImagesTable(project_tables.ImagesTable):
70 70
                          link="horizon:admin:images:detail",
71 71
                          verbose_name=_("Image Name"))
72 72
 
73
-    class Meta:
73
+    class Meta(object):
74 74
         name = "images"
75 75
         row_class = UpdateRow
76 76
         status_columns = ["status"]

+ 4
- 4
openstack_dashboard/dashboards/admin/info/tables.py View File

@@ -64,7 +64,7 @@ class ServicesTable(tables.DataTable):
64 64
                            status=True,
65 65
                            display_choices=SERVICE_STATUS_DISPLAY_CHOICES)
66 66
 
67
-    class Meta:
67
+    class Meta(object):
68 68
         name = "services"
69 69
         verbose_name = _("Services")
70 70
         table_actions = (ServiceFilterAction,)
@@ -102,7 +102,7 @@ class NovaServicesTable(tables.DataTable):
102 102
     def get_object_id(self, obj):
103 103
         return "%s-%s-%s" % (obj.binary, obj.host, obj.zone)
104 104
 
105
-    class Meta:
105
+    class Meta(object):
106 106
         name = "nova_services"
107 107
         verbose_name = _("Compute Services")
108 108
         table_actions = (SubServiceFilterAction,)
@@ -127,7 +127,7 @@ class CinderServicesTable(tables.DataTable):
127 127
     def get_object_id(self, obj):
128 128
         return "%s-%s-%s" % (obj.binary, obj.host, obj.zone)
129 129
 
130
-    class Meta:
130
+    class Meta(object):
131 131
         name = "cinder_services"
132 132
         verbose_name = _("Block Storage Services")
133 133
         table_actions = (SubServiceFilterAction,)
@@ -176,7 +176,7 @@ class NetworkAgentsTable(tables.DataTable):
176 176
     def get_object_id(self, obj):
177 177
         return "%s-%s" % (obj.binary, obj.host)
178 178
 
179
-    class Meta:
179
+    class Meta(object):
180 180
         name = "network_agents"
181 181
         verbose_name = _("Network Agents")
182 182
         table_actions = (NetworkAgentsFilterAction,)

+ 1
- 1
openstack_dashboard/dashboards/admin/instances/tables.py View File

@@ -159,7 +159,7 @@ class AdminInstancesTable(tables.DataTable):
159 159
                                      filters.timesince_sortable),
160 160
                             attrs={'data-type': 'timesince'})
161 161
 
162
-    class Meta:
162
+    class Meta(object):
163 163
         name = "instances"
164 164
         verbose_name = _("Instances")
165 165
         status_columns = ["status", "task"]

+ 1
- 1
openstack_dashboard/dashboards/admin/metadata_defs/panel.py View File

@@ -28,4 +28,4 @@ class MetadataDefinitions(horizon.Panel):
28 28
 
29 29
 
30 30
 if glance.VERSIONS.active >= 2:
31
-    dashboard.Admin.register(MetadataDefinitions)
31
+    dashboard.Admin.register(MetadataDefinitions)

+ 1
- 1
openstack_dashboard/dashboards/admin/metadata_defs/tables.py View File

@@ -160,7 +160,7 @@ class AdminNamespacesTable(tables.DataTable):
160 160
             return datum.display_name
161 161
         return None
162 162
 
163
-    class Meta:
163
+    class Meta(object):
164 164
         name = "namespaces"
165 165
         verbose_name = _("Namespaces")
166 166
         row_class = UpdateRow

+ 2
- 2
openstack_dashboard/dashboards/admin/metering/tables.py View File

@@ -51,7 +51,7 @@ class ReportTable(tables.DataTable):
51 51
     def get_object_id(self, obj):
52 52
         return "%s-%s-%s" % (obj['project'], obj['service'], obj['meter'])
53 53
 
54
-    class Meta:
54
+    class Meta(object):
55 55
         name = 'report_table'
56 56
         verbose_name = _("Daily Usage Report")
57 57
         table_actions = (ModifyUsageReportParameters, CreateCSVUsageReport)
@@ -86,5 +86,5 @@ class UsageTable(tables.DataTable):
86 86
     def __unicode__(self):
87 87
         return self.title
88 88
 
89
-    class Meta:
89
+    class Meta(object):
90 90
         name = 'daily'

+ 1
- 1
openstack_dashboard/dashboards/admin/networks/agents/tables.py View File

@@ -96,7 +96,7 @@ class DHCPAgentsTable(tables.DataTable):
96 96
                                         filters=(utils_filters.parse_isotime,
97 97
                                                  filters.timesince))
98 98
 
99
-    class Meta:
99
+    class Meta(object):
100 100
         name = "agents"
101 101
         verbose_name = _("DHCP Agents")
102 102
         table_actions = (AddDHCPAgent, DeleteDHCPAgent)

+ 1
- 1
openstack_dashboard/dashboards/admin/networks/ports/tables.py View File

@@ -104,7 +104,7 @@ class PortsTable(tables.DataTable):
104 104
     mac_state = tables.Column("mac_state", empty_value=api.neutron.OFF_STATE,
105 105
                               verbose_name=_("Mac Learning State"))
106 106
 
107
-    class Meta:
107
+    class Meta(object):
108 108
         name = "ports"
109 109
         verbose_name = _("Ports")
110 110
         table_actions = (CreatePort, DeletePort)

+ 1
- 1
openstack_dashboard/dashboards/admin/networks/subnets/tables.py View File

@@ -111,7 +111,7 @@ class SubnetsTable(tables.DataTable):
111 111
             exceptions.handle(self.request, msg, redirect=self.failure_url)
112 112
         return network
113 113
 
114
-    class Meta:
114
+    class Meta(object):
115 115
         name = "subnets"
116 116
         verbose_name = _("Subnets")
117 117
         table_actions = (CreateSubnet, DeleteSubnet)

+ 1
- 1
openstack_dashboard/dashboards/admin/networks/tables.py View File

@@ -104,7 +104,7 @@ class NetworksTable(tables.DataTable):
104 104
                                 verbose_name=_("Admin State"),
105 105
                                 display_choices=DISPLAY_CHOICES)
106 106
 
107
-    class Meta:
107
+    class Meta(object):
108 108
         name = "networks"
109 109
         verbose_name = _("Networks")
110 110
         table_actions = (CreateNetwork, DeleteNetwork,

+ 1
- 1
openstack_dashboard/dashboards/admin/routers/extensions/routerrules/tables.py View File

@@ -24,6 +24,6 @@ class RouterRulesTable(tables.DataTable):
24 24
     action = tables.Column("action", verbose_name=_("Action"))
25 25
     nexthops = tables.Column("nexthops", verbose_name=_("Next Hops"))
26 26
 
27
-    class Meta:
27
+    class Meta(object):
28 28
         name = "routerrules"
29 29
         verbose_name = _("Router Rules")

+ 1
- 1
openstack_dashboard/dashboards/admin/routers/ports/tables.py View File

@@ -44,6 +44,6 @@ class PortsTable(tables.DataTable):
44 44
     def get_object_display(self, port):
45 45
         return port.id
46 46
 
47
-    class Meta:
47
+    class Meta(object):
48 48
         name = "interfaces"
49 49
         verbose_name = _("Interfaces")

+ 1
- 1
openstack_dashboard/dashboards/admin/routers/tables.py View File

@@ -41,7 +41,7 @@ class RoutersTable(r_tables.RoutersTable):
41 41
                          verbose_name=_("Name"),
42 42
                          link="horizon:admin:routers:detail")
43 43
 
44
-    class Meta:
44
+    class Meta(object):
45 45
         name = "Routers"
46 46
         verbose_name = _("Routers")
47 47
         status_columns = ["status"]

+ 1
- 1
openstack_dashboard/dashboards/admin/volumes/snapshots/tables.py View File

@@ -64,7 +64,7 @@ class VolumeSnapshotsTable(volumes_tables.VolumesTableBase):
64 64
     host = tables.Column("host_name", verbose_name=_("Host"))
65 65
     tenant = tables.Column("tenant_name", verbose_name=_("Project"))
66 66
 
67
-    class Meta:
67
+    class Meta(object):
68 68
         name = "volume_snapshots"
69 69
         verbose_name = _("Volume Snapshots")
70 70
         table_actions = (snapshots_tables.VolumeSnapshotsFilterAction,

+ 1
- 1
openstack_dashboard/dashboards/admin/volumes/volume_types/extras/tables.py View File

@@ -69,7 +69,7 @@ class ExtraSpecsTable(tables.DataTable):
69 69
     key = tables.Column('key', verbose_name=_('Key'))
70 70
     value = tables.Column('value', verbose_name=_('Value'))
71 71
 
72
-    class Meta:
72
+    class Meta(object):
73 73
         name = "extras"
74 74
         verbose_name = _("Extra Specs")
75 75
         table_actions = (ExtraSpecCreate, ExtraSpecDelete)

+ 1
- 1
openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/forms.py View File

@@ -67,4 +67,4 @@ class EditKeyValuePair(forms.SelfHandlingForm):
67 67
         except Exception:
68 68
             exceptions.handle(request,
69 69
                               _("Unable to edit spec."))
70
-            return False
70
+            return False

+ 1
- 1
openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/tables.py View File

@@ -58,7 +58,7 @@ class SpecsTable(tables.DataTable):
58 58
     key = tables.Column('key', verbose_name=_('Key'))
59 59
     value = tables.Column('value', verbose_name=_('Value'))
60 60
 
61
-    class Meta:
61
+    class Meta(object):
62 62
         name = "specs"
63 63
         verbose_name = _("Key-Value Pairs")
64 64
         table_actions = (SpecCreateKeyValuePair, SpecDeleteKeyValuePair)

+ 2
- 2
openstack_dashboard/dashboards/admin/volumes/volume_types/tables.py View File

@@ -157,7 +157,7 @@ class VolumeTypesTable(tables.DataTable):
157 157
     def get_object_id(self, vol_type):
158 158
         return str(vol_type.id)
159 159
 
160
-    class Meta:
160
+    class Meta(object):
161 161
         name = "volume_types"
162 162
         hidden_title = False
163 163
         verbose_name = _("Volume Types")
@@ -239,7 +239,7 @@ class QosSpecsTable(tables.DataTable):
239 239
     def get_object_id(self, qos_specs):
240 240
         return qos_specs.id
241 241
 
242
-    class Meta:
242
+    class Meta(object):
243 243
         name = "qos_specs"
244 244
         hidden_title = False
245 245
         verbose_name = _("QoS Specs")

+ 1
- 1
openstack_dashboard/dashboards/admin/volumes/volumes/tables.py View File

@@ -81,7 +81,7 @@ class VolumesTable(volumes_tables.VolumesTable):
81 81
     host = tables.Column("os-vol-host-attr:host", verbose_name=_("Host"))
82 82
     tenant = tables.Column("tenant_name", verbose_name=_("Project"))
83 83
 
84
-    class Meta:
84
+    class Meta(object):
85 85
         name = "volumes"
86 86
         verbose_name = _("Volumes")
87 87
         status_columns = ["status"]

+ 1
- 1
openstack_dashboard/dashboards/identity/domains/tables.py View File

@@ -201,7 +201,7 @@ class DomainsTable(tables.DataTable):
201 201
     id = tables.Column('id', verbose_name=_('Domain ID'))
202 202
     enabled = tables.Column('enabled', verbose_name=_('Enabled'), status=True)
203 203
 
204
-    class Meta:
204
+    class Meta(object):
205 205
         name = "domains"
206 206
         verbose_name = _("Domains")
207 207
         row_actions = (SetDomainContext, UpdateUsersLink, UpdateGroupsLink,

+ 4
- 4
openstack_dashboard/dashboards/identity/domains/workflows.py View File

@@ -40,7 +40,7 @@ class CreateDomainInfoAction(workflows.Action):
40 40
                                  required=False,
41 41
                                  initial=True)
42 42
 
43
-    class Meta:
43
+    class Meta(object):
44 44
         name = _("Domain Information")
45 45
         slug = "create_domain"
46 46
         help_text = _("Domains provide separation between users and "
@@ -123,7 +123,7 @@ class UpdateDomainUsersAction(workflows.MembershipAction):
123 123
                     field_name = self.get_member_field_name(role_id)
124 124
                     self.fields[field_name].initial.append(user_id)
125 125
 
126
-    class Meta:
126
+    class Meta(object):
127 127
         name = _("Domain Members")
128 128
         slug = constants.DOMAIN_USER_MEMBER_SLUG
129 129
 
@@ -220,7 +220,7 @@ class UpdateDomainGroupsAction(workflows.MembershipAction):
220 220
                     field_name = self.get_member_field_name(role.id)
221 221
                     self.fields[field_name].initial.append(group.id)
222 222
 
223
-    class Meta:
223
+    class Meta(object):
224 224
         name = _("Domain Groups")
225 225
         slug = constants.DOMAIN_GROUP_MEMBER_SLUG
226 226
 
@@ -277,7 +277,7 @@ class CreateDomain(workflows.Workflow):
277 277
 
278 278
 class UpdateDomainInfoAction(CreateDomainInfoAction):
279 279
 
280
-    class Meta:
280
+    class Meta(object):
281 281
         name = _("Domain Information")
282 282
         slug = 'update_domain'
283 283
         help_text = _("Domains provide separation between users and "

+ 3
- 3
openstack_dashboard/dashboards/identity/groups/tables.py View File

@@ -117,7 +117,7 @@ class GroupsTable(tables.DataTable):
117 117
                                 verbose_name=_('Description'))
118 118
     id = tables.Column('id', verbose_name=_('Group ID'))
119 119
 
120
-    class Meta:
120
+    class Meta(object):
121 121
         name = "groups"
122 122
         verbose_name = _("Groups")
123 123
         row_actions = (ManageUsersLink, EditGroupLink, DeleteGroupsAction)
@@ -199,7 +199,7 @@ class UsersTable(tables.DataTable):
199 199
 
200 200
 
201 201
 class GroupMembersTable(UsersTable):
202
-    class Meta:
202
+    class Meta(object):
203 203
         name = "group_members"
204 204
         verbose_name = _("Group Members")
205 205
         table_actions = (UserFilterAction, AddMembersLink, RemoveMembers)
@@ -249,7 +249,7 @@ class AddMembers(tables.BatchAction):
249 249
 
250 250
 
251 251
 class GroupNonMembersTable(UsersTable):
252
-    class Meta:
252
+    class Meta(object):
253 253
         name = "group_non_members"
254 254
         verbose_name = _("Non-Members")
255 255
         table_actions = (UserFilterAction, AddMembers)

+ 1
- 1
openstack_dashboard/dashboards/identity/projects/tables.py View File

@@ -241,7 +241,7 @@ class TenantsTable(tables.DataTable):
241 241
                                 required=False),
242 242
                             update_action=UpdateCell)
243 243
 
244
-    class Meta:
244
+    class Meta(object):
245 245
         name = "tenants"
246 246
         verbose_name = _("Projects")
247 247
         row_class = UpdateRow

+ 6
- 6
openstack_dashboard/dashboards/identity/projects/workflows.py View File

@@ -108,14 +108,14 @@ class UpdateProjectQuotaAction(ProjectQuotaAction):
108 108
             raise forms.ValidationError(msg)
109 109
         return cleaned_data
110 110
 
111
-    class Meta:
111
+    class Meta(object):
112 112
         name = _("Quota")
113 113
         slug = 'update_quotas'
114 114
         help_text = _("Set maximum quotas for the project.")
115 115
 
116 116
 
117 117
 class CreateProjectQuotaAction(ProjectQuotaAction):
118
-    class Meta:
118
+    class Meta(object):
119 119
         name = _("Quota")
120 120
         slug = 'create_quotas'
121 121
         help_text = _("Set maximum quotas for the project.")
@@ -161,7 +161,7 @@ class CreateProjectInfoAction(workflows.Action):
161 161
             self.fields["domain_id"].widget = readonlyInput
162 162
             self.fields["domain_name"].widget = readonlyInput
163 163
 
164
-    class Meta:
164
+    class Meta(object):
165 165
         name = _("Project Information")
166 166
         help_text = _("Create a project to organize users.")
167 167
 
@@ -247,7 +247,7 @@ class UpdateProjectMembersAction(workflows.MembershipAction):
247 247
                     field_name = self.get_member_field_name(role_id)
248 248
                     self.fields[field_name].initial.append(user_id)
249 249
 
250
-    class Meta:
250
+    class Meta(object):
251 251
         name = _("Project Members")
252 252
         slug = PROJECT_USER_MEMBER_SLUG
253 253
 
@@ -345,7 +345,7 @@ class UpdateProjectGroupsAction(workflows.MembershipAction):
345 345
                     field_name = self.get_member_field_name(role_id)
346 346
                     self.fields[field_name].initial.append(group_id)
347 347
 
348
-    class Meta:
348
+    class Meta(object):
349 349
         name = _("Project Groups")
350 350
         slug = PROJECT_GROUP_MEMBER_SLUG
351 351
 
@@ -542,7 +542,7 @@ class UpdateProjectInfoAction(CreateProjectInfoAction):
542 542
             cleaned_data['enabled'] = True
543 543
         return cleaned_data
544 544
 
545
-    class Meta:
545
+    class Meta(object):
546 546
         name = _("Project Information")
547 547
         slug = 'update_info'
548 548
         help_text = _("Edit the project details.")

+ 1
- 1
openstack_dashboard/dashboards/identity/roles/tables.py View File

@@ -81,7 +81,7 @@ class RolesTable(tables.DataTable):
81 81
     name = tables.Column('name', verbose_name=_('Role Name'))
82 82
     id = tables.Column('id', verbose_name=_('Role ID'))
83 83
 
84
-    class Meta:
84
+    class Meta(object):
85 85
         name = "roles"
86 86
         verbose_name = _("Roles")
87 87
         row_actions = (EditRoleLink, DeleteRolesAction)

+ 1
- 1
openstack_dashboard/dashboards/identity/users/tables.py View File

@@ -225,7 +225,7 @@ class UsersTable(tables.DataTable):
225 225
                             status_choices=STATUS_CHOICES,
226 226
                             empty_value="False")
227 227
 
228
-    class Meta:
228
+    class Meta(object):
229 229
         name = "users"
230 230
         verbose_name = _("Users")
231 231
         row_actions = (EditUserLink, ToggleEnabled, DeleteUsersAction)

+ 1
- 1
openstack_dashboard/dashboards/project/access_and_security/api_access/tables.py View File

@@ -63,7 +63,7 @@ class EndpointsTable(tables.DataTable):
63 63
     api_endpoint = tables.Column('public_url',
64 64
                                  verbose_name=_("Service Endpoint"))
65 65
 
66
-    class Meta:
66
+    class Meta(object):
67 67
         name = "endpoints"
68 68
         verbose_name = _("API Endpoints")
69 69
         multi_select = False

+ 1
- 1
openstack_dashboard/dashboards/project/access_and_security/floating_ips/tables.py View File

@@ -215,7 +215,7 @@ class FloatingIPsTable(tables.DataTable):
215 215
     def get_object_display(self, datum):
216 216
         return datum.ip
217 217
 
218
-    class Meta:
218
+    class Meta(object):
219 219
         name = "floating_ips"
220 220
         verbose_name = _("Floating IPs")
221 221
         table_actions = (AllocateIP, ReleaseIPs)

+ 1
- 1
openstack_dashboard/dashboards/project/access_and_security/floating_ips/workflows.py View File

@@ -36,7 +36,7 @@ class AssociateIPAction(workflows.Action):
36 36
                                           add_item_link=ALLOCATE_URL)
37 37
     instance_id = forms.ChoiceField(label=_("Instance"))
38 38
 
39
-    class Meta:
39
+    class Meta(object):
40 40
         name = _("IP Address")
41 41
         help_text = _("Select the IP address you wish to associate with "
42 42
                       "the selected instance or port.")

+ 1
- 1
openstack_dashboard/dashboards/project/access_and_security/keypairs/tables.py View File

@@ -88,7 +88,7 @@ class KeypairsTable(tables.DataTable):
88 88
     def get_object_id(self, keypair):
89 89
         return keypair.name
90 90
 
91
-    class Meta:
91
+    class Meta(object):
92 92
         name = "keypairs"
93 93
         verbose_name = _("Key Pairs")
94 94
         table_actions = (CreateKeyPair, ImportKeyPair, DeleteKeyPairs,)

+ 2
- 2
openstack_dashboard/dashboards/project/access_and_security/security_groups/tables.py View File

@@ -135,7 +135,7 @@ class SecurityGroupsTable(tables.DataTable):
135 135
     def sanitize_id(self, obj_id):
136 136
         return filters.get_int_or_uuid(obj_id)
137 137
 
138
-    class Meta:
138
+    class Meta(object):
139 139
         name = "security_groups"
140 140
         verbose_name = _("Security Groups")
141 141
         table_actions = (CreateGroup, DeleteGroup)
@@ -263,7 +263,7 @@ class RulesTable(tables.DataTable):
263 263
     def get_object_display(self, rule):
264 264
         return unicode(rule)
265 265
 
266
-    class Meta:
266
+    class Meta(object):
267 267
         name = "rules"
268 268
         verbose_name = _("Security Group Rules")
269 269
         table_actions = (CreateRule, DeleteRule)

+ 2
- 2
openstack_dashboard/dashboards/project/containers/tables.py View File

@@ -271,7 +271,7 @@ class ContainersTable(tables.DataTable):
271 271
                                     status_choices=METADATA_LOADED_CHOICES,
272 272
                                     hidden=True)
273 273
 
274
-    class Meta:
274
+    class Meta(object):
275 275
         name = "containers"
276 276
         verbose_name = _("Containers")
277 277
         row_class = ContainerAjaxUpdateRow
@@ -445,7 +445,7 @@ class ObjectsTable(tables.DataTable):
445 445
 
446 446
     size = tables.Column(get_size, verbose_name=_('Size'))
447 447
 
448
-    class Meta:
448
+    class Meta(object):
449 449
         name = "objects"
450 450
         verbose_name = _("Objects")
451 451
         table_actions = (ObjectFilterAction, CreatePseudoFolder, UploadObject,

+ 1
- 1
openstack_dashboard/dashboards/project/data_processing/cluster_templates/tables.py View File

@@ -119,7 +119,7 @@ class ClusterTemplatesTable(tables.DataTable):
119 119
     description = tables.Column("description",
120 120
                                 verbose_name=_("Description"))
121 121
 
122
-    class Meta:
122
+    class Meta(object):
123 123
         name = "cluster_templates"
124 124
         verbose_name = _("Cluster Templates")
125 125
         table_actions = (UploadFile,

+ 3
- 3
openstack_dashboard/dashboards/project/data_processing/cluster_templates/workflows/create.py View File

@@ -65,7 +65,7 @@ class SelectPluginAction(workflows.Action):
65 65
             )
66 66
             self.fields[field_name] = choice_field
67 67
 
68
-    class Meta:
68
+    class Meta(object):
69 69
         name = _("Select plugin and hadoop version for cluster template")
70 70
         help_text_template = ("project/data_processing.cluster_templates/"
71 71
                               "_create_general_help.html")
@@ -134,7 +134,7 @@ class GeneralConfigAction(workflows.Action):
134 134
             self._errors = dict()
135 135
         return cleaned_data
136 136
 
137
-    class Meta:
137
+    class Meta(object):
138 138
         name = _("Details")
139 139
         help_text_template = ("project/data_processing.cluster_templates/"
140 140
                               "_configure_general_help.html")
@@ -202,7 +202,7 @@ class ConfigureNodegroupsAction(workflows.Action):
202 202
             self._errors = dict()
203 203
         return cleaned_data
204 204
 
205
-    class Meta:
205
+    class Meta(object):
206 206
         name = _("Node Groups")
207 207
 
208 208
 

+ 1
- 1
openstack_dashboard/dashboards/project/data_processing/clusters/tables.py View File

@@ -112,7 +112,7 @@ class ClustersTable(tables.DataTable):
112 112
     instances_count = tables.Column(get_instances_count,
113 113
                                     verbose_name=_("Instances Count"))
114 114
 
115
-    class Meta:
115
+    class Meta(object):
116 116
         name = "clusters"
117 117
         verbose_name = _("Clusters")
118 118
         row_class = UpdateRow

+ 1
- 1
openstack_dashboard/dashboards/project/data_processing/clusters/tabs.py View File

@@ -142,7 +142,7 @@ class InstancesTable(tables.DataTable):
142 142
     management_ip = tables.Column("management_ip",
143 143
                                   verbose_name=_("Management IP"))
144 144
 
145
-    class Meta:
145
+    class Meta(object):
146 146
         name = "cluster_instances"
147 147
         # Just ignoring the name.
148 148
         verbose_name = _(" ")

+ 1
- 1
openstack_dashboard/dashboards/project/data_processing/clusters/tests.py View File

@@ -63,4 +63,4 @@ class DataProcessingClusterTests(test.TestCase):
63 63
 
64 64
         self.assertNoFormErrors(res)
65 65
         self.assertRedirectsNoFollow(res, INDEX_URL)
66
-        self.assertMessageCount(success=1)
66
+        self.assertMessageCount(success=1)

+ 2
- 2
openstack_dashboard/dashboards/project/data_processing/clusters/workflows/create.py View File

@@ -39,7 +39,7 @@ KEYPAIR_IMPORT_URL = "horizon:project:access_and_security:keypairs:import"
39 39
 
40 40
 
41 41
 class SelectPluginAction(t_flows.SelectPluginAction):
42
-    class Meta:
42
+    class Meta(object):
43 43
         name = _("Select plugin and hadoop version for cluster")
44 44
         help_text_template = (
45 45
             "project/data_processing.clusters/_create_general_help.html")
@@ -179,7 +179,7 @@ class GeneralConfigAction(workflows.Action):
179 179
             self._errors = dict()
180 180
         return cleaned_data
181 181
 
182
-    class Meta:
182
+    class Meta(object):
183 183
         name = _("Configure Cluster")
184 184
         help_text_template = \
185 185
             ("project/data_processing.clusters/_configure_general_help.html")

+ 1
- 1
openstack_dashboard/dashboards/project/data_processing/data_image_registry/tables.py View File

@@ -76,7 +76,7 @@ class ImageRegistryTable(tables.DataTable):
76 76
     tags = tables.Column(tags_to_string,
77 77
                          verbose_name=_("Tags"))
78 78
 
79
-    class Meta:
79
+    class Meta(object):
80 80
         name = "image_registry"
81 81
         verbose_name = _("Image Registry")
82 82
         table_actions = (RegisterImage, UnregisterImages,)

+ 1
- 1
openstack_dashboard/dashboards/project/data_processing/data_plugins/tables.py View File

@@ -35,6 +35,6 @@ class PluginsTable(tables.DataTable):
35 35
     description = tables.Column("description",
36 36
                                 verbose_name=_("Description"))
37 37
 
38
-    class Meta:
38
+    class Meta(object):
39 39
         name = "plugins"
40 40
         verbose_name = _("Plugins")

+ 1
- 1
openstack_dashboard/dashboards/project/data_processing/data_sources/tables.py View File

@@ -62,7 +62,7 @@ class DataSourcesTable(tables.DataTable):
62 62
     description = tables.Column("description",
63 63
                                 verbose_name=_("Description"))
64 64
 
65
-    class Meta:
65
+    class Meta(object):
66 66
         name = "data_sources"
67 67
         verbose_name = _("Data Sources")
68 68
         table_actions = (CreateDataSource,

+ 1
- 1
openstack_dashboard/dashboards/project/data_processing/data_sources/workflows/create.py View File

@@ -50,7 +50,7 @@ class GeneralConfigAction(workflows.Action):
50 50
     def __init__(self, request, *args, **kwargs):
51 51
         super(GeneralConfigAction, self).__init__(request, *args, **kwargs)
52 52
 
53
-    class Meta:
53
+    class Meta(object):
54 54
         name = _("Create Data Source")
55 55
         help_text_template = ("project/data_processing.data_sources/"
56 56
                               "_create_data_source_help.html")

+ 1
- 1
openstack_dashboard/dashboards/project/data_processing/job_binaries/forms.py View File

@@ -194,7 +194,7 @@ class JobBinaryCreateForm(forms.SelfHandlingForm):
194 194
             text += defaultfilters.linebreaks(force_text(self.help_text))
195 195
         return defaultfilters.safe(text)
196 196
 
197
-    class Meta:
197
+    class Meta(object):
198 198
         name = _("Create Job Binary")
199 199
         help_text_template = ("project/data_processing.job_binaries/"
200 200
                               "_create_job_binary_help.html")

+ 1
- 1
openstack_dashboard/dashboards/project/data_processing/job_binaries/tables.py View File

@@ -83,7 +83,7 @@ class JobBinariesTable(tables.DataTable):
83 83
     description = tables.Column("description",
84 84
                                 verbose_name=_("Description"))
85 85
 
86
-    class Meta:
86
+    class Meta(object):
87 87
         name = "job_binaries"
88 88
         verbose_name = _("Job Binaries")
89 89
         table_actions = (CreateJobBinary,

+ 1
- 1
openstack_dashboard/dashboards/project/data_processing/job_executions/tables.py View File

@@ -160,7 +160,7 @@ class JobExecutionsTable(tables.DataTable):
160 160
     def get_object_display(self, datum):
161 161
         return datum.id
162 162
 
163
-    class Meta:
163
+    class Meta(object):
164 164
         name = "job_executions"
165 165
         row_class = UpdateRow
166 166
         status_columns = ["status"]

+ 1
- 1
openstack_dashboard/dashboards/project/data_processing/jobs/tables.py View File

@@ -100,7 +100,7 @@ class JobsTable(tables.DataTable):
100 100
     description = tables.Column("description",
101 101
                                 verbose_name=_("Description"))
102 102
 
103
-    class Meta:
103
+    class Meta(object):
104 104
         name = "jobs"
105 105
         verbose_name = _("Jobs")
106 106
         table_actions = (CreateJob,

+ 2
- 2
openstack_dashboard/dashboards/project/data_processing/jobs/workflows/create.py View File

@@ -43,7 +43,7 @@ class AdditionalLibsAction(workflows.Action):
43 43
 
44 44
         return choices
45 45
 
46
-    class Meta:
46
+    class Meta(object):
47 47
         name = _("Libs")
48 48
         help_text_template = (
49 49
             "project/data_processing.jobs/_create_job_libs_help.html")
@@ -102,7 +102,7 @@ class GeneralConfigAction(workflows.Action):
102 102
 
103 103
         return cleaned_data
104 104
 
105
-    class Meta:
105
+    class Meta(object):
106 106
         name = _("Create Job")
107 107
         help_text_template = (
108 108
             "project/data_processing.jobs/_create_job_help.html")

+ 5
- 5
openstack_dashboard/dashboards/project/data_processing/jobs/workflows/launch.py View File

@@ -93,7 +93,7 @@ class JobExecutionGeneralConfigAction(workflows.Action):
93 93
 
94 94
         return choices
95 95
 
96
-    class Meta:
96
+    class Meta(object):
97 97
         name = _("Job")
98 98
         help_text_template = (
99 99
             "project/data_processing.jobs/_launch_job_help.html")
@@ -118,7 +118,7 @@ class JobExecutionExistingGeneralConfigAction(JobExecutionGeneralConfigAction):
118 118
 
119 119
         return choices
120 120
 
121
-    class Meta:
121
+    class Meta(object):
122 122
         name = _("Job")
123 123
         help_text_template = (
124 124
             "project/data_processing.jobs/_launch_job_help.html")
@@ -226,7 +226,7 @@ class JobConfigAction(workflows.Action):
226 226
             del configs[rmkey]
227 227
         return (configs, edp_configs)
228 228
 
229
-    class Meta:
229
+    class Meta(object):
230 230
         name = _("Configure")
231 231
         help_text_template = (
232 232
             "project/data_processing.jobs/_launch_job_configure_help.html")
@@ -308,7 +308,7 @@ class NewClusterConfigAction(c_flow.GeneralConfigAction):
308 308
         label=_("Persist cluster after job exit"),
309 309
         required=False)
310 310
 
311
-    class Meta:
311
+    class Meta(object):
312 312
         name = _("Configure Cluster")
313 313
         help_text_template = (
314 314
             "project/data_processing.clusters/_configure_general_help.html")
@@ -390,7 +390,7 @@ class SelectHadoopPluginAction(t_flows.SelectPluginAction):
390 390
                 self.fields["job_args"].initial = (
391 391
                     json.dumps(job_configs["args"]))
392 392
 
393
-    class Meta:
393
+    class Meta(object):
394 394
         name = _("Select plugin and hadoop version for cluster")
395 395
         help_text_template = ("project/data_processing.clusters/"
396 396
                               "_create_general_help.html")

+ 1
- 1
openstack_dashboard/dashboards/project/data_processing/nodegroup_templates/tables.py View File

@@ -84,7 +84,7 @@ class NodegroupTemplatesTable(tables.DataTable):
84 84
                                    wrap_list=True,
85 85
                                    filters=(filters.unordered_list,))
86 86
 
87
-    class Meta:
87
+    class Meta(object):
88 88
         name = "nodegroup_templates"
89 89
         verbose_name = _("Node Group Templates")
90 90
         table_actions = (CreateNodegroupTemplate,

+ 3
- 3
openstack_dashboard/dashboards/project/data_processing/nodegroup_templates/workflows/create.py View File

@@ -145,7 +145,7 @@ class GeneralConfigAction(workflows.Action):
145 145
         extra["hadoop_version"] = hadoop_version
146 146
         return super(GeneralConfigAction, self).get_help_text(extra)
147 147
 
148
-    class Meta:
148
+    class Meta(object):
149 149
         name = _("Configure Node Group Template")
150 150
         help_text_template = (
151 151
             "project/data_processing.nodegroup_templates"
@@ -178,7 +178,7 @@ class SecurityConfigAction(workflows.Action):
178 178
             choices=security_group_list,
179 179
             required=False)
180 180
 
181
-    class Meta:
181
+    class Meta(object):
182 182
         name = _("Security")
183 183
         help_text = _("Control access to instances of the node group.")
184 184
 
@@ -315,7 +315,7 @@ class SelectPluginAction(workflows.Action,
315 315
         sahara = saharaclient.client(request)
316 316
         self._generate_plugin_version_fields(sahara)
317 317
 
318
-    class Meta:
318
+    class Meta(object):
319 319
         name = _("Select plugin and hadoop version")
320 320
         help_text_template = ("project/data_processing.nodegroup_templates"
321 321
                               "/_create_general_help.html")

+ 1
- 1
openstack_dashboard/dashboards/project/database_backups/tables.py View File

@@ -162,7 +162,7 @@ class BackupsTable(tables.DataTable):
162 162
                            status=True,
163 163
                            status_choices=STATUS_CHOICES)
164 164
 
165
-    class Meta:
165
+    class Meta(object):
166 166
         name = "backups"
167 167
         verbose_name = _("Backups")
168 168
         status_columns = ["status"]

+ 1
- 1
openstack_dashboard/dashboards/project/database_backups/workflows/create_backup.py View File

@@ -39,7 +39,7 @@ class BackupDetailsAction(workflows.Action):
39 39
                                required=False,
40 40
                                help_text=_("Optional parent backup"))
41 41
 
42
-    class Meta:
42
+    class Meta(object):
43 43
         name = _("Details")
44 44
         help_text_template = \
45 45
             "project/database_backups/_backup_details_help.html"

+ 4
- 4
openstack_dashboard/dashboards/project/databases/tables.py View File

@@ -279,7 +279,7 @@ class InstancesTable(tables.DataTable):
279 279
                            status=True,
280 280
                            status_choices=STATUS_CHOICES)
281 281
 
282
-    class Meta:
282
+    class Meta(object):
283 283
         name = "databases"
284 284
         verbose_name = _("Instances")
285 285
         status_columns = ["status"]
@@ -297,7 +297,7 @@ class UsersTable(tables.DataTable):
297 297
     host = tables.Column("host", verbose_name=_("Allowed Host"))
298 298
     databases = tables.Column(get_databases, verbose_name=_("Databases"))
299 299
 
300
-    class Meta:
300
+    class Meta(object):
301 301
         name = "users"
302 302
         verbose_name = _("Users")
303 303
         table_actions = [DeleteUser]
@@ -310,7 +310,7 @@ class UsersTable(tables.DataTable):
310 310
 class DatabaseTable(tables.DataTable):
311 311
     name = tables.Column("name", verbose_name=_("Database Name"))
312 312
 
313
-    class Meta:
313
+    class Meta(object):
314 314
         name = "databases"
315 315
         verbose_name = _("Databases")
316 316
         table_actions = [DeleteDatabase]
@@ -344,7 +344,7 @@ class InstanceBackupsTable(tables.DataTable):
344 344
                            status=True,
345 345
                            status_choices=backup_tables.STATUS_CHOICES)
346 346
 
347
-    class Meta:
347
+    class Meta(object):
348 348
         name = "backups"
349 349
         verbose_name = _("Backups")
350 350
         status_columns = ["status"]

+ 4
- 4
openstack_dashboard/dashboards/project/databases/workflows/create_instance.py View File

@@ -43,7 +43,7 @@ class SetInstanceDetailsAction(workflows.Action):
43 43
                                   help_text=_(
44 44
                                       "Type and version of datastore."))
45 45
 
46
-    class Meta:
46
+    class Meta(object):
47 47
         name = _("Details")
48 48
         help_text_template = "project/databases/_launch_details_help.html"
49 49
 
@@ -143,7 +143,7 @@ class SetNetworkAction(workflows.Action):
143 143
         if len(network_list) == 1:
144 144
             self.fields['network'].initial = [network_list[0][0]]
145 145
 
146
-    class Meta:
146
+    class Meta(object):
147 147
         name = _("Networking")
148 148
         permissions = ('openstack.services.network',)
149 149
         help_text = _("Select networks for your instance.")
@@ -200,7 +200,7 @@ class AddDatabasesAction(workflows.Action):
200 200
                            help_text=_("Host or IP that the user is allowed "
201 201
                                        "to connect through."))
202 202
 
203
-    class Meta:
203
+    class Meta(object):
204 204
         name = _("Initialize Databases")
205 205
         permissions = TROVE_ADD_PERMS
206 206
         help_text_template = "project/databases/_launch_initialize_help.html"
@@ -228,7 +228,7 @@ class RestoreAction(workflows.Action):
228 228
                                required=False,
229 229
                                help_text=_('Select a backup to restore'))
230 230
 
231
-    class Meta:
231
+    class Meta(object):
232 232
         name = _("Restore From Backup")
233 233
         permissions = ('openstack.services.object-store',)
234 234
         help_text_template = "project/databases/_launch_restore_help.html"

+ 3
- 3
openstack_dashboard/dashboards/project/firewalls/tables.py View File

@@ -218,7 +218,7 @@ class RulesTable(tables.DataTable):
218 218
                                        link=get_policy_link,
219 219
                                        verbose_name=_("In Policy"))
220 220
 
221
-    class Meta:
221
+    class Meta(object):
222 222
         name = "rulestable"
223 223
         verbose_name = _("Rules")
224 224
         table_actions = (AddRuleLink, DeleteRuleLink)
@@ -234,7 +234,7 @@ class PoliciesTable(tables.DataTable):
234 234
     audited = tables.Column("audited",
235 235
                             verbose_name=_("Audited"))
236 236
 
237
-    class Meta:
237
+    class Meta(object):
238 238
         name = "policiestable"
239 239
         verbose_name = _("Policies")
240 240
         table_actions = (AddPolicyLink, DeletePolicyLink)
@@ -252,7 +252,7 @@ class FirewallsTable(tables.DataTable):
252 252
     status = tables.Column("status",
253 253
                            verbose_name=_("Status"))
254 254
 
255
-    class Meta:
255
+    class Meta(object):
256 256
         name = "firewallstable"
257 257
         verbose_name = _("Firewalls")
258 258
         table_actions = (AddFirewallLink, DeleteFirewallLink)

+ 4
- 4
openstack_dashboard/dashboards/project/firewalls/workflows.py View File

@@ -69,7 +69,7 @@ class AddRuleAction(workflows.Action):
69 69
     def __init__(self, request, *args, **kwargs):
70 70
         super(AddRuleAction, self).__init__(request, *args, **kwargs)
71 71
 
72
-    class Meta:
72
+    class Meta(object):
73 73
         name = _("AddRule")
74 74
         permissions = ('openstack.services.network',)
75 75
         help_text = _("Create a firewall rule.\n\n"
@@ -133,7 +133,7 @@ class SelectRulesAction(workflows.Action):
133 133
         widget=forms.CheckboxSelectMultiple(),
134 134
         help_text=_("Create a policy with selected rules."))
135 135
 
136
-    class Meta:
136
+    class Meta(object):
137 137
         name = _("Rules")
138 138
         permissions = ('openstack.services.network',)
139 139
         help_text = _("Select rules for your policy.")
@@ -184,7 +184,7 @@ class AddPolicyAction(workflows.Action):
184 184
     def __init__(self, request, *args, **kwargs):
185 185
         super(AddPolicyAction, self).__init__(request, *args, **kwargs)
186 186
 
187
-    class Meta:
187
+    class Meta(object):
188 188
         name = _("AddPolicy")
189 189
         permissions = ('openstack.services.network',)
190 190
         help_text = _("Create a firewall policy with an ordered list "
@@ -261,7 +261,7 @@ class AddFirewallAction(workflows.Action):
261 261
         if not request.user.is_superuser:
262 262
             self.fields['shared'].widget.attrs['disabled'] = 'disabled'
263 263
 
264
-    class Meta:
264
+    class Meta(object):
265 265
         name = _("AddFirewall")
266 266
         permissions = ('openstack.services.network',)
267 267
         help_text = _("Create a firewall based on a policy.\n\n"

+ 1
- 1
openstack_dashboard/dashboards/project/images/images/tables.py View File

@@ -262,7 +262,7 @@ class ImagesTable(tables.DataTable):
262 262
                          attrs=({"data-type": "size"}),
263 263
                          verbose_name=_("Size"))
264 264
 
265
-    class Meta:
265
+    class Meta(object):
266 266
         name = "images"
267 267
         row_class = UpdateRow
268 268
         status_columns = ["status"]

+ 1
- 1
openstack_dashboard/dashboards/project/instances/audit_tables.py View File

@@ -28,7 +28,7 @@ class AuditTable(tables.DataTable):
28 28
     user_id = tables.Column('user_id', verbose_name=_('User ID'))
29 29
     message = tables.Column('message', verbose_name=_('Message'))
30 30
 
31
-    class Meta:
31
+    class Meta(object):
32 32
         name = 'audit'
33 33
         verbose_name = _('Instance Action List')
34 34
 

+ 1
- 1
openstack_dashboard/dashboards/project/instances/tables.py View File

@@ -1016,7 +1016,7 @@ class InstancesTable(tables.DataTable):
1016 1016
                                      filters.timesince_sortable),
1017 1017
                             attrs={'data-type': 'timesince'})
1018 1018
 
1019
-    class Meta:
1019
+    class Meta(object):
1020 1020
         name = "instances"
1021 1021
         verbose_name = _("Instances")
1022 1022
         status_columns = ["status", "task"]

+ 6
- 6
openstack_dashboard/dashboards/project/instances/workflows/create_instance.py View File

@@ -63,7 +63,7 @@ class SelectProjectUserAction(workflows.Action):
63 63
         users = [(request.user.id, request.user.username)]
64 64
         self.fields['user_id'].choices = users
65 65
 
66
-    class Meta:
66
+    class Meta(object):
67 67
         name = _("Project & User")
68 68
         # Unusable permission so this is always hidden. However, we
69 69
         # keep this step in the workflow for validation/verification purposes.
@@ -132,7 +132,7 @@ class SetInstanceDetailsAction(workflows.Action):
132 132
                                              help_text=_("Delete volume on "
133 133
                                                          "instance terminate"))
134 134
 
135
-    class Meta:
135
+    class Meta(object):
136 136
         name = _("Details")
137 137
         help_text_template = ("project/instances/"
138 138
                               "_launch_details_help.html")
@@ -549,7 +549,7 @@ class SetAccessControlsAction(workflows.Action):
549 549
                                        help_text=_("Launch instance in these "
550 550
                                                    "security groups."))
551 551
 
552
-    class Meta:
552
+    class Meta(object):
553 553
         name = _("Access & Security")
554 554
         help_text = _("Control access to your instance via key pairs, "
555 555
                       "security groups, and other mechanisms.")
@@ -613,7 +613,7 @@ class SetAccessControls(workflows.Step):
613 613
 
614 614
 
615 615
 class CustomizeAction(workflows.Action):
616
-    class Meta:
616
+    class Meta(object):
617 617
         name = _("Post-Creation")
618 618
         help_text_template = ("project/instances/"
619 619
                               "_launch_customize_help.html")
@@ -723,7 +723,7 @@ class SetNetworkAction(workflows.Action):
723 723
             self.fields['profile'].choices = (
724 724
                 self.get_policy_profile_choices(request))
725 725
 
726
-    class Meta:
726
+    class Meta(object):
727 727
         name = _("Networking")
728 728
         permissions = ('openstack.services.network',)
729 729
         help_text = _("Select networks for your instance.")
@@ -815,7 +815,7 @@ class SetAdvancedAction(workflows.Action):
815 815
             exceptions.handle(request, _('Unable to retrieve extensions '
816 816
                                          'information.'))
817 817
 
818
-    class Meta:
818
+    class Meta(object):
819 819
         name = _("Advanced Options")
820 820
         help_text_template = ("project/instances/"
821 821
                               "_launch_advanced_help.html")

+ 1
- 1
openstack_dashboard/dashboards/project/instances/workflows/resize_instance.py View File

@@ -38,7 +38,7 @@ class SetFlavorChoiceAction(workflows.Action):
38 38
     flavor = forms.ChoiceField(label=_("New Flavor"),
39 39
                                help_text=_("Choose the flavor to launch."))
40 40
 
41
-    class Meta:
41
+    class Meta(object):
42 42
         name = _("Flavor Choice")
43 43
         slug = 'flavor_choice'
44 44
         help_text_template = ("project/instances/"

+ 2
- 2
openstack_dashboard/dashboards/project/instances/workflows/update_instance.py View File

@@ -76,7 +76,7 @@ class UpdateInstanceSecurityGroupsAction(workflows.MembershipAction):
76 76
             return False
77 77
         return True
78 78
 
79
-    class Meta:
79
+    class Meta(object):
80 80
         name = _("Security Groups")
81 81
         slug = INSTANCE_SEC_GROUP_SLUG
82 82
 
@@ -115,7 +115,7 @@ class UpdateInstanceInfoAction(workflows.Action):
115 115
             return False
116 116
         return True
117 117
 
118
-    class Meta:
118
+    class Meta(object):
119 119
         name = _("Information")
120 120
         slug = 'instance_info'
121 121
         help_text = _("Edit the instance details.")

+ 3
- 3
openstack_dashboard/dashboards/project/loadbalancers/tables.py View File

@@ -278,7 +278,7 @@ class PoolsTable(tables.DataTable):
278 278
     vip_name = tables.Column('vip_name', verbose_name=_("VIP"),
279 279
                              link=get_vip_link)
280 280
 
281
-    class Meta:
281
+    class Meta(object):
282 282
         name = "poolstable"
283 283
         verbose_name = _("Pools")
284 284
         table_actions = (AddPoolLink, DeletePoolLink)
@@ -310,7 +310,7 @@ class MembersTable(tables.DataTable):
310 310
                               verbose_name=_("Pool"), link=get_pool_link)
311 311
     status = tables.Column('status', verbose_name=_("Status"))
312 312
 
313
-    class Meta:
313
+    class Meta(object):
314 314
         name = "memberstable"
315 315
         verbose_name = _("Members")
316 316
         table_actions = (AddMemberLink, DeleteMemberLink)
@@ -336,7 +336,7 @@ class MonitorsTable(tables.DataTable):
336 336
     max_retries = tables.Column("max_retries", verbose_name=_("Max Retries"))
337 337
     details = tables.Column(get_monitor_details, verbose_name=_("Details"))
338 338
 
339
-    class Meta:
339
+    class Meta(object):
340 340
         name = "monitorstable"
341 341
         verbose_name = _("Monitors")
342 342
         table_actions = (AddMonitorLink, DeleteMonitorLink)

+ 6
- 6
openstack_dashboard/dashboards/project/loadbalancers/workflows.py View File

@@ -106,7 +106,7 @@ class AddPoolAction(workflows.Action):
106 106
             self.fields['provider'].widget.attrs['readonly'] = True
107 107
         self.fields['provider'].choices = provider_choices
108 108
 
109
-    class Meta:
109
+    class Meta(object):
110 110
         name = _("Add New Pool")
111 111
         permissions = ('openstack.services.network',)
112 112
         help_text = _("Create Pool for current project.\n\n"
@@ -229,7 +229,7 @@ class AddVipAction(workflows.Action):
229 229
             self._errors['cookie_name'] = self.error_class([msg])
230 230
         return cleaned_data
231 231
 
232
-    class Meta:
232
+    class Meta(object):
233 233
         name = _("Specify VIP")
234 234
         permissions = ('openstack.services.network',)
235 235
         help_text = _("Create a VIP for this pool. "
@@ -397,7 +397,7 @@ class AddMemberAction(workflows.Action):
397 397
             self._errors['address'] = self.error_class([msg])
398 398
         return cleaned_data
399 399
 
400
-    class Meta:
400
+    class Meta(object):
401 401
         name = _("Add New Member")
402 402
         permissions = ('openstack.services.network',)
403 403
         help_text = _("Add member(s) to the selected pool.\n\n"
@@ -574,7 +574,7 @@ class AddMonitorAction(workflows.Action):
574 574
                 self._errors['expected_codes'] = self.error_class([msg])
575 575
         return cleaned_data
576 576
 
577
-    class Meta:
577
+    class Meta(object):
578 578
         name = _("Add New Monitor")
579 579
         permissions = ('openstack.services.network',)
580 580
         help_text = _("Create a monitor template.\n\n"
@@ -644,7 +644,7 @@ class AddPMAssociationAction(workflows.Action):
644 644
 
645 645
         return monitor_id_choices
646 646
 
647
-    class Meta:
647
+    class Meta(object):
648 648
         name = _("Association Details")
649 649
         permissions = ('openstack.services.network',)
650 650
         help_text = _("Associate a health monitor with target pool.")
@@ -706,7 +706,7 @@ class DeletePMAssociationAction(workflows.Action):
706 706
 
707 707
         return monitor_id_choices
708 708
 
709
-    class Meta:
709
+    class Meta(object):
710 710
         name = _("Association Details")
711 711
         permissions = ('openstack.services.network',)
712 712
         help_text = _("Disassociate a health monitor from target pool. ")

+ 1
- 1
openstack_dashboard/dashboards/project/network_topology/instances/tables.py View File

@@ -18,7 +18,7 @@ from openstack_dashboard.dashboards.project.instances import tables
18 18
 
19 19
 
20 20
 class InstancesTable(tables.InstancesTable):
21
-    class Meta:
21
+    class Meta(object):
22 22
         name = "instances"
23 23
         verbose_name = _("Instances")
24 24
         row_actions = (

+ 1
- 1
openstack_dashboard/dashboards/project/network_topology/ports/tables.py View File

@@ -23,7 +23,7 @@ class RemoveInterface(tables.RemoveInterface):
23 23
 
24 24
 
25 25
 class PortsTable(tables.PortsTable):
26
-    class Meta:
26
+    class Meta(object):
27 27
         name = "interfaces"
28 28
         verbose_name = _("Interfaces")
29 29
         row_actions = (RemoveInterface, )

+ 1
- 1
openstack_dashboard/dashboards/project/network_topology/routers/tables.py View File

@@ -22,7 +22,7 @@ class DeleteRouter(tables.DeleteRouter):
22 22
 
23 23
 
24 24
 class RoutersTable(tables.RoutersTable):
25
-    class Meta:
25
+    class Meta(object):
26 26
         name = "Routers"
27 27
         verbose_name = _("Routers")
28 28
         status_columns = ["status"]

+ 1
- 1
openstack_dashboard/dashboards/project/networks/ports/tables.py View File

@@ -80,7 +80,7 @@ class PortsTable(tables.DataTable):
80 80
     def get_object_display(self, port):
81 81
         return port.id
82 82
 
83
-    class Meta:
83
+    class Meta(object):
84 84
         name = "ports"
85 85
         verbose_name = _("Ports")
86 86
         row_actions = (UpdatePort,)

+ 1
- 1
openstack_dashboard/dashboards/project/networks/subnets/tables.py View File

@@ -145,7 +145,7 @@ class SubnetsTable(tables.DataTable):
145 145
             exceptions.handle(self.request, msg, redirect=self.failure_url)
146 146
         return network
147 147
 
148
-    class Meta:
148
+    class Meta(object):
149 149
         name = "subnets"
150 150
         verbose_name = _("Subnets")
151 151
         table_actions = (CreateSubnet, DeleteSubnet)

+ 3
- 3
openstack_dashboard/dashboards/project/networks/subnets/workflows.py View File

@@ -34,7 +34,7 @@ class CreateSubnetInfoAction(network_workflows.CreateSubnetInfoAction):
34 34
                                      widget=forms.HiddenInput())
35 35
     msg = _('Specify "Network Address"')
36 36
 
37
-    class Meta:
37
+    class Meta(object):
38 38
         name = _("Subnet")
39 39
         help_text = _('Create a subnet associated with the network. '
40 40
                       'Advanced configuration is available by clicking on the '
@@ -112,7 +112,7 @@ class UpdateSubnetInfoAction(CreateSubnetInfoAction):
112 112
     no_gateway = forms.BooleanField(label=_("Disable Gateway"),
113 113
                                     initial=False, required=False)
114 114
 
115
-    class Meta:
115
+    class Meta(object):
116 116
         name = _("Subnet")
117 117
         help_text = _('Update a subnet associated with the network. '
118 118
                       'Advanced configuration are available at '
@@ -144,7 +144,7 @@ class UpdateSubnetDetailAction(network_workflows.CreateSubnetDetailAction):
144 144
         self.fields['ipv6_modes'].widget = forms.HiddenInput()
145 145
         self.fields['ipv6_modes'].required = False
146 146
 
147
-    class Meta:
147
+    class Meta(object):
148 148
         name = _("Subnet Details")
149 149
         help_text = _('Specify additional attributes for the subnet.')
150 150
 

+ 1
- 1
openstack_dashboard/dashboards/project/networks/tables.py View File

@@ -171,7 +171,7 @@ class NetworksTable(tables.DataTable):
171 171
                                 verbose_name=_("Admin State"),
172 172
                                 display_choices=DISPLAY_CHOICES)
173 173
 
174
-    class Meta:
174
+    class Meta(object):
175 175
         name = "networks"
176 176
         verbose_name = _("Networks")
177 177
         table_actions = (CreateNetwork, DeleteNetwork,

+ 1
- 1
openstack_dashboard/dashboards/project/networks/tests.py View File

@@ -1894,7 +1894,7 @@ class NetworkViewTests(test.TestCase):
1894 1894
         subnets = res.context['subnets_table'].data
1895 1895
         self.assertItemsEqual(subnets, self.subnets.list())
1896 1896
 
1897
-        class FakeTable():
1897
+        class FakeTable(object):
1898 1898
             kwargs = {'network_id': network_id}
1899 1899
         create_link = subnets_tables.CreateSubnet()
1900 1900
         create_link.table = FakeTable()

+ 3
- 3
openstack_dashboard/dashboards/project/networks/workflows.py View File

@@ -74,7 +74,7 @@ class CreateNetworkInfoAction(workflows.Action):
74 74
     # TODO(absubram): Add ability to view network profile information
75 75
     # in the network detail if a profile is used.
76 76
 
77
-    class Meta:
77
+    class Meta(object):
78 78
         name = _("Network")
79 79
         help_text = _("Create a new network. "
80 80
                       "In addition a subnet associated with the network "
@@ -154,7 +154,7 @@ class CreateSubnetInfoAction(workflows.Action):
154 154
     msg = _('Specify "Network Address" or '
155 155
             'clear "Create Subnet" checkbox.')
156 156
 
157
-    class Meta:
157
+    class Meta(object):
158 158
         name = _("Subnet")
159 159
         help_text = _('Create a subnet associated with the new network, '
160 160
                       'in which case "Network Address" must be specified. '
@@ -251,7 +251,7 @@ class CreateSubnetDetailAction(workflows.Action):
251 251
                     "and one entry per line."),
252 252
         required=False)
253 253
 
254
-    class Meta:
254
+    class Meta(object):
255 255
         name = _("Subnet Details")
256 256
         help_text = _('Specify additional attributes for the subnet.')
257 257
 

+ 1
- 1
openstack_dashboard/dashboards/project/routers/extensions/routerrules/tables.py View File

@@ -76,7 +76,7 @@ class RouterRulesTable(tables.DataTable):
76 76
     def get_object_display(self, rule):
77 77
         return "(%(action)s) %(source)s -> %(destination)s" % rule
78 78
 
79
-    class Meta:
79
+    class Meta(object):
80 80
         name = "routerrules"
81 81
         verbose_name = _("Router Rules")
82 82
         table_actions = (AddRouterRule, RemoveRouterRule)

+ 1
- 1
openstack_dashboard/dashboards/project/routers/ports/tables.py View File

@@ -112,7 +112,7 @@ class PortsTable(tables.DataTable):
112 112
     def get_object_display(self, port):
113 113
         return port.id
114 114
 
115
-    class Meta:
115
+    class Meta(object):
116 116
         name = "interfaces"
117 117
         verbose_name = _("Interfaces")
118 118
         table_actions = (AddInterface, RemoveInterface)

+ 1
- 1
openstack_dashboard/dashboards/project/routers/tables.py View File

@@ -223,7 +223,7 @@ class RoutersTable(tables.DataTable):
223 223
     def get_object_display(self, obj):
224 224
         return obj.name
225 225
 
226
-    class Meta:
226
+    class Meta(object):
227 227
         name = "Routers"
228 228
         verbose_name = _("Routers")
229 229
         status_columns = ["status"]

+ 1
- 1
openstack_dashboard/dashboards/project/routers/tests.py View File

@@ -27,7 +27,7 @@ from openstack_dashboard.test import helpers as test
27 27
 from openstack_dashboard.usage import quotas
28 28
 
29 29
 
30
-class RouterMixin:
30
+class RouterMixin(object):
31 31
     @test.create_stubs({
32 32
         api.neutron: ('router_get', 'port_list',
33 33
                       'network_get'),

+ 4
- 4
openstack_dashboard/dashboards/project/stacks/forms.py View File

@@ -48,7 +48,7 @@ def create_upload_form_attributes(prefix, input_type, name):
48 48
 
49 49
 class TemplateForm(forms.SelfHandlingForm):
50 50
 
51
-    class Meta:
51
+    class Meta(object):
52 52
         name = _('Select Template')
53 53
         help_text = _('Select a template to launch a stack.')
54 54
 
@@ -223,7 +223,7 @@ class TemplateForm(forms.SelfHandlingForm):
223 223
 
224 224
 
225 225
 class ChangeTemplateForm(TemplateForm):
226
-    class Meta:
226
+    class Meta(object):
227 227
         name = _('Edit Template')
228 228
         help_text = _('Select a new template to re-launch a stack.')
229 229
     stack_id = forms.CharField(
@@ -238,7 +238,7 @@ class CreateStackForm(forms.SelfHandlingForm):
238 238
 
239 239
     param_prefix = '__param_'
240 240
 
241
-    class Meta:
241
+    class Meta(object):
242 242
         name = _('Create Stack')
243 243
 
244 244
     template_data = forms.CharField(
@@ -372,7 +372,7 @@ class CreateStackForm(forms.SelfHandlingForm):
372 372
 
373 373
 class EditStackForm(CreateStackForm):
374 374
 
375
-    class Meta:
375
+    class Meta(object):
376 376
         name = _('Update Stack Parameters')
377 377
 
378 378
     stack_id = forms.CharField(

+ 1
- 1
openstack_dashboard/dashboards/project/stacks/resource_types/tables.py View File

@@ -40,6 +40,6 @@ class ResourceTypesTable(tables.DataTable):
40 40
     def get_object_id(self, resource):
41 41
         return resource.resource_type
42 42
 
43
-    class Meta:
43
+    class Meta(object):
44 44
         name = "resource_types"
45 45
         verbose_name = _("Resource Types")

+ 3
- 3
openstack_dashboard/dashboards/project/stacks/tables.py View File

@@ -198,7 +198,7 @@ class StacksTable(tables.DataTable):
198 198
     def get_object_display(self, stack):
199 199
         return stack.stack_name
200 200
 
201
-    class Meta:
201
+    class Meta(object):
202 202
         name = "stacks"
203 203
         verbose_name = _("Stacks")
204 204
         pagination_param = 'stack_marker'
@@ -240,7 +240,7 @@ class EventsTable(tables.DataTable):
240 240
     statusreason = tables.Column("resource_status_reason",
241 241
                                  verbose_name=_("Status Reason"),)
242 242
 
243
-    class Meta:
243
+    class Meta(object):
244 244
         name = "events"
245 245
         verbose_name = _("Stack Events")
246 246
 
@@ -298,7 +298,7 @@ class ResourcesTable(tables.DataTable):
298 298
     def get_object_id(self, datum):
299 299
         return datum.resource_name
300 300
 
301
-    class Meta:
301
+    class Meta(object):
302 302
         name = "resources"
303 303
         verbose_name = _("Stack Resources")
304 304
         status_columns = ["status", ]

+ 1
- 1
openstack_dashboard/dashboards/project/volumes/backups/tables.py View File

@@ -132,7 +132,7 @@ class BackupsTable(tables.DataTable):
132 132
                                          link="horizon:project"
133 133
                                               ":volumes:volumes:detail")
134 134
 
135
-    class Meta:
135
+    class Meta(object):
136 136
         name = "volume_backups"
137 137
         verbose_name = _("Volume Backups")
138 138
         status_columns = ("status",)

+ 1
- 1
openstack_dashboard/dashboards/project/volumes/snapshots/tables.py View File

@@ -151,7 +151,7 @@ class VolumeSnapshotsTable(volume_tables.VolumesTableBase):
151 151
         verbose_name=_("Volume Name"),
152 152
         link="horizon:project:volumes:volumes:detail")
153 153
 
154
-    class Meta:
154
+    class Meta(object):
155 155
         name = "volume_snapshots"
156 156
         verbose_name = _("Volume Snapshots")
157 157
         table_actions = (VolumeSnapshotsFilterAction, DeleteVolumeSnapshot,)

+ 2
- 2
openstack_dashboard/dashboards/project/volumes/volumes/tables.py View File

@@ -423,7 +423,7 @@ class VolumesTable(VolumesTableBase):
423 423
                                link="horizon:project:volumes:"
424 424
                                     "volumes:encryption_detail")
425 425
 
426
-    class Meta:
426
+    class Meta(object):
427 427
         name = "volumes"
428 428
         verbose_name = _("Volumes")
429 429
         status_columns = ["status"]
@@ -498,7 +498,7 @@ class AttachmentsTable(tables.DataTable):
498 498
                 return obj
499 499
         raise ValueError('No match found for the id "%s".' % obj_id)
500 500
 
501
-    class Meta:
501
+    class Meta(object):
502 502
         name = "attachments"
503 503
         verbose_name = _("Attachments")
504 504
         table_actions = (DetachVolume,)

+ 4
- 4
openstack_dashboard/dashboards/project/vpn/tables.py View File

@@ -241,7 +241,7 @@ class IPSecSiteConnectionsTable(tables.DataTable):
241 241
                            status=True,
242 242
                            status_choices=STATUS_CHOICES)
243 243
 
244
-    class Meta:
244
+    class Meta(object):
245 245
         name = "ipsecsiteconnectionstable"
246 246
         verbose_name = _("IPSec Site Connections")
247 247
         table_actions = (AddIPSecSiteConnectionLink,
@@ -268,7 +268,7 @@ class VPNServicesTable(tables.DataTable):
268 268
                            status=True,
269 269
                            status_choices=STATUS_CHOICES)
270 270
 
271
-    class Meta:
271
+    class Meta(object):
272 272
         name = "vpnservicestable"
273 273
         verbose_name = _("VPN Services")
274 274
         table_actions = (AddVPNServiceLink, DeleteVPNServiceLink)
@@ -286,7 +286,7 @@ class IKEPoliciesTable(tables.DataTable):
286 286
         verbose_name=_('Encryption algorithm'))
287 287
     pfs = tables.Column("pfs", verbose_name=_('PFS'))
288 288
 
289
-    class Meta:
289
+    class Meta(object):
290 290
         name = "ikepoliciestable"
291 291
         verbose_name = _("IKE Policies")
292 292
         table_actions = (AddIKEPolicyLink, DeleteIKEPolicyLink)
@@ -304,7 +304,7 @@ class IPSecPoliciesTable(tables.DataTable):
304 304
         verbose_name=_('Encryption algorithm'))
305 305
     pfs = tables.Column("pfs", verbose_name=_('PFS'))
306 306
 
307
-    class Meta:
307
+    class Meta(object):
308 308
         name = "ipsecpoliciestable"
309 309
         verbose_name = _("IPSec Policies")
310 310
         table_actions = (AddIPSecPolicyLink, DeleteIPSecPolicyLink,)

+ 5
- 5
openstack_dashboard/dashboards/project/vpn/workflows.py View File

@@ -65,7 +65,7 @@ class AddVPNServiceAction(workflows.Action):
65 65
         self.fields['router_id'].choices = router_id_choices
66 66
         return router_id_choices
67 67
 
68
-    class Meta:
68
+    class Meta(object):
69 69
         name = _("Add New VPN Service")
70 70
         permissions = ('openstack.services.network',)
71 71
         help_text = _("Create VPN Service for current project.\n\n"
@@ -160,7 +160,7 @@ class AddIKEPolicyAction(workflows.Action):
160 160
         # Currently this field has only one choice, so mark it as readonly.
161 161
         self.fields['phase1_negotiation_mode'].widget.attrs['readonly'] = True
162 162
 
163
-    class Meta:
163
+    class Meta(object):
164 164
         name = _("Add New IKE Policy")
165 165
         permissions = ('openstack.services.network',)
166 166
         help_text = _("Create IKE Policy for current project.\n\n"
@@ -257,7 +257,7 @@ class AddIPSecPolicyAction(workflows.Action):
257 257
                                       ("ah-esp", "ah-esp")]
258 258
         self.fields['transform_protocol'].choices = transform_protocol_choices
259 259
 
260
-    class Meta:
260
+    class Meta(object):
261 261
         name = _("Add New IPSec Policy")
262 262
         permissions = ('openstack.services.network',)
263 263
         help_text = _("Create IPSec Policy for current project.\n\n"
@@ -379,7 +379,7 @@ class AddIPSecSiteConnectionAction(workflows.Action):
379 379
         self.fields['vpnservice_id'].choices = vpnservice_id_choices
380 380
         return vpnservice_id_choices
381 381
 
382
-    class Meta:
382
+    class Meta(object):
383 383
         name = _("Add New IPSec Site Connection")
384 384
         permissions = ('openstack.services.network',)
385 385
         help_text = _("Create IPSec Site Connection for current project.\n\n"
@@ -436,7 +436,7 @@ class AddIPSecSiteConnectionOptionalAction(workflows.Action):
436 436
         self.fields['dpd_action'].choices = dpd_action_choices
437 437
         return dpd_action_choices
438 438
 
439
-    class Meta:
439
+    class Meta(object):
440 440
         name = _("Optional Parameters")
441 441
         permissions = ('openstack.services.network',)
442 442
         help_text = _("Fields in this tab are optional. "

+ 2
- 2
openstack_dashboard/dashboards/router/nexus1000v/tables.py View File

@@ -82,7 +82,7 @@ class NetworkProfile(tables.DataTable):
82 82
     physical_network = tables.Column("physical_network",
83 83
                                      verbose_name=_("Physical Network Name"))
84 84
 
85
-    class Meta:
85
+    class Meta(object):
86 86
         name = "network_profile"
87 87
         verbose_name = _("Network Profile")
88 88
         table_actions = (CreateNetworkProfile, DeleteNetworkProfile,)
@@ -94,6 +94,6 @@ class PolicyProfile(tables.DataTable):
94 94
     name = tables.Column("name", verbose_name=_("Policy Profile"), )
95 95
     project = tables.Column("project_name", verbose_name=_("Project"))
96 96
 
97
-    class Meta:
97
+    class Meta(object):
98 98
         name = "policy_profile"
99 99
         verbose_name = _("Policy Profile")

+ 1
- 1
openstack_dashboard/test/integration_tests/tests/test_flavors.py View File

@@ -34,4 +34,4 @@ class TestFlavors(helpers.AdminTestCase):
34 34
         self.assertTrue(flavors_page.is_flavor_present(self.FLAVOR_NAME))
35 35
 
36 36
         flavors_page.delete_flavor(self.FLAVOR_NAME)
37
-        self.assertFalse(flavors_page.is_flavor_present(self.FLAVOR_NAME))
37
+        self.assertFalse(flavors_page.is_flavor_present(self.FLAVOR_NAME))

+ 2
- 2
openstack_dashboard/usage/tables.py View File

@@ -57,7 +57,7 @@ class GlobalUsageTable(BaseUsageTable):
57 57
     def get_object_id(self, datum):
58 58
         return datum.tenant_id
59 59
 
60
-    class Meta:
60
+    class Meta(object):
61 61
         name = "global_usage"
62 62
         hidden_title = False
63 63
         verbose_name = _("Usage")
@@ -87,7 +87,7 @@ class ProjectUsageTable(BaseUsageTable):
87 87
     def get_object_id(self, datum):
88 88
         return datum.get('instance_id', id(datum))
89 89
 
90
-    class Meta:
90
+    class Meta(object):
91 91
         name = "project_usage"
92 92
         hidden_title = False
93 93
         verbose_name = _("Usage")

+ 0
- 0
test-requirements.txt View File


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save