x
/
iotronic
Code Issues Proposed changes

filtering status of board and checking if it is online 

Change-Id: Ie8a5e57feb7ae68092a5190af33a83955834fce4
This commit is contained in:
Fabio Verboso 2017-03-27 15:21:29 +02:00
parent b77c12a7d6
commit 063e62ee3d
4 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
iotronic/api/controllers/v1/board.py
View File

@ -240,7 +240,7 @@ class BoardPluginsController(rest.RestController):
@expose.expose(wtypes.text, types.uuid_or_name,
status_code=204)
def delete(self, plugin_uuid):
"""inject a plugin into a board.
"""Remove a plugin from a board.
:param plugin_ident: UUID or logical name of a plugin.
:param board_ident: UUID or logical name of a board.
@ -249,8 +249,9 @@ class BoardPluginsController(rest.RestController):
# cdict = context.to_policy_values()
# policy.authorize('iot:plugin:remove', cdict, cdict)
rpc_plugin = api_utils.get_rpc_plugin(plugin_uuid)
rpc_board = api_utils.get_rpc_board(self.board_ident)
rpc_board.check_if_online()
rpc_plugin = api_utils.get_rpc_plugin(plugin_uuid)
return pecan.request.rpcapi.remove_plugin(pecan.request.context,
rpc_plugin.uuid,
rpc_board.uuid)
@ -282,7 +283,7 @@ class BoardsController(rest.RestController):
if subcontroller:
return subcontroller(board_ident=ident), remainder[1:]
def _get_boards_collection(self, marker, limit,
def _get_boards_collection(self, status, marker, limit,
sort_key, sort_dir,
project=None,
resource_url=None, fields=None):
@ -314,6 +315,9 @@ class BoardsController(rest.RestController):
else:
filters['project_id'] = pecan.request.context.project_id
if status:
filters['status'] = status
boards = objects.Board.list(pecan.request.context, limit, marker_obj,
sort_key=sort_key, sort_dir=sort_dir,
filters=filters)
@ -341,13 +345,15 @@ class BoardsController(rest.RestController):
return Board.convert_with_links(rpc_board, fields=fields)
@expose.expose(BoardCollection, types.uuid, int, wtypes.text,
@expose.expose(BoardCollection, wtypes.text, types.uuid, int, wtypes.text,
wtypes.text, types.listtype, wtypes.text)
def get_all(self, marker=None,
def get_all(self, status=None, marker=None,
limit=None, sort_key='id', sort_dir='asc',
fields=None):
fields=None, project=None):
"""Retrieve a list of boards.
:param status: Optional string value to get only board in
that status.
:param marker: pagination marker for large data sets.
:param limit: maximum number of resources to return in a single result.
This value cannot be larger than the value of max_limit
@ -363,9 +369,9 @@ class BoardsController(rest.RestController):
if fields is None:
fields = _DEFAULT_RETURN_FIELDS
return self._get_boards_collection(marker,
return self._get_boards_collection(status, marker,
limit, sort_key, sort_dir,
fields=fields)
fields=fields, project=project)
@expose.expose(Board, body=Board, status_code=201)
def post(self, Board):
@ -447,13 +453,15 @@ class BoardsController(rest.RestController):
board)
return Board.convert_with_links(updated_board)
@expose.expose(BoardCollection, types.uuid, int, wtypes.text,
@expose.expose(BoardCollection, wtypes.text, types.uuid, int, wtypes.text,
wtypes.text, types.listtype, wtypes.text)
def detail(self, marker=None,
def detail(self, status=None, marker=None,
limit=None, sort_key='id', sort_dir='asc',
fields=None, project=None):
"""Retrieve a list of boards.
:param status: Optional string value to get only board in
that status.
:param marker: pagination marker for large data sets.
:param limit: maximum number of resources to return in a single result.
This value cannot be larger than the value of max_limit
@ -475,7 +483,7 @@ class BoardsController(rest.RestController):
if parent != "boards":
raise exception.HTTPNotFound()
return self._get_boards_collection(marker,
return self._get_boards_collection(status, marker,
limit, sort_key, sort_dir,
project=project,
fields=fields)

11
iotronic/conductor/endpoints.py
View File

@ -13,6 +13,7 @@
# under the License.
import cPickle as cpickle
from iotronic.common import exception
from iotronic.common import states
from iotronic.conductor.provisioner import Provisioner
from iotronic import objects
@ -170,16 +171,15 @@ class ConductorEndpoint(object):
board = objects.Board.get_by_uuid(ctx, board_uuid)
# check the session; it rise an excpetion if session miss
objects.SessionWP.get_session_by_board_uuid(ctx, board_uuid)
s4t_topic = 's4t_invoke_wamp'
full_topic = board.agent + '.' + s4t_topic
self.target.topic = full_topic
full_wamp_call = 'iotronic.' + board.uuid + "." + wamp_rpc_call
# check the session; it rise an excpetion if session miss
if not board.is_online():
raise exception.BoardNotConnected(board=board.uuid)
res = self.wamp_agent_client.call(ctx, full_topic,
wamp_rpc_call=full_wamp_call,
data=wamp_rpc_args)
@ -268,7 +268,6 @@ class ConductorEndpoint(object):
LOG.info('Calling plugin with id %s into the board %s',
plugin_uuid, board_uuid)
plugin = objects.Plugin.get(ctx, plugin_uuid)
objects.plugin.is_valid_action(action)
try:

2
iotronic/db/sqlalchemy/api.py
View File

@ -129,6 +129,8 @@ class Connection(api.Connection):
if 'project_id' in filters:
query = query.filter(models.Board.project == filters['project_id'])
if 'status' in filters:
query = query.filter(models.Board.status == filters['status'])
return query

14
iotronic/objects/board.py
View File

@ -17,6 +17,7 @@ from oslo_utils import strutils
from oslo_utils import uuidutils
from iotronic.common import exception
from iotronic.common import states
from iotronic.db import api as db_api
from iotronic.objects import base
from iotronic.objects import utils as obj_utils
@ -43,6 +44,15 @@ class Board(base.IotronicObject):
'extra': obj_utils.dict_or_none,
}
def check_if_online(self):
if self.status != states.ONLINE:
raise exception.BoardNotConnected(board=self.uuid)
def is_online(self):
if self.status == states.ONLINE:
return True
return False
@staticmethod
def _from_db_object(board, db_board):
"""Converts a database entity to a formal object."""
@ -227,6 +237,6 @@ class Board(base.IotronicObject):
current = self.__class__.get_by_uuid(self._context, self.uuid)
for field in self.fields:
if (hasattr(
self, base.get_attrname(field)) and
self[field] != current[field]):
self, base.get_attrname(field))
and self[field] != current[field]):
self[field] = current[field]