Merge branch 'stable-2.6'

[ganeti-local] / test / ganeti.qlang_unittest.py

diff --git a/test/ganeti.qlang_unittest.py b/test/ganeti.qlang_unittest.py
index 305c5e5..02b9534 100755 (executable)
--- a/test/ganeti.qlang_unittest.py
+++ b/test/ganeti.qlang_unittest.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 #
 
-# Copyright (C) 2010 Google Inc.
+# Copyright (C) 2010, 2011 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
 """Script for testing ganeti.qlang"""
 
 import unittest
+import string
 
 from ganeti import utils
 from ganeti import errors
@@ -36,8 +37,8 @@ class TestMakeSimpleFilter(unittest.TestCase):
     if parse_exp is None:
       parse_exp = names
 
-    filter_ = qlang.MakeSimpleFilter(field, names)
-    self.assertEqual(filter_, expected)
+    qfilter = qlang.MakeSimpleFilter(field, names)
+    self.assertEqual(qfilter, expected)
 
   def test(self):
     self._Test("name", None, None, parse_exp=[])
@@ -52,8 +53,9 @@ class TestParseFilter(unittest.TestCase):
   def setUp(self):
     self.parser = qlang.BuildFilterParser()
 
-  def _Test(self, filter_, expected):
-    self.assertEqual(qlang.ParseFilter(filter_, parser=self.parser), expected)
+  def _Test(self, qfilter, expected, expect_filter=True):
+    self.assertEqual(qlang.MakeFilter([qfilter], not expect_filter), expected)
+    self.assertEqual(qlang.ParseFilter(qfilter, parser=self.parser), expected)
 
   def test(self):
     self._Test("name==\"foobar\"", [qlang.OP_EQUAL, "name", "foobar"])
@@ -90,10 +92,12 @@ class TestParseFilter(unittest.TestCase):
                              [qlang.OP_TRUE, "field"]])
     self._Test("mem == 128", [qlang.OP_EQUAL, "mem", 128])
     self._Test("negfield != -1", [qlang.OP_NOT_EQUAL, "negfield", -1])
-    self._Test("master", [qlang.OP_TRUE, "master"])
+    self._Test("master", [qlang.OP_TRUE, "master"],
+               expect_filter=False)
     self._Test("not master", [qlang.OP_NOT, [qlang.OP_TRUE, "master"]])
     for op in ["not", "and", "or"]:
