Commit 55d7e0fd authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

AT5-382: Add TM TelState simulator devices in tests to 

perform in the proper way the Mid.CSP subarrays.
Changed name to the Mid.CSP TANGO DB volume.
Update dsconfig file and release number.
parent 6ca7400f

csp-lmc-mid/conftest.py

+22 −0
Original line number Diff line number Diff line
@@ -95,3 +95,25 @@ def cbf_master(): 
        except tango.DevFailed:

            continue



@pytest.fixture(scope="class")

def tm1_telstate_proxy():

    database = tango.Database()

    instance_list = database.get_device_exported_for_class('TmCspSubarrayLeafNodeTest')

    for instance in instance_list.value_string:

        try:

            if "subarray_01" in instance:

                return tango.DeviceProxy(instance)

        except tango.DevFailed:

            continue





@pytest.fixture(scope="class")

def tm2_telstate_proxy():

    database = tango.Database()

    instance_list = database.get_device_exported_for_class('TmCspSubarrayLeafNodeTest')

    for instance in instance_list.value_string:

        try:

            if "subarray_02" in instance:

                return tango.DeviceProxy(instance)

        except tango.DevFailed:

            continue

csp-lmc-mid/csp_lmc_mid/release.py

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
"""Release information for Python Package"""



name = """mid-csp-lmc"""

version = "0.5.2"

version = "0.5.3"

version_info = version.split(".")

description = """SKA MID CSP.LMC"""

author = "INAF-OAA"

csp-lmc-mid/docker/.release

+3 −3
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
"""Release information for Python Package"""



name = """MID CSP.LMC"""

version = "0.5.2"

version = "0.5.3"

version_info = version.split(".")

description = """SKA MID CSP.LMC Classes"""

author = "E.G"
@@ -18,5 +18,5 @@ license = """BSD-3-Clause""" 
url = """www.tango-controls.org"""

copyright = """"""



release=0.5.2

tag=mid-csp-lmc-0.5.2
 
release=0.5.3

tag=mid-csp-lmc-0.5.3

csp-lmc-mid/docker/config/midcsplmc_dsconfig.json

+227 −948

File changed.

Preview size limit exceeded, changes collapsed.

csp-lmc-mid/docker/mid-csp-tangodb.yml

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#

version: '2.2'

volumes:

  tangodb: {}

  mid-csp_tangodb: {}



services:

  tangodb:
@@ -23,7 +23,7 @@ services: 
      - MYSQL_USER=tango

      - MYSQL_PASSWORD=tango

    volumes:

      - tangodb:/var/lib/mysql

      - mid-csp_tangodb:/var/lib/mysql



  databaseds:

    image: nexus.engageska-portugal.pt/ska-docker/tango-cpp:latest