Adjusted old tests to match Geon's published API, added two helper scripts to generate an RF snapshot (for FEI FileReader) and the missing SigTest waveform from the old tests. Added a Docker Compose YAML for future CI usage.

btgoodwin · btgoodwin · commit 2a1ce9a51bf0 · 2017-06-09T10:55:04.000-04:00
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,66 @@
+version: "3"
+volumes:
+    sdrroot:
+    rf_snapshots:
+
+services:
+    # OmniORB services
+    omni:
+        image: geontech/redhawk-omniserver
+        hostname: omni
+        ports:
+            - "2809:2809"
+            - "11169:11169"
+
+    # Standard REDHAWK SDR Domain
+    domain:
+        image: geontech/redhawk-domain
+        depends_on:
+            - omni
+        environment:
+            - DOMAINNAME=REDHAWK_DEV
+            - OMNISERVICEIP=omni
+        volumes:
+            - sdrroot:/var/redhawk/sdr
+
+    # Standard GPP 
+    gpp:
+        image: geontech/redhawk-gpp
+        depends_on:
+            - domain
+        environment:
+            - DOMAINNAME=REDHAWK_DEV
+            - NODENAME=GPP_Node
+            - GPPNAME=GPP
+            - OMNISERVICEIP=omni
+
+    # FEI FileReader Device runner mounted to the snapshot.
+    fei_file_reader:
+        image: geontech/redhawk-fei-filereader
+        build: http://github.com/GeonTech/FEI_FileReader.git
+        environment:
+            - DOMAINNAME=REDHAWK_DEV
+            - NODENAME=FEI_FR_Node
+            - OMNISERVICEIP=omni
+        volumes:
+            - rf_snapshots:/var/rf_snapshots
+
+    # REST-Python Unit Under Test (UUT)
+    rest:
+        image: geontech/redhawk-webserver
+        depends_on:
+            - domain
+            - gpp
+            - fei_file_reader
+        environment:
+            - OMNISERVICEIP=omni
+        ports:
+            - "8080:8080"
+        # 1. Mount the external rest-python
+        # 2. Share SDRROOT with the Domain for access to standard components in sandbox
+        # 3. Share RF_Snapshots with the FEI FileReader
+        volumes:
+            - ./:/opt/rest-python
+            - sdrroot:/var/redhawk/sdr
+            - rf_snapshots:/var/rf_snapshots
+        command: [bash, -l, -c, /opt/rest-python/test.sh]
diff --git a/test.sh b/test.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # This file is protected by Copyright. Please refer to the COPYRIGHT file
 # distributed with this source distribution.
@@ -27,7 +27,16 @@ pyvenv="${SCRIPTPATH}/pyvenv"
 
 source /etc/profile.d/redhawk.sh
 
+# Create a simple waveform for testing
+SIGTEST="$(python tests/generate_sigtest_sad.py)"
+RF_SNAPSHOT="$(python tests/generate_rf_snapshot.py)"
+RF_SNAPSHOT="${RF_SNAPSHOT##*$'\n'}"
+
 # Clear virtual env
 ./setup.sh install
 
 exec ${pyvenv} python ${SCRIPTPATH}/test.py $@
+
+# Clean up
+echo "Cleaning up ${SIGTEST} and ${RF_SNAPSHOT}"
+rm ${SIGTEST} ${RF_SNAPSHOT}
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -36,6 +36,6 @@
 from device import DeviceTests
 from application import ApplicationTests
 from component import ComponentTests
-from bulkio import BulkIOTests
+from bulkio_tests import BulkIOTests
 from port import PortTests
 from concurrent import ConcurrencyTests
diff --git a/tests/application.py b/tests/application.py
@@ -37,17 +37,11 @@ def setUp(self):
 
     def tearDown(self):
         # kill SigTest waveforms
-        url = '/domains/'+Default.DOMAIN_NAME
-        json, resp =  self._json_request(url, 200)
-        if 'applications' not in json:
-            json['applications'] = []
-        for a in json['applications']:
-            if a['name'].startswith('SigTest'):
-                self._json_request(
-                            '/domains/'+Default.DOMAIN_NAME+'/applications/'+a['id'],
-                            200,
-                            'DELETE'
-                            )
+        dom = self.redhawk._get_domain(Default.DOMAIN_NAME)
+        apps = dom.find_app()
+        for app in apps:
+            if app.name.startswith(Default.WAVEFORM):
+                app.releaseObject()
         super(ApplicationTests, self).tearDown();
     
     @tornado.gen.coroutine
@@ -125,11 +119,12 @@ def test_info(self):
         self.assertAttr(json, 'id', wf_id)
 
         self.assertList(json, 'properties')
-        # TODO: self.assertProperties(json['properties'])
+        self.assertProperties(json['properties'])
         
     @tornado.testing.gen_test
     def test_detect_new_applications(self):
