Merge "Fix tap-flow CLI to take service parameter"

This commit is contained in:
Jenkins 2016-06-02 02:33:05 +00:00 committed by Gerrit Code Review
commit e8903b444d
2 changed files with 7 additions and 8 deletions
neutron_taas
taas_client
tests/unit/taas_client

@ -66,11 +66,10 @@ class CreateTapFlow(extension.ClientExtensionCreate, TapFlow):
metavar="SOURCE_PORT", metavar="SOURCE_PORT",
help=_('Source port to which the Tap Flow is connected.')) help=_('Source port to which the Tap Flow is connected.'))
parser.add_argument( parser.add_argument(
'--service', '--tap-service',
required=True, required=True,
dest='service_id', metavar="TAP_SERVICE",
metavar="SERVICE", help=_('Tap Service to which the Tap Flow belongs.'))
help=_('Tap Service to which the flow belongs.'))
parser.add_argument( parser.add_argument(
'--direction', '--direction',
required=True, required=True,
@ -84,11 +83,11 @@ class CreateTapFlow(extension.ClientExtensionCreate, TapFlow):
source_port = neutronv20.find_resourceid_by_name_or_id( source_port = neutronv20.find_resourceid_by_name_or_id(
client, 'port', client, 'port',
parsed_args.port) parsed_args.port)
service_id = neutronv20.find_resourceid_by_name_or_id( tap_service_id = neutronv20.find_resourceid_by_name_or_id(
client, 'tap_service', client, 'tap_service',
parsed_args.service_id) parsed_args.tap_service)
body = {'source_port': source_port, body = {'source_port': source_port,
'tap_service_id': service_id} 'tap_service_id': tap_service_id}
neutronv20.update_dict(parsed_args, body, ['tenant_id', 'direction']) neutronv20.update_dict(parsed_args, body, ['tenant_id', 'direction'])
_updatable_args2body(parsed_args, body) _updatable_args2body(parsed_args, body)
return {self.resource: body} return {self.resource: body}

@ -65,7 +65,7 @@ class CLITestV20TapFlowJSON(test_cli20.CLITestV20Base):
my_id = 'my-id' my_id = 'my-id'
args = ['--tenant-id', tenant_id, args = ['--tenant-id', tenant_id,
'--port', port_id, '--port', port_id,
'--service', service_id, '--tap-service', service_id,
'--direction', direction] + arg_attr '--direction', direction] + arg_attr
pos_names = ['source_port', 'tap_service_id', 'direction'] + name_attr pos_names = ['source_port', 'tap_service_id', 'direction'] + name_attr
pos_values = [port_id, service_id, direction] + val_attr pos_values = [port_id, service_id, direction] + val_attr