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>

3 files changed, 26 insertions, 26 deletions

diff --git a/openstackclient/tests/unit/compute/v2/test_aggregate.py b/openstackclient/tests/unit/compute/v2/test_aggregate.py
index e12edd0f..8563f988 100644
--- a/openstackclient/tests/unit/compute/v2/test_aggregate.py
+++ b/openstackclient/tests/unit/compute/v2/test_aggregate.py
@@ -138,7 +138,7 @@ class TestAggregateCreate(TestAggregate):
             'ag1',
         ]
         verifylist = [
-            ('property', {'key1': 'value1', 'key2': 'value2'}),
+            ('properties', {'key1': 'value1', 'key2': 'value2'}),
             ('name', 'ag1'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -146,7 +146,7 @@ class TestAggregateCreate(TestAggregate):
         self.sdk_client.create_aggregate.assert_called_once_with(
             name=parsed_args.name)
         self.sdk_client.set_aggregate_metadata.assert_called_once_with(
-            self.fake_ag.id, parsed_args.property)
+            self.fake_ag.id, parsed_args.properties)
         self.assertEqual(self.columns, columns)
         self.assertItemsEqual(self.data, data)
 
@@ -378,7 +378,7 @@ class TestAggregateSet(TestAggregate):
             'ag1',
         ]
         verifylist = [
-            ('property', {'key1': 'value1', 'key2': 'value2'}),
+            ('properties', {'key1': 'value1', 'key2': 'value2'}),
             ('aggregate', 'ag1'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -388,7 +388,7 @@ class TestAggregateSet(TestAggregate):
             parsed_args.aggregate, ignore_missing=False)
         self.assertNotCalled(self.sdk_client.update_aggregate)
         self.sdk_client.set_aggregate_metadata.assert_called_once_with(
-            self.fake_ag.id, parsed_args.property)
+            self.fake_ag.id, parsed_args.properties)
         self.assertIsNone(result)
 
     def test_aggregate_set_with_no_property_and_property(self):
@@ -399,7 +399,7 @@ class TestAggregateSet(TestAggregate):
         ]
         verifylist = [
             ('no_property', True),
-            ('property', {'key2': 'value2'}),
+            ('properties', {'key2': 'value2'}),
             ('aggregate', 'ag1'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -509,14 +509,14 @@ class TestAggregateUnset(TestAggregate):
             'ag1',
         ]
         verifylist = [
-            ('property', ['unset_key']),
+            ('properties', ['unset_key']),
             ('aggregate', 'ag1'),
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
         self.sdk_client.set_aggregate_metadata.assert_called_once_with(
-            self.fake_ag, {'unset_key': None})
+            self.fake_ag.id, {'unset_key': None})
         self.assertIsNone(result)
 
     def test_aggregate_unset_multiple_properties(self):
@@ -526,14 +526,14 @@ class TestAggregateUnset(TestAggregate):
             'ag1',
         ]
         verifylist = [
-            ('property', ['unset_key1', 'unset_key2']),
+            ('properties', ['unset_key1', 'unset_key2']),
             ('aggregate', 'ag1'),
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
         self.sdk_client.set_aggregate_metadata.assert_called_once_with(
-            self.fake_ag, {'unset_key1': None, 'unset_key2': None})
+            self.fake_ag.id, {'unset_key1': None, 'unset_key2': None})
         self.assertIsNone(result)
 
     def test_aggregate_unset_no_option(self):
