openstack/python-neutronclient
Code Issues Proposed changes

Make quantum cli consistent with other cli's practice.

Browse Source 
Bug 1011759

We use dash in command names, underscore in options or arguments,
adopt noun-verb format command names.

Change-Id: Ibeb2b4a31929dbb7008cec3b04bd77e75d9ace1a
This commit is contained in:
Yong Sheng Gong 2012-07-05 15:01:39 +08:00
parent d955740671
commit 1586c923d9
8 changed files with 113 additions and 168 deletions

12
quantumclient/quantum/v2_0/__init__.py

@ -28,7 +28,7 @@ from quantumclient.common import utils
def add_show_list_common_argument(parser):
parser.add_argument(
'-D', '--show-details',
'-D', '--show_details',
help='show detailed info',
action='store_true',
default=False, )
@ -145,7 +145,7 @@ class QuantumCommand(command.OpenStackCommand):
def get_parser(self, prog_name):
parser = super(QuantumCommand, self).get_parser(prog_name)
parser.add_argument(
'--request-format',
'--request_format',
help=_('the xml or json request format'),
default='json',
choices=['json', 'xml', ], )
@ -165,7 +165,7 @@ class CreateCommand(QuantumCommand, show.ShowOne):
def get_parser(self, prog_name):
parser = super(CreateCommand, self).get_parser(prog_name)
parser.add_argument(
'--tenant-id', metavar='tenant-id',
'--tenant_id', metavar='tenant_id',
help=_('the owner tenant ID'), )
self.add_known_arguments(parser)
add_extra_argument(parser, 'value_specs',
@ -221,7 +221,7 @@ class UpdateCommand(QuantumCommand):
def get_parser(self, prog_name):
parser = super(UpdateCommand, self).get_parser(prog_name)
parser.add_argument(
'id', metavar='%s-id' % self.resource,
'id', metavar='%s_id' % self.resource,
help='ID of %s to update' % self.resource)
add_extra_argument(parser, 'value_specs',
'new values for the %s' % self.resource)
@ -257,7 +257,7 @@ class DeleteCommand(QuantumCommand):
def get_parser(self, prog_name):
parser = super(DeleteCommand, self).get_parser(prog_name)
parser.add_argument(
'id', metavar='%s-id' % self.resource,
'id', metavar='%s_id' % self.resource,
help='ID of %s to delete' % self.resource)
return parser
@ -335,7 +335,7 @@ class ShowCommand(QuantumCommand, show.ShowOne):
parser = super(ShowCommand, self).get_parser(prog_name)
add_show_list_common_argument(parser)
parser.add_argument(
'id', metavar='%s-id' % self.resource,
'id', metavar='%s_id' % self.resource,
help='ID of %s to look up' % self.resource)
return parser

27
quantumclient/quantum/v2_0/network.py

@ -32,10 +32,7 @@ def _format_subnets(network):
class ListNetwork(ListCommand):
"""List networks that belong to a given tenant
Sample: list_nets -D -- --name=test4 --tag a b
"""
"""List networks that belong to a given tenant."""
resource = 'network'
log = logging.getLogger(__name__ + '.ListNetwork')
@ -43,27 +40,21 @@ class ListNetwork(ListCommand):
class ShowNetwork(ShowCommand):
"""Show information of a given network
Sample: show_net -D <network_id>
"""
"""Show information of a given network."""
resource = 'network'
log = logging.getLogger(__name__ + '.ShowNetwork')
class CreateNetwork(CreateCommand):
"""Create a network for a given tenant
Sample create_net --tenant-id xxx --admin-state-down <net_name> --tag x y
"""
"""Create a network for a given tenant."""
resource = 'network'
log = logging.getLogger(__name__ + '.CreateNetwork')
def add_known_arguments(self, parser):
parser.add_argument(
'--admin-state-down',
'--admin_state_down',
default=True, action='store_false',
help='Set Admin State Up to false')
parser.add_argument(
@ -80,20 +71,14 @@ class CreateNetwork(CreateCommand):
class DeleteNetwork(DeleteCommand):
"""Delete a given network
Sample: delete_net <network_id>
"""
"""Delete a given network."""
log = logging.getLogger(__name__ + '.DeleteNetwork')
resource = 'network'
class UpdateNetwork(UpdateCommand):
"""Update network's information
Sample: update_net <network_id> --name=test --admin_state_up type=bool True
"""
"""Update network's information."""
log = logging.getLogger(__name__ + '.UpdateNetwork')
resource = 'network'

35
quantumclient/quantum/v2_0/port.py

@ -33,10 +33,7 @@ def _format_fixed_ips(port):
class ListPort(ListCommand):
"""List networks that belong to a given tenant
Sample: list_ports -D -- --name=test4 --tag a b
"""
"""List networks that belong to a given tenant."""
resource = 'port'
log = logging.getLogger(__name__ + '.ListPort')
@ -44,39 +41,31 @@ class ListPort(ListCommand):
class ShowPort(ShowCommand):
"""Show information of a given port
Sample: show_port -D <port_id>
"""
"""Show information of a given port."""
resource = 'port'
log = logging.getLogger(__name__ + '.ShowPort')
class CreatePort(CreateCommand):
"""Create a port for a given tenant
Sample create_port --tenant-id xxx --admin-state-down \
--mac_address mac --device_id deviceid <network_id>
"""
"""Create a port for a given tenant."""
resource = 'port'
log = logging.getLogger(__name__ + '.CreatePort')
def add_known_arguments(self, parser):
parser.add_argument(
'--admin-state-down',
'--admin_state_down',
default=True, action='store_false',
help='set admin state up to false')
parser.add_argument(
'--mac-address',
'--mac_address',
help='mac address of port')
parser.add_argument(
'--device-id',
'--device_id',
help='device id of this port')
parser.add_argument(
'--fixed-ip',
'--fixed_ip',
action='append',
help='desired Ip for this port: '
'subnet_id=<id>,ip_address=<ip>, '
@ -104,20 +93,14 @@ class CreatePort(CreateCommand):
class DeletePort(DeleteCommand):
"""Delete a given port
Sample: delete_port <port_id>
"""
"""Delete a given port."""
resource = 'port'
log = logging.getLogger(__name__ + '.DeletePort')
class UpdatePort(UpdateCommand):
"""Update port's information
Sample: update_port <port_id> --name=test --admin_state_up type=bool True
"""
"""Update port's information."""
resource = 'port'
log = logging.getLogger(__name__ + '.UpdatePort')

29
quantumclient/quantum/v2_0/subnet.py

@ -25,10 +25,7 @@ from quantumclient.quantum.v2_0 import UpdateCommand
class ListSubnet(ListCommand):
"""List networks that belong to a given tenant
Sample: list_subnets -D -- --name=test4 --tag a b
"""
"""List networks that belong to a given tenant."""
resource = 'subnet'
log = logging.getLogger(__name__ + '.ListSubnet')
@ -36,27 +33,20 @@ class ListSubnet(ListCommand):
class ShowSubnet(ShowCommand):
"""Show information of a given subnet
Sample: show_subnet -D <subnet_id>
"""
"""Show information of a given subnet."""
resource = 'subnet'
log = logging.getLogger(__name__ + '.ShowSubnet')
class CreateSubnet(CreateCommand):
"""Create a subnet for a given tenant
Sample create_subnet --tenant-id xxx --ip-version 4\
<network_id> <cidr> --tag x y --otherfield value
"""
"""Create a subnet for a given tenant."""
resource = 'subnet'
log = logging.getLogger(__name__ + '.CreateSubnet')
def add_known_arguments(self, parser):
parser.add_argument('--ip-version', type=int,
parser.add_argument('--ip_version', type=int,
default=4, choices=[4, 6],
help='IP version with default 4')
parser.add_argument(
@ -81,21 +71,14 @@ class CreateSubnet(CreateCommand):
class DeleteSubnet(DeleteCommand):
"""Delete a given subnet
Sample: delete_subnet <subnet-id>
"""
"""Delete a given subnet."""
resource = 'subnet'
log = logging.getLogger(__name__ + '.DeleteSubnet')
class UpdateSubnet(UpdateCommand):
"""Update subnet's information
Sample:
update_subnet <subnet-id> --name=test --admin_state_up type=bool True
"""
"""Update subnet's information."""
resource = 'subnet'
log = logging.getLogger(__name__ + '.UpdateSubnet')

94
quantumclient/shell.py

@ -51,64 +51,64 @@ def env(*vars, **kwargs):
return kwargs.get('default', '')
COMMAND_V1 = {
'list_nets': utils.import_class(
'net-list': utils.import_class(
'quantumclient.quantum.v1_1.network.ListNetwork'),
'show_net': utils.import_class(
'net-show': utils.import_class(
'quantumclient.quantum.v1_1.network.ShowNetwork'),
'create_net': utils.import_class(
'net-create': utils.import_class(
'quantumclient.quantum.v1_1.network.CreateNetwork'),
'delete_net': utils.import_class(
'net-delete': utils.import_class(
'quantumclient.quantum.v1_1.network.DeleteNetwork'),
'update_net': utils.import_class(
'net-update': utils.import_class(
'quantumclient.quantum.v1_1.network.UpdateNetwork'),
'list_ports': utils.import_class(
'port-list': utils.import_class(
'quantumclient.quantum.v1_1.port.ListPort'),
'show_port': utils.import_class(
'port-show': utils.import_class(
'quantumclient.quantum.v1_1.port.ShowPort'),
'create_port': utils.import_class(
'port-create': utils.import_class(
'quantumclient.quantum.v1_1.port.CreatePort'),
'delete_port': utils.import_class(
'port-delete': utils.import_class(
'quantumclient.quantum.v1_1.port.DeletePort'),
'update_port': utils.import_class(
'port-update': utils.import_class(
'quantumclient.quantum.v1_1.port.UpdatePort'),
'plug_iface': utils.import_class(
'iface-plugin': utils.import_class(
'quantumclient.quantum.v1_1.interface.PlugInterface'),
'unplug_iface': utils.import_class(
'iface-unplug': utils.import_class(
'quantumclient.quantum.v1_1.interface.UnPlugInterface'),
'show_iface': utils.import_class(
'iface-show': utils.import_class(
'quantumclient.quantum.v1_1.interface.ShowInterface'), }
COMMAND_V2 = {
'list_nets': utils.import_class(
'net-list': utils.import_class(
'quantumclient.quantum.v2_0.network.ListNetwork'),
'show_net': utils.import_class(
'net-show': utils.import_class(
'quantumclient.quantum.v2_0.network.ShowNetwork'),
'create_net': utils.import_class(
'net-create': utils.import_class(
'quantumclient.quantum.v2_0.network.CreateNetwork'),
'delete_net': utils.import_class(
'net-delete': utils.import_class(
'quantumclient.quantum.v2_0.network.DeleteNetwork'),
'update_net': utils.import_class(
'net-update': utils.import_class(
'quantumclient.quantum.v2_0.network.UpdateNetwork'),
'list_subnets': utils.import_class(
'subnet-list': utils.import_class(
'quantumclient.quantum.v2_0.subnet.ListSubnet'),
'show_subnet': utils.import_class(
'subnet-show': utils.import_class(
'quantumclient.quantum.v2_0.subnet.ShowSubnet'),
'create_subnet': utils.import_class(
'subnet-create': utils.import_class(
'quantumclient.quantum.v2_0.subnet.CreateSubnet'),
'delete_subnet': utils.import_class(
'subnet-delete': utils.import_class(
'quantumclient.quantum.v2_0.subnet.DeleteSubnet'),
'update_subnet': utils.import_class(
'subnet-update': utils.import_class(
'quantumclient.quantum.v2_0.subnet.UpdateSubnet'),
'list_ports': utils.import_class(
'port-list': utils.import_class(
'quantumclient.quantum.v2_0.port.ListPort'),
'show_port': utils.import_class(
'port-show': utils.import_class(
'quantumclient.quantum.v2_0.port.ShowPort'),
'create_port': utils.import_class(
'port-create': utils.import_class(
'quantumclient.quantum.v2_0.port.CreatePort'),
'delete_port': utils.import_class(
'port-delete': utils.import_class(
'quantumclient.quantum.v2_0.port.DeletePort'),
'update_port': utils.import_class(
'port-update': utils.import_class(
'quantumclient.quantum.v2_0.port.UpdatePort'), }
COMMANDS = {'1.0': COMMAND_V1,
@ -198,51 +198,51 @@ class QuantumShell(App):
help='show tracebacks on errors', )
# Global arguments
parser.add_argument(
'--os-auth-strategy', metavar='<auth-strategy>',
'--os_auth_strategy', metavar='<auth_strategy>',
default=env('OS_AUTH_STRATEGY', default='keystone'),
help='Authentication strategy (Env: OS_AUTH_STRATEGY'
', default keystone). For now, any other value will'
' disable the authentication')
parser.add_argument(
'--os-auth-url', metavar='<auth-url>',
'--os_auth_url', metavar='<auth_url>',
default=env('OS_AUTH_URL'),
help='Authentication URL (Env: OS_AUTH_URL)')
parser.add_argument(
'--os-tenant-name', metavar='<auth-tenant-name>',
'--os_tenant_name', metavar='<auth_tenant_name>',
default=env('OS_TENANT_NAME'),
help='Authentication tenant name (Env: OS_TENANT_NAME)')
parser.add_argument(
'--os-username', metavar='<auth-username>',
'--os_username', metavar='<auth_username>',
default=utils.env('OS_USERNAME'),
help='Authentication username (Env: OS_USERNAME)')
parser.add_argument(
'--os-password', metavar='<auth-password>',
'--os_password', metavar='<auth_password>',
default=utils.env('OS_PASSWORD'),
help='Authentication password (Env: OS_PASSWORD)')
parser.add_argument(
'--os-region-name', metavar='<auth-region-name>',
'--os_region_name', metavar='<auth_region_name>',
default=env('OS_REGION_NAME'),
help='Authentication region name (Env: OS_REGION_NAME)')
parser.add_argument(
'--os-quantum-api-version',
metavar='<quantum-api-version>',
'--os_quantum_api_version',
metavar='<quantum_api_version>',
default=env('OS_QUANTUM_API_VERSION', default='2.0'),
help='QAUNTUM API version, default=2.0 '
'(Env: OS_QUANTUM_API_VERSION)')
parser.add_argument(
'--os-token', metavar='<token>',
'--os_token', metavar='<token>',
default=env('OS_TOKEN'),
help='Defaults to env[OS_TOKEN]')
parser.add_argument(
'--os-url', metavar='<url>',
'--os_url', metavar='<url>',
default=env('OS_URL'),
help='Defaults to env[OS_URL]')
@ -285,39 +285,39 @@ class QuantumShell(App):
if not self.options.os_token:
raise exc.CommandError(
"You must provide a token via"
" either --os-token or env[OS_TOKEN]")
" either --os_token or env[OS_TOKEN]")
if not self.options.os_url:
raise exc.CommandError(
"You must provide a service URL via"
" either --os-url or env[OS_URL]")
" either --os_url or env[OS_URL]")
else:
# Validate password flow auth
if not self.options.os_username:
raise exc.CommandError(
"You must provide a username via"
" either --os-username or env[OS_USERNAME]")
" either --os_username or env[OS_USERNAME]")
if not self.options.os_password:
raise exc.CommandError(
"You must provide a password via"
" either --os-password or env[OS_PASSWORD]")
" either --os_password or env[OS_PASSWORD]")
if not (self.options.os_tenant_name):
raise exc.CommandError(
"You must provide a tenant_name via"
" either --os-tenant-name or via env[OS_TENANT_NAME]")
" either --os_tenant_name or via env[OS_TENANT_NAME]")
if not self.options.os_auth_url:
raise exc.CommandError(
"You must provide an auth url via"
" either --os-auth-url or via env[OS_AUTH_URL]")
" either --os_auth_url or via env[OS_AUTH_URL]")
else: # not keystone
if not self.options.os_url:
raise exc.CommandError(
"You must provide a service URL via"
" either --os-url or env[OS_URL]")
" either --os_url or env[OS_URL]")
self.client_manager = clientmanager.ClientManager(
token=self.options.os_token,
@ -367,10 +367,10 @@ def main(argv=sys.argv[1:]):
apiVersion = None
versionFlag = False
for argitem in argv:
if argitem.startswith('--os-quantum-api-version='):
if argitem.startswith('--os_quantum_api_version='):
apiVersion = argitem.split('=', 2)[1]
break
elif '--os-quantum-api-version' == argitem:
elif '--os_quantum_api_version' == argitem:
versionFlag = True
elif versionFlag:
apiVersion = argitem

30
quantumclient/tests/unit/test_cli20_network.py

@ -29,7 +29,7 @@ from quantumclient.quantum.v2_0.network import DeleteNetwork
class CLITestV20Network(CLITestV20Base):
def test_create_network(self):
""" create_net myname"""
"""Create net: myname."""
resource = 'network'
cmd = CreateNetwork(MyApp(sys.stdout), None)
name = 'myname'
@ -41,12 +41,12 @@ class CLITestV20Network(CLITestV20Base):
position_names, position_values)
def test_create_network_tenant(self):
"""create_net --tenant-id tenantid myname"""
"""Create net: --tenant_id tenantid myname."""
resource = 'network'
cmd = CreateNetwork(MyApp(sys.stdout), None)
name = 'myname'
myid = 'myid'
args = ['--tenant-id', 'tenantid', name]
args = ['--tenant_id', 'tenantid', name]
position_names = ['name', ]
position_values = [name, ]
_str = self._test_create_resource(resource, cmd, name, myid, args,
@ -54,7 +54,7 @@ class CLITestV20Network(CLITestV20Base):
tenant_id='tenantid')
def test_create_network_tags(self):
""" create_net myname --tags a b"""
"""Create net: myname --tags a b."""
resource = 'network'
cmd = CreateNetwork(MyApp(sys.stdout), None)
name = 'myname'
@ -67,12 +67,12 @@ class CLITestV20Network(CLITestV20Base):
tags=['a', 'b'])
def test_create_network_state(self):
""" create_net --admin-state-down myname"""
"""Create net: --admin_state_down myname."""
resource = 'network'
cmd = CreateNetwork(MyApp(sys.stdout), None)
name = 'myname'
myid = 'myid'
args = ['--admin-state-down', name, ]
args = ['--admin_state_down', name, ]
position_names = ['name', ]
position_values = [name, ]
_str = self._test_create_resource(resource, cmd, name, myid, args,
@ -80,39 +80,39 @@ class CLITestV20Network(CLITestV20Base):
admin_state_up=False)
def test_list_nets_detail(self):
"""list_nets -D"""
"""list nets: -D."""
resources = "networks"
cmd = ListNetwork(MyApp(sys.stdout), None)
self._test_list_resources(resources, cmd, True)
def test_list_nets_tags(self):
"""list_nets -- --tags a b"""
"""List nets: -- --tags a b."""
resources = "networks"
cmd = ListNetwork(MyApp(sys.stdout), None)
self._test_list_resources(resources, cmd, tags=['a', 'b'])
def test_list_nets_detail_tags(self):
"""list_nets -D -- --tags a b"""
"""List nets: -D -- --tags a b."""
resources = "networks"
cmd = ListNetwork(MyApp(sys.stdout), None)
self._test_list_resources(resources, cmd, detail=True, tags=['a', 'b'])
def test_list_nets_fields(self):
"""list_nets --fields a --fields b -- --fields c d"""
"""List nets: --fields a --fields b -- --fields c d."""
resources = "networks"
cmd = ListNetwork(MyApp(sys.stdout), None)
self._test_list_resources(resources, cmd,
fields_1=['a', 'b'], fields_2=['c', 'd'])
def test_update_network_exception(self):
""" update_net myid"""
"""Update net: myid."""
resource = 'network'
cmd = UpdateNetwork(MyApp(sys.stdout), None)
self.assertRaises(exceptions.CommandError, self._test_update_resource,
resource, cmd, 'myid', ['myid'], {})
def test_update_network(self):
""" update_net myid --name myname --tags a b"""
"""Update net: myid --name myname --tags a b."""
resource = 'network'
cmd = UpdateNetwork(MyApp(sys.stdout), None)
self._test_update_resource(resource, cmd, 'myid',
@ -122,7 +122,7 @@ class CLITestV20Network(CLITestV20Base):
)
def test_show_network(self):
""" show_net --fields id --fields name myid """
"""Show net: --fields id --fields name myid."""
resource = 'network'
cmd = ShowNetwork(MyApp(sys.stdout), None)
myid = 'myid'
@ -130,9 +130,7 @@ class CLITestV20Network(CLITestV20Base):
self._test_show_resource(resource, cmd, myid, args, ['id', 'name'])
def test_delete_network(self):
"""
delete_net myid
"""
"""Delete net: myid."""
resource = 'network'
cmd = DeleteNetwork(MyApp(sys.stdout), None)
myid = 'myid'

30
quantumclient/tests/unit/test_cli20_port.py

@ -29,7 +29,7 @@ from quantumclient.quantum.v2_0.port import DeletePort
class CLITestV20Port(CLITestV20Base):
def test_create_port(self):
""" create_port netid"""
"""Create port: netid."""
resource = 'port'
cmd = CreatePort(MyApp(sys.stdout), None)
name = 'myname'
@ -43,26 +43,26 @@ class CLITestV20Port(CLITestV20Base):
position_names, position_values)
def test_create_port_full(self):
""" create_port --mac-address mac --device-id deviceid netid"""
"""Create port: --mac_address mac --device_id deviceid netid."""
resource = 'port'
cmd = CreatePort(MyApp(sys.stdout), None)
name = 'myname'
myid = 'myid'
netid = 'netid'
args = ['--mac-address', 'mac', '--device-id', 'deviceid', netid]
args = ['--mac_address', 'mac', '--device_id', 'deviceid', netid]
position_names = ['network_id', 'mac_address', 'device_id']
position_values = [netid, 'mac', 'deviceid']
_str = self._test_create_resource(resource, cmd, name, myid, args,
position_names, position_values)
def test_create_port_tenant(self):
"""create_port --tenant-id tenantid netid"""
"""Create port: --tenant_id tenantid netid."""
resource = 'port'
cmd = CreatePort(MyApp(sys.stdout), None)
name = 'myname'
myid = 'myid'
netid = 'netid'
args = ['--tenant-id', 'tenantid', netid, ]
args = ['--tenant_id', 'tenantid', netid, ]
position_names = ['network_id']
position_values = []
position_values.extend([netid])
@ -71,7 +71,7 @@ class CLITestV20Port(CLITestV20Base):
tenant_id='tenantid')
def test_create_port_tags(self):
""" create_port netid mac_address device_id --tags a b"""
"""Create port: netid mac_address device_id --tags a b."""
resource = 'port'
cmd = CreatePort(MyApp(sys.stdout), None)
name = 'myname'
@ -85,33 +85,33 @@ class CLITestV20Port(CLITestV20Base):
position_names, position_values,
tags=['a', 'b'])
def test_list_ports_detail(self):
"""list_ports -D"""
def test_list_ports(self):
"""List ports: -D."""
resources = "ports"
cmd = ListPort(MyApp(sys.stdout), None)
self._test_list_resources(resources, cmd, True)
def test_list_ports_tags(self):
"""list_ports -- --tags a b"""
"""List ports: -- --tags a b."""
resources = "ports"
cmd = ListPort(MyApp(sys.stdout), None)
self._test_list_resources(resources, cmd, tags=['a', 'b'])
def test_list_ports_detail_tags(self):
"""list_ports -D -- --tags a b"""
"""List ports: -D -- --tags a b."""
resources = "ports"
cmd = ListPort(MyApp(sys.stdout), None)
self._test_list_resources(resources, cmd, detail=True, tags=['a', 'b'])
def test_list_ports_fields(self):
"""list_ports --fields a --fields b -- --fields c d"""
"""List ports: --fields a --fields b -- --fields c d."""
resources = "ports"
cmd = ListPort(MyApp(sys.stdout), None)
self._test_list_resources(resources, cmd,
fields_1=['a', 'b'], fields_2=['c', 'd'])
def test_update_port(self):
""" update_port myid --name myname --tags a b"""
"""Update port: myid --name myname --tags a b."""
resource = 'port'
cmd = UpdatePort(MyApp(sys.stdout), None)
self._test_update_resource(resource, cmd, 'myid',
@ -121,7 +121,7 @@ class CLITestV20Port(CLITestV20Base):
)
def test_show_port(self):
""" show_port --fields id --fields name myid """
"""Show port: --fields id --fields name myid."""
resource = 'port'
cmd = ShowPort(MyApp(sys.stdout), None)
myid = 'myid'
@ -129,9 +129,7 @@ class CLITestV20Port(CLITestV20Base):
self._test_show_resource(resource, cmd, myid, args, ['id', 'name'])
def test_delete_port(self):
"""
delete_port myid
"""
"""Delete port: myid."""
resource = 'port'
cmd = DeletePort(MyApp(sys.stdout), None)
myid = 'myid'

24
quantumclient/tests/unit/test_cli20_subnet.py

@ -29,7 +29,7 @@ from quantumclient.quantum.v2_0.subnet import DeleteSubnet
class CLITestV20Subnet(CLITestV20Base):
def test_create_subnet(self):
""" create_subnet --gateway gateway netid cidr"""
"""Create sbunet: --gateway gateway netid cidr."""
resource = 'subnet'
cmd = CreateSubnet(MyApp(sys.stdout), None)
name = 'myname'
@ -45,14 +45,14 @@ class CLITestV20Subnet(CLITestV20Base):
position_names, position_values)
def test_create_subnet_tenant(self):
"""create_subnet --tenant-id tenantid netid cidr"""
"""Create subnet: --tenant_id tenantid netid cidr."""
resource = 'subnet'
cmd = CreateSubnet(MyApp(sys.stdout), None)
name = 'myname'
myid = 'myid'
netid = 'netid'
cidr = 'prefixvalue'
args = ['--tenant-id', 'tenantid', netid, cidr]
args = ['--tenant_id', 'tenantid', netid, cidr]
position_names = ['ip_version', 'network_id', 'cidr']
position_values = [4, ]
position_values.extend([netid, cidr])
@ -61,7 +61,7 @@ class CLITestV20Subnet(CLITestV20Base):
tenant_id='tenantid')
def test_create_subnet_tags(self):
""" create_subnet netid cidr --tags a b"""
"""Create subnet: netid cidr --tags a b."""
resource = 'subnet'
cmd = CreateSubnet(MyApp(sys.stdout), None)
name = 'myname'
@ -77,32 +77,32 @@ class CLITestV20Subnet(CLITestV20Base):
tags=['a', 'b'])
def test_list_subnets_detail(self):
"""list_subnets -D"""
"""List subnets: -D."""
resources = "subnets"
cmd = ListSubnet(MyApp(sys.stdout), None)
self._test_list_resources(resources, cmd, True)
def test_list_subnets_tags(self):
"""list_subnets -- --tags a b"""
"""List subnets: -- --tags a b."""
resources = "subnets"
cmd = ListSubnet(MyApp(sys.stdout), None)
self._test_list_resources(resources, cmd, tags=['a', 'b'])
def test_list_subnets_detail_tags(self):
"""list_subnets -D -- --tags a b"""
"""List subnets: -D -- --tags a b."""
resources = "subnets"
cmd = ListSubnet(MyApp(sys.stdout), None)
self._test_list_resources(resources, cmd, detail=True, tags=['a', 'b'])
def test_list_subnets_fields(self):
"""list_subnets --fields a --fields b -- --fields c d"""
"""List subnets: --fields a --fields b -- --fields c d."""
resources = "subnets"
cmd = ListSubnet(MyApp(sys.stdout), None)
self._test_list_resources(resources, cmd,
fields_1=['a', 'b'], fields_2=['c', 'd'])
def test_update_subnet(self):
""" update_subnet myid --name myname --tags a b"""
"""Update subnet: myid --name myname --tags a b."""
resource = 'subnet'
cmd = UpdateSubnet(MyApp(sys.stdout), None)
self._test_update_resource(resource, cmd, 'myid',
@ -112,7 +112,7 @@ class CLITestV20Subnet(CLITestV20Base):
)
def test_show_subnet(self):
""" show_subnet --fields id --fields name myid """
"""Show subnet: --fields id --fields name myid."""
resource = 'subnet'
cmd = ShowSubnet(MyApp(sys.stdout), None)
myid = 'myid'
@ -120,9 +120,7 @@ class CLITestV20Subnet(CLITestV20Base):
self._test_show_resource(resource, cmd, myid, args, ['id', 'name'])
def test_delete_subnet(self):
"""
delete_subnet myid
"""
"""Delete subnet: subnetid."""
resource = 'subnet'
cmd = DeleteSubnet(MyApp(sys.stdout), None)
myid = 'myid'