nxsconfigserver 2.17.0__tar.gz → 2.18.0__tar.gz

{nxsconfigserver-2.17.0 → nxsconfigserver-2.18.0}/.ci/install.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 echo "restart mysql service"
-if [ "$1" = "debian11" ] || [ "$1" = "debian12" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu24.04" ]; then
+if [ "$1" = "debian11" ] || [ "$1" = "debian12" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "ubuntu24.04" ]; then
     docker exec --user root ndts service mariadb restart
 else
     # workaround for a bug in debian9, i.e. starting mysql hangs
@@ -16,7 +16,7 @@ fi
 
 echo "install tango-common"
 docker exec  --user root ndts /bin/bash -c 'apt-get -qq update; export DEBIAN_FRONTEND=noninteractive; apt-get -qq install -y tango-common; sleep 10'
-if  [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ]; then
+if  [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ]; then
     # docker exec  --user tango ndts /bin/bash -c '/usr/lib/tango/DataBaseds 2 -ORBendPoint giop:tcp::10000  &'
     docker exec  --user root ndts /bin/bash -c 'echo -e "[client]\nuser=root\npassword=rootpw" > /root/.my.cnf'
     docker exec  --user root ndts /bin/bash -c 'echo -e "[client]\nuser=tango\nhost=localhost\npassword=rootpw" > /var/lib/tango/.my.cnf'
@@ -32,7 +32,7 @@ fi
 echo "install tango-db"
 docker exec  --user root ndts /bin/bash -c 'apt-get -qq update; export DEBIAN_FRONTEND=noninteractive; apt-get -qq install -y tango-db; sleep 10'
 if [ "$?" -ne "0" ]; then exit 255; fi
-if  [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ]; then
+if  [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ]; then
     docker exec  --user tango ndts /usr/bin/mysql -e 'create database tango'
     docker exec  --user tango ndts /bin/bash -c '/usr/bin/mysql tango < /usr/share/dbconfig-common/data/tango-db/install/mysql'
 fi
@@ -52,12 +52,12 @@ if [ "$2" = "2" ]; then
     echo "install pytango and nxsconfigserver-db"
     docker exec  --user root ndts /bin/bash -c 'apt-get -qq update; apt-get install -y   python-pytango  nxsconfigserver-db ; sleep 10'
 else
-    if [ "$1" = "debian10" ] || [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu22.04" ] || [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "debian11" ] || [ "$1" = "debian12" ] ; then
+    if [ "$1" = "debian10" ] || [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "ubuntu22.04" ] || [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "debian11" ] || [ "$1" = "debian12" ] ; then
 	echo "install pytango"
 	docker exec --user root ndts /bin/bash -c 'apt-get -qq update; apt-get install -y   python3-tango'
 	echo "install nxsconfigserver-db"
 	docker exec --user root ndts /bin/bash -c 'apt-get -qq update; apt-get  install -y   nxsconfigserver-db'
-	if [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ]; then
+	if [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ]; then
 	    docker exec  --user root ndts /usr/bin/mysql -e 'GRANT ALL PRIVILEGES ON nxsconfig.* TO "tango"@"%" identified by "rootpw"'
 	    docker exec  --user root ndts /usr/bin/mysql -e 'GRANT ALL PRIVILEGES ON nxsconfig.* TO "tango"@"localhost" identified by "rootpw"'
 	    docker exec  --user root ndts /usr/bin/mysql -e 'FLUSH PRIVILEGES'

{nxsconfigserver-2.17.0 → nxsconfigserver-2.18.0}/.github/workflows/tests.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [debian12, debian11, debian10, ubuntu24.10, ubuntu24.04, ubuntu22.04]
+        os: [debian12, debian11, debian10, ubuntu25.04, ubuntu24.04, ubuntu22.04]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2

{nxsconfigserver-2.17.0 → nxsconfigserver-2.18.0}/ChangeLog

@@ -1,3 +1,7 @@
+2025-07-10 Jan Kotanski <jankotan@gmail.com>
+	* add InstantiatedDataSources command (#73)
+	* tagged as v2.18.0
+
 2025-04-15 Jan Kotanski <jankotan@gmail.com>
 	* add ExtraLinkDataSources attribute and ExtraLinkPath property(#68)
 	* tagged as v2.17.0

{nxsconfigserver-2.17.0 → nxsconfigserver-2.18.0}/NXSConfigServer.xmi

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://tango.org/pogo/PogoDsl">
-  <classes name="NXSConfigServer" pogoRevision="9.8">
-    <description description="NeXuS Configuration Server is a Tango Server with its implementation based&#xA;on a MySQL database. It allows to store XML configuration datasources&#xA;and components. It also gives possibility to select mandatory components&#xA;and perform the process of component merging.&#xA;&#xA;Source code: https://github.com/nexdatas/nxsconfigserver/&#xA;Web page: https://nexdatas.github.io/nxsconfigserver/&#xA;NexDaTaS Web page: https://nexdatas.github.io&#xA;" title="Configuration Server for Nexus Data Writer" sourcePath="/home/jkotan/ndts/nxsconfigserver" language="Python" filestogenerate="XMI   file,Protected Regions,html Pages" license="GPL" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false" descriptionHtmlExists="false">
+  <classes name="NXSConfigServer" pogoRevision="9.9">
+    <description description="NeXuS Configuration Server is a Tango Server with its implementation based&#xA;on a MySQL database. It allows to store XML configuration datasources&#xA;and components. It also gives possibility to select mandatory components&#xA;and perform the process of component merging.&#xA;&#xA;Source code: https://github.com/nexdatas/nxsconfigserver/&#xA;Web page: https://nexdatas.github.io/nxsconfigserver/&#xA;NexDaTaS Web page: https://nexdatas.github.io&#xA;" title="Configuration Server for Nexus Data Writer" sourcePath="/home/jkotan/ndts/nxsconfigserver" language="Python" filestogenerate="XMI   file,Code files,Protected Regions,html Pages" license="GPL" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false" descriptionHtmlExists="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <identification contact="at desy.de - jan.kotanski" author="jan.kotanski" emailDomain="desy.de" classFamily="Acquisition" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="DESY" reference=""/>
     </description>
@@ -318,6 +318,17 @@
       <excludedStates>ON</excludedStates>
       <excludedStates>RUNNING</excludedStates>
     </commands>
+    <commands name="InstantiatedDataSources" description="Returns a list of required datasources" execMethod="instantiated_data_sources" displayLevel="OPERATOR" polledPeriod="0" isDynamic="false">
+      <argin description="list of datasources names">
+        <type xsi:type="pogoDsl:StringArrayType"/>
+      </argin>
+      <argout description="list of instantiated datasources">
+        <type xsi:type="pogoDsl:StringArrayType"/>
+      </argout>
+      <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
+      <excludedStates>ON</excludedStates>
+      <excludedStates>RUNNING</excludedStates>
+    </commands>
     <attributes name="XMLString" attType="Scalar" rwType="READ_WRITE" displayLevel="EXPERT" polledPeriod="0" maxX="" maxY="" allocReadMember="true" isDynamic="false">
       <dataType xsi:type="pogoDsl:StringType"/>
       <changeEvent fire="false" libCheckCriteria="false"/>

{nxsconfigserver-2.17.0/nxsconfigserver.egg-info → nxsconfigserver-2.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxsconfigserver
-Version: 2.17.0
+Version: 2.18.0
 Summary: Configuration Server for Nexus Data Writer
 Home-page: http://github.com/jkotan/nexdatas/nxsconfigserver
 Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic
@@ -21,6 +21,9 @@ Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 
 ======================================================
 Welcome to NeXuS Configuration Server's documentation!
@@ -95,7 +98,7 @@ with proper privileges.
 Debian packages
 ^^^^^^^^^^^^^^^
 
-Debian Bookworm, Bullseye, Buster and as well as Ubuntu Lunar, Jammy  packages can be found in the HDRI repository.
+Debian Bookworm, Bullseye, Buster and as well as Ubuntu Plucky, Noble, Jammy  packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 

{nxsconfigserver-2.17.0 → nxsconfigserver-2.18.0}/README.rst

@@ -71,7 +71,7 @@ with proper privileges.
 Debian packages
 ^^^^^^^^^^^^^^^
 
-Debian Bookworm, Bullseye, Buster and as well as Ubuntu Lunar, Jammy  packages can be found in the HDRI repository.
+Debian Bookworm, Bullseye, Buster and as well as Ubuntu Plucky, Noble, Jammy  packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 

{nxsconfigserver-2.17.0 → nxsconfigserver-2.18.0}/doc_html/Commands.html

@@ -211,6 +211,13 @@
 		<td> OPERATOR </td>
 		<td> Returns a list of dependent component names for a given components </td>
 	</tr>
+	<tr>
+		<td> <a href="CmdInstantiatedDataSources.html"> InstantiatedDataSources </a> </td>
+		<td> DEVVAR_STRINGARRAY </td>
+		<td> DEVVAR_STRINGARRAY </td>
+		<td> OPERATOR </td>
+		<td> Returns a list of required datasources </td>
+	</tr>
 </table>
 </body>
 </html>

{nxsconfigserver-2.17.0 → nxsconfigserver-2.18.0}/doc_html/FullDocument.html

@@ -42,6 +42,7 @@
 				<li> <a href="FullDocument.html#cmdComponentVariables"> ComponentVariables </a>
 				<li> <a href="FullDocument.html#cmdMerge"> Merge </a>
 				<li> <a href="FullDocument.html#cmdDependentComponents"> DependentComponents </a>
+				<li> <a href="FullDocument.html#cmdInstantiatedDataSources"> InstantiatedDataSources </a>
 			</ul>
 			<li> <a href="FullDocument.html#attributes">   Attributes   </a>
 			<ul>
@@ -360,6 +361,13 @@
 		<td> OPERATOR </td>
 		<td> Returns a list of dependent component names for a given components </td>
 	</tr>
+	<tr>
+		<td> <a href="CmdInstantiatedDataSources.html"> InstantiatedDataSources </a> </td>
+		<td> DEVVAR_STRINGARRAY </td>
+		<td> DEVVAR_STRINGARRAY </td>
+		<td> OPERATOR </td>
+		<td> Returns a list of required datasources </td>
+	</tr>
 </table>
 <br><br><hr>
 <a name="cmdState"> </a>
@@ -1733,6 +1741,55 @@
 		<td> .. </td>
 	</tr>
 </table>
+<br><br><hr>
+<a name="cmdInstantiatedDataSources"> </a>
+<br><br><br>
+<font size="+1"><u><b> Command InstantiatedDataSources : </b></u></font>
+<ul>
+	Returns a list of required datasources
+</ul>
+<br><br><br>
+<Table Border=2 Cellpadding=3 CELLSPACING=0>
+	<tr bgcolor="#CCCCFF" class="TableHeadingColor">
+	<td colspan=0> <font size=+1> <center><b> InstantiatedDataSources Definition </b></font></center></td>
+	</tr>
+	<tr>
+		<td> Input Argument </td>
+		<td> Tango::DEVVAR_STRINGARRAY </td>
+		<td> list of datasources names </td>
+	</tr>
+	<tr>
+		<td> Output Argument </td>
+		<td> Tango::DEVVAR_STRINGARRAY </td>
+		<td> list of instantiated datasources </td>
+	</tr>
+	<tr>
+		<td> DisplayLevel </td>
+		<td> OPERATOR </td>
+		<td> .. </td>
+	</tr>
+	<tr>
+		<td> Inherited </td>
+		<td> false </td>
+		<td> .. </td>
+	</tr>
+	<tr>
+		<td> Abstract </td>
+		<td> false </td>
+		<td> .. </td>
+	</tr>
+	<tr>
+		<td> Polling Period </td>
+		<td> Not polled </td>
+		<td> .. </td>
+	</tr>
+<Tr BGCOLOR="#CCCCFF"><Td><Hr></Td><Td><Hr></Td><Td><Hr></Td></Tr>
+	<tr>
+		<td> Command NOT allowed for </td>
+		<td> <font size="-1">  <li> ON </li>  <li> RUNNING </li> </font> </td>
+		<td> .. </td>
+	</tr>
+</table>
 <br><br>
 <hr>
 <a name="attributes"> </a>

{nxsconfigserver-2.17.0 → nxsconfigserver-2.18.0}/nxsconfigserver/NXSConfigServer.py

@@ -522,6 +522,38 @@ class NXSConfigServer(tango.LatestDeviceImpl):
             return False
         return True
 
+    def InstantiatedDataSources(self, argin):
+        """ InstantiatedDataSources command
+
+        :brief: Returns a list of required components
+
+        :param argin:  DevVarStringArray    list of component names
+        :type argin: :obj:`list` <:obj:`str`>
+        :returns: DevVarStringArray    list of instantiated components
+        :rtype: :obj:`list` <:obj:`str`>
+        """
+        self.debug_stream("In InstantiateDataSources()")
+        try:
+            self.set_state(tango.DevState.RUNNING)
+            argout = self.xmlc.instantiatedDataSources(argin)
+            self.set_state(tango.DevState.OPEN)
+        finally:
+            if self.get_state() == tango.DevState.RUNNING:
+                self.set_state(tango.DevState.OPEN)
+
+        return argout
+
+    def is_InstantiatedDataSources_allowed(self):
+        """ DataSources command State Machine
+
+        :returns: True if the operation allowed
+        :rtype: :obj:`bool`
+        """
+        if self.get_state() in [tango.DevState.ON,
+                                tango.DevState.RUNNING]:
+            return False
+        return True
+
     def DataSources(self, argin):
         """ DataSources command
 
@@ -1195,6 +1227,9 @@ class NXSConfigServerClass(tango.DeviceClass):
         'InstantiatedComponents':
             [[tango.DevVarStringArray, "list of component names"],
              [tango.DevVarStringArray, "list of instantiated components"]],
+        'InstantiatedDataSources':
+            [[tango.DevVarStringArray, "list of component names"],
+             [tango.DevVarStringArray, "list of instantiated datasources"]],
         'DataSources':
             [[tango.DevVarStringArray, "list of DataSource names"],
              [tango.DevVarStringArray, "list of required DataSources"]],

{nxsconfigserver-2.17.0 → nxsconfigserver-2.18.0}/nxsconfigserver/Release.py

@@ -20,4 +20,4 @@
 """ release version module """
 
 #: version number
-__version__ = "2.17.0"
+__version__ = "2.18.0"

{nxsconfigserver-2.17.0 → nxsconfigserver-2.18.0}/nxsconfigserver/XMLConfigurator.py

@@ -353,6 +353,20 @@ class XMLConfigurator(object):
             comps = [self.__instantiate(cp) for cp in comps]
         return comps
 
+    def instantiatedDataSources(self, names):
+        """ instantiates the required datasources
+
+        :param names: list of datasource names
+        :type names: :obj:`list` <:obj:`str`>
+        :returns: list of instantiated datasources
+        :rtype: :obj:`list` <:obj:`str`>
+        """
+        comps = []
+        if self.__mydb:
+            comps = self.__mydb.dataSources(names)
+            comps = [self.__instantiate(ds) for ds in comps]
+        return comps
+
     def __instantiate(self, xmlcp):
         """ instantiates the xml component
 

{nxsconfigserver-2.17.0 → nxsconfigserver-2.18.0/nxsconfigserver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxsconfigserver
-Version: 2.17.0
+Version: 2.18.0
 Summary: Configuration Server for Nexus Data Writer
 Home-page: http://github.com/jkotan/nexdatas/nxsconfigserver
 Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic
@@ -21,6 +21,9 @@ Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 
 ======================================================
 Welcome to NeXuS Configuration Server's documentation!
@@ -95,7 +98,7 @@ with proper privileges.
 Debian packages
 ^^^^^^^^^^^^^^^
 
-Debian Bookworm, Bullseye, Buster and as well as Ubuntu Lunar, Jammy  packages can be found in the HDRI repository.
+Debian Bookworm, Bullseye, Buster and as well as Ubuntu Plucky, Noble, Jammy  packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 

{nxsconfigserver-2.17.0 → nxsconfigserver-2.18.0}/setup.py

@@ -123,6 +123,9 @@ SETUPDATA = dict(
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
     ],
     install_requires=install_requires,
     scripts=['NXSConfigServer'],

{nxsconfigserver-2.17.0 → nxsconfigserver-2.18.0}/test/XMLConfigurator_test.py

@@ -9668,6 +9668,81 @@ ds.result = nxsconfigserver.__version__</result></datasource>"""
         el.setMandatoryComponents(man)
         el.close()
 
+    # creatConf test
+    # \brief It tests XMLConfigurator
+    def test_instantiatedDataSources(self):
+        fun = sys._getframe().f_code.co_name
+        print("Run: %s.%s() " % (self.__class__.__name__, fun))
+
+        el = self.openConf()
+        man = el.mandatoryComponents()
+        el.unsetMandatoryComponents(man)
+        self.__man += man
+
+        revision = long(el.version.split('.')[-1])
+
+        # avc = el.availableComponents()
+
+        xds = [
+            '<datasource name="%s" type="PYEVAL">'
+            '<result name="result">'
+            'ds.result = ds.%s + ds.%s\n'
+            '</result>\n'
+            '$datasources.%s\n'
+            '$datasources.%s\n'
+            '</datasource>',
+            '<datasource name="%s" type="CLIENT"><record name="r1" />'
+            '</datasource>',
+            '<datasource name="%s" type="CLIENT"><record name="r2" />'
+            '</datasource>',
+            '<datasource name="%s" type="CLIENT"><record name="r3" />'
+            '</datasource>',
+        ]
+
+        odsname = "pmcs_test.datasource"
+        avds = el.availableDataSources()
+        self.assertTrue(isinstance(avds, list))
+        dsnp = len(xds)
+        dsname = []
+        for i in range(dsnp):
+
+            dsname.append(odsname + '_%s' % i)
+            while dsname[i] in avds:
+                dsname[i] = dsname[i] + '_%s' % i
+
+        for i in range(dsnp):
+            if not i:
+                self.setXML(el, xds[i] % (
+                    dsname[0],
+                    dsname[1], dsname[2], dsname[1], dsname[2]))
+            else:
+                self.setXML(el, xds[i] % dsname[i])
+            self.assertEqual(el.storeDataSource(dsname[i]), None)
+            self.__ds.append(dsname[i])
+
+        css = [dsname[0],  dsname[3]]
+        comps = el.instantiatedDataSources(css)
+        self.assertEqual(len(comps), 2)
+        self.assertEqual(
+            comps[0],
+            '<datasource name="%s" type="PYEVAL">'
+            '<result name="result">ds.result = ds.%s + ds.%s\n'
+            '</result>\n\n'
+            '<datasource name="%s" type="CLIENT"><record name="r1" />'
+            '</datasource>\n\n'
+            '<datasource name="%s" type="CLIENT"><record name="r2" />'
+            '</datasource>\n'
+            '</datasource>' % (dsname[0], dsname[1], dsname[2],
+                               dsname[1], dsname[2]))
+        self.assertEqual(
+            comps[1],
+            '<datasource name="%s" type="CLIENT"><record name="r3" />'
+            '</datasource>' % (dsname[3]))
+
+        self.assertEqual(long(el.version.split('.')[-1]), revision + 4)
+        el.setMandatoryComponents(man)
+        el.close()
+
     # creatConf test
     # \brief It tests XMLConfigurator
     def test_instantiatedComponents_mixed(self):