X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju%2Fconstraints.py;h=c5518837faf645a6bde740f2e2af57ee0525a6ed;hb=e2a3f01e7bb983ac3cd8eb24117e0d4208b40cc9;hp=43c048ae4fb87cc0e1434540b0725a22d31c1da1;hpb=d703653028e7ea25da20f205b9ff341c75694e33;p=osm%2FN2VC.git

diff --git a/juju/constraints.py b/juju/constraints.py
index 43c048a..c551883 100644
--- a/juju/constraints.py
+++ b/juju/constraints.py
@@ -21,6 +21,7 @@ import re
 MEM = re.compile('^[1-9][0-9]*[MGTP]$')
 
 # Multiplication factors to get Megabytes
+# https://github.com/juju/juju/blob/master/constraints/constraints.go#L666
 FACTORS = {
     "M": 1,
     "G": 1024,
@@ -28,6 +29,10 @@ FACTORS = {
     "P": 1024 * 1024 * 1024
 }
 
+SNAKE1 = re.compile(r'(.)([A-Z][a-z]+)')
+SNAKE2 = re.compile('([a-z0-9])([A-Z])')
+
+
 def parse(constraints):
     """
     Constraints must be expressed as a string containing only spaces
@@ -37,6 +42,9 @@ def parse(constraints):
     if constraints is None:
         return None
 
+    if constraints == "":
+        return None
+
     if type(constraints) is dict:
         # Fowards compatibilty: already parsed
         return constraints
@@ -52,6 +60,11 @@ def normalize_key(key):
     key = key.strip()
 
     key = key.replace("-", "_")  # Our _client lib wants "_" in place of "-"
+
+    # Convert camelCase to snake_case
+    key = SNAKE1.sub(r'\1_\2', key)
+    key = SNAKE2.sub(r'\1_\2', key).lower()
+
     return key
 
 
@@ -68,4 +81,7 @@ def normalize_value(value):
         values = [normalize_value(v) for v in values]
         return values
 
+    if value.isdigit():
+        return int(value)
+
     return value