openstack/python-zunclient
Code Issues Proposed changes

Support stop and delete container

Browse Source 
This patch adds an option for user to stop container firstly when deleting
the container, and bumps the api version to 1.12.

Change-Id: I87b226a65a5f42747b9c969cfb954d25d56b1646
Related-Bug: #1713520
Depends-On: I5e5afb6a7a1b8850fc57cdae6e0e3553d56b1040
This commit is contained in:
miaohb
2017-10-25 02:04:50 -07:00
parent 46d5f5960a
commit 5ee3b99161
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zunclient/api_versions.py
View File

@@ -30,7 +30,7 @@ if not LOG.handlers:
HEADER_NAME = "OpenStack-API-Version"
SERVICE_TYPE = "container"
DEFAULT_API_VERSION = '1.11'
DEFAULT_API_VERSION = '1.12'
_SUBSTITUTIONS = {}

5
zunclient/osc/v1/containers.py
View File

@@ -293,6 +293,10 @@ class DeleteContainer(command.Command):
'--force',
action='store_true',
help='Force delete the container.')
parser.add_argument(
'--stop',
action='store_true',
help='Stop the running container first before delete.')
parser.add_argument(
'--all-tenants',
action="store_true",
@@ -307,6 +311,7 @@ class DeleteContainer(command.Command):
opts = {}
opts['id'] = container
opts['force'] = parsed_args.force
opts['stop'] = parsed_args.stop
opts['all_tenants'] = parsed_args.all_tenants
opts = zun_utils.remove_null_parms(**opts)
try:

8
zunclient/tests/unit/test_shell.py
View File

@@ -246,7 +246,7 @@ class ShellTest(utils.TestCase):
project_domain_id='', project_domain_name='',
user_domain_id='', user_domain_name='', profile=None,
endpoint_override=None, insecure=False,
version=api_versions.APIVersion('1.11'))
version=api_versions.APIVersion('1.12'))
def test_main_option_region(self):
self.make_env()
@@ -274,7 +274,7 @@ class ShellTest(utils.TestCase):
project_domain_id='', project_domain_name='',
user_domain_id='', user_domain_name='', profile=None,
endpoint_override=None, insecure=False,
version=api_versions.APIVersion('1.11'))
version=api_versions.APIVersion('1.12'))
@mock.patch('zunclient.client.Client')
def test_main_endpoint_internal(self, mock_client):
@@ -288,7 +288,7 @@ class ShellTest(utils.TestCase):
project_domain_id='', project_domain_name='',
user_domain_id='', user_domain_name='', profile=None,
endpoint_override=None, insecure=False,
version=api_versions.APIVersion('1.11'))
version=api_versions.APIVersion('1.12'))
class ShellTestKeystoneV3(ShellTest):
@@ -319,4 +319,4 @@ class ShellTestKeystoneV3(ShellTest):
project_domain_id='', project_domain_name='Default',
user_domain_id='', user_domain_name='Default',
endpoint_override=None, insecure=False, profile=None,
version=api_versions.APIVersion('1.11'))
version=api_versions.APIVersion('1.12'))

4
zunclient/v1/containers_shell.py
View File

@@ -197,6 +197,9 @@ def do_list(cs, args):
@utils.arg('-f', '--force',
action='store_true',
help='Force delete the container.')
@utils.arg('-s', '--stop',
action='store_true',
help='Stop the running container first before delete.')
@utils.arg('--all-tenants',
action="store_true",
default=False,
@@ -207,6 +210,7 @@ def do_delete(cs, args):
opts = {}
opts['id'] = container
opts['force'] = args.force
opts['stop'] = args.stop
opts['all_tenants'] = args.all_tenants
opts = zun_utils.remove_null_parms(**opts)
try: