openstack/python-neutronclient
Code Issues Proposed changes

Merge "refactor: Get rid of usage of get_data in favor of take_action"

Browse Source
This commit is contained in:
Jenkins
2016-01-21 12:38:31 +00:00
committed by Gerrit Code Review
parent 0259e03fea 131160ed56
commit db3e862265
9 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
neutronclient/common/extension.py
View File

@@ -31,26 +31,26 @@ class NeutronClientExtension(neutronV20.NeutronCommand):
class ClientExtensionShow(NeutronClientExtension, neutronV20.ShowCommand):
def get_data(self, parsed_args):
def take_action(self, parsed_args):
# NOTE(mdietz): Calls 'execute' to provide a consistent pattern
# for any implementers adding extensions with
# regard to any other extension verb.
return self.execute(parsed_args)
def execute(self, parsed_args):
return super(ClientExtensionShow, self).get_data(parsed_args)
return super(ClientExtensionShow, self).take_action(parsed_args)
class ClientExtensionList(NeutronClientExtension, neutronV20.ListCommand):
def get_data(self, parsed_args):
def take_action(self, parsed_args):
# NOTE(mdietz): Calls 'execute' to provide a consistent pattern
# for any implementers adding extensions with
# regard to any other extension verb.
return self.execute(parsed_args)
def execute(self, parsed_args):
return super(ClientExtensionList, self).get_data(parsed_args)
return super(ClientExtensionList, self).take_action(parsed_args)
class ClientExtensionDelete(NeutronClientExtension, neutronV20.DeleteCommand):
@@ -65,14 +65,14 @@ class ClientExtensionDelete(NeutronClientExtension, neutronV20.DeleteCommand):
class ClientExtensionCreate(NeutronClientExtension, neutronV20.CreateCommand):
def get_data(self, parsed_args):
def take_action(self, parsed_args):
# NOTE(mdietz): Calls 'execute' to provide a consistent pattern
# for any implementers adding extensions with
# regard to any other extension verb.
return self.execute(parsed_args)
def execute(self, parsed_args):
return super(ClientExtensionCreate, self).get_data(parsed_args)
return super(ClientExtensionCreate, self).take_action(parsed_args)
class ClientExtensionUpdate(NeutronClientExtension, neutronV20.UpdateCommand):

20
neutronclient/neutron/v2_0/__init__.py
View File

@@ -390,11 +390,9 @@ class NeutronCommand(command.Command):
shadow_resource = None
parent_id = None
# TODO(amotoki): Remove the usage of get_data and use take_action directly.
# Overriding take_action() is recommended when implementing cliff command.
def get_data(self, parsed_args):
pass
# TODO(amotoki): Remove take_action here. It should be an abstract method
# as cliff.command.Command does. To do this, we need to avoid overriding
# run() directly.
def take_action(self, parsed_args):
return self.get_data(parsed_args)
@@ -466,8 +464,8 @@ class CreateCommand(NeutronCommand, show.ShowOne):
self.add_known_arguments(parser)
return parser
def get_data(self, parsed_args):
self.log.debug('get_data(%s)' % parsed_args)
def take_action(self, parsed_args):
self.log.debug('run(%s)' % parsed_args)
self.set_extra_attrs(parsed_args)
neutron_client = self.get_client()
_extra_values = parse_args_to_dict(self.values_specs)
@@ -687,8 +685,8 @@ class ListCommand(NeutronCommand, lister.Lister):
s, _columns, formatters=formatters, )
for s in info), )
def get_data(self, parsed_args):
self.log.debug('get_data(%s)', parsed_args)
def take_action(self, parsed_args):
self.log.debug('run(%s)', parsed_args)
self.set_extra_attrs(parsed_args)
data = self.retrieve_list(parsed_args)
self.extend_list(data, parsed_args)
@@ -714,8 +712,8 @@ class ShowCommand(NeutronCommand, show.ShowOne):
self.add_known_arguments(parser)
return parser
def get_data(self, parsed_args):
self.log.debug('get_data(%s)', parsed_args)
def take_action(self, parsed_args):
self.log.debug('run(%s)', parsed_args)
self.set_extra_attrs(parsed_args)
neutron_client = self.get_client()

2
neutronclient/neutron/v2_0/lb/pool.py
View File

