Multiple panels

Updated import paths, API Wrappers and other files related to
these panels:

- Panels Provider Networks
- Provider Network Topology
- Storage Overview

Depends-on: https://review.openstack.org/#/c/591107/1
Change-Id: Id4ed29c110d8c7183c788ddb001395a9f4712960

starlingx_dashboard/api/base.py

@@ -3,10 +3,11 @@
 # 
 # SPDX-License-Identifier: Apache-2.0 
 #
-
+import six
 from django.conf import settings
 from horizon import exceptions
-import six
+
+from openstack_dashboard.api import base
 
 def get_request_page_size(request, limit=None):
     default_limit = getattr(settings, 'API_RESULT_LIMIT', 1000)
@@ -16,3 +17,7 @@ def get_request_page_size(request, limit=None):
         default_page_size = getattr(settings, 'API_RESULT_PAGE_SIZE', 20)
         return request.session.get('horizon_pagesize', default_page_size)
 
+def is_TiS_region(request):
+    if not base.is_service_enabled(request, 'platform'):
+        return False
+    return True

starlingx_dashboard/api/neutron.py

@@ -0,0 +1,139 @@
+# 
+# Copyright (c) 2018 Intel Corporation 
+# 
+# SPDX-License-Identifier: Apache-2.0 
+#
+
+from openstack_dashboard.api.neutron import *
+
+def provider_network_type_list(request, **params):
+    providernet_types = neutronclient(request).list_providernet_types(
+        **params).get(
+            'providernet_types')
+    return [ProviderNetworkType(t) for t in providernet_types]
+
+
+def provider_network_create(request, **kwargs):
+    body = {'providernet': kwargs}
+
+    providernet = neutronclient(request).create_providernet(body=body).get(
+        'providernet')
+    return ProviderNetwork(providernet)
+
+
+def provider_network_list(request, **params):
+    providernets = neutronclient(request).list_providernets(**params).get(
+        'providernets')
+    return [ProviderNetwork(n) for n in providernets]
+
+
+def provider_network_list_for_tenant(request, tenant_id, **params):
+    return provider_network_list(request, tenant_id=tenant_id, **params)
+
+
+def provider_network_list_tenant_networks(request, providernet_id, **params):
+    nets = neutronclient(request).list_networks_on_providernet(
+        providernet_id, **params).get('networks')
+    return [ProviderTenantNetwork(n) for n in nets]
+
+
+def provider_network_get(request, providernet_id,
+                         expand_subnet=True, **params):
+    providernet = neutronclient(request).show_providernet(
+        providernet_id, **params).get('providernet')
+    return ProviderNetwork(providernet)
+
+
+def provider_network_delete(request, providernet_id):
+    neutronclient(request).delete_providernet(providernet_id)
+
+
+def provider_network_modify(request, providernet_id, **kwargs):
+    body = {'providernet': kwargs}
+    providernet = neutronclient(request).update_providernet(
+        providernet_id, body=body).get('providernet')
+    return ProviderNetwork(providernet)
+
+
+def provider_network_range_create(request, **kwargs):
+    body = {'providernet_range': kwargs}
+    range = neutronclient(request).create_providernet_range(body=body).get(
+        'providernet_range')
+    return ProviderNetworkRange(range)
+
+
+def provider_network_range_list(request, **params):
+    ranges = neutronclient(request).list_providernet_ranges(**params).get(
+        'providernet_ranges')
+    return [ProviderNetworkRange(r) for r in ranges]
+
+
+def provider_network_range_get(request, range_id,
+                               expand_subnet=True, **params):
+    range = neutronclient(request).show_providernet_range(
+        range_id, **params).get('providernet_range')
+    return ProviderNetworkRange(range)
+
+
+def provider_network_range_delete(request, range_id):
+    neutronclient(request).delete_providernet_range(range_id)
+
+
+def provider_network_range_modify(request, range_id, **kwargs):
+    body = {'providernet_range': kwargs}
+    range = neutronclient(request).update_providernet_range(
+        range_id, body=body).get('providernet_range')
+    return ProviderNetworkRange(range)
+
+
+def qos_list(request):
+    qoses = neutronclient(request).list_qoses().get('qoses')
+    return [QoSPolicy(q) for q in qoses]
+
+
+def qos_get(request, qos_id):
+    qos = neutronclient(request).show_qos(qos_id).get('qos')
+    return QoSPolicy(qos)
+
+
+def qos_create(request, **kwargs):
+    body = {'qos': kwargs}
+    return neutronclient(request).create_qos(body=body)
+
+
+def qos_update(request, qos_id, **kwargs):
+    body = {'qos': kwargs}
+    return neutronclient(request).update_qos(qos_id, body=body)
+
+
+def qos_delete(request, qos_id):
+    neutronclient(request).delete_qos(qos_id)
+
+
+def portforwarding_list(request, **params):
+    rules = (neutronclient(request).
+             list_portforwardings(**params).get('portforwardings'))
+    return [PortForwardingRule(r) for r in rules]
+
+
+def portforwarding_get(request, portforwarding_id):
+    rule = (neutronclient(request).
+            show_portforwarding(portforwarding_id).get('portforwarding'))
+    return PortForwardingRule(rule)
+
+
+def portforwarding_create(request, **kwargs):
+    body = {'portforwarding': kwargs}
+    rule = neutronclient(request).create_portforwarding(body=body)
+    return PortForwardingRule(rule)
+
+
+def portforwarding_update(request, portforwarding_id, **kwargs):
+    body = {'portforwarding': kwargs}
+    rule = neutronclient(request).update_portforwarding(
+        portforwarding_id, body=body).get('portforwarding')
+    return PortForwardingRule(rule)
+
+
+def portforwarding_delete(request, portforwarding_id):
+    return neutronclient(request).delete_portforwarding(portforwarding_id)

