From 8500d14450abe0faae8d65e64aa20f29bc9c594b Mon Sep 17 00:00:00 2001 From: Enol Fernandez Date: Mon, 24 Jul 2017 11:25:59 +0100 Subject: [PATCH] Add default values to resource templates Change-Id: I55e5b66cdc1d861651658d8e3bad204618ad2e35 Closes-Bug: 1687943 --- ooi/openstack/templates.py | 10 +++++----- ooi/tests/unit/occi/test_openstack.py | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ooi/openstack/templates.py b/ooi/openstack/templates.py index 6ad065d..226fe1a 100644 --- a/ooi/openstack/templates.py +++ b/ooi/openstack/templates.py @@ -35,19 +35,19 @@ class OpenStackResourceTemplate(templates.OCCIResourceTemplate): def __init__(self, id, name, cores, memory, disk, ephemeral=0, swap=0): attrs = [ attribute.InmutableAttribute( - "occi.compute.cores", cores, + "occi.compute.cores", cores, default=cores, attr_type=attribute.AttributeType.number_type), attribute.InmutableAttribute( - "occi.compute.memory", memory, + "occi.compute.memory", memory, default=memory, attr_type=attribute.AttributeType.number_type), attribute.InmutableAttribute( - "org.openstack.flavor.disk", disk, + "org.openstack.flavor.disk", disk, default=disk, attr_type=attribute.AttributeType.number_type), attribute.InmutableAttribute( - "org.openstack.flavor.ephemeral", ephemeral, + "org.openstack.flavor.ephemeral", ephemeral, default=ephemeral, attr_type=attribute.AttributeType.number_type), attribute.InmutableAttribute( - "org.openstack.flavor.swap", swap, + "org.openstack.flavor.swap", swap, default=swap, attr_type=attribute.AttributeType.number_type), attribute.InmutableAttribute( "org.openstack.flavor.name", name, diff --git a/ooi/tests/unit/occi/test_openstack.py b/ooi/tests/unit/occi/test_openstack.py index faf4afa..f196d8f 100644 --- a/ooi/tests/unit/occi/test_openstack.py +++ b/ooi/tests/unit/occi/test_openstack.py @@ -70,6 +70,12 @@ class TestOpenStackResourceTemplate(base.TestCase): self.assertEqual(disk, tpl.disk) self.assertEqual(swap, tpl.swap) self.assertEqual(ephemeral, tpl.ephemeral) + for attr in [("occi.compute.cores", cores), + ("occi.compute.memory", memory), + ("org.openstack.flavor.swap", swap), + ("org.openstack.flavor.ephemeral", ephemeral), + ("org.openstack.flavor.disk", disk)]: + self.assertEqual(tpl.attributes[attr[0]].default, attr[1]) self.assertEqual(name, tpl.name) self.assertEqual(location, tpl.location) self.assertEqual([compute.ComputeResource.kind],