Fix python sandbox for child devices

Author: Max Robert

redhawk-codegen/redhawk/codegen/model/softpkg.py

@@ -131,7 +131,11 @@ def __init__(self, spdFile=None, name=None, prfFile=None, scdFile=None):
             self.__children = []
             if self.__spd.get_child():
                 for child in self.__spd.get_child():
-                    self.__children.append({'name':child.get_name(), 'prf':child.get_childPropertyFile().get_localfile().get_name(), 'scd':child.get_childDescriptorFile().get_localfile().get_name()})
+                    child_spd_name = child.get_childSoftwarePackageFile().get_localfile().get_name()
+                    child_spd = ossie.parsers.spd.parse(child_spd_name)
+                    child_prf_name = child_spd.propertyfile.localfile.name
+                    child_scd_name = child_spd.descriptor.localfile.name
+                    self.__children.append({'name':child.get_name(), 'spd':child_spd_name, 'prf':child_prf_name, 'scd':child_scd_name})
         else:
             self.__spdFile = None
             class tmpSPD:

redhawk/src/base/framework/python/ossie/dynamiccomponent.py

@@ -5,6 +5,8 @@
 from omniORB import any as _any
 import threading
 
+from utils.sandbox.model import SandboxDevice
+
 class DynamicComponentRegistry:
     def __init__(self):
         self.__components = {}
@@ -44,9 +46,11 @@ def addChild(self, instance, instanceName=None):
                 self._dynamicComponentCount[device_name] += 1
                 device_name_count = device_name+'_'+str(self._dynamicComponentCount[device_name])
                 device_label = self._label+':'+device_name_count
+                base_path = self._softwareProfile.split('/')
+                device_spd = '/'.join(base_path[:-1])+'/'+device_name+'.spd.xml'
                 parameters.append(CF.DataType('IDM_CHANNEL_IOR', _any.to_any(ossie.resource.__orb__.object_to_string(self._idm_publisher.channel))))
                 parameters.append(CF.DataType('DEVICE_LABEL', _any.to_any(device_label)))
-                parameters.append(CF.DataType('PROFILE_NAME', _any.to_any('')))
+                parameters.append(CF.DataType('PROFILE_NAME', _any.to_any(device_spd)))
                 parameters.append(CF.DataType('DEVICE_MGR_IOR', _any.to_any(ossie.resource.__orb__.object_to_string(self._devMgr.ref))))
                 parameters.append(CF.DataType('DEVICE_ID', _any.to_any(self._id+':'+device_name_count)))
                 parameters.append(CF.DataType('COMPOSITE_DEVICE_IOR', _any.to_any(ossie.resource.__orb__.object_to_string(self._this()))))

redhawk/src/base/framework/python/ossie/utils/sandbox/local.py

@@ -40,6 +40,7 @@
 import launcher
 from debugger import GDB, JDB, PDB, Valgrind, Debugger
 import terminal
+from model import SandboxDevice
 
 warnings.filterwarnings('once',category=DeprecationWarning)
 
@@ -507,7 +508,24 @@ def _createLauncher(self, comptype, execparams, initProps, initialize, configPro
             return None
         return clazz(execparams, initProps, initialize, configProps, debugger, window, timeout, shared, stdout)
 
+    def _refreshChildDevices(self):
+        for comp in self.__components.values():
+            if hasattr(comp, 'devices'):
+                for dev in comp.devices:
+                    found_device = False
+                    for _tmp_comp_key in self.__components:
+                        if _tmp_comp_key == dev.label:
+                            found_device = True
+                            break
+                    if not found_device:
+                        sdrRoot = self.getSdrRoot()
+                        spd, scd, prf = sdrRoot.readProfile(dev.softwareProfile)
+                        comp = SandboxDevice(self, dev.softwareProfile, spd, scd, prf, dev.label, dev.identifier, None)
+                        comp.ref = dev
+                        self._registerComponent(comp)
+
     def getComponents(self):
+        self._refreshChildDevices()
         return self.__components.values()
 
     def getServices(self):
@@ -526,6 +544,7 @@ def _addService(self, service):
         self.__services[service._instanceName] = service
 
     def getComponent(self, name):
+        self._refreshChildDevices()
         return self.__components.get(name, None)
 
     def retrieve(self, name):

redhawk/src/base/framework/python/ossie/utils/sb/domainless.py

@@ -301,6 +301,7 @@ def show():
     sandbox = _getSandbox()
     print "Components Running:"
     print "------------------"
+    print '*********'
     for component in sandbox.getComponents():
         print component._instanceName, component
     print "\n"