Merge "convert stx-gui to use django2" into f/centos8

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/datanets/datanets/forms.py

@@ -18,7 +18,7 @@
 
 import logging
 
-from django.core.urlresolvers import reverse  # noqa
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _  # noqa
 
 from cgtsclient import exc as sysinv_exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/datanets/datanets/ranges/forms.py

@@ -18,7 +18,7 @@
 
 import logging
 
-from django.core.urlresolvers import reverse  # noqa
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _  # noqa
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/datanets/datanets/ranges/tables.py

@@ -18,8 +18,8 @@
 
 import logging
 
-from django.core.urlresolvers import reverse  # noqa
 from django.template import defaultfilters as filters
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _  # noqa
 from django.utils.translation import ungettext_lazy
 

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/datanets/datanets/ranges/urls.py

@@ -26,3 +26,5 @@ RANGES = r'^(?P<providernet_range_id>[^/]+)/%s$'
 urlpatterns = [
     url(RANGES % 'detail', views.DetailView.as_view(),
         name='detail')]
+
+app_name = 'detail'

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/datanets/datanets/ranges/views.py

@@ -16,7 +16,7 @@
 #
 
 
-from django.core.urlresolvers import reverse  # noqa
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _  # noqa
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/datanets/datanets/tables.py

@@ -18,7 +18,7 @@
 
 import logging
 
-from django.core.urlresolvers import reverse  # noqa
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _  # noqa
 from django.utils.translation import ungettext_lazy
 

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/datanets/datanets/urls.py

@@ -47,3 +47,5 @@ urlpatterns += [
         range_views.UpdateView.as_view(), name='editrange'),
     url(r'^ranges/',
         include(range_urls, namespace='ranges'))]
+
+app_name = "ranges"

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/datanets/datanets/views.py

@@ -19,7 +19,7 @@
 from collections import OrderedDict
 import logging
 
-from django.core.urlresolvers import reverse_lazy  # noqa
+from django.urls import reverse_lazy  # noqa
 from django.utils.translation import ugettext_lazy as _  # noqa
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/host_topology/tabs.py

@@ -7,7 +7,7 @@
 from collections import OrderedDict
 import logging
 
-from django.core.urlresolvers import reverse_lazy  # noqa
+from django.urls import reverse_lazy  # noqa
 from django.utils.translation import ugettext_lazy as _  # noqa
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/host_topology/views.py

@@ -10,8 +10,8 @@ import logging
 
 from django.conf import settings
 from django.core.serializers.json import DjangoJSONEncoder
-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.http import HttpResponse  # noqa
 from django.utils.translation import ugettext_lazy as _
 from django.views.generic import View  # noqa

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/cpu_functions/forms.py

@@ -9,8 +9,8 @@
 import logging
 
 from cgtsclient import exc
-from django.core.urlresolvers import reverse  # noqa
 from django import shortcuts
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/cpu_functions/tables.py

@@ -6,8 +6,8 @@
 
 import logging
 
-from django.core.urlresolvers import reverse  # noqa
 from django import template
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import tables

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/cpu_functions/views.py

@@ -10,7 +10,7 @@ import logging
 
 import utils as icpu_utils
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/devices/forms.py

@@ -8,7 +8,7 @@
 
 import logging
 
-from django.core.urlresolvers import reverse  # noqa
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/devices/tables.py

@@ -9,7 +9,7 @@
 
 import logging
 
-from django.core.urlresolvers import reverse  # noqa
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import tables

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/devices/views.py

@@ -8,7 +8,7 @@
 
 import logging
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/filesystems/forms.py

@@ -8,7 +8,7 @@
 
 import logging
 
-from django.core.urlresolvers import reverse  # noqa
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/filesystems/tables.py

@@ -6,7 +6,7 @@
 
 import logging
 
-from django.core.urlresolvers import reverse  # noqa
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import tables

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/filesystems/views.py

@@ -8,7 +8,7 @@
 
 import logging
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/interfaces/address/forms.py

@@ -17,8 +17,8 @@
 
 import logging
 
-from django.core.urlresolvers import reverse
 from django import shortcuts
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 import netaddr

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/interfaces/address/tables.py

@@ -14,7 +14,7 @@
 
 import logging
 
-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
 

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/interfaces/address/views.py

