openstack
/
manila-ui
Code Issues Proposed changes

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
This commit is contained in:
vponomaryov 2017-06-06 12:22:14 +03:00
parent 28111cf878
commit 9787fb3a78
1 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
manila_ui/api/network.py
View File

@ -13,39 +13,12 @@
# License for the specific language governing permissions and limitations
# under the License.
from openstack_dashboard.api import base
from openstack_dashboard.api import network
from openstack_dashboard.api import neutron
from openstack_dashboard.api import nova
def _nova_network_list(request):
nets = nova.novaclient(request).networks.list()
for net in nets:
net.name_or_id = net.to_dict().get('label', net.to_dict().get('id'))
return nets
def _nova_network_get(request, nova_net_id):
net = nova.novaclient(request).networks.get(nova_net_id)
net.name_or_id = net.to_dict().get('label', net.to_dict().get('id'))
return net
class NetworkClient(network.NetworkClient):
def __init__(self, request):
super(NetworkClient, self).__init__(request)
if base.is_service_enabled(request, 'network'):
self.network_list = neutron.network_list
self.network_get = neutron.network_get
else:
self.network_list = _nova_network_list
self.network_get = _nova_network_get
def network_list(request):
return NetworkClient(request).network_list(request)
return neutron.network_list(request)
def network_get(request, net_id):
return NetworkClient(request).network_get(request, net_id)
return neutron.network_get(request, net_id)