starlingx_dashboard/api/nova.py

@@ -10,13 +10,11 @@ def server_group_create(request, **kwargs):
     return novaclient(request).server_groups.create(**kwargs)
 
 
-# WRS: Nova extension for provider network.
 def provider_network_get(request, providernet_id):
     return wrs_providernets.ProviderNetsManager(novaclient(request)).get(
         providernet_id)
 
 
-# WRS: Nova extension for device usage
 class DeviceUsage(base.APIResourceWrapper):
     """Wrapper for Inventory Device Usage
     """
@@ -39,7 +37,6 @@ def get_device_usage(request, device_id):
     return DeviceUsage(usage[0])
 
 
-# WRS: Nova extension for detail device usage
 class DetailUsage(base.APIResourceWrapper):
     """Wrapper for Inventory Device Usage
     """

starlingx_dashboard/dashboards/admin/host_topology/panel.py

@@ -8,6 +8,7 @@
 from django.utils.translation import ugettext_lazy as _
 
 import horizon
+
 from openstack_dashboard.api import base
 from openstack_dashboard.dashboards.admin import dashboard
 

starlingx_dashboard/dashboards/admin/host_topology/tables.py

@@ -8,11 +8,11 @@ import logging
 
 from django.utils.translation import ugettext_lazy as _
 
-from openstack_dashboard.dashboards.admin.fault_management import \
+from starlingx_dashboard.dashboards.admin.fault_management import \
     tables as fm_tables
-from openstack_dashboard.dashboards.admin.inventory.interfaces import \
+from starlingx_dashboard.dashboards.admin.inventory.interfaces import \
     tables as if_tables
-from openstack_dashboard.dashboards.admin.providernets.providernets.ranges import \
+from starlingx_dashboard.dashboards.admin.providernets.providernets.ranges import \
     tables as sr_tables
 
 LOG = logging.getLogger(__name__)

starlingx_dashboard/dashboards/admin/host_topology/tabs.py

@@ -12,12 +12,13 @@ from django.utils.translation import ugettext_lazy as _  # noqa
 
 from horizon import exceptions
 from horizon import tabs
-from openstack_dashboard import api
-from openstack_dashboard.dashboards.admin.host_topology import \
+
+from starlingx_dashboard import api as stx_api
+from starlingx_dashboard.dashboards.admin.host_topology import \
     tables as tables
-from openstack_dashboard.dashboards.admin.inventory import \
+from starlingx_dashboard.dashboards.admin.inventory import \
     tabs as i_tabs
-from openstack_dashboard.dashboards.admin.providernets.providernets import \
+from starlingx_dashboard.dashboards.admin.providernets.providernets import \
     tables as pn_tables
 
 LOG = logging.getLogger(__name__)
@@ -83,7 +84,7 @@ class OverviewTab(tabs.TableTab):
     def get_tenant_networks_data(self):
         try:
             providernet_id = self.tab_group.kwargs['providernet_id']