-        yield [ self.detect_new_applications() for x in xrange(10) ]        
+        # yield [ self.detect_new_applications() for x in xrange(10) ]
+        yield self.detect_new_applications()
         
     @tornado.gen.coroutine
     def detect_new_applications(self):
@@ -138,31 +133,29 @@ def detect_new_applications(self):
         
         # start a new app
         id = yield self.redhawk.launch_application(Default.DOMAIN_NAME, Default.WAVEFORM)
-        
-#         yield self._async_sleep(.5)
-        
+        self._async_sleep(1)
+
         # ensure it exists in the application
         url, apps2 = yield self._get_applications()
         if id not in (a['id'] for a in apps2):
             self.fail("Expecting %s in domain %s" % (id, Default.DOMAIN_NAME))
-#         if (len(apps)+1 != len(apps2)):
-#             self.fail("Expecting one additional app %s %s" % (apps, apps2))
+        if (len(apps)+1 != len(apps2)):
+            self.fail("Expecting one additional app %s %s" % (apps, apps2))
             
         # now release it
         yield self.redhawk.release_application(Default.DOMAIN_NAME, id)
+        self._async_sleep(1)
 
         # ensure it is missing in the application list
         url, apps3 = yield self._get_applications()
         if id in (a['id'] for a in apps3):
             self.fail("Not Expecting %s in domain %s" % (id, Default.DOMAIN_NAME))
-#         if (len(apps) != len(apps3)):
-#             self.fail("Expecting same number of apps %s %s" % (apps, apps3))
+        if (len(apps) != len(apps3)):
+            self.fail("Expecting same number of apps %s %s" % (apps, apps3))
         
         
     @tornado.testing.gen_test
     def test_not_found(self):
         url = '/domains/%s/applications/adskfhsdhfasdhjfhsd' %Default.DOMAIN_NAME
         json, resp = yield self._async_json_request(url, 404)
-
-        self._resource_not_found(json)
     
diff --git a/tests/base.py b/tests/base.py
@@ -146,14 +146,26 @@ def assertIdList(self, data, name):
 
     def assertProperties(self, data):
         self.assertTrue(isinstance(data, list))
+        MODES = ['readwrite', 'writeonly', 'readonly']
+        SCA_TYPES = ['simple', 'simpleSeq', 'struct', 'structSeq']
         for prop in data:
-            self.assertList(prop, 'kinds')
+            # CORBA and SCA Properties have these 4 fields for certain.
+            self.assertTrue('id' in prop)
             self.assertTrue('name' in prop)
-            self.assertTrue('value' in prop)
             self.assertTrue('scaType' in prop)
-            self.assertTrue('mode' in prop)
-            self.assertTrue('type' in prop)
-            self.assertTrue('id' in prop)
+            self.assertTrue(prop['scaType'] in SCA_TYPES)
+            self.assertTrue('value' in prop)
+            if prop['scaType'] != 'simple':
+                self.assertList(prop, 'value')
+            if prop['scaType'] in ['struct', 'structSeq']:
+                self.assertProperties(prop['value'])
+
+            # SCA Properties can be identified from CORBA ones since the former have 'kinds', among other things.
+            if 'kinds' in prop:
+                if prop['scaType'] in ['simple', 'simpleSeq']:
+                    self.assertTrue('type' in prop)
+                self.assertTrue('mode' in prop)
+                self.assertTrue(prop['mode'] in MODES)
 
 
 
diff --git a/tests/component.py b/tests/component.py
@@ -77,8 +77,6 @@ def test_info(self):
     def test_not_found(self):
         json, resp = self._json_request('%s/components/ggsdfgfdg' % self.base_url, 404)
 
-        self._resource_not_found(json)
-
     def test_properties(self):
         comp_id = self.components[0]['id']
         json, resp = self._json_request('%s/components/%s' % (self.base_url, comp_id), 200)
diff --git a/tests/defaults.py b/tests/defaults.py
@@ -28,10 +28,20 @@ class Default(object):
 
     WAVEFORM = 'SigTest'
 
-    COMPONENT = 'SigGen'
+    COMPONENT = 'rh.SigGen'
     COMPONENT_PROPERTY = 'frequency'
     COMPONENT_PROPERTY_VALUE = 1000
     COMPONENT_PROPERTY_CHANGE = 2000
+    COMPONENT_USES_PORT = 'dataShort_out'
 
     RESOURCE_NOT_FOUND_ERR = 'ResourceNotFound'
     RESOURCE_NOT_FOUND_MSG_REGEX = re.compile(r"^Unable to find .[^']* '.[^']*'$")
+    
+    FEI_DEVICE      = 'FEI_FileReader'
+    FEI_ALLOC_ID    = 'test_allocation'
+    FEI_ALLOC_CF    = 101700000
+    FEI_ALLOC_SR    = 512000
+    FEI_ALLOC_BW    = None
+    FEI_ALLOC_TYPE  = 'I'
+    FEI_ALLOC_R     = True
+
diff --git a/tests/device.py b/tests/device.py
@@ -81,10 +81,9 @@ def test_info(self):
 
         self.assertTrue('started' in json)
         self.assertTrue('properties' in json)
