Merge branch 'CT-126' into CT-166

docs/source/CspSubElementSubarray.rst

+.. LMC Base Classes documentation master file, created by
+   sphinx-quickstart on Fri Jan 11 10:03:42 2019.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+SKA CSP Sub-element Subarray
+============================================
+This module implements a generic Subarray device for a CSP Sub-element.
+The scope of this module is to provide a uniform access to a CSP Sub-element 
+subarray from the CSP.LMC side.
+
+
+.. toctree::
+   :maxdepth: 2
+
+.. automodule:: ska.base.csp_subelement_subarray
+.. autoclass:: ska.base.CspSubElementSubarray
+   :members:
+   :undoc-members:

docs/source/index.rst

@@ -22,6 +22,7 @@ Welcome to LMC Base Classes documentation!
 
    Device:  SKA CSP Sub-element Master<CspSubElementMaster>
    Device:  SKA CSP Sub-element ObsDevice<CspSubElementObsDevice>
+   Device:  SKA CSP Sub-element Subarray<CspSubElementSubarray>
 
    SKA Control Model<Control_Model>
    SKA Commands<Commands>

setup.py

@@ -50,6 +50,7 @@ setuptools.setup(
             "SKATelState=ska.base.tel_state_device:main",
             "CspSubelementMaster=ska.base.csp_subelement_master:main",
             "CspSubelementObsDevice=ska.base.csp_subelement_obsdevice:main",
+            "CspSubelementSubarray=ska.base.csp_subelement_subarray:main",
         ]
     },
     keywords="lmc base classes ska",

src/ska/base/__init__.py

@@ -18,6 +18,7 @@ __all__ = (
     "CspSubElementMaster",
     "CspSubElementObsDevice",
     "CspSubElementObsDeviceStateModel",
+    "CspSubElementSubarray",
 )
 
 # Note: order of imports is important - start with lowest in the hierarchy
@@ -39,6 +40,7 @@ from .subarray_device import (
 )
 # CspSubElement classes
 from .csp_subelement_master import CspSubElementMaster
+from .csp_subelement_subarray import CspSubElementSubarray
 from .csp_subelement_obsdevice import (
         CspSubElementObsDevice,
         CspSubElementObsDeviceStateModel,