Restored _application_externalProps to expose all properties

Waveform property lists will now include the assembly controller
properties as well as anything listed in the external properties.
Previous commit's removal of this mechanism was actually because
it was bugged to appear to be the same as _getPropertySet since
the method wasn't modifying the emitted property IDs to the
external IDs, which were then filtered out when compared with
app.query([]).

Author: btgoodwin

model/redhawk.py

@@ -193,10 +193,37 @@ def release_application(self, domain_name, 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()
+        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.  This can duplicate external properties
+    listed by the assembly controller in the event the user wants to make some
+    external under a namespaced ID.
+    '''
+    @staticmethod
+    def _application_externalProps(app):
+        props = app._getPropertySet()
+        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
+            log.app_log.debug('Looking for {}: {}'.format(cid, pid))
+            for comp in app.comps:
+                if comp.identifier.split(':')[0] == cid:
+                    log.app_log.debug('Found component')
+                    for prop in comp._properties:
+                        log.app_log.debug('Checking {} == {}'.format(prop.id, pid))
+                        if prop.id == pid:
+                            prop.id = epid;
+                            props.append(prop)
+                            log.app_log.debug('Found external property {} -> {}'.format(epid, pid))
+                            break;
+                    break;
+        log.app_log.debug('All properties: {}'.format(props))
+        return props
+
     ##############################
     # COMMON PROPERTIES
     '''

rest/application.py

@@ -38,7 +38,7 @@ def get(self, domain_name, app_id=None):
             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()
+                props = self.redhawk._application_externalProps(app)
 
                 info = {
                     'id': app._get_identifier(),
@@ -120,7 +120,7 @@ class ApplicationProperties(JsonHandler, PropertyHelper):
     def get(self, domain, app_id):
         try:
             app = yield self.redhawk.get_application(domain, app_id)
-            props = app._getPropertySet()
+            props = self.redhawk._application_externalProps(app)
 
             self._render_json({
                 'properties': self.format_properties(props, app.query([]))