@@ -15,7 +15,7 @@
 
 import logging
 
-from django.core.urlresolvers import reverse  # noqa
+from django.urls import reverse  # noqa
 
 from horizon import forms
 from starlingx_dashboard.dashboards.admin.inventory.interfaces.address import \

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/interfaces/forms.py

@@ -6,16 +6,14 @@
 
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-
+import collections
 import logging
-
-from compiler.ast import flatten
 import netaddr
 
 from cgtsclient import exc
 from django.conf import settings
-from django.core.urlresolvers import reverse  # noqa
 from django import shortcuts
+from django.urls import reverse  # noqa
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _
 
@@ -28,6 +26,17 @@ from starlingx_dashboard.api import sysinv
 LOG = logging.getLogger(__name__)
 
 
+def flatten(iterable):
+    result = []
+    for elem in iterable:
+        if isinstance(iterable, collections.Iterable) \
+                and not isinstance(elem, str):
+            result.extend(flatten(elem))
+        else:
+            result.append(elem)
+    return result
+
+
 def _get_ipv4_pool_choices(pools):
     choices = []
     for p in pools:

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/interfaces/route/forms.py

@@ -17,8 +17,8 @@
 
 import logging
 
-from django.core.urlresolvers import reverse
 from django import shortcuts
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 import netaddr
 

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/interfaces/route/tables.py

@@ -14,7 +14,7 @@
 
 import logging
 
-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
 

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/interfaces/route/views.py

@@ -15,7 +15,7 @@
 
 import logging
 
-from django.core.urlresolvers import reverse  # noqa
+from django.urls import reverse  # noqa
 
 from horizon import forms
 

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/interfaces/tables.py

@@ -6,8 +6,8 @@
 
 import logging
 
-from django.core.urlresolvers import reverse  # noqa
 from django.template import defaultfilters as filters
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy
 

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/interfaces/views.py

@@ -8,8 +8,8 @@
 
 import logging
 
-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

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/kubernetes_labels/forms.py

@@ -10,8 +10,8 @@
 import logging
 
 from cgtsclient import exc
-from django.core.urlresolvers import reverse  # noqa
 from django import shortcuts
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/kubernetes_labels/tables.py

@@ -7,7 +7,7 @@
 
 import logging
 
-from django.core.urlresolvers import reverse  # noqa
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy
 

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/kubernetes_labels/views.py

@@ -9,7 +9,7 @@
 
 import logging
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/lldp/views.py

@@ -8,7 +8,7 @@
 
 import logging
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/memories/forms.py

@@ -8,8 +8,8 @@
 import logging
 
 from cgtsclient import exc
-from django.core.urlresolvers import reverse  # noqa
 from django import shortcuts
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/memories/tables.py

@@ -6,8 +6,8 @@
 
 import logging
 
-from django.core.urlresolvers import reverse  # noqa
 from django import template
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import tables

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/memories/views.py

@@ -8,7 +8,7 @@
 
 import logging
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/ports/forms.py

@@ -8,7 +8,7 @@
 
 import logging
 
-from django.core.urlresolvers import reverse  # noqa
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/ports/tables.py

@@ -6,8 +6,8 @@
 
 import logging
 
-from django.core.urlresolvers import reverse  # noqa
 from django import template
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import tables

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/ports/views.py

@@ -9,7 +9,7 @@
 
 import logging
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/sensors/forms.py

@@ -10,8 +10,8 @@ import logging
 
 from cgtsclient import exc
 
-from django.core.urlresolvers import reverse  # noqa
 from django import shortcuts
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/sensors/tables.py

@@ -6,8 +6,8 @@
 
 import logging
 
-from django.core.urlresolvers import reverse  # noqa
 from django import template
+from django.urls import reverse  # noqa
 from django.utils.translation import string_concat  # noqa
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/sensors/views.py

@@ -8,7 +8,7 @@
 
 import logging
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/storages/forms.py

@@ -9,8 +9,8 @@
 import logging
 
 from cgtsclient import exc
-from django.core.urlresolvers import reverse  # noqa
 from django import shortcuts
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/storages/lvg_params/forms.py

@@ -5,7 +5,7 @@
 
 import logging
 
