From cfe48fa22d2e159f16553d3b60a6946236945f1a Mon Sep 17 00:00:00 2001 From: Dmitry Shulyak Date: Wed, 3 Jun 2015 15:43:31 +0200 Subject: [PATCH] Fix connect and disconnect cli commands --- cli.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/cli.py b/cli.py index a29fb0dd..371d5283 100755 --- a/cli.py +++ b/cli.py @@ -14,6 +14,10 @@ from solar.core import signals as xs from solar import operations from solar import state +from solar.interfaces.db import get_db + +db = get_db() + @click.group() def cli(): @@ -109,8 +113,8 @@ def init_cli_connect(): @click.option('--mapping', default=None) def connect(mapping, receiver, emitter): print 'Connect', emitter, receiver - emitter = xr.load(emitter) - receiver = xr.load(receiver) + emitter = db.get_obj_resource(emitter) + receiver = db.get_obj_resource(receiver) print emitter print receiver if mapping is not None: @@ -124,8 +128,8 @@ def init_cli_connect(): @click.argument('receiver') def disconnect(receiver, emitter): print 'Disconnect', emitter, receiver - emitter = xr.load(emitter) - receiver = xr.load(receiver) + emitter = db.get_obj_resource(emitter) + receiver = db.get_obj_resource(receiver) print emitter print receiver xs.disconnect(emitter, receiver)