RD=2144 Add is_not filter operator (#1294)

Author: YoniItzhak

cloudify_cli/cli/helptexts.py

@@ -504,11 +504,12 @@
          "The labels' keys are saved in lowercase."
 
 LABELS_FILTER_RULES = "A labels' filter rule. Labels' filter rules must be " \
-                      "one of: <key>=<value>, <key>!=<value>, <key> is null," \
-                      " <key> is not null. <value> can be a single string " \
-                      "or a list of strings of the form " \
-                      "[<value1>,<value2>,...]. Any comma and colon in " \
-                      "<value> must be escaped with `\\`. The labels' " \
+                      "one of: <key>=<value>, <key>!=<value>, " \
+                      "<key> is-not <value>, <key> is null, " \
+                      "<key> is not null. <value> can be a single string or " \
+                      "a list of strings of the form " \
+                      "[<value1>,<value2>,...]. Any comma and " \
+                      "colon in <value> must be escaped with `\\`. " \
                       "The labels' keys specified in the filter rules will " \
                       "be saved in lower case."
 

cloudify_cli/filters_utils.py

@@ -18,6 +18,7 @@
 OPERATOR_MAPPING = {
     '=': 'any_of',
     '!=': 'not_any_of',
+    'is-not': 'is_not',
     'contains': 'contains',
     'does-not-contain': 'not_contains',
     'starts-with': 'starts_with',
@@ -34,9 +35,9 @@ class InvalidLabelsFilterRuleFormat(CloudifyCliError):
     def __init__(self, labels_filter_value):
         super(CloudifyCliError, self).__init__(
             'The labels filter rule `{0}` is not in the right format. It must '
-            'be one of: <key>=<value>, <key>!=<value>, <key> is null, '
-            '<key> is not null. <value> can be a single string or a list of '
-            'strings of the form [<value1>,<value2>,...]. '
+            'be one of: <key>=<value>, <key>!=<value>, <key> is-not <value>,'
+            ' <key> is null, <key> is not null. <value> can be a single '
+            'string or a list of strings of the form [<value1>,<value2>,...]. '
             '<value> cannot contain control characters, plus, any comma and '
             'colon in <value> must be escaped with `\\`. <key> can '
             'contain only letters, digits and the characters '
@@ -94,16 +95,15 @@ def __init__(self, key, values, operator):
 
     @classmethod
     def from_string(cls, str_filter_rule):
-        match_equal = re.match(r'^([\w\-\.]+)(=)([^\n\t\"]+)$',
-                               str_filter_rule)
-        match_not_equal = re.match(r'^([\w\-\.]+)(!=)([^\n\t\"]+)$',
-                                   str_filter_rule)
-        equal_matching = match_equal or match_not_equal
-        if equal_matching:
-            key = equal_matching.group(1).lower()
-            operator = equal_matching.group(2)
-            values = cls._get_rule_values(equal_matching.group(3))
-            return cls(key, values, OPERATOR_MAPPING[operator])
+        for operator in ['!=', '=', ' is-not ']:
+            matching = re.match(
+                r'^([\w\-\.]+)({0})([^\n\t\"]+)$'.format(operator),
+                str_filter_rule)
+            if matching:
+                key = matching.group(1).lower()
+                operator = matching.group(2)
+                values = cls._get_rule_values(matching.group(3))
+                return cls(key, values, OPERATOR_MAPPING[operator.strip()])
 
         match_null = re.match(r'^([\w\-\.]+) (is null)$', str_filter_rule)
         match_not_null = re.match(r'^([\w\-\.]+) (is not null)$',
@@ -122,6 +122,8 @@ def __str__(self):
         cli_operator = REVERSED_OPERATOR_MAPPING[self['operator']]
         if self['operator'] in ('is_null', 'is_not_null'):
             return '"{0} {1}"'.format(self['key'], cli_operator)
+        if cli_operator == 'is-not':
+            cli_operator = ' is-not '
         self['values'] = [val.replace(',', '\\,').replace(':', '\\:')
                           .replace('$', '\\$') for val in self['values']]
         return super(LabelsFilterRule, self).__str__(cli_operator)

cloudify_cli/tests/commands/test_filters.py

@@ -24,7 +24,11 @@
     ('"k_l is null"', {'key': 'k_l', 'values': [], 'operator': 'is_null',
                        'type': 'label'}),
     ('"l_m-n.o is not null"', {'key': 'l_m-n.o', 'values': [],
-                               'operator': 'is_not_null', 'type': 'label'})
+                               'operator': 'is_not_null', 'type': 'label'}),
+    ('"p is-not [i#:,j k\xf3]"', {'key': 'p', 'values': ['i#:', 'j k\xf3'],
+                                  'operator': 'is_not', 'type': 'label'}),
+    ('"q is-not rg@!"', {'key': 'q', 'values': ['rg@!'],
+                         'operator': 'is_not', 'type': 'label'}),
 ])
 
 # These are not real attributes, but it doesn't matter for the CLI tests