-from django.core.urlresolvers import reverse  # noqa
+from django.urls import reverse  # noqa
 from django.core import validators  # noqa
 from django.utils.translation import ugettext_lazy as _  # noqa
 

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/storages/lvg_params/tables.py

@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-from django.core.urlresolvers import reverse  # noqa
 from django.template import defaultfilters as filters
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _  # noqa
 
 from horizon import tables

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/storages/lvg_params/urls.py

@@ -11,3 +11,5 @@ from starlingx_dashboard.dashboards.admin.inventory.storages.lvg_params \
 urlpatterns = [
     url(r'^(?P<key>[^/]+)/edit/$', views.EditView.as_view(),
         name='edit')]
+
+app_name = "edit"

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/storages/lvg_params/views.py

@@ -5,7 +5,7 @@
 
 import logging
 
-from django.core.urlresolvers import reverse  # noqa
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _  # noqa
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/storages/tables.py

@@ -7,8 +7,8 @@
 import logging
 import re
 
-from django.core.urlresolvers import reverse  # noqa
 from django import template
+from django.urls import reverse  # noqa
 from django.utils.translation import string_concat  # noqa
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/storages/tabs.py

@@ -4,7 +4,7 @@
 #
 import logging
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/storages/urls.py

@@ -13,3 +13,5 @@ urlpatterns = [
     url(r'lvg/',
         include(lvg_params_urls, namespace='lvg'))
 ]
+
+app_name = "lvg"

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/storages/views.py

@@ -8,7 +8,7 @@
 
 import logging
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/tables.py

@@ -8,10 +8,10 @@
 import cgcs_patch.constants as patch_constants
 import logging
 
-from django.core.urlresolvers import reverse  # noqa
 from django import shortcuts
 from django import template
 from django.template.defaultfilters import safe  # noqa
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy
 

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/tabs.py

@@ -9,7 +9,7 @@
 
 import logging
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/views.py

@@ -8,9 +8,9 @@
 
 import logging
 
-import cpu_functions.utils as icpu_utils
+from .cpu_functions import utils as icpu_utils
-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

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/inventory/workflows.py

@@ -8,7 +8,7 @@
 
 import logging
 
-import cpu_functions.utils as icpu_utils
+from .cpu_functions import utils as icpu_utils
 import sysinv.common.constants as sysinv_const
 
 from cgtsclient.common import constants

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/software_management/forms.py

@@ -6,7 +6,7 @@
 
 import logging
 
-from django.core.urlresolvers import reverse  # noqa
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/software_management/tables.py

@@ -7,9 +7,9 @@
 import datetime
 import logging
 
-from django.core.urlresolvers import reverse  # noqa
 from django import shortcuts
 from django.template.defaultfilters import title  # noqa
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy
 

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/software_management/views.py

@@ -7,8 +7,8 @@
 import datetime
 import logging
 
-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

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/system_config/address_pools/forms.py

@@ -17,8 +17,8 @@
 
 import logging
 
-from django.core.urlresolvers import reverse
 from django import shortcuts
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import forms

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/system_config/address_pools/tables.py

@@ -14,7 +14,7 @@
 
 import logging
 
-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
 

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/system_config/address_pools/views.py

@@ -15,7 +15,7 @@
 
 import logging
 
-from django.core.urlresolvers import reverse  # noqa
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _  # noqa
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/system_config/forms.py

@@ -10,7 +10,7 @@ from collections import OrderedDict
 
 from cgtsclient import exc
 
-from django.core.urlresolvers import reverse  # noqa
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/system_config/tables.py

@@ -7,7 +7,7 @@
 import logging
 
 from cgtsclient import exc
-from django.core.urlresolvers import reverse  # noqa
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy
 

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/system_config/views.py

@@ -6,7 +6,7 @@
 
 import logging
 
-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

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/dc_admin/dc_software_management/forms.py

@@ -8,7 +8,7 @@ import logging
 
 from dcmanagerclient import exceptions as exc
 
-from django.core.urlresolvers import reverse  # noqa
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/dc_admin/dc_software_management/tables.py

@@ -6,9 +6,9 @@
 
 import logging
 
-from django.core.urlresolvers import reverse  # noqa
 from django import shortcuts
 from django.template.defaultfilters import safe
+from django.urls import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy
 

starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/dc_admin/dc_software_management/views.py

@@ -6,7 +6,7 @@
 
 import logging
 
-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