openstack/murano
Code Issues Proposed changes

Ignoring properties with None value in Murano->Congress mapping

Browse Source 
Change-Id: I90624cb58eca1104ede8446cef0c80342153a6aa
This commit is contained in:
Radek Pospisil 2015-02-27 15:09:08 +01:00
parent 3cd187ce8c
commit ea03c1f55c
3 changed files with 14 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
murano/policy/congress_rules.py
View File

@ -110,22 +110,20 @@ class CongressRulesManager(object):
if key == '?':
continue
if value is None:
value = ""
value = self._to_dict(value)
if isinstance(value, dict):
rules.extend(self._create_propety_rules(
obj_id, value, prefix + key + "."))
elif isinstance(value, list):
for v in value:
v = self._to_dict(v)
if not isinstance(v, dict):
rule = PropertyRule(obj_id, prefix + key, v)
rules.append(rule)
else:
rule = PropertyRule(obj_id, prefix + key, value)
rules.append(rule)
if value is not None:
value = self._to_dict(value)
if isinstance(value, dict):
rules.extend(self._create_propety_rules(
obj_id, value, prefix + key + "."))
elif isinstance(value, list):
for v in value:
v = self._to_dict(v)
if not isinstance(v, dict):
rule = PropertyRule(obj_id, prefix + key, v)
rules.append(rule)
else:
rule = PropertyRule(obj_id, prefix + key, value)
rules.append(rule)
return rules

1
murano/tests/unit/policy/expected_rules_model_complex.txt
View File