-      self._Test("%sxyz" % op, [qlang.OP_TRUE, "%sxyz" % op])
+      self._Test("%sxyz" % op, [qlang.OP_TRUE, "%sxyz" % op],
+                 expect_filter=False)
       self._Test("not %sxyz" % op,
                  [qlang.OP_NOT, [qlang.OP_TRUE, "%sxyz" % op]])
       self._Test("  not \t%sfoo" % op,
@@ -137,6 +141,12 @@ class TestParseFilter(unittest.TestCase):
       self._Test("notname =~ m%stest%s" % (i, i),
                  [qlang.OP_REGEXP, "notname", "test"])
 
+    self._Test("name =* '*.site'",
+               [qlang.OP_REGEXP, "name", utils.DnsNameGlobPattern("*.site")])
+    self._Test("field !* '*.example.*'",
+               [qlang.OP_NOT, [qlang.OP_REGEXP, "field",
+                               utils.DnsNameGlobPattern("*.example.*")]])
+
   def testAllFields(self):
     for name in frozenset(i for d in query.ALL_FIELD_LISTS for i in d.keys()):
       self._Test("%s == \"value\"" % name, [qlang.OP_EQUAL, name, "value"])
@@ -157,13 +167,77 @@ class TestParseFilter(unittest.TestCase):
     # Non-matching regexp delimiters
     tests.append("name =~ /foobarbaz#")
 
-    for filter_ in tests:
+    for qfilter in tests:
       try:
-        qlang.ParseFilter(filter_, parser=self.parser)
+        qlang.ParseFilter(qfilter, parser=self.parser)
       except errors.QueryFilterParseError, err:
         self.assertEqual(len(err.GetDetails()), 3)
       else:
-        self.fail("Invalid filter '%s' did not raise exception" % filter_)
+        self.fail("Invalid filter '%s' did not raise exception" % qfilter)
+
+
+class TestMakeFilter(unittest.TestCase):
+  def testNoNames(self):
+    self.assertEqual(qlang.MakeFilter([], False), None)
+    self.assertEqual(qlang.MakeFilter(None, False), None)
+
+  def testPlainNames(self):
+    self.assertEqual(qlang.MakeFilter(["web1", "web2"], False),
+                     [qlang.OP_OR, [qlang.OP_EQUAL, "name", "web1"],
+                                   [qlang.OP_EQUAL, "name", "web2"]])
+
+  def testPlainNamesOtherNamefield(self):
+    self.assertEqual(qlang.MakeFilter(["mailA", "mailB"], False,
+                                      namefield="id"),
+                     [qlang.OP_OR, [qlang.OP_EQUAL, "id", "mailA"],
+                                   [qlang.OP_EQUAL, "id", "mailB"]])
+
+  def testForcedFilter(self):
+    for i in [None, [], ["1", "2"], ["", "", ""], ["a", "b", "c", "d"]]:
+      self.assertRaises(errors.OpPrereqError, qlang.MakeFilter, i, True)
+
+    # Glob pattern shouldn't parse as filter
+    self.assertRaises(errors.QueryFilterParseError,
+                      qlang.MakeFilter, ["*.site"], True)
+
+    # Plain name parses as boolean filter
+    self.assertEqual(qlang.MakeFilter(["web1"], True), [qlang.OP_TRUE, "web1"])
+
+  def testFilter(self):
+    self.assertEqual(qlang.MakeFilter(["foo/bar"], False),
+                     [qlang.OP_TRUE, "foo/bar"])
+    self.assertEqual(qlang.MakeFilter(["foo=='bar'"], False),
+                     [qlang.OP_EQUAL, "foo", "bar"])
+    self.assertEqual(qlang.MakeFilter(["field=*'*.site'"], False),
+                     [qlang.OP_REGEXP, "field",
+                      utils.DnsNameGlobPattern("*.site")])
+
+    # Plain name parses as name filter, not boolean
+    for name in ["node1", "n-o-d-e", "n_o_d_e", "node1.example.com",
+                 "node1.example.com."]:
+      self.assertEqual(qlang.MakeFilter([name], False),
+                       [qlang.OP_OR, [qlang.OP_EQUAL, "name", name]])
+
+    # Invalid filters
+    for i in ["foo==bar", "foo+=1"]:
+      self.assertRaises(errors.QueryFilterParseError,
+                        qlang.MakeFilter, [i], False)
+
+  def testGlob(self):
+    self.assertEqual(qlang.MakeFilter(["*.site"], False),
+                     [qlang.OP_OR, [qlang.OP_REGEXP, "name",
+                                    utils.DnsNameGlobPattern("*.site")]])
+    self.assertEqual(qlang.MakeFilter(["web?.example"], False),
+                     [qlang.OP_OR, [qlang.OP_REGEXP, "name",
+                                    utils.DnsNameGlobPattern("web?.example")]])
+    self.assertEqual(qlang.MakeFilter(["*.a", "*.b", "?.c"], False),
+                     [qlang.OP_OR,
+                      [qlang.OP_REGEXP, "name",
+                       utils.DnsNameGlobPattern("*.a")],
+                      [qlang.OP_REGEXP, "name",
+                       utils.DnsNameGlobPattern("*.b")],
+                      [qlang.OP_REGEXP, "name",
+                       utils.DnsNameGlobPattern("?.c")]])
 
 
 if __name__ == "__main__":