Merge pull request #67 from arenadata/fix_duplicated_fields

Removed query and form parameters if they exist in path parameters

Author: grey-kristy

adcm_client/wrappers/api.py

@@ -133,22 +133,24 @@ def action(self, *args, **kwargs):
         Example:
         api.action(['cluster', 'create'], name='testcluster')
         """
-        overrides = None
-
-        if args[0][-1] == 'list':
-            # Removing query parameters if they exist in path parameters
-            path = args[0]
-            link = self.schema[path[0]]
-            for item in path[1:]:
-                link = link[item]
-
-            fields = []
-            path_fields = [field.name for field in link.fields if field.location == 'path']
-            for field in link.fields:
-                if not (field.location == 'query' and field.name in path_fields):
-                    fields.append(field)
-            fields = tuple(fields)
-            overrides = {'fields': fields}
+
+        # After parsing the schema, fields for a query, a form, or a path may appear that have
+        # the same names, which may cause the field value to go to the wrong place.
+        # Path fields take precedence over query and form fields, so if there are path fields
+        # and query or form fields with the same name, we delete the query and form fields
+        # with the given name.
+        path = args[0]
+        link = self.schema[path[0]]
+        for item in path[1:]:
+            link = link[item]
+
+        fields = []
+        path_fields = [field.name for field in link.fields if field.location == 'path']
+        for field in link.fields:
+            if not (field.location in ('query', 'form') and field.name in path_fields):
+                fields.append(field)
+        fields = tuple(fields)
+        overrides = {'fields': fields}
 
         data = self.client.action(self.schema, *args, overrides=overrides, **kwargs)
         self._check_for_error(data)