@@ -541,7 +541,7 @@ class TestAggregateUnset(TestAggregate):
             'ag1',
         ]
         verifylist = [
-            ('property', None),
+            ('properties', []),
             ('aggregate', 'ag1'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
diff --git a/openstackclient/tests/unit/compute/v2/test_flavor.py b/openstackclient/tests/unit/compute/v2/test_flavor.py
index 8c1147fd..ee4479b0 100644
--- a/openstackclient/tests/unit/compute/v2/test_flavor.py
+++ b/openstackclient/tests/unit/compute/v2/test_flavor.py
@@ -160,7 +160,7 @@ class TestFlavorCreate(TestFlavor):
             ('rxtx_factor', self.flavor.rxtx_factor),
             ('public', True),
             ('description', self.flavor.description),
-            ('property', {'property': 'value'}),
+            ('properties', {'property': 'value'}),
             ('name', self.flavor.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -232,7 +232,7 @@ class TestFlavorCreate(TestFlavor):
             ('public', False),
             ('description', 'description'),
             ('project', self.project.id),
-            ('property', {'key1': 'value1', 'key2': 'value2'}),
+            ('properties', {'key1': 'value1', 'key2': 'value2'}),
             ('name', self.flavor.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -688,7 +688,7 @@ class TestFlavorSet(TestFlavor):
             'baremetal'
         ]
         verifylist = [
-            ('property', {'FOO': '"B A R"'}),
+            ('properties', {'FOO': '"B A R"'}),
             ('flavor', 'baremetal')
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1017,7 +1017,7 @@ class TestFlavorUnset(TestFlavor):
             'baremetal'
         ]
         verifylist = [
-            ('property', ['property']),
+            ('properties', ['property']),
             ('flavor', 'baremetal'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1039,7 +1039,7 @@ class TestFlavorUnset(TestFlavor):
             'baremetal'
         ]
         verifylist = [
-            ('property', ['property1', 'property2']),
+            ('properties', ['property1', 'property2']),
             ('flavor', 'baremetal'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py
index 8c3bf317..99f7eede 100644
--- a/openstackclient/tests/unit/compute/v2/test_server.py
+++ b/openstackclient/tests/unit/compute/v2/test_server.py
@@ -1159,7 +1159,7 @@ class TestServerCreate(TestServer):
             ('image', 'image1'),
             ('flavor', 'flavor1'),
             ('key_name', 'keyname'),
-            ('property', {'Beta': 'b'}),
+            ('properties', {'Beta': 'b'}),
             ('security_group', ['securitygroup']),
             ('hint', {'a': ['b', 'c']}),
             ('config_drive', True),
@@ -2227,7 +2227,7 @@ class TestServerCreate(TestServer):
             self.new_server.name,
         ]
         verifylist = [
-            ('image_property', {'hypervisor_type': 'qemu'}),
+            ('image_properties', {'hypervisor_type': 'qemu'}),
             ('flavor', 'flavor1'),
             ('nic', ['none']),
             ('config_drive', False),
@@ -2282,7 +2282,7 @@ class TestServerCreate(TestServer):
             self.new_server.name,
         ]
         verifylist = [
-            ('image_property', {'hypervisor_type': 'qemu',
+            ('image_properties', {'hypervisor_type': 'qemu',
              'hw_disk_bus': 'ide'}),
             ('flavor', 'flavor1'),
             ('nic', ['none']),
@@ -2338,7 +2338,7 @@ class TestServerCreate(TestServer):
             self.new_server.name,
         ]
         verifylist = [
-            ('image_property', {'hypervisor_type': 'qemu',
+            ('image_properties', {'hypervisor_type': 'qemu',
              'hw_disk_bus': 'virtio'}),
             ('flavor', 'flavor1'),
             ('nic', ['none']),
@@ -2370,7 +2370,7 @@ class TestServerCreate(TestServer):
         ]
 
         verifylist = [
-            ('image_property',
+            ('image_properties',
                 {'owner_specified.openstack.object': 'image/cirros'}),
             ('flavor', 'flavor1'),
             ('nic', ['none']),
@@ -4973,10 +4973,10 @@ class TestServerRebuild(TestServer):
             '--property', 'key1=value1',
             '--property', 'key2=value2'
         ]
-        expected_property = {'key1': 'value1', 'key2': 'value2'}
+        expected_properties = {'key1': 'value1', 'key2': 'value2'}
         verifylist = [
             ('server', self.server.id),
-            ('property', expected_property)
+            ('properties', expected_properties)
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -4986,7 +4986,7 @@ class TestServerRebuild(TestServer):
         self.servers_mock.get.assert_called_with(self.server.id)
         self.get_image_mock.assert_called_with(self.image.id)
         self.server.rebuild.assert_called_with(
-            self.image, None, meta=expected_property)
+            self.image, None, meta=expected_properties)
 
     def test_rebuild_with_keypair_name(self):
         self.app.client_manager.compute.api_version = \
@@ -6145,13 +6145,13 @@ class TestServerSet(TestServer):
             'foo_vm',
         ]
         verifylist = [
-            ('property', {'key1': 'value1', 'key2': 'value2'}),
+            ('properties', {'key1': 'value1', 'key2': 'value2'}),
             ('server', 'foo_vm'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
         self.servers_mock.set_meta.assert_called_once_with(
-            self.fake_servers[0], parsed_args.property)
+            self.fake_servers[0], parsed_args.properties)
         self.assertIsNone(result)
 
     @mock.patch.object(getpass, 'getpass',
@@ -6579,7 +6579,7 @@ class TestServerUnset(TestServer):
             'foo_vm',
         ]
         verifylist = [
-            ('property', ['key1', 'key2']),
+            ('properties', ['key1', 'key2']),
             ('server', 'foo_vm'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)