Django 2.0 support

Change-Id: Id3db080c8641b018ab6cab39ddb6fa34c9e7988c

.zuul.yaml

@@ -10,6 +10,9 @@
         - openstack-tox-py35:
             required-projects:
               openstack/horizon
+        - horizon-openstack-tox-py35dj20:
+            required-projects:
+              openstack/horizon
     gate:
       jobs:
         - openstack-tox-lower-constraints:
@@ -19,6 +22,9 @@
         - openstack-tox-py35:
             required-projects:
               openstack/horizon
+        - horizon-openstack-tox-py35dj20:
+            required-projects:
+              openstack/horizon
 
 - job:
     name: manila-ui-dsvm

manila_ui/dashboards/admin/security_services/views.py

@@ -16,7 +16,7 @@
 Admin views for managing security services.
 """
 
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import tables

manila_ui/dashboards/admin/share_group_snapshots/forms.py

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import forms

manila_ui/dashboards/admin/share_group_snapshots/tables.py

@@ -13,9 +13,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-
-from django.core.urlresolvers import reverse
 from django.template.defaultfilters import title  # noqa
+from django.urls import reverse
 from django.utils.translation import pgettext_lazy
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy

manila_ui/dashboards/admin/share_group_snapshots/views.py

@@ -17,8 +17,8 @@
 Admin views for managing share group snapshots.
 """
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import forms

manila_ui/dashboards/admin/share_group_types/views.py

@@ -17,8 +17,8 @@
 Admin views for managing share group types.
 """
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import forms

manila_ui/dashboards/admin/share_groups/forms.py

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import forms

manila_ui/dashboards/admin/share_groups/tables.py

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy
 from horizon import tables

manila_ui/dashboards/admin/share_groups/views.py

@@ -17,8 +17,8 @@
 Admin views for managing share groups.
 """
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import forms

manila_ui/dashboards/admin/share_instances/tables.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from horizon import tables
 import six

manila_ui/dashboards/admin/share_instances/views.py

@@ -16,7 +16,7 @@
 Admin views for managing share instances.
 """
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import tables

manila_ui/dashboards/admin/share_networks/views.py

@@ -16,7 +16,7 @@
 Admin views for managing share networks.
 """
 
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import tables

manila_ui/dashboards/admin/share_servers/tables.py

@@ -10,8 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from django.core.urlresolvers import reverse
 from django.template.defaultfilters import title  # noqa
+from django.urls import reverse
 from django.utils.translation import pgettext_lazy
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy

manila_ui/dashboards/admin/share_servers/views.py

@@ -16,8 +16,8 @@
 Admin views for managing share servers.
 """
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import tables

manila_ui/dashboards/admin/share_snapshots/tables.py

@@ -11,8 +11,8 @@
 # under the License.
 
 
-from django.core.urlresolvers import reverse
 from django.template.defaultfilters import title  # noqa
+from django.urls import reverse
 from django.utils.translation import pgettext_lazy
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy

manila_ui/dashboards/admin/share_snapshots/views.py

@@ -16,7 +16,7 @@
 Admin views for managing share snapshots.
 """
 
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import tables

manila_ui/dashboards/admin/share_types/views.py

@@ -14,8 +14,8 @@
 Admin views for managing share types.
 """
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import forms

manila_ui/dashboards/admin/shares/forms.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
 from django.forms import ValidationError  # noqa
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import forms

manila_ui/dashboards/admin/shares/replicas/forms.py

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

manila_ui/dashboards/admin/shares/replicas/tables.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy
 

manila_ui/dashboards/admin/shares/replicas/views.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

manila_ui/dashboards/admin/shares/tables.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from horizon import tables
 

manila_ui/dashboards/admin/shares/views.py

@@ -16,8 +16,8 @@
 Admin views for managing shares.
 """
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import forms

manila_ui/dashboards/project/security_services/forms.py