@ -2,5 +2,4 @@ murano:properties+("ade378ce-00d4-4a33-99eb-7b4b6ea3ab97", "ipAddresses", "10.0.
murano:properties+("ade378ce-00d4-4a33-99eb-7b4b6ea3ab97", "ipAddresses", "16.60.90.90")
murano:properties+("ade378ce-00d4-4a33-99eb-7b4b6ea3ab97", "networks.customNetworks", "10.0.1.0")
murano:properties+("ade378ce-00d4-4a33-99eb-7b4b6ea3ab97", "networks.customNetworks", "10.0.2.0")
murano:properties+("be3c5155-6670-4cf6-9a28-a4574ff70b71", "floatingIpAddress", "")
murano:properties+("ade378ce-00d4-4a33-99eb-7b4b6ea3ab97", "networks.customProp1.prop", "val")

32
murano/tests/unit/policy/expected_rules_wordpress.txt
View File

@ -1,14 +1,10 @@
murano:objects+("83bff5acf8354816b08cf9b4917c898d", "de305d5475b4431badb2eb6b9e546013", "io.murano.Environment")
murano:properties+("83bff5acf8354816b08cf9b4917c898d", "defaultNetworks.flat", "")
murano:properties+("83bff5acf8354816b08cf9b4917c898d", "name", "wordpress-env")
murano:parent_types+("83bff5acf8354816b08cf9b4917c898d", "io.murano.Object")
murano:objects+("c46770dec1db483ca2322914b842e50f", "83bff5acf8354816b08cf9b4917c898d", "io.murano.resources.NeutronNetwork")
murano:properties+("c46770dec1db483ca2322914b842e50f", "useDefaultDns", "True")
murano:properties+("c46770dec1db483ca2322914b842e50f", "name", "wordpress-env-network")
murano:properties+("c46770dec1db483ca2322914b842e50f", "dnsNameserver", "")
murano:properties+("c46770dec1db483ca2322914b842e50f", "externalRouterId", "")
murano:properties+("c46770dec1db483ca2322914b842e50f", "autogenerateSubnet", "True")
murano:properties+("c46770dec1db483ca2322914b842e50f", "subnetCidr", "")
murano:properties+("c46770dec1db483ca2322914b842e50f", "autoUplink", "True")
murano:parent_types+("c46770dec1db483ca2322914b842e50f", "io.murano.resources.Network")
murano:parent_types+("c46770dec1db483ca2322914b842e50f", "io.murano.Object")
@ -22,13 +18,9 @@ murano:parent_types+("e7a13d3c-b3c9-42fa-975d-a47b142fd233", "io.murano.Object")
murano:parent_types+("e7a13d3c-b3c9-42fa-975d-a47b142fd233", "io.murano.Application")
murano:objects+("825dc61d-217a-4fd8-80fc-43807f8d6fa2", "83bff5acf8354816b08cf9b4917c898d", "io.murano.resources.LinuxMuranoInstance")
murano:properties+("825dc61d-217a-4fd8-80fc-43807f8d6fa2", "name", "qgijhi4uwe5wd8")
murano:properties+("825dc61d-217a-4fd8-80fc-43807f8d6fa2", "securityGroupName", "")
murano:properties+("825dc61d-217a-4fd8-80fc-43807f8d6fa2", "assignFloatingIp", "False")
murano:properties+("825dc61d-217a-4fd8-80fc-43807f8d6fa2", "networks.useFlatNetwork", "False")
murano:properties+("825dc61d-217a-4fd8-80fc-43807f8d6fa2", "networks.primaryNetwork", "")
murano:properties+("825dc61d-217a-4fd8-80fc-43807f8d6fa2", "networks.useEnvironmentNetwork", "True")
murano:properties+("825dc61d-217a-4fd8-80fc-43807f8d6fa2", "keyname", "")
murano:properties+("825dc61d-217a-4fd8-80fc-43807f8d6fa2", "floatingIpAddress", "")
murano:properties+("825dc61d-217a-4fd8-80fc-43807f8d6fa2", "flavor", "m1.small")
murano:properties+("825dc61d-217a-4fd8-80fc-43807f8d6fa2", "image", "murano-ubuntu")
murano:parent_types+("825dc61d-217a-4fd8-80fc-43807f8d6fa2", "io.murano.resources.LinuxInstance")
@ -41,13 +33,9 @@ murano:parent_types+("d224db7d-081d-47a4-9333-9d2677b90b1f", "io.murano.Object")
murano:parent_types+("d224db7d-081d-47a4-9333-9d2677b90b1f", "io.murano.Application")
murano:objects+("3ddd4945-e4b8-4dac-9f85-537fc0957151", "83bff5acf8354816b08cf9b4917c898d", "io.murano.resources.LinuxMuranoInstance")
murano:properties+("3ddd4945-e4b8-4dac-9f85-537fc0957151", "name", "yeqsbi4uwejfg7")
murano:properties+("3ddd4945-e4b8-4dac-9f85-537fc0957151", "securityGroupName", "")
murano:properties+("3ddd4945-e4b8-4dac-9f85-537fc0957151", "assignFloatingIp", "False")
murano:properties+("3ddd4945-e4b8-4dac-9f85-537fc0957151", "networks.useFlatNetwork", "False")
murano:properties+("3ddd4945-e4b8-4dac-9f85-537fc0957151", "networks.primaryNetwork", "")
murano:properties+("3ddd4945-e4b8-4dac-9f85-537fc0957151", "networks.useEnvironmentNetwork", "True")
murano:properties+("3ddd4945-e4b8-4dac-9f85-537fc0957151", "keyname", "")
murano:properties+("3ddd4945-e4b8-4dac-9f85-537fc0957151", "floatingIpAddress", "")
murano:properties+("3ddd4945-e4b8-4dac-9f85-537fc0957151", "flavor", "m1.small")
murano:properties+("3ddd4945-e4b8-4dac-9f85-537fc0957151", "image", "murano-ubuntu")
murano:parent_types+("3ddd4945-e4b8-4dac-9f85-537fc0957151", "io.murano.resources.LinuxInstance")
@ -62,13 +50,9 @@ murano:parent_types+("33e91790-5c44-40ce-9292-9dd4856325a0", "io.murano.Object")
murano:parent_types+("33e91790-5c44-40ce-9292-9dd4856325a0", "io.murano.Application")
murano:objects+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "83bff5acf8354816b08cf9b4917c898d", "io.murano.resources.LinuxMuranoInstance")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "name", "gzxgdi4uwfjt57")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "securityGroupName", "")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "assignFloatingIp", "False")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "networks.useFlatNetwork", "False")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "networks.primaryNetwork", "")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "networks.useEnvironmentNetwork", "True")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "keyname", "")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "floatingIpAddress", "")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "flavor", "m1.small")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "image", "murano-ubuntu")
murano:parent_types+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "io.murano.resources.LinuxInstance")
@ -89,13 +73,9 @@ murano:parent_types+("33e91790-5c44-40ce-9292-9dd4856325a0", "io.murano.Object")
murano:parent_types+("33e91790-5c44-40ce-9292-9dd4856325a0", "io.murano.Application")
murano:objects+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "83bff5acf8354816b08cf9b4917c898d", "io.murano.resources.LinuxMuranoInstance")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "name", "gzxgdi4uwfjt57")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "securityGroupName", "")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "assignFloatingIp", "False")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "networks.useFlatNetwork", "False")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "networks.primaryNetwork", "")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "networks.useEnvironmentNetwork", "True")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "keyname", "")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "floatingIpAddress", "")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "flavor", "m1.small")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "image", "murano-ubuntu")
murano:parent_types+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "io.murano.resources.LinuxInstance")
@ -123,13 +103,9 @@ murano:parent_types+("33e91790-5c44-40ce-9292-9dd4856325a0", "io.murano.Object")
murano:parent_types+("33e91790-5c44-40ce-9292-9dd4856325a0", "io.murano.Application")
murano:objects+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "83bff5acf8354816b08cf9b4917c898d", "io.murano.resources.LinuxMuranoInstance")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "name", "gzxgdi4uwfjt57")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "securityGroupName", "")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "assignFloatingIp", "False")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "networks.useFlatNetwork", "False")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "networks.primaryNetwork", "")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "networks.useEnvironmentNetwork", "True")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "keyname", "")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "floatingIpAddress", "")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "flavor", "m1.small")
murano:properties+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "image", "murano-ubuntu")
murano:parent_types+("0b568a74-66c9-4e73-84d8-7dd1b96066ec", "io.murano.resources.LinuxInstance")
@ -145,13 +121,9 @@ murano:parent_types+("e7a13d3c-b3c9-42fa-975d-a47b142fd233", "io.murano.Object")
murano:parent_types+("e7a13d3c-b3c9-42fa-975d-a47b142fd233", "io.murano.Application")
murano:objects+("825dc61d-217a-4fd8-80fc-43807f8d6fa2", "83bff5acf8354816b08cf9b4917c898d", "io.murano.resources.LinuxMuranoInstance")
murano:properties+("825dc61d-217a-4fd8-80fc-43807f8d6fa2", "name", "qgijhi4uwe5wd8")
murano:properties+("825dc61d-217a-4fd8-80fc-43807f8d6fa2", "securityGroupName", "")
murano:properties+("825dc61d-217a-4fd8-80fc-43807f8d6fa2", "assignFloatingIp", "False")
murano:properties+("825dc61d-217a-4fd8-80fc-43807f8d6fa2", "networks.useFlatNetwork", "False")
murano:properties+("825dc61d-217a-4fd8-80fc-43807f8d6fa2", "networks.primaryNetwork", "")
murano:properties+("825dc61d-217a-4fd8-80fc-43807f8d6fa2", "networks.useEnvironmentNetwork", "True")
murano:properties+("825dc61d-217a-4fd8-80fc-43807f8d6fa2", "keyname", "")
murano:properties+("825dc61d-217a-4fd8-80fc-43807f8d6fa2", "floatingIpAddress", "")
murano:properties+("825dc61d-217a-4fd8-80fc-43807f8d6fa2", "flavor", "m1.small")
murano:properties+("825dc61d-217a-4fd8-80fc-43807f8d6fa2", "image", "murano-ubuntu")
murano:parent_types+("825dc61d-217a-4fd8-80fc-43807f8d6fa2", "io.murano.resources.LinuxInstance")
@ -164,13 +136,9 @@ murano:parent_types+("d224db7d-081d-47a4-9333-9d2677b90b1f", "io.murano.Object")
murano:parent_types+("d224db7d-081d-47a4-9333-9d2677b90b1f", "io.murano.Application")
murano:objects+("3ddd4945-e4b8-4dac-9f85-537fc0957151", "83bff5acf8354816b08cf9b4917c898d", "io.murano.resources.LinuxMuranoInstance")
murano:properties+("3ddd4945-e4b8-4dac-9f85-537fc0957151", "name", "yeqsbi4uwejfg7")
murano:properties+("3ddd4945-e4b8-4dac-9f85-537fc0957151", "securityGroupName", "")
murano:properties+("3ddd4945-e4b8-4dac-9f85-537fc0957151", "assignFloatingIp", "False")
murano:properties+("3ddd4945-e4b8-4dac-9f85-537fc0957151", "networks.useFlatNetwork", "False")
murano:properties+("3ddd4945-e4b8-4dac-9f85-537fc0957151", "networks.primaryNetwork", "")
murano:properties+("3ddd4945-e4b8-4dac-9f85-537fc0957151", "networks.useEnvironmentNetwork", "True")
murano:properties+("3ddd4945-e4b8-4dac-9f85-537fc0957151", "keyname", "")
murano:properties+("3ddd4945-e4b8-4dac-9f85-537fc0957151", "floatingIpAddress", "")
murano:properties+("3ddd4945-e4b8-4dac-9f85-537fc0957151", "flavor", "m1.small")
murano:properties+("3ddd4945-e4b8-4dac-9f85-537fc0957151", "image", "murano-ubuntu")
murano:parent_types+("3ddd4945-e4b8-4dac-9f85-537fc0957151", "io.murano.resources.LinuxInstance")