From 0a14dc61bb5db0607b0ebaf533c83ea3650a2b49 Mon Sep 17 00:00:00 2001 From: Kent Wu Date: Thu, 16 Mar 2017 11:34:59 -0700 Subject: [PATCH] Add the application_policy_group to the purge list 1. also corrected the help text for the APG. 2. also clean up Neutron resources while doing the pruge as now gbpclient inherits from neutronclient. Change-Id: I1469ee3c51295eac7a670d105398b384db23be70 --- gbpclient/gbp/v2_0/groupbasedpolicy.py | 3 ++- gbpclient/gbp/v2_0/purge.py | 7 ++++--- gbpclient/tests/unit/test_cli20_purge.py | 3 ++- gbpclient/v2_0/client.py | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gbpclient/gbp/v2_0/groupbasedpolicy.py b/gbpclient/gbp/v2_0/groupbasedpolicy.py index 81a10f2..8dbbe28 100644 --- a/gbpclient/gbp/v2_0/groupbasedpolicy.py +++ b/gbpclient/gbp/v2_0/groupbasedpolicy.py @@ -727,7 +727,8 @@ class CreateApplicationPolicyGroup(neutronV20.CreateCommand): help=_('Description of the Application Policy Group')) parser.add_argument( 'name', metavar='NAME', - help=_('Name of L3 policy to create (required argument)')) + help=_('Name of the Application Policy Group to create ' + '(required argument)')) n_utils.add_boolean_argument( parser, '--shared', dest='shared', help=_('Enable or disable resource sharing, default is False')) diff --git a/gbpclient/gbp/v2_0/purge.py b/gbpclient/gbp/v2_0/purge.py index bfebcda..2475dc9 100644 --- a/gbpclient/gbp/v2_0/purge.py +++ b/gbpclient/gbp/v2_0/purge.py @@ -87,7 +87,8 @@ class Purge(n_purge.Purge): 'policy_rule', 'policy_classifier', 'policy_action', 'network_service_policy', 'servicechain_instance', 'servicechain_spec', - 'servicechain_node', 'service_profile'] + 'servicechain_node', 'service_profile', + 'application_policy_group'] deleted = {} failed = {} self.total_resources = 0 @@ -99,8 +100,8 @@ class Purge(n_purge.Purge): resources) print('\n%s' % self._build_message(deleted, failed, failures)) - # TODO(Kent): clean up Neutron resources also - # super(Purge, self).take_action(parsed_args) + # clean up Neutron resources also + super(Purge, self).take_action(parsed_args) class PurgeAPI(Purge): diff --git a/gbpclient/tests/unit/test_cli20_purge.py b/gbpclient/tests/unit/test_cli20_purge.py index 8f49fdc..26d7adb 100644 --- a/gbpclient/tests/unit/test_cli20_purge.py +++ b/gbpclient/tests/unit/test_cli20_purge.py @@ -24,4 +24,5 @@ class CLITestV20Purge(test_cli20_purge.CLITestV20Purge): 'policy_classifier', 'policy_action', 'network_service_policy', 'servicechain_instance', 'servicechain_spec', - 'servicechain_node', 'service_profile'] + 'servicechain_node', 'service_profile', + 'application_policy_group'] diff --git a/gbpclient/v2_0/client.py b/gbpclient/v2_0/client.py index 6a38573..bd8089c 100644 --- a/gbpclient/v2_0/client.py +++ b/gbpclient/v2_0/client.py @@ -93,7 +93,7 @@ class APIParamsCall(object): return with_params -class Client(clientV2_0.ClientBase): +class Client(clientV2_0.Client): """Client for the GBP API. :param string username: Username for authentication. (optional)