@@ -13,9 +13,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from django.core.urlresolvers import reverse
 from django.forms import ValidationError  # noqa
 from django.template.defaultfilters import filesizeformat  # noqa
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.debug import sensitive_variables  # noqa
 from horizon import exceptions

manila_ui/dashboards/project/security_services/views.py

@@ -12,8 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import forms

manila_ui/dashboards/project/share_group_snapshots/forms.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import forms

manila_ui/dashboards/project/share_group_snapshots/tables.py

@@ -13,9 +13,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-
-from django.core.urlresolvers import reverse
 from django.template.defaultfilters import title  # noqa
+from django.urls import reverse
 from django.utils.http import urlencode  # noqa
 from django.utils.translation import pgettext_lazy
 from django.utils.translation import ugettext_lazy as _

manila_ui/dashboards/project/share_group_snapshots/views.py

@@ -17,8 +17,8 @@
 Project views for managing share group snapshots.
 """
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import forms

manila_ui/dashboards/project/share_groups/forms.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.core.urlresolvers import reverse
 from django.forms import ValidationError  # noqa
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import forms

manila_ui/dashboards/project/share_groups/tables.py

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy
 from horizon import tables

manila_ui/dashboards/project/share_groups/views.py

@@ -17,8 +17,8 @@
 Project views for managing share groups.
 """
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import forms

manila_ui/dashboards/project/share_networks/forms.py

@@ -13,9 +13,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from django.core.urlresolvers import reverse
 from django.forms import ValidationError  # noqa
 from django.template.defaultfilters import filesizeformat  # noqa
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import forms

manila_ui/dashboards/project/share_networks/tables.py

@@ -12,8 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.core.urlresolvers import NoReverseMatch  # noqa
 from django.template.defaultfilters import title  # noqa
+from django.urls import NoReverseMatch  # noqa
 from django.utils.translation import pgettext_lazy
 from django.utils.translation import string_concat  # noqa
 from django.utils.translation import ugettext_lazy as _

manila_ui/dashboards/project/share_networks/views.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import forms

manila_ui/dashboards/project/share_snapshots/forms.py

