parse_query: cleanup tests

Author: brainexe

adminapi/cli.py

@@ -34,6 +34,12 @@ def parse_args(args):
         action='append',
         help='Attributes to order by the result' + multi_note,
     )
+    parser.add_argument(
+        '-s',
+        '--sort',
+        action='append',
+        help='Attributes to sort by on client side' + multi_note,
+    )
     parser.add_argument(
         '-r',
         '--reset',
@@ -66,6 +72,11 @@ def main():
         attribute_ids_to_fetch.extend(args.reset)
     if args.update:
         attribute_ids_to_fetch.extend(u[0] for u in args.update)
+    if args.sort:
+        # Add sort attributes to fetch list if not already included
+        for sort_attr in args.sort:
+            if sort_attr not in attribute_ids_to_fetch:
+                attribute_ids_to_fetch.append(sort_attr)
 
     # TODO: Avoid .join()
     filters = parse_query(' '.join(args.query))
@@ -74,7 +85,14 @@ def main():
     if args.one and len(query) > 1:
         raise Exception('Expecting exactly one server, found {} servers'.format(len(query)))
 
-    for server in query:
+    # Collect servers into a list for client-side sorting
+    servers = list(query)
+
+    # Apply client-side sorting if requested
+    if args.sort:
+        servers = sort_servers(servers, args.sort)
+
+    for server in servers:
         if args.reset:
             apply_resets(server, args.reset)
         if args.update:
@@ -87,6 +105,26 @@ def main():
         query.commit()
 
 
+def sort_servers(servers, sort_attributes):
+    """Sort servers by multiple attributes on client side.
+
+    Attributes are applied in order, with later attributes used as tie-breakers.
+    Missing values (None) are sorted to the end.
+    """
+    def sort_key(server):
+        keys = []
+        for attr in sort_attributes:
+            value = server.get(attr)
+            # Sort None values to the end
+            if value is None:
+                keys.append((1, None))
+            else:
+                keys.append((0, value))
+        return keys
+
+    return sorted(servers, key=sort_key)
+
+
 def attr_value(arg):
     arg_split = tuple(arg.split('='))
     if len(arg_split) != 2:

adminapi/tests/test_parse.py

@@ -91,7 +91,6 @@ def test_newline_in_query(self):
 
     def test_any_filter_with_duplicate_hostname(self):
         # Hostname shorthand triggers regex, but explicit attribute assignment doesn't
-        # Order: explicit assignment value comes first, then shorthand value
         result = parse_query("web.* hostname=db.*")
         expected = {"hostname": Any(BaseFilter("db.*"), Regexp("web.*"))}
         assert_filters_equal(self, result, expected)
@@ -100,7 +99,6 @@ def test_invalid_function(self):
         with self.assertRaisesRegex(DatatypeError, r"Invalid function InvalidFunc"):
             parse_query("hostname=InvalidFunc(test)")
 
-
     def test_top_level_literal_error(self):
         with self.assertRaisesRegex(
             DatatypeError, r"Invalid term: Top level literals are not allowed"
@@ -127,14 +125,11 @@ def test_quoted_string(self):
         result = parse_function_string('hostname="web 01"')
         self.assertEqual(result, [("key", "hostname"), ("literal", "web 01")])
 
-    def test_single_quoted_string(self):
         result = parse_function_string("hostname='web 01'")
         self.assertEqual(result, [("key", "hostname"), ("literal", "web 01")])
 
-    def test_escaped_quote(self):
         result = parse_function_string('hostname="web\\"01"')
-        # Note: string_buf stores the actual chars, but the result is the original slice
-        self.assertEqual(result[1][0], "literal")
+        self.assertEqual(result[1], ("literal", 'web\\"01'))
 
     def test_function_call(self):
         result = parse_function_string("num_cores=GreaterThan(4)")
@@ -173,7 +168,6 @@ def test_invalid_escape(self):
         with self.assertRaisesRegex(DatatypeError, r"Invalid escape"):
             parse_function_string('hostname="web\\01"', strict=True)
 
-
     def test_empty_string(self):
         result = parse_function_string("")
         self.assertEqual(result, [])
@@ -191,7 +185,3 @@ def test_parentheses_handling(self):
             ("endfunc", ""),
         ]
         self.assertEqual(result, expected)
-
-
-if __name__ == "__main__":
-    unittest.main()