Changed the json attributes to match the application changes to the URI

robpc · robpc · commit ff9ee1764ea6 · 2014-11-24T15:03:14.000-05:00
diff --git a/rest/domain.py b/rest/domain.py
@@ -44,7 +44,7 @@ def get(self, domain_name=None):
                 'id': dom_info._get_identifier(),
                 'name': dom_info.name,
                 'properties': self.format_properties(properties),
-                'waveforms': apps,
+                'applications': apps,
                 'deviceManagers': device_managers
             }
 
diff --git a/rest/waveform.py b/rest/waveform.py
@@ -52,7 +52,7 @@ def get(self, domain_name, app_id=None):
             wfs = yield self.redhawk.get_application_list(domain_name)
             avail = yield self.redhawk.get_available_applications(domain_name)
 
-            info = {'waveforms': wfs, 'available': avail}
+            info = {'applications': wfs, 'waveforms': avail}
 
         self._render_json(info)
 

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ def get(self, domain_name=None):`
`44`	`44`	`'id': dom_info._get_identifier(),`
`45`	`45`	`'name': dom_info.name,`
`46`	`46`	`'properties': self.format_properties(properties),`
`47`		`- 'waveforms': apps,`
	`47`	`+ 'applications': apps,`
`48`	`48`	`'deviceManagers': device_managers`
`49`	`49`	`}`
`50`	`50`