diff --git a/manila_ui/dashboards/admin/share_networks/templates/share_networks/_detail.html b/manila_ui/dashboards/admin/share_networks/templates/share_networks/_detail.html
index e0089661..60e43273 100644
--- a/manila_ui/dashboards/admin/share_networks/templates/share_networks/_detail.html
+++ b/manila_ui/dashboards/admin/share_networks/templates/share_networks/_detail.html
@@ -32,9 +32,6 @@
{% trans "Subnet" %}
{{ share_network.neutron_subnet}}
{% endif %}
- {% if share_network.nova_net %}
- {{ share_network.nova_net }}
- {% endif %}
diff --git a/manila_ui/dashboards/project/share_networks/forms.py b/manila_ui/dashboards/project/share_networks/forms.py
index 82d6b7fa..415fbd8b 100644
--- a/manila_ui/dashboards/project/share_networks/forms.py
+++ b/manila_ui/dashboards/project/share_networks/forms.py
@@ -57,27 +57,18 @@ class Create(forms.SelfHandlingForm):
self.fields[subnet_field_name].choices = [
(' ', ' ')] + [(choice.id, choice.name_or_id)
for choice in subnet_choices]
- else:
- self.fields['nova_net_id'] = forms.ChoiceField(
- choices=[(' ', ' ')] + [(choice.id, choice.name_or_id)
- for choice in net_choices],
- label=_("Nova Net"), widget=forms.Select(
- attrs={'class': 'switched', 'data-slug': 'net'}))
def handle(self, request, data):
try:
send_data = {'name': data['name']}
if data['description']:
send_data['description'] = data['description']
- share_net_id = data.get('neutron_net_id', data.get('nova_net_id'))
- share_net_id = share_net_id.strip()
+ share_net_id = data.get('neutron_net_id')
if self.neutron_enabled and share_net_id:
- send_data['neutron_net_id'] = share_net_id
+ send_data['neutron_net_id'] = share_net_id.strip()
subnet_key = 'subnet-choices-%s' % share_net_id
if subnet_key in data:
send_data['neutron_subnet_id'] = data[subnet_key]
- elif not self.neutron_enabled and share_net_id:
- send_data['nova_net_id'] = data['nova_net_id']
share_network = manila.share_network_create(request, **send_data)
messages.success(request, _('Successfully created share'
' network: %s') % send_data['name'])
diff --git a/manila_ui/dashboards/project/share_networks/tables.py b/manila_ui/dashboards/project/share_networks/tables.py
index 8b48a6ac..043a9012 100644
--- a/manila_ui/dashboards/project/share_networks/tables.py
+++ b/manila_ui/dashboards/project/share_networks/tables.py
@@ -20,7 +20,6 @@ from openstack_dashboard.api import base
from openstack_dashboard.api import neutron
from manila_ui.api import manila
-from manila_ui.api import network
DELETABLE_STATES = ("INACTIVE", "ERROR")
@@ -91,9 +90,6 @@ class UpdateRow(tables.Row):
request, share_net.neutron_net_id).name_or_id
share_net.neutron_subnet = neutron.subnet_get(
request, share_net.neutron_subnet_id).name_or_id
- else:
- share_net.nova_net = network.network_get(
- request, share_net.nova_net_id).name_or_id
return share_net
diff --git a/manila_ui/dashboards/project/share_networks/templates/share_networks/_detail.html b/manila_ui/dashboards/project/share_networks/templates/share_networks/_detail.html
index 855b9597..af009757 100644
--- a/manila_ui/dashboards/project/share_networks/templates/share_networks/_detail.html
+++ b/manila_ui/dashboards/project/share_networks/templates/share_networks/_detail.html
@@ -25,9 +25,6 @@
{% trans "Subnet" %}
{{ share_network.neutron_subnet}}
{% endif %}
- {% if share_network.nova_net %}
- {{ share_network.nova_net }}
- {% endif %}
diff --git a/manila_ui/dashboards/project/share_networks/views.py b/manila_ui/dashboards/project/share_networks/views.py
index dcfdcec0..84755cff 100644
--- a/manila_ui/dashboards/project/share_networks/views.py
+++ b/manila_ui/dashboards/project/share_networks/views.py
@@ -24,7 +24,6 @@ from openstack_dashboard.api import base
from openstack_dashboard.api import neutron
from manila_ui.api import manila
-from manila_ui.api import network
from manila_ui.dashboards.project.share_networks import forms as sn_forms
from manila_ui.dashboards.project.share_networks import tables as sn_tables
from manila_ui.dashboards.project.share_networks import tabs as sn_tabs
@@ -123,12 +122,6 @@ class Detail(tabs.TabView):
except (
neutron.neutron_client.exceptions.NeutronClientException):
share_net.neutron_subnet = _("Unknown")
- else:
- try:
- share_net.nova_net = network.network_get(
- self.request, share_net.nova_net_id).name_or_id
- except Exception:
- share_net.nova_net = _("Unknown")
share_net.sec_services = (
manila.share_network_security_service_list(
diff --git a/releasenotes/notes/remove-nova-net-plugin-4fdc0d944d93644f.yaml b/releasenotes/notes/remove-nova-net-plugin-4fdc0d944d93644f.yaml
new file mode 100644
index 00000000..64a8ae5f
--- /dev/null
+++ b/releasenotes/notes/remove-nova-net-plugin-4fdc0d944d93644f.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+ - |
+ Support for nova networking has been removed. Manila and the
+ manilaclient sdk dropped support for nova network in the Ocata release
+ (Feb 2017). So this should not have an impact on deployers running later
+ releases, and this note is only informational.