From 2297d624153322ccf24e804e9c6279e1f0e9f463 Mon Sep 17 00:00:00 2001 From: kavithahr Date: Fri, 30 Jun 2017 12:37:35 +0530 Subject: [PATCH] Use 'project' instead of 'tenant' While switching to openstackclient we use project instead of tenant. Change-Id: I1d6b80a88d3067809e2a9723ece4fbdf16042d73 --- saharaclient/osc/v1/cluster_templates.py | 4 ++-- saharaclient/osc/v1/clusters.py | 4 ++-- saharaclient/osc/v1/data_sources.py | 2 +- saharaclient/osc/v1/job_binaries.py | 5 +++-- saharaclient/osc/v1/job_templates.py | 2 +- saharaclient/osc/v1/jobs.py | 4 ++-- saharaclient/osc/v1/node_group_templates.py | 6 +++--- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/saharaclient/osc/v1/cluster_templates.py b/saharaclient/osc/v1/cluster_templates.py index e39c40e5..6d9491e8 100644 --- a/saharaclient/osc/v1/cluster_templates.py +++ b/saharaclient/osc/v1/cluster_templates.py @@ -107,7 +107,7 @@ class CreateClusterTemplate(command.ShowOne): action='store_true', default=False, help='Make the cluster template public (Visible from other ' - 'tenants)', + 'projects)', ) parser.add_argument( '--protected', @@ -391,7 +391,7 @@ class UpdateClusterTemplate(command.ShowOne): '--public', action='store_true', help='Make the cluster template public ' - '(Visible from other tenants)', + '(Visible from other projects)', dest='is_public' ) public.add_argument( diff --git a/saharaclient/osc/v1/clusters.py b/saharaclient/osc/v1/clusters.py index a7909262..b156a3d3 100644 --- a/saharaclient/osc/v1/clusters.py +++ b/saharaclient/osc/v1/clusters.py @@ -111,7 +111,7 @@ class CreateCluster(command.ShowOne): '--public', action='store_true', default=False, - help='Make the cluster public (Visible from other tenants)', + help='Make the cluster public (Visible from other projects)', ) parser.add_argument( '--protected', @@ -451,7 +451,7 @@ class UpdateCluster(command.ShowOne): '--public', action='store_true', help='Make the cluster public ' - '(Visible from other tenants)', + '(Visible from other projects)', dest='is_public' ) public.add_argument( diff --git a/saharaclient/osc/v1/data_sources.py b/saharaclient/osc/v1/data_sources.py index ff3a1527..2c296f0a 100644 --- a/saharaclient/osc/v1/data_sources.py +++ b/saharaclient/osc/v1/data_sources.py @@ -250,7 +250,7 @@ class UpdateDataSource(command.ShowOne): '--public', action='store_true', dest='is_public', - help='Make the data source public (Visible from other tenants)', + help='Make the data source public (Visible from other projects)', ) public.add_argument( '--private', diff --git a/saharaclient/osc/v1/job_binaries.py b/saharaclient/osc/v1/job_binaries.py index fd440a1b..962b9c9d 100644 --- a/saharaclient/osc/v1/job_binaries.py +++ b/saharaclient/osc/v1/job_binaries.py @@ -311,13 +311,14 @@ class UpdateJobBinary(command.ShowOne): public.add_argument( '--public', action='store_true', - help='Make the job binary public (Visible from other tenants)', + help='Make the job binary public (Visible from other projects)', dest='is_public' ) public.add_argument( '--private', action='store_false', - help='Make the job binary private (Visible only from this tenant)', + help='Make the job binary private (Visible only from' + ' this project)', dest='is_public' ) protected = parser.add_mutually_exclusive_group() diff --git a/saharaclient/osc/v1/job_templates.py b/saharaclient/osc/v1/job_templates.py index d51fe3ab..476a49ea 100644 --- a/saharaclient/osc/v1/job_templates.py +++ b/saharaclient/osc/v1/job_templates.py @@ -278,7 +278,7 @@ class UpdateJobTemplate(command.ShowOne): '--public', action='store_true', help='Make the job template public ' - '(Visible from other tenants)', + '(Visible from other projects)', dest='is_public' ) public.add_argument( diff --git a/saharaclient/osc/v1/jobs.py b/saharaclient/osc/v1/jobs.py index d52ce70d..ec9743d0 100644 --- a/saharaclient/osc/v1/jobs.py +++ b/saharaclient/osc/v1/jobs.py @@ -340,13 +340,13 @@ class UpdateJob(command.ShowOne): public.add_argument( '--public', action='store_true', - help='Make the job public (Visible from other tenants)', + help='Make the job public (Visible from other projects)', dest='is_public' ) public.add_argument( '--private', action='store_false', - help='Make the job private (Visible only from this tenant)', + help='Make the job private (Visible only from this project)', dest='is_public' ) protected = parser.add_mutually_exclusive_group() diff --git a/saharaclient/osc/v1/node_group_templates.py b/saharaclient/osc/v1/node_group_templates.py index 1ce94d72..dec774d3 100644 --- a/saharaclient/osc/v1/node_group_templates.py +++ b/saharaclient/osc/v1/node_group_templates.py @@ -171,7 +171,7 @@ class CreateNodeGroupTemplate(command.ShowOne): action='store_true', default=False, help='Make the node group template public (Visible from other ' - 'tenants)', + 'projects)', ) parser.add_argument( '--protected', @@ -569,14 +569,14 @@ class UpdateNodeGroupTemplate(command.ShowOne): '--public', action='store_true', help='Make the node group template public ' - '(Visible from other tenants)', + '(Visible from other projects)', dest='is_public' ) public.add_argument( '--private', action='store_false', help='Make the node group template private ' - '(Visible only from this tenant)', + '(Visible only from this project)', dest='is_public' ) protected = parser.add_mutually_exclusive_group()