From bbf7de83ff83b7c124ff30e421bd3eea6f1a8765 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <sfinucan@redhat.com>
Date: Thu, 5 Nov 2020 12:27:17 +0000
Subject: trivial: Use plural for appended parameters

Multiple compute commands take a '--property' parameter or variant
thereof. These should be stored in a 'properties' (plural) dest for
sanity's sake. Correct this.

Change-Id: If393836925fa736404527d9abd212b8ac9931027
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
---
 openstackclient/compute/v2/aggregate.py | 44 ++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'openstackclient/compute/v2/aggregate.py')

diff --git a/openstackclient/compute/v2/aggregate.py b/openstackclient/compute/v2/aggregate.py
index 8b70f426..e39eb2d2 100644
--- a/openstackclient/compute/v2/aggregate.py
+++ b/openstackclient/compute/v2/aggregate.py
@@ -101,6 +101,7 @@ class CreateAggregate(command.ShowOne):
             "--property",
             metavar="<key=value>",
             action=parseractions.KeyValueAction,
+            dest="properties",
             help=_("Property to add to this aggregate "
                    "(repeat option to set multiple properties)")
         )
@@ -116,10 +117,10 @@ class CreateAggregate(command.ShowOne):
 
         aggregate = compute_client.create_aggregate(**attrs)
 
-        if parsed_args.property:
+        if parsed_args.properties:
             aggregate = compute_client.set_aggregate_metadata(
                 aggregate.id,
-                parsed_args.property,
+                parsed_args.properties,
             )
 
         display_columns, columns = _get_aggregate_columns(aggregate)
@@ -269,12 +270,12 @@ class SetAggregate(command.Command):
             "--property",
             metavar="<key=value>",
             action=parseractions.KeyValueAction,
+            dest="properties",
             help=_("Property to set on <aggregate> "
                    "(repeat option to set multiple properties)")
         )
         parser.add_argument(
             "--no-property",
-            dest="no_property",
             action="store_true",
             help=_("Remove all properties from <aggregate> "
                    "(specify both --property and --no-property to "
@@ -296,21 +297,20 @@ class SetAggregate(command.Command):
         if kwargs:
             compute_client.update_aggregate(aggregate.id, **kwargs)
 
-        set_property = {}
+        properties = {}
         if parsed_args.no_property:
             # NOTE(RuiChen): "availability_zone" can not be unset from
             # properties. It is already excluded from show and create output.
-            set_property.update({key: None
-                                 for key in aggregate.metadata.keys()
-                                 if key != 'availability_zone'})
-        if parsed_args.property:
-            set_property.update(parsed_args.property)
-
-        if set_property:
-            compute_client.set_aggregate_metadata(
-                aggregate.id,
-                set_property
-            )
+            properties.update({
+                key: None for key in aggregate.metadata.keys()
+                if key != 'availability_zone'
+            })
+
+        if parsed_args.properties:
+            properties.update(parsed_args.properties)
+
+        if properties:
+            compute_client.set_aggregate_metadata(aggregate.id, properties)
 
 
 class ShowAggregate(command.ShowOne):
@@ -354,7 +354,9 @@ class UnsetAggregate(command.Command):
         parser.add_argument(
             "--property",
             metavar="<key>",
-            action='append',
+            action="append",
+            default=[],
+            dest="properties",
             help=_("Property to remove from aggregate "
                    "(repeat option to remove multiple properties)")
         )
@@ -365,12 +367,10 @@ class UnsetAggregate(command.Command):
         aggregate = compute_client.find_aggregate(
             parsed_args.aggregate, ignore_missing=False)
 
-        unset_property = {}
-        if parsed_args.property:
-            unset_property.update({key: None for key in parsed_args.property})
-        if unset_property:
-            compute_client.set_aggregate_metadata(
-                aggregate, unset_property)
+        properties = {key: None for key in parsed_args.properties}
+
+        if properties:
+            compute_client.set_aggregate_metadata(aggregate.id, properties)
 
 
 class CacheImageForAggregate(command.Command):
-- 
cgit v1.2.1