From ce3180d823ced0ffc035e84948f0fa1454887af0 Mon Sep 17 00:00:00 2001 From: Deepak C Shetty Date: Tue, 9 Sep 2014 09:53:50 +0000 Subject: [PATCH] Add GlusterFS protocol as a supported Share/NAS type This patch adds GlusterFS as a supported protocol (in addition to NFS and CIFS) in the Share/NAS type doc/help string. Since the Manila server side now support cert based access type which introduced 'glusterfs' as a new share protocol, this patch updates the manilaclient help/doc string to reflect the same. 'glusterfs' protocol support was added to server side using: https://review.openstack.org/116859 Change-Id: I94cbecd55fabbfd1bb7c06184e4679c7531d0214 Closes-Bug: #1367205 --- manilaclient/v1/shell.py | 4 ++-- tests/test_shell.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/manilaclient/v1/shell.py b/manilaclient/v1/shell.py index a5bbf3edd..8a340b886 100644 --- a/manilaclient/v1/shell.py +++ b/manilaclient/v1/shell.py @@ -311,7 +311,7 @@ def do_rate_limits(cs, args): 'share_protocol', metavar='', type=str, - help='Share type (NFS or CIFS).') + help='Share type (NFS, CIFS or GlusterFS).') @cliutils.arg( 'size', metavar='', @@ -351,7 +351,7 @@ def do_rate_limits(cs, args): default=None) @cliutils.service_type('share') def do_create(cs, args): - """Creates new NAS storage (NFS or CIFS).""" + """Creates new NAS storage (NFS, CIFS or GlusterFS).""" share_metadata = None if args.metadata is not None: diff --git a/tests/test_shell.py b/tests/test_shell.py index 1ad252957..efe7d1f26 100644 --- a/tests/test_shell.py +++ b/tests/test_shell.py @@ -60,7 +60,8 @@ class ShellTest(utils.TestCase): def test_help(self): required = [ '.*?^usage: ', - '.*?^\s+create\s+Creates new NAS storage \(NFS or CIFS\).', + '.*?^\s+create\s+Creates new NAS storage ' + '\(NFS, CIFS or GlusterFS\).', '.*?(?m)^See "manila help COMMAND" for help ' 'on a specific command.', ]