Merge branch 'feature-1-waveform-prop' into 'master'

Added ability to configure waveform properties

Closes #1

See merge request geon/redhawk-ui/rest-python!6

Author: B. Thomas Goodwin

model/redhawk.py

@@ -23,16 +23,16 @@
     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
 
+from ossie.cf import CF
 from ossie.properties import __TYPE_MAP as TYPE_MAP
 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 +166,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,8 +190,18 @@ 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 = app._getPropertySet()
+        changes = Redhawk._get_prop_changes(props, new_properties)
+        return app.configure(changes)
+
     ##############################
     # COMMON PROPERTIES
+    '''
+    Cleans out IDs being unicode, etc. since CF can't handle unicode strings.
+    '''
     @staticmethod
     def _clean_property(property):
         if isinstance(property, basestring):
@@ -203,16 +217,22 @@ def _clean_property(property):
     # CF.Properties and dict() of { 'id': value, ... }
     # Use force to treat all ID matches as required changes
     def _get_prop_changes(current_props, new_properties, force=False):
-        changes = {}
+        changes = []
         for prop in current_props:
             if prop.id in new_properties:
                 if new_properties[prop.id] != prop.queryValue() or force:
-                    changes[str(prop.id)] = prop.fromAny(
-                        prop.toAny(
-                            Redhawk._clean_property(new_properties[prop.id])
+                    changes.append(
+                        CF.DataType(
+                            prop.id,
+                            prop.toAny(
+                                    Redhawk._clean_property(new_properties[prop.id])
+                                )
                             )
                         )
-        return props_from_dict(changes)
+        log.app_log.debug('Current properties: {}'.format(current_props))
+        log.app_log.debug('New properties:     {}'.format(new_properties))
+        log.app_log.debug('Changes:            {}'.format(changes))
+        return changes
 
     ##############################
     # COMPONENT

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 = app._getPropertySet()
 
                 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 = app._getPropertySet()
+
+            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)
+