Merge remote-tracking branch 'origin/master' into debian

CHANGELOG.md

@@ -1,5 +1,12 @@
 # CUMIN CHANGELOG
 
+
+## v1.1.1 (2017-09-26)
+
+### Bug Fixes:
+* OpenStack: limit grammar to not overlap with the global one
+
+
 ## v1.1.0 (2017-09-21)
 
 ### New features:

cumin/backends/openstack.py

@@ -34,8 +34,8 @@ def grammar():
     quoted_string = pp.quotedString.copy().addParseAction(pp.removeQuotes)  # Both single and double quotes are allowed
 
     # Key-value tokens: key:value
-    # All printables characters except the parentheses that are part of this or the global grammar
-    key = pp.Word(pp.alphanums + '-_.')('key')
+    # Lowercase key, all printable characters except the parentheses that are part of the global grammar for the value
+    key = pp.Word(pp.srange('[a-z0-9-_.]"'), min=2)('key')
     all_but_par = ''.join([c for c in pp.printables if c not in ('(', ')', '{', '}')])
     value = (quoted_string | pp.Word(all_but_par))('value')
     item = pp.Combine(key + ':' + value)

cumin/tests/fixtures/backends/grammars/openstack_invalid.txt

@@ -4,3 +4,8 @@ key:value key
 key:value :value
 "key":value
 key%:value
+A:value
+a:value
+KEY:value
+Key:value
+kEy:value

cumin/tests/fixtures/backends/grammars/openstack_valid.txt

@@ -8,3 +8,4 @@ project:project_name
 project:"Project Name"
 project:project_name name:host1
 project:"Project Name" name:host1
+ip:value