@@ -17,9 +17,9 @@
 Views for managing share snapshots.
 """
 
-from django.core.urlresolvers import reverse
 from django.forms import ValidationError  # noqa
 from django.template.defaultfilters import filesizeformat  # noqa
+from django.urls import reverse
 from django.utils.http import urlencode  # noqa
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions

manila_ui/dashboards/project/share_snapshots/tables.py

@@ -12,9 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.core.urlresolvers import NoReverseMatch  # noqa
-from django.core.urlresolvers import reverse
 from django.template.defaultfilters import title  # noqa
+from django.urls import NoReverseMatch  # noqa
+from django.urls import reverse
 from django.utils.http import urlencode  # noqa
 from django.utils.translation import pgettext_lazy
 from django.utils.translation import string_concat  # noqa

manila_ui/dashboards/project/share_snapshots/views.py

@@ -12,8 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import forms

manila_ui/dashboards/project/shares/forms.py

@@ -14,9 +14,9 @@
 # under the License.
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
 from django.forms import ValidationError  # noqa
 from django.template.defaultfilters import filesizeformat  # noqa
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import forms

manila_ui/dashboards/project/shares/replicas/forms.py

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

manila_ui/dashboards/project/shares/replicas/tables.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.core.urlresolvers import reverse
 from django.template.defaultfilters import title
+from django.urls import reverse
 from django.utils.translation import pgettext_lazy
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy

manila_ui/dashboards/project/shares/replicas/views.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

manila_ui/dashboards/project/shares/tables.py

@@ -12,9 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.core.urlresolvers import NoReverseMatch  # noqa
-from django.core.urlresolvers import reverse
 from django.template.defaultfilters import title  # noqa
+from django.urls import NoReverseMatch  # noqa
+from django.urls import reverse
 from django.utils.translation import string_concat, ugettext_lazy  # noqa
 from django.utils.translation import pgettext_lazy
 from django.utils.translation import ugettext_lazy as _

manila_ui/dashboards/project/shares/views.py

@@ -12,8 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import forms

manila_ui/tests/dashboards/admin/security_services/tests.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from horizon import exceptions as horizon_exceptions
 import mock
 from openstack_dashboard.api import keystone as api_keystone

manila_ui/tests/dashboards/admin/share_group_snapshots/tests.py

@@ -14,7 +14,7 @@
 #    under the License.
 
 import ddt
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 import mock
 
 from manila_ui.api import manila as api_manila

manila_ui/tests/dashboards/admin/share_group_types/tests.py

@@ -12,7 +12,7 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 import mock
 
 from manila_ui.api import manila as api_manila

manila_ui/tests/dashboards/admin/share_groups/tests.py

@@ -14,7 +14,7 @@
 #    under the License.
 
 import ddt
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 import mock
 
 from manila_ui.api import manila as api_manila

manila_ui/tests/dashboards/admin/share_instances/tests.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from horizon import exceptions as horizon_exceptions
 import mock
 from openstack_dashboard.api import keystone as api_keystone

manila_ui/tests/dashboards/admin/share_networks/tests.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from horizon import exceptions as horizon_exceptions
 import mock
 from neutronclient.client import exceptions

manila_ui/tests/dashboards/admin/share_servers/tests.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from horizon import exceptions as horizon_exceptions
 import mock
 from openstack_dashboard.api import keystone as api_keystone

manila_ui/tests/dashboards/admin/share_snapshots/tests.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from horizon import exceptions as horizon_exceptions
 import mock
 from openstack_dashboard.api import keystone as api_keystone

manila_ui/tests/dashboards/admin/share_types/tests.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 import mock
 from openstack_dashboard.api import keystone as api_keystone
 from openstack_dashboard.api import neutron as api_neutron

manila_ui/tests/dashboards/admin/shares/replicas/tests.py

@@ -13,7 +13,7 @@
 #    under the License.
 
 import ddt
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 import mock
 
 from manila_ui.api import manila as api_manila

manila_ui/tests/dashboards/admin/shares/tests.py

@@ -14,7 +14,7 @@
 #    under the License.
 
 import ddt
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 import mock
 from openstack_dashboard.api import keystone as api_keystone
 from openstack_dashboard.api import neutron as api_neutron

manila_ui/tests/dashboards/project/security_services/tests.py

@@ -16,7 +16,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from horizon import exceptions as horizon_exceptions
 import mock
 from openstack_dashboard import api

manila_ui/tests/dashboards/project/share_group_snapshots/tests.py

@@ -14,7 +14,7 @@
 #    under the License.
 
 import ddt
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 import mock
 
 from manila_ui.api import manila as api_manila

manila_ui/tests/dashboards/project/share_groups/tests.py

@@ -14,7 +14,7 @@
 #    under the License.
 
 import ddt
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 import mock
 
 from manila_ui.api import manila as api_manila

manila_ui/tests/dashboards/project/share_networks/tests.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 import mock
 from neutronclient.client import exceptions
 from openstack_auth import policy

manila_ui/tests/dashboards/project/share_snapshots/tests.py

@@ -13,7 +13,7 @@
 #    under the License.
 
 import ddt
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 import mock
 from openstack_dashboard.api import neutron
 from openstack_dashboard.usage import quotas

manila_ui/tests/dashboards/project/shares/replicas/tests.py

@@ -13,7 +13,7 @@
 #    under the License.
 
 import ddt
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 import mock
 from openstack_dashboard.api import neutron
 

manila_ui/tests/dashboards/project/shares/tests.py

@@ -14,7 +14,7 @@
 
 import ddt
 from django.core.handlers import wsgi
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from horizon import messages as horizon_messages
 import mock
 from openstack_dashboard.api import neutron

manila_ui/tests/dashboards/project/tests.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils import translation
 import mock