Moved 'waveforms' listing from the 'applications' target to the domain.

Author: btgoodwin

rest/application.py

@@ -50,9 +50,8 @@ def get(self, domain_name, app_id=None):
                 }
             else:
                 apps = yield self.redhawk.get_application_list(domain_name)
-                wfs = yield self.redhawk.get_available_applications(domain_name)
 
-                info = {'applications': apps, 'waveforms': wfs}
+                info = {'applications': apps}
 
             self._render_json(info)
         except Exception as e:

rest/domain.py

@@ -41,6 +41,7 @@ def get(self, domain_name=None, *args):
                     dom_info = yield self.redhawk.get_domain_info(domain_name)
                     propertySet = yield self.redhawk.get_domain_properties(domain_name)
                     apps = yield self.redhawk.get_application_list(domain_name)
+                    wfs = yield self.redhawk.get_available_applications(domain_name)
                     device_managers = yield self.redhawk.get_device_manager_list(domain_name)
                     allocations = yield self.redhawk.get_allocation_list(domain_name)
                     fs = yield self.redhawk.get_path(domain_name, '')
@@ -51,6 +52,7 @@ def get(self, domain_name=None, *args):
                         'properties': self.format_properties(propertySet, dom_info.query([])),
                         'eventChannels': event_channels,
                         'applications': apps,
+                        'waveforms': wfs,
                         'deviceManagers': device_managers,
                         'allocations': allocations,
                         'fs': fs