x/ooi
Code Issues Proposed changes

Added Storage to query.

Browse Source
This commit is contained in:
Enol Fernandez 2015-04-08 11:39:33 +02:00
parent fcaab700d3
commit 62b6de5d4c
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ooi/api/query.py
View File

@ -19,6 +19,8 @@ from ooi.occi.core import entity
from ooi.occi.core import link from ooi.occi.core import link
from ooi.occi.core import resource from ooi.occi.core import resource
from ooi.occi.infrastructure import compute from ooi.occi.infrastructure import compute
from ooi.occi.infrastructure import storage
from ooi.occi.infrastructure import storage_link
from ooi.occi.infrastructure import templates as infra_templates from ooi.occi.infrastructure import templates as infra_templates
from ooi.openstack import mixins from ooi.openstack import mixins
from ooi.openstack import templates from ooi.openstack import templates
@ -63,6 +65,11 @@ class Controller(base.Controller):
l.append(compute.ComputeResource.kind) l.append(compute.ComputeResource.kind)
l.extend(compute.ComputeResource.actions) l.extend(compute.ComputeResource.actions)
# OCCI infra Storage
l.append(storage.StorageResource.kind)
l.append(storage_link.StorageLink.kind)
l.extend(storage.StorageResource.actions)
# OCCI infra mixins # OCCI infra mixins
l.append(infra_templates.os_tpl) l.append(infra_templates.os_tpl)
l.append(infra_templates.resource_tpl) l.append(infra_templates.resource_tpl)

28
ooi/tests/fakes.py
View File

@ -115,6 +115,14 @@ volumes = {
def fake_query_results(): def fake_query_results():
cats = [] cats = []
cats.append(
'storage; '
'scheme="http://schemas.ogf.org/occi/infrastructure"; '
'class="kind"')
cats.append(
'storagelink; '
'scheme="http://schemas.ogf.org/occi/infrastructure"; '
'class="kind"')
cats.append( cats.append(
'compute; ' 'compute; '
'scheme="http://schemas.ogf.org/occi/infrastructure"; ' 'scheme="http://schemas.ogf.org/occi/infrastructure"; '
@ -131,6 +139,26 @@ def fake_query_results():
'entity; ' 'entity; '
'scheme="http://schemas.ogf.org/occi/core"; ' 'scheme="http://schemas.ogf.org/occi/core"; '
'class="kind"') 'class="kind"')
cats.append(
'offline; '
'scheme="http://schemas.ogf.org/occi/infrastructure/storage/action"; '
'class="action"')
cats.append(
'online; '
'scheme="http://schemas.ogf.org/occi/infrastructure/storage/action"; '
'class="action"')
cats.append(
'backup; '
'scheme="http://schemas.ogf.org/occi/infrastructure/storage/action"; '
'class="action"')
cats.append(
'resize; '
'scheme="http://schemas.ogf.org/occi/infrastructure/storage/action"; '
'class="action"')
cats.append(
'snapshot; '
'scheme="http://schemas.ogf.org/occi/infrastructure/storage/action"; '
'class="action"')
cats.append( cats.append(
'start; ' 'start; '
'scheme="http://schemas.ogf.org/occi/infrastructure/compute/action"; ' 'scheme="http://schemas.ogf.org/occi/infrastructure/compute/action"; '