broken compatibility with horizon

[Valeriy Ponomaryov]

Latest horizon fails to work with manila UI after merge of [1]. It became incompatibile and raises following error:

Trace:

Traceback (most recent call last):
  File "/usr/lib/python2.7/wsgiref/handlers.py", line 85, in run
    self.result = application(self.environ, self.start_response)
  File "/opt/stack/horizon/.venv/local/lib/python2.7/site-packages/django/contrib/staticfiles/handlers.py", line 63, in __call__
    return self.application(environ, start_response)
  File "/opt/stack/horizon/.venv/local/lib/python2.7/site-packages/django/core/handlers/wsgi.py", line 170, in __call__
    self.load_middleware()
  File "/opt/stack/horizon/.venv/local/lib/python2.7/site-packages/django/core/handlers/base.py", line 52, in load_middleware
    mw_instance = mw_class()
  File "/opt/stack/horizon/.venv/local/lib/python2.7/site-packages/django/middleware/locale.py", line 24, in __init__
    for url_pattern in get_resolver(None).url_patterns:
  File "/opt/stack/horizon/.venv/local/lib/python2.7/site-packages/django/core/urlresolvers.py", line 401, in url_patterns
    patterns = getattr(self.urlconf_module, "urlpatterns", self.urlconf_module)
  File "/opt/stack/horizon/.venv/local/lib/python2.7/site-packages/django/core/urlresolvers.py", line 395, in urlconf_module
    self._urlconf_module = import_module(self.urlconf_name)
  File "/usr/lib/python2.7/importlib/__init__.py", line 37, in import_module
    __import__(name)
  File "/opt/stack/horizon/openstack_dashboard/urls.py", line 38, in <module>
    url(r'', include(horizon.urls)),
  File "/opt/stack/horizon/.venv/local/lib/python2.7/site-packages/django/conf/urls/__init__.py", line 34, in include
    patterns = getattr(urlconf_module, 'urlpatterns', urlconf_module)
  File "/opt/stack/horizon/.venv/local/lib/python2.7/site-packages/django/utils/functional.py", line 225, in inner
    self._setup()
  File "/opt/stack/horizon/.venv/local/lib/python2.7/site-packages/django/utils/functional.py", line 376, in _setup
    self._wrapped = self._setupfunc()
  File "/opt/stack/horizon/horizon/base.py", line 833, in url_patterns
    return self._urls()[0]
  File "/opt/stack/horizon/horizon/base.py", line 867, in _urls
    include(dash._decorated_urls)))
  File "/opt/stack/horizon/horizon/base.py", line 544, in _decorated_urls
    include(panel._decorated_urls)))
  File "/opt/stack/horizon/horizon/base.py", line 318, in _decorated_urls
    urlpatterns = self._get_default_urlpatterns()
  File "/opt/stack/horizon/horizon/base.py", line 120, in _get_default_urlpatterns
    urls_mod = import_module('.urls', package_string)
  File "/usr/lib/python2.7/importlib/__init__.py", line 37, in import_module
    __import__(name)
  File "/opt/stack/manila-ui/manila_ui/dashboards/admin/share_snapshots/urls.py", line 15, in <module>
    from manila_ui.dashboards.admin.share_snapshots import views
  File "/opt/stack/manila-ui/manila_ui/dashboards/admin/share_snapshots/views.py", line 26, in <module>
    from manila_ui.dashboards.admin.share_snapshots import tables as ss_tables
  File "/opt/stack/manila-ui/manila_ui/dashboards/admin/share_snapshots/tables.py", line 23, in <module>
    from manila_ui.dashboards.project.shares.shares import tables as shares_tables
  File "/opt/stack/manila-ui/manila_ui/dashboards/project/shares/__init__.py", line 85, in <module>
    quotas.QUOTA_FIELDS += MANILA_QUOTA_FIELDS
TypeError: unsupported operand type(s) for +=: 'set' and 'tuple'
[17/May/2017 12:40:56] "GET /project/shares/ HTTP/1.1" 500 59

[1] https://github.com/openstack/horizon/commit/81891697c6c8d2cf1ee0bfceb3512e174624bc00

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/465628

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/465628
Committed: https://git.openstack.org/cgit/openstack/manila-ui/commit/?id=fae241c1614de093636379fb306fa3242b45fe1a
Submitter: Jenkins
Branch: master

commit fae241c1614de093636379fb306fa3242b45fe1a
Author: Valeriy Ponomaryov <email address hidden>
Date: Wed May 17 17:46:14 2017 +0300

    Fix compatibility with Horizon

    One of recent commits [1] to Horizon project broke compatibility
    with Manila UI project. So, update it.

    [1] I41cdabde477d87aa8b35d1c908e18a69454286c3

    Change-Id: I4a5e76671a786e89c9e2bf4b0af3dad7aabf45ef
    Closes-Bug: #1691466

[Valeriy Ponomaryov (vponomaryov)]

Another one breakage:

http://logs.openstack.org/64/368664/2/check/gate-manila-ui-python27-ubuntu-xenial/970507d/console.html#_2017-06-05_17_06_36_438401

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/471286

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/471286
Committed: https://git.openstack.org/cgit/openstack/manila-ui/commit/?id=9787fb3a78d681aff25c6cbaac2c1ba842c4c7db
Submitter: Jenkins
Branch: master

commit 9787fb3a78d681aff25c6cbaac2c1ba842c4c7db
Author: vponomaryov <email address hidden>
Date: Tue Jun 6 12:22:14 2017 +0300

    Fix compatibility with latest horizon

    Class "NetworkClient" from "openstack_dashboards.api.network" module
    was removed from horizon repo. So, remove its usage and use neutron
    directly.

    Change-Id: Idcf51553f64fae2254c224d4c6ef4fbb94e6f279
    Closes-Bug: #1691466

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/manila-ui 2.9.0 release.