diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-05 00:42:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-05 00:42:54 +0000 |
| commit | 345770cdf8873458ce6dc4400a27c63ed7e49e40 (patch) | |
| tree | 1a6ec2bc6f1a0f3b784cd6d310c63d08e7d79dbf | |
| parent | d550e02ed60144ca010573085ad3a0de6fe31441 (diff) | |
| parent | 97994ae519c2fd0ba86d601d341e2c73754588d4 (diff) | |
| download | horizon-345770cdf8873458ce6dc4400a27c63ed7e49e40.tar.gz | |
Merge "exclude subnets without gateway in create interface" into stable/liberty
| -rw-r--r-- | openstack_dashboard/dashboards/project/routers/ports/forms.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/openstack_dashboard/dashboards/project/routers/ports/forms.py b/openstack_dashboard/dashboards/project/routers/ports/forms.py index f629f0e6b..5b5174b59 100644 --- a/openstack_dashboard/dashboards/project/routers/ports/forms.py +++ b/openstack_dashboard/dashboards/project/routers/ports/forms.py @@ -76,7 +76,8 @@ class AddInterface(forms.SelfHandlingForm): '%s%s (%s)' % (net_name, subnet.cidr, subnet.name or subnet.id)) for subnet in n['subnets'] - if subnet.id not in router_subnet_ids] + if subnet.id not in router_subnet_ids + and subnet.gateway_ip] if choices: choices.insert(0, ("", _("Select Subnet"))) else: |