From a1353da833b2d176e33e05724d982f0b9aa2e7fa Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sun, 22 Jun 2014 01:04:35 +0200 Subject: [PATCH] add support for params in device discovery --- tests/scripts/cmdmgr.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tests/scripts/cmdmgr.py b/tests/scripts/cmdmgr.py index 2bc52125..4587782a 100755 --- a/tests/scripts/cmdmgr.py +++ b/tests/scripts/cmdmgr.py @@ -68,10 +68,10 @@ def get_deviceClasses(vendorId = None): def list_deviceClasses(vendorId = None): response = get_deviceClasses(vendorId) - print "=== Devices ===" + print "=== DeviceClasses ===" for deviceClass in response: print "%40s %s" % (deviceClass['name'], deviceClass['id']) - print "=== Devices ===" + print "=== DeviceClasses ===" def select_deviceClass(): vendorId = select_vendor() @@ -110,8 +110,19 @@ def list_configured_devices(): def discover_device(deviceClassId = None): if deviceClassId == None: deviceClassId = select_deviceClass() + deviceClass = get_deviceClass(deviceClassId) + discoveryParams = [] + for paramType in deviceClass['discoveryParamTypes']: + paramValue = raw_input("Please enter value for parameter %s" % paramType['name']) + dp = {} + dp[paramType['name']] = paramValue + discoveryParams.append(dp) + params = {} params['deviceClassId'] = deviceClassId + if len(discoveryParams) > 0: + params['discoveryParams'] = discoveryParams + print "\ndiscovering..." response = send_command("Devices.GetDiscoveredDevices", params) deviceDescriptorList = [];