x
/
ooi
Code Issues Proposed changes

Merge "Do not use occi.compute for OpenStack attributes"

This commit is contained in:
Jenkins 2016-06-10 10:21:40 +00:00 committed by Gerrit Code Review
parent dabdd4b06c 527a90a5eb
commit 9bda682f7e
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ooi/openstack/templates.py
View File

@ -38,9 +38,10 @@ class OpenStackResourceTemplate(templates.OCCIResourceTemplate):
attrs = [
attribute.InmutableAttribute("occi.compute.cores", cores),
attribute.InmutableAttribute("occi.compute.memory", memory),
attribute.InmutableAttribute("occi.compute.disk", disk),
attribute.InmutableAttribute("occi.compute.ephemeral", ephemeral),
attribute.InmutableAttribute("occi.compute.swap", swap),
attribute.InmutableAttribute("org.openstack.flavor.disk", disk),
attribute.InmutableAttribute("org.openstack.flavor.ephemeral",
ephemeral),
attribute.InmutableAttribute("org.openstack.flavor.swap", swap),
attribute.InmutableAttribute("org.openstack.flavor.name", name)
]
@ -64,15 +65,15 @@ class OpenStackResourceTemplate(templates.OCCIResourceTemplate):
@property
def disk(self):
return self.attributes["occi.compute.disk"].value
return self.attributes["org.openstack.flavor.disk"].value
@property
def ephemeral(self):
return self.attributes["occi.compute.ephemeral"].value
return self.attributes["org.openstack.flavor.ephemeral"].value
@property
def swap(self):
return self.attributes["occi.compute.swap"].value
return self.attributes["org.openstack.flavor.swap"].value
@property
def name(self):