-            networks = api.neutron.provider_network_list_tenant_networks(
+            networks = stx_api.neutron.provider_network_list_tenant_networks(
                 self.request, providernet_id=providernet_id)
         except Exception:
             networks = []
@@ -94,7 +95,7 @@ class OverviewTab(tabs.TableTab):
     def get_provider_network_ranges_data(self):
         try:
             providernet_id = self.tab_group.kwargs['providernet_id']
-            ranges = api.neutron.provider_network_range_list(
+            ranges = stx_api.neutron.provider_network_range_list(
                 self.request, providernet_id=providernet_id)
         except Exception:
             ranges = []

starlingx_dashboard/dashboards/admin/host_topology/urls.py

@@ -7,7 +7,7 @@
 
 from django.conf.urls import url
 
-from openstack_dashboard.dashboards.admin.host_topology import views
+from starlingx_dashboard.dashboards.admin.host_topology import views
 
 
 urlpatterns = [

starlingx_dashboard/dashboards/admin/host_topology/views.py

@@ -20,13 +20,14 @@ from horizon import tabs
 from horizon.utils import settings as utils_settings
 from horizon import views
 
-from openstack_dashboard import api
-from openstack_dashboard.dashboards.admin.host_topology import\
-    tabs as topology_tabs
-from openstack_dashboard.dashboards.admin.inventory import\
-    views as i_views
 from openstack_dashboard.usage import quotas
 
+from starlingx_dashboard import api as stx_api
+from starlingx_dashboard.dashboards.admin.host_topology import\
+    tabs as topology_tabs
+from starlingx_dashboard.dashboards.admin.inventory import\
+    views as i_views
+
 LOG = logging.getLogger(__name__)
 
 
@@ -41,7 +42,7 @@ class HostDetailView(i_views.DetailView):
 
                 alarms = []
                 try:
-                    alarms = api.sysinv.alarm_list(self.request)
+                    alarms = stx_api.sysinv.alarm_list(self.request)
                 except Exception as ex:
                     exceptions.handle(ex)
                 # Filter out unrelated alarms
@@ -72,11 +73,11 @@ class ProvidernetDetailView(tabs.TabbedTableView):
         if not hasattr(self, "_providernet"):
             try:
                 providernet_id = self.kwargs['providernet_id']
-                providernet = api.neutron.provider_network_get(
+                providernet = stx_api.neutron.provider_network_get(
                     self.request, providernet_id)
                 providernet.set_id_as_name_if_empty(length=0)
 
-                alarms = api.sysinv.alarm_list(self.request)
+                alarms = stx_api.sysinv.alarm_list(self.request)
                 # Filter out unrelated alarms
                 providernet.alarms = \
                     topology_tabs.get_alarms_for_entity(alarms,
@@ -99,7 +100,7 @@ class ProvidernetDetailView(tabs.TabbedTableView):
         if not hasattr(self, "_providernet_nova"):
             try:
                 providernet_id = self.kwargs['providernet_id']
-                providernet_nova = api.nova.provider_network_get(
+                providernet_nova = stx_api.nova.provider_network_get(
                     self.request, providernet_id)
             except Exception:
                 redirect = self.failure_url
@@ -172,7 +173,7 @@ class JSONView(View):
     def _get_alarms(self, request):
         alarms = []
         try:
-            alarms = api.sysinv.alarm_list(request)
+            alarms = stx_api.sysinv.alarm_list(request)
         except Exception as ex:
             exceptions.handle(ex)
 
@@ -182,7 +183,7 @@ class JSONView(View):
     def _get_hosts(self, request):
         hosts = []
         try:
-            hosts = api.sysinv.host_list(request)
+            hosts = stx_api.sysinv.host_list(request)
         except Exception as ex:
             exceptions.handle(ex)
 
@@ -192,15 +193,15 @@ class JSONView(View):
             try:
                 host_data['ports'] = [
                     p.to_dict() for p in
-                    api.sysinv.host_port_list(request, host.uuid)]
+                    stx_api.sysinv.host_port_list(request, host.uuid)]
 
                 host_data['interfaces'] = [
                     i.to_dict() for i in
-                    api.sysinv.host_interface_list(request, host.uuid)]
+                    stx_api.sysinv.host_interface_list(request, host.uuid)]
 
                 host_data['lldpneighbours'] = [
                     n.to_dict() for n in
-                    api.sysinv.host_lldpneighbour_list(request, host.uuid)]
+                    stx_api.sysinv.host_lldpneighbour_list(request, host.uuid)]
 
                 # Set the value for neighbours field for each port in the host.
                 # This will be referenced in Interfaces table
@@ -219,7 +220,7 @@ class JSONView(View):
     def _get_pnets(self, request):
         pnets = []
         try:
-            pnets = api.neutron.provider_network_list(request)
+            pnets = stx_api.neutron.provider_network_list(request)
         except Exception as ex:
             exceptions.handle(ex)
         data = [p.to_dict() for p in pnets]

starlingx_dashboard/dashboards/admin/providernets/providernets/forms.py

@@ -20,12 +20,14 @@ import logging
 
 from django.core.urlresolvers import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _  # noqa
+
 from neutronclient.common import exceptions as neutron_exceptions
 
 from horizon import exceptions
 from horizon import forms
 from horizon import messages
-from openstack_dashboard import api
+
+from starlingx_dashboard import api as stx_api
 
 LOG = logging.getLogger(__name__)
 
@@ -66,7 +68,7 @@ class CreateProviderNetwork(forms.SelfHandlingForm):
         super(CreateProviderNetwork, self).__init__(request, *args, **kwargs)
 
         providernet_type_choices = [('', _("Select a network type"))]
-        providernet_types = api.neutron.provider_network_type_list(request)
+        providernet_types = stx_api.neutron.provider_network_type_list(request)
         for providernet_type in providernet_types:
             providernet_type_choices.append((providernet_type.type,
                                              providernet_type.type))
@@ -87,7 +89,7 @@ class CreateProviderNetwork(forms.SelfHandlingForm):
                       'mtu': data['mtu'],
                       'vlan_transparent': data['vlan_transparent']}
 
-            network = api.neutron.provider_network_create(request, **params)
+            network = stx_api.neutron.provider_network_create(request, **params)
             msg = (_('Provider network %s was successfully created.') %
                    data['name'])
             LOG.debug(msg)
@@ -135,7 +137,7 @@ class UpdateProviderNetwork(forms.SelfHandlingForm):
                       'mtu': data['mtu'],
                       'vlan_transparent': data['vlan_transparent']}
 
-            providernet = api.neutron.provider_network_modify(
+            providernet = stx_api.neutron.provider_network_modify(
                 request, data['id'], **params)
             msg = (_('Provider network %s was successfully updated.') %
                    data['name'])

starlingx_dashboard/dashboards/admin/providernets/providernets/ranges/forms.py

@@ -20,13 +20,17 @@ import logging
 
 from django.core.urlresolvers import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _  # noqa
-from neutronclient.common import exceptions as neutron_exceptions
 
 from horizon import exceptions
 from horizon import forms
 from horizon import messages
+
+from neutronclient.common import exceptions as neutron_exceptions
+
 from openstack_dashboard import api
 
+from starlingx_dashboard import api as stx_api
+
 LOG = logging.getLogger(__name__)
 
 
@@ -133,7 +137,7 @@ class CreateProviderNetworkRange(forms.SelfHandlingForm):
                 params['port'] = int(data['port'])
                 params['ttl'] = int(data['ttl'])
 
-            providernet_range = api.neutron.provider_network_range_create(
+            providernet_range = stx_api.neutron.provider_network_range_create(
                 request, **params)
             msg = (_('Provider network range %s was successfully created.') %
                    providernet_range['id'])
@@ -224,7 +228,7 @@ class UpdateProviderNetworkRange(forms.SelfHandlingForm):
                       'minimum': data['minimum'],
                       'maximum': data['maximum']}
 
-            providernet_range = api.neutron.provider_network_range_modify(
+            providernet_range = stx_api.neutron.provider_network_range_modify(
                 request, data['providernet_range_id'], **params)
             msg = (_('Provider network range %s was successfully updated.') %
                    data['providernet_range_id'])

starlingx_dashboard/dashboards/admin/providernets/providernets/ranges/tables.py

@@ -24,11 +24,13 @@ from django.core.urlresolvers import reverse  # noqa
 from django.template import defaultfilters as filters
 from django.utils.translation import ugettext_lazy as _  # noqa
 from django.utils.translation import ungettext_lazy
-from neutronclient.common import exceptions as neutron_exceptions
 
 from horizon import exceptions
 from horizon import tables
-from openstack_dashboard import api
+
+from neutronclient.common import exceptions as neutron_exceptions
+
+from starlingx_dashboard import api as stx_api
 
 LOG = logging.getLogger(__name__)
 
@@ -57,7 +59,7 @@ class DeleteProviderNetworkRange(tables.DeleteAction):
 
     def delete(self, request, obj_id):
         try:
-            api.neutron.provider_network_range_delete(request, obj_id)
+            stx_api.neutron.provider_network_range_delete(request, obj_id)
         except neutron_exceptions.NeutronClientException as e:
             LOG.info(e.message)
             exceptions.handle(request, e.message,

starlingx_dashboard/dashboards/admin/providernets/providernets/ranges/urls.py

@@ -20,7 +20,7 @@
 
 from django.conf.urls import url  # noqa
 
-from openstack_dashboard.dashboards.admin.providernets.providernets.ranges \
+from starlingx_dashboard.dashboards.admin.providernets.providernets.ranges \
     import views
 
 RANGES = r'^(?P<providernet_range_id>[^/]+)/%s$'

starlingx_dashboard/dashboards/admin/providernets/providernets/ranges/views.py

@@ -25,10 +25,11 @@ from horizon import exceptions
 from horizon import forms
 from horizon import tabs
 from horizon.utils import memoized
-from openstack_dashboard import api
-from openstack_dashboard.dashboards.admin.providernets.providernets.ranges \
+
+from starlingx_dashboard import api as stx_api
+from starlingx_dashboard.dashboards.admin.providernets.providernets.ranges \
     import forms as range_forms
-from openstack_dashboard.dashboards.admin.providernets.providernets.ranges \
+from starlingx_dashboard.dashboards.admin.providernets.providernets.ranges \
     import tabs as range_tabs
 
 
@@ -50,7 +51,7 @@ class CreateView(forms.ModalFormView):
         if not hasattr(self, "_object"):
             try:
                 providernet_id = self.kwargs["providernet_id"]
-                self._object = api.neutron.provider_network_get(self.request,
+                self._object = stx_api.neutron.provider_network_get(self.request,
                                                                 providernet_id)
             except Exception:
                 redirect = reverse(self.failure_url,
@@ -82,7 +83,7 @@ class DetailView(tabs.TabView):
             providernet_range_id = \
                 self.kwargs['providernet_range_id']
             try:
-                self._object = api.neutron.provider_network_range_get(
+                self._object = stx_api.neutron.provider_network_range_get(
                     self.request, providernet_range_id)
             except Exception:
                 redirect = \
@@ -112,7 +113,7 @@ class DetailView(tabs.TabView):
     @memoized.memoized_method
     def get_providernet_name(self, providernet_id):
         try:
-            providernet = api.neutron.provider_network_get(self.request,
+            providernet = stx_api.neutron.provider_network_get(self.request,
                                                            providernet_id)
             providernet.set_id_as_name_if_empty(length=0)
         except Exception:
@@ -142,7 +143,7 @@ class UpdateView(forms.ModalFormView):
         if not hasattr(self, "_object"):
             providernet_range_id = self.kwargs['providernet_range_id']
             try:
-                self._object = api.neutron.provider_network_range_get(
+                self._object = stx_api.neutron.provider_network_range_get(
                     self.request, providernet_range_id)
             except Exception:
                 redirect = \

starlingx_dashboard/dashboards/admin/providernets/providernets/tables.py

@@ -23,11 +23,12 @@ from django.core.urlresolvers import reverse  # noqa
 from django.utils.translation import ugettext_lazy as _  # noqa
 from django.utils.translation import ungettext_lazy
 
-from neutronclient.common import exceptions as neutron_exceptions
-
 from horizon import exceptions
 from horizon import tables
-from openstack_dashboard import api
+
+from neutronclient.common import exceptions as neutron_exceptions
+
+from starlingx_dashboard import api as stx_api
 
 LOG = logging.getLogger(__name__)
 
@@ -51,7 +52,7 @@ class DeleteProviderNetwork(tables.DeleteAction):
 
     def delete(self, request, obj_id):
         try:
-            api.neutron.provider_network_delete(request, obj_id)
+            stx_api.neutron.provider_network_delete(request, obj_id)
         except neutron_exceptions.NeutronClientException as e:
             LOG.info(e.message)
             redirect = reverse('horizon:admin:providernets:index')

starlingx_dashboard/dashboards/admin/providernets/providernets/urls.py

@@ -19,15 +19,15 @@
 from django.conf.urls import include  # noqa
 from django.conf.urls import url  # noqa
 
-from openstack_dashboard.dashboards.admin.providernets.providernets.ranges \
+from starlingx_dashboard.dashboards.admin.providernets.providernets.ranges \
     import urls as range_urls
-from openstack_dashboard.dashboards.admin.providernets.providernets.ranges \
+from starlingx_dashboard.dashboards.admin.providernets.providernets.ranges \
     import views as range_views
-from openstack_dashboard.dashboards.admin.providernets.providernets import \
+from starlingx_dashboard.dashboards.admin.providernets.providernets import \
     views
 
 PROVIDERNETS = r'^(?P<providernet_id>[^/]+)/%s$'
-VIEW_MOD = 'openstack_dashboard.dashboards.admin.providernets.providernets.' \
+VIEW_MOD = 'starlingx_dashboard.dashboards.admin.providernets.providernets.' \
            'views'
 
 urlpatterns = [

starlingx_dashboard/dashboards/admin/providernets/providernets/views.py

@@ -26,14 +26,17 @@ from django.utils.translation import ugettext_lazy as _  # noqa
 from horizon import exceptions
 from horizon import forms
 from horizon import tables
+
 from openstack_dashboard import api
-from openstack_dashboard.dashboards.admin.providernets.providernets import \
+
+from starlingx_dashboard import api as stx_api
+from starlingx_dashboard.dashboards.admin.providernets.providernets import \
     forms as providernet_forms
-from openstack_dashboard.dashboards.admin.providernets.providernets.ranges \
+from starlingx_dashboard.dashboards.admin.providernets.providernets.ranges \
     import tables as range_tables
-from openstack_dashboard.dashboards.admin.providernets.providernets.ranges \
+from starlingx_dashboard.dashboards.admin.providernets.providernets.ranges \
     import views as range_views
-from openstack_dashboard.dashboards.admin.providernets.providernets import \
+from starlingx_dashboard.dashboards.admin.providernets.providernets import \
     tables as providernet_tables
 
 LOG = logging.getLogger(__name__)
@@ -68,7 +71,7 @@ class DetailView(tables.MultiTableView):
         try:
             providernet_id = self.kwargs['providernet_id']
             # self.table.kwargs['providernet'] = self._get_data()
-            networks = api.neutron.provider_network_list_tenant_networks(
+            networks = stx_api.neutron.provider_network_list_tenant_networks(
                 self.request, providernet_id=providernet_id)
         except Exception:
             networks = []
@@ -80,7 +83,7 @@ class DetailView(tables.MultiTableView):
         try:
             providernet_id = self.kwargs['providernet_id']
             # self.table.kwargs['providernet'] = self._get_data()
-            ranges = api.neutron.provider_network_range_list(
+            ranges = stx_api.neutron.provider_network_range_list(
                 self.request, providernet_id=providernet_id)
         except Exception:
             ranges = []
@@ -98,7 +101,7 @@ class DetailView(tables.MultiTableView):
         if not hasattr(self, "_providernet"):
             try:
                 providernet_id = self.kwargs['providernet_id']
-                providernet = api.neutron.provider_network_get(
+                providernet = stx_api.neutron.provider_network_get(
                     self.request, providernet_id)
                 providernet.set_id_as_name_if_empty(length=0)
             except Exception:
@@ -114,7 +117,7 @@ class DetailView(tables.MultiTableView):
         if not hasattr(self, "_providernet_nova"):
             try:
                 providernet_id = self.kwargs['providernet_id']
-                providernet_nova = api.nova.provider_network_get(
+                providernet_nova = stx_api.nova.provider_network_get(
                     self.request, providernet_id)
             except Exception as ex:
                 # redirect = self.failure_url
@@ -149,7 +152,7 @@ class UpdateView(forms.ModalFormView):
         if not hasattr(self, "_object"):
             providernet_id = self.kwargs['providernet_id']
             try:
-                self._object = api.neutron.provider_network_get(
+                self._object = stx_api.neutron.provider_network_get(
                     self.request, providernet_id)
             except Exception:
                 redirect = self.success_url

starlingx_dashboard/dashboards/admin/providernets/tabs.py

@@ -11,9 +11,10 @@ from django.utils.translation import ugettext_lazy as _  # noqa
 
 from horizon import exceptions
 from horizon import tabs
-from openstack_dashboard.api import base
-from openstack_dashboard.api import neutron
-from openstack_dashboard.dashboards.admin.providernets.providernets import \
+
+from starlingx_dashboard.api import base as stx_base
+from starlingx_dashboard.api import neutron as stx_neutron
+from starlingx_dashboard.dashboards.admin.providernets.providernets import \
     tables as providernets_tables
 
 LOG = logging.getLogger(__name__)
@@ -28,7 +29,7 @@ class ProviderNetworkTab(tabs.TableTab):
     def get_provider_networks_data(self):
         try:
             providernets = \
-                neutron.provider_network_list(self.tab_group.request)
+                stx_neutron.provider_network_list(self.tab_group.request)
         except Exception:
             providernets = []
             msg = _('Unable to get provider network list.')
@@ -37,7 +38,7 @@ class ProviderNetworkTab(tabs.TableTab):
         return providernets
 
     def allowed(self, request):
-        return base.is_TiS_region(request)
+        return stx_base.is_TiS_region(request)
 
 
 class NetworkTabs(tabs.TabGroup):

starlingx_dashboard/dashboards/admin/providernets/urls.py

@@ -7,9 +7,9 @@
 from django.conf.urls import include
 from django.conf.urls import url
 
-from openstack_dashboard.dashboards.admin.providernets.providernets \
+from starlingx_dashboard.dashboards.admin.providernets.providernets \
     import urls as providernet_urls
-from openstack_dashboard.dashboards.admin.providernets import views
+from starlingx_dashboard.dashboards.admin.providernets import views
 
 
 NETWORKS = r'^(?P<network_id>[^/]+)/%s$'

starlingx_dashboard/dashboards/admin/providernets/views.py

@@ -8,7 +8,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from horizon import tabs
 
-from openstack_dashboard.dashboards.admin.providernets \
+from starlingx_dashboard.dashboards.admin.providernets \
     import tabs as project_tabs
 
 

starlingx_dashboard/dashboards/admin/storage_overview/panel.py

@@ -7,6 +7,7 @@
 from django.utils.translation import ugettext_lazy as _
 
 import horizon
+
 from openstack_dashboard.api import base
 from openstack_dashboard.dashboards.admin import dashboard
 

starlingx_dashboard/dashboards/admin/storage_overview/tabs.py

@@ -10,11 +10,13 @@ from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions
 from horizon import tabs
-from openstack_dashboard.api import base
+
 from openstack_dashboard.api import ceph
-from openstack_dashboard.api import sysinv
-from openstack_dashboard.dashboards.admin.storage_overview import constants
-from openstack_dashboard.dashboards.admin.storage_overview import tables
+
+from starlingx_dashboard.api import base as stx_base
+from starlingx_dashboard.api import sysinv
+from starlingx_dashboard.dashboards.admin.storage_overview import constants
+from starlingx_dashboard.dashboards.admin.storage_overview import tables
 
 LOG = logging.getLogger(__name__)
 
@@ -68,7 +70,7 @@ class StorageServicesTab(tabs.TableTab):
             return
 
     def allowed(self, request):
-        return base.is_TiS_region(request)
+        return stx_base.is_TiS_region(request)
 
 
 class StorageUsageTab(tabs.TableTab):

starlingx_dashboard/dashboards/admin/storage_overview/urls.py

@@ -5,7 +5,8 @@
 #
 
 from django.conf.urls import url
-from openstack_dashboard.dashboards.admin.storage_overview import views
+
+from starlingx_dashboard.dashboards.admin.storage_overview import views
 
 urlpatterns = [
     url(r'^$', views.StorageOverview.as_view(), name='index')

starlingx_dashboard/dashboards/admin/storage_overview/views.py

@@ -7,10 +7,10 @@
 from django.utils.translation import ugettext_lazy as _
 from horizon import tabs
 
-from openstack_dashboard.dashboards.admin.storage_overview import (
+from starlingx_dashboard.dashboards.admin.storage_overview import (
     tabs as project_tabs
 )
-from openstack_dashboard.dashboards.admin.storage_overview import constants
+from starlingx_dashboard.dashboards.admin.storage_overview import constants
 
 
 class StorageOverview(tabs.TabbedTableView):