Added 'configure' of application/waveform external properties

Closes #1

Took this as an opportunity to produce a properties list from
applications that is identical to that of components and devices
by iterating over the external properties and fetching them from
the associated component.  This simplified adding the 'configure'
(HTTP PUT) to the new ApplicationProperties handler.

Author: Thomas Goodwin

model/redhawk.py

@@ -23,7 +23,6 @@
     Asynchronous Tornado service for REDHAWK. Maps the functions
     in domain.py and caches the domain object.
 """
-import logging
 from _utils.tasking import background_task
 
 from domain import Domain, scan_domains, ResourceNotFound
@@ -32,7 +31,7 @@
 from ossie.properties import props_from_dict, props_to_dict
 
 from tornado.websocket import WebSocketClosedError
-from tornado import ioloop
+from tornado import ioloop, log
 
 import collections
 
@@ -166,6 +165,10 @@ def get_application(self, domain_name, app_id):
         dom = self._get_domain(domain_name)
         return dom.find_app(app_id)
 
+    def _get_application(self, domain_name, app_id):
+        dom = self._get_domain(domain_name)
+        return dom.find_app(app_id)
+
     @background_task
     def get_application_list(self, domain_name):
         dom = self._get_domain(domain_name)
@@ -186,6 +189,31 @@ def release_application(self, domain_name, app_id):
         dom = self._get_domain(domain_name)
         return dom.release(app_id)
 
+    @background_task
+    def application_configure(self, domain_name, app_id, new_properties):
+        app = self._get_application(domain_name, app_id)
+        props = Redhawk._application_externalProps(app)
+
+        changes = Redhawk._get_prop_changes(props, new_properties)
+        return app.configure(changes)
+
+    '''
+    Helper function to streamline getting a property list similar to what one
+    gets from components, devices, etc.
+    '''
+    @staticmethod
+    def _application_externalProps(app):
+        props = []
+        for epid, t in app._externalProps.iteritems():
+            pid = t[0] # First item is the property id relative to the component
+            cid = t[1] # Second item in tuple is prefix of component identifier
+            for comp in app.comps:
+                if comp.identifier.startswith(cid):
+                    for prop in comp._properties:
+                        if prop.id == pid:
+                            props.append(prop)
+        return props
+
     ##############################
     # COMMON PROPERTIES
     @staticmethod

pyrest.py

@@ -23,7 +23,7 @@
 
 from rest.domain import DomainInfo, DomainProperties
 from rest.allocation import Allocations
-from rest.application import Applications
+from rest.application import Applications, ApplicationProperties
 from rest.component import Components, ComponentProperties
 from rest.devicemanager import DeviceManagers
 from rest.device import Devices, DeviceProperties
@@ -119,6 +119,10 @@ def __init__(self, *args, **kwargs):
                 dict(redhawk=redhawk, kind='application')),
             (_APPLICATION_PATH + _ID + _BULKIO_PATH, BulkIOWebsocketHandler, 
                 dict(redhawk=redhawk, kind='application', _ioloop=_ioloop)),
+            (_APPLICATION_PATH + _ID + _PROPERTIES_PATH + _LIST, ApplicationProperties,
+                dict(redhawk=redhawk)),
+            (_APPLICATION_PATH + _ID + _PROPERTIES_PATH + _ID, ApplicationProperties,
+                dict(redhawk=redhawk)),
 
             # Components
             (_COMPONENT_PATH + _LIST, Components, dict(redhawk=redhawk)),

rest/application.py

@@ -31,22 +31,22 @@
 
 import json
 
-
 class Applications(JsonHandler, PropertyHelper, PortHelper):
     @gen.coroutine
     def get(self, domain_name, app_id=None):
         try:
             if app_id:
                 app = yield self.redhawk.get_application(domain_name, app_id)
                 comps = yield self.redhawk.get_component_list(domain_name, app_id)
+                props = self.redhawk._application_externalProps(app)
 
                 info = {
                     'id': app._get_identifier(),
                     'name': app.name,
                     'started': app._get_started(),
                     'components': comps,
                     'ports': self.format_ports(app.ports),
-                    'properties': self.format_properties(app._externalProps, app.query([]))
+                    'properties': self.format_properties(props, app.query([]))
                 }
             else:
                 apps = yield self.redhawk.get_application_list(domain_name)
@@ -114,3 +114,28 @@ def delete(self, domain_name, app_id):
 
         except Exception as e:
             self._handle_request_exception(e)
+
+class ApplicationProperties(JsonHandler, PropertyHelper):
+    @gen.coroutine
+    def get(self, domain, app_id):
+        try:
+            app = yield self.redhawk.get_application(domain, app_id)
+            props = self.redhawk._application_externalProps(app)
+
+            self._render_json({
+                'properties': self.format_properties(props, app.query([]))
+            })
+        except Exception as e:
+            self._handle_request_exception(e)
+
+    @gen.coroutine
+    def put(self, domain, app_id):
+        try:
+            data = json.loads(self.request.body)
+            json_props = data.get('properties', [])
+            changes = self.unformat_properties(json_props)
+
+            yield self.redhawk.application_configure(domain, app_id, changes)
+        except Exception as e:
+            self._handle_request_exception(e)
+