openstack/python-neutronclient
Code Issues Proposed changes

Merge "Revert "Add '--router:external' option to 'net-create'""

Browse Source
This commit is contained in:
Jenkins 2015-07-06 12:40:56 +00:00 committed by Gerrit Code Review
commit b25af0ea03
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutronclient/neutron/v2_0/network.py
View File

@ -120,11 +120,6 @@ class CreateNetwork(neutronV20.CreateCommand):
action='store_true', action='store_true',
help=_('Set the network as shared.'), help=_('Set the network as shared.'),
default=argparse.SUPPRESS) default=argparse.SUPPRESS)
parser.add_argument(
'--router:external',
action='store_true',
help=_('Set network as external, it is only available for admin'),
default=argparse.SUPPRESS)
parser.add_argument( parser.add_argument(
'--provider:network_type', '--provider:network_type',
metavar='<network_type>', metavar='<network_type>',
@ -154,7 +149,7 @@ class CreateNetwork(neutronV20.CreateCommand):
'name': parsed_args.name, 'name': parsed_args.name,
'admin_state_up': parsed_args.admin_state}, } 'admin_state_up': parsed_args.admin_state}, }
neutronV20.update_dict(parsed_args, body['network'], neutronV20.update_dict(parsed_args, body['network'],
['shared', 'tenant_id', 'router:external', ['shared', 'tenant_id',
'vlan_transparent', 'vlan_transparent',
'provider:network_type', 'provider:network_type',
'provider:physical_network', 'provider:physical_network',

14
neutronclient/tests/unit/test_cli20_network.py
View File

@ -103,20 +103,6 @@ class CLITestV20NetworkJSON(test_cli20.CLITestV20Base):
position_names, position_values, position_names, position_values,
tags=['a', 'b']) tags=['a', 'b'])
def test_create_network_external(self):
"""Create net: --router:external myname."""
resource = 'network'
cmd = network.CreateNetwork(test_cli20.MyApp(sys.stdout), None)
name = 'myname'
myid = 'myid'
args = [name, '--router:external']
position_names = ['name', ]
position_values = [name, ]
external = {'router:external': True}
self._test_create_resource(resource, cmd, name, myid, args,
position_names, position_values,
**external)
def test_create_network_state(self): def test_create_network_state(self):
"""Create net: --admin_state_down myname.""" """Create net: --admin_state_down myname."""
resource = 'network' resource = 'network'