Support passing name for action-value in PolicyAction
Also fixes the following: 1) Adds validations for invalid name/uuid 2) Fixes an error with handling Network service policy in update PTG 3) Remove py26 from tox.ini Change-Id: I9f07bfed7277428eee2187eebb699d4a6768c4b3 Closes-bug:1406704
This commit is contained in:
@@ -250,7 +250,7 @@ class UpdatePolicyTargetGroup(neutronV20.UpdateCommand):
|
|||||||
body[self.resource]['network_service_policy_id'] = \
|
body[self.resource]['network_service_policy_id'] = \
|
||||||
neutronV20.find_resourceid_by_name_or_id(
|
neutronV20.find_resourceid_by_name_or_id(
|
||||||
self.get_client(), 'network_service_policy',
|
self.get_client(), 'network_service_policy',
|
||||||
parsed_args.l2_policy)
|
parsed_args.network_service_policy)
|
||||||
|
|
||||||
if parsed_args.provided_policy_rule_sets:
|
if parsed_args.provided_policy_rule_sets:
|
||||||
for key in parsed_args.provided_policy_rule_sets.keys():
|
for key in parsed_args.provided_policy_rule_sets.keys():
|
||||||
@@ -684,7 +684,7 @@ class CreatePolicyAction(neutronV20.CreateCommand):
|
|||||||
help=_('Type of action'))
|
help=_('Type of action'))
|
||||||
parser.add_argument(
|
parser.add_argument(
|
||||||
'--action-value',
|
'--action-value',
|
||||||
help=_('uuid of service for redirect action'))
|
help=_('Name/UUID of servicechain spec for redirect action'))
|
||||||
parser.add_argument(
|
parser.add_argument(
|
||||||
'name', metavar='NAME',
|
'name', metavar='NAME',
|
||||||
help=_('Name of action to create'))
|
help=_('Name of action to create'))
|
||||||
@@ -692,9 +692,15 @@ class CreatePolicyAction(neutronV20.CreateCommand):
|
|||||||
def args2body(self, parsed_args):
|
def args2body(self, parsed_args):
|
||||||
body = {self.resource: {}, }
|
body = {self.resource: {}, }
|
||||||
|
|
||||||
|
if parsed_args.action_value:
|
||||||
|
body[self.resource]['action_value'] = (
|
||||||
|
neutronV20.find_resourceid_by_name_or_id(
|
||||||
|
self.get_client(), 'servicechain_spec',
|
||||||
|
parsed_args.action_value))
|
||||||
|
|
||||||
neutronV20.update_dict(parsed_args, body[self.resource],
|
neutronV20.update_dict(parsed_args, body[self.resource],
|
||||||
['name', 'tenant_id', 'description',
|
['name', 'tenant_id', 'description',
|
||||||
'action_type', 'action_value'])
|
'action_type'])
|
||||||
|
|
||||||
return body
|
return body
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user