@@ -107,7 +107,7 @@ class RetrievePoolStats(neutronV20.ShowCommand):
resource = 'pool'
def get_data(self, parsed_args):
def take_action(self, parsed_args):
self.log.debug('run(%s)' % parsed_args)
neutron_client = self.get_client()
pool_id = neutronV20.find_resourceid_by_name_or_id(

2
neutronclient/neutron/v2_0/lb/v2/loadbalancer.py
View File

@@ -100,7 +100,7 @@ class RetrieveLoadBalancerStats(neutronV20.ShowCommand):
resource = 'loadbalancer'
def get_data(self, parsed_args):
def take_action(self, parsed_args):
self.log.debug('run(%s)' % parsed_args)
neutron_client = self.get_client()
neutron_client.format = parsed_args.request_format

4
neutronclient/neutron/v2_0/lb/v2/member.py
View File

@@ -49,10 +49,10 @@ class ListMember(LbaasMemberMixin, neutronV20.ListCommand):
pagination_support = True
sorting_support = True
def get_data(self, parsed_args):
def take_action(self, parsed_args):
self.parent_id = _get_pool_id(self.get_client(), parsed_args.pool)
self.values_specs.append('--pool_id=%s' % self.parent_id)
return super(ListMember, self).get_data(parsed_args)
return super(ListMember, self).take_action(parsed_args)
class ShowMember(LbaasMemberMixin, neutronV20.ShowCommand):

4
neutronclient/neutron/v2_0/port.py
View File

@@ -111,12 +111,12 @@ class ListRouterPort(neutronV20.ListCommand):
help=_('ID or name of router to look up.'))
return parser
def get_data(self, parsed_args):
def take_action(self, parsed_args):
neutron_client = self.get_client()
_id = neutronV20.find_resourceid_by_name_or_id(
neutron_client, 'router', parsed_args.id)
self.values_specs.append('--device_id=%s' % _id)
return super(ListRouterPort, self).get_data(parsed_args)
return super(ListRouterPort, self).take_action(parsed_args)
class ShowPort(neutronV20.ShowCommand):

10
neutronclient/neutron/v2_0/quota.py
View File

@@ -75,8 +75,8 @@ class ListQuota(neutronV20.NeutronCommand, lister.Lister):
parser = super(ListQuota, self).get_parser(prog_name)
return parser
def get_data(self, parsed_args):
self.log.debug('get_data(%s)', parsed_args)
def take_action(self, parsed_args):
self.log.debug('run(%s)', parsed_args)
neutron_client = self.get_client()
search_opts = {}
self.log.debug('search options: %s', search_opts)
@@ -114,8 +114,8 @@ class ShowQuota(neutronV20.NeutronCommand, show.ShowOne):
help=argparse.SUPPRESS, nargs='?')
return parser
def get_data(self, parsed_args):
self.log.debug('get_data(%s)', parsed_args)
def take_action(self, parsed_args):
self.log.debug('run(%s)', parsed_args)
neutron_client = self.get_client()
tenant_id = get_tenant_id(parsed_args, neutron_client)
params = {}
@@ -213,7 +213,7 @@ class UpdateQuota(neutronV20.NeutronCommand, show.ShowOne):
getattr(parsed_args, resource))
return {self.resource: quota}
def get_data(self, parsed_args):
def take_action(self, parsed_args):
self.log.debug('run(%s)', parsed_args)
neutron_client = self.get_client()
_extra_values = neutronV20.parse_args_to_dict(self.values_specs)

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

@@ -288,7 +288,7 @@ class CLITestV20NetworkJSON(test_cli20.CLITestV20Base):
args = []
cmd_parser = cmd.get_parser('list_networks')
parsed_args = cmd_parser.parse_args(args)
result = cmd.get_data(parsed_args)
result = cmd.take_action(parsed_args)
self.mox.VerifyAll()
self.mox.UnsetStubs()
_result = [x for x in result[1]]

2
neutronclient/tests/unit/test_cli20_securitygroup.py
View File

@@ -407,7 +407,7 @@ class CLITestV20SecurityGroupsJSON(test_cli20.CLITestV20Base):
cmd_parser = cmd.get_parser('list_security_group_rules')
parsed_args = cmd_parser.parse_args(args)
result = cmd.get_data(parsed_args)
result = cmd.take_action(parsed_args)
self.mox.VerifyAll()
self.mox.UnsetStubs()
# Check columns