X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Fvnf.py;fp=n2vc%2Fvnf.py;h=075d235938b11777df9d739cf45c3d05b0474afe;hp=7c39fa11f37eb8063f7bd1efac5ef5b9a15f9f11;hb=7b4702c2e118bab49def498b4b4c236d430dbc13;hpb=f7c0922f9ddcdee33df3783a97d8c7978dae8210 diff --git a/n2vc/vnf.py b/n2vc/vnf.py index 7c39fa1..075d235 100644 --- a/n2vc/vnf.py +++ b/n2vc/vnf.py @@ -583,7 +583,50 @@ class N2VC: if parameter['value'] == "": params[param] = str(values[parameter['value']]) else: - params[param] = str(parameter['value']) + """ + The Juju API uses strictly typed data-types, so we must make + sure the parameters from the VNFD match the appropriate type. + + The honus will still be on the operator, to make sure the + data-type in the VNFD matches the one in the charm. N2VC will + raise N2VCPrimitiveExecutionFailed when there is a mismatch. + + There are three data types supported by the YANG model: + # - STRING + # - INTEGER + # - BOOLEAN + + Each parameter will look like this: + { + 'seq': '3', + 'name': 'testint', + 'parameter': [ + { + 'name': 'interval', + 'data-type': 'INTEGER', + 'value': 20 + } + ] + } + """ + + if 'value' in parameter: + # String is the default format + val = str(parameter['value']) + + # If the data-type is explicitly set, cast to that type. + if 'data-type' in parameter: + dt = parameter['data-type'].upper() + if dt == "INTEGER": + val = int(val) + + elif dt == "BOOLEAN": + if val in ['true', 'false', '0', '1']: + val = True + else: + val = False + + params[param] = val return params def _get_config_from_yang(self, config_primitive, values):