+        self.assertProperties(json['properties'])
         self.assertTrue('ports' in json)
 
     def test_info_not_found(self):
         url, devices = self._get_dev_list()
         json, resp = self._json_request(url+"/devices/sdkafsdfhklasdfhkajl", 404)
-
-        self._resource_not_found(json)
diff --git a/tests/devicemanager.py b/tests/devicemanager.py
@@ -73,7 +73,4 @@ def test_info(self):
         self.assertTrue('devices' in body)
 
     def test_info_not_found(self):
-        global DOMAIN_NAME
         body, resp = self._json_request("/domains/"+Default.DOMAIN_NAME+"/deviceManagers/sdkafsdfhklasdfhkajl", 404)
-
-        self._resource_not_found(body)
diff --git a/tests/domain.py b/tests/domain.py
@@ -40,12 +40,14 @@ def test_info(self):
         self.assertTrue('name' in body)
         self.assertEquals(body['name'], Default.DOMAIN_NAME)
 
-        self.assertTrue('applications' in body)
-        self.assertTrue('deviceManagers' in body)
-        self.assertTrue('properties' in body)
         self.assertTrue('id' in body)
+        self.assertTrue('properties' in body)
+        self.assertProperties(body['properties'])
+        self.assertIdList(body, 'applications')
+        self.assertIdList(body, 'deviceManagers')
+        self.assertList(body, 'eventChannels')
+        self.assertList(body, 'allocations')
+        self.assertTrue('fs' in body)
 
     def test_info_not_found(self):
         body, resp = self._json_request("/domains/ldskfadjklfsdjkfasdl", 404)
-        print body
-        self._resource_not_found(body)
diff --git a/tests/generate_rf_snapshot.py b/tests/generate_rf_snapshot.py
@@ -0,0 +1,82 @@
+#!/usr/bin/env python
+#
+# This file is protected by Copyright. Please refer to the COPYRIGHT file
+# distributed with this source distribution.
+#
+# This file is part of REDHAWK rest-python.
+#
+# REDHAWK rest-python is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
+#
+# REDHAWK rest-python is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see http://www.gnu.org/licenses/.
+#
+
+import os
+import time
+from ossie.utils import sb
+from ossie.cf import CF
+
+from defaults import Default
+
+def fei_filename_format(file_handle, CF, SR, BW=None, TYPE='B', R=False):
+    '''
+    The format is fileHandle_CF_SR<_BW>.TYPE<R> where:
+    - file_handle: Any handle used to identify data (with no _'s present)
+    - CF: The center frequency of the data
+    - SR: The sample rate of the data
+    - BW: The optional bandwidth. If not included, use optional complex specifier to determine bandwidth
+    - TYPE: The type of data (B, I, UB, etc.) based on MIDAS format
+    - R: When present, the data is treated as real, otherwise, complex
+    '''
+    fn = '_'.join([str(n) for n in [file_handle, CF, SR]])
+
+    if BW:
+        fn = '_'.join([str(n) for n in [fn, BW]])
+    '.'.join([fn, TYPE])
+
+    if R:
+        fn += 'R'
+    return fn
+
+
+def main():
+    FILE_NAME = fei_filename_format(
+        file_handle='testTone',
+        CF=Default.FEI_ALLOC_CF,
+        SR=Default.FEI_ALLOC_SR,
+        BW=Default.FEI_ALLOC_BW,
+        TYPE=Default.FEI_ALLOC_TYPE,
+        R=Default.FEI_ALLOC_R)
+    SNAPSHOT_DIR = '/var/rf_snapshots'
+    SNAPSHOT_FILE = os.path.join(SNAPSHOT_DIR, FILE_NAME) 
+
+    # Setup a siggen and filewriter 
+    siggen = sb.launch('rh.SigGen')
+    siggen.configure({ 'sample_rate': Default.FEI_ALLOC_SR })
+
+    # Launch a FileWriter, configured for BLUE format
+    filewriter = sb.launch('rh.FileWriter')
+    filewriter.configure({ 'destination_uri': 'file://{0}'.format(SNAPSHOT_FILE)})
+
+    # Connect short interfaces together
+    port = siggen.getPort('dataShort_out')._narrow(CF.Port)
+    port.connectPort(filewriter.getPort('dataShort_in'), 'snapshot')
+
+    # Start, wait, stop, release... File should be saved off at that point.
+    sb.start()
+    time.sleep(2)
+    sb.stop()
+
+    return SNAPSHOT_FILE
+
+if __name__ == '__main__':
+    print main()
+
diff --git a/tests/generate_sigtest_sad.py b/tests/generate_sigtest_sad.py
