nxsconfigserver 2.19.0__tar.gz → 2.20.0__tar.gz

{nxsconfigserver-2.19.0 → nxsconfigserver-2.20.0}/.ci/debian11_py3/Dockerfile

@@ -1,6 +1,6 @@
 FROM debian:bullseye
 
-MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>
+# MAINTAINER DESY, Jan Kotanski <jankotan@gmail.com>
 
 ENV DEBIAN_FRONTEND=noninteractive
 

{nxsconfigserver-2.19.0 → nxsconfigserver-2.20.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" = "ubuntu25.04" ] || [ "$1" = "ubuntu24.04" ]; then
+if [ "$1" = "debian11" ] || [ "$1" = "debian12" ]  || [ "$1" = "debian12tg10" ]  || [ "$1" = "debian13" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "ubuntu25.10" ] || [ "$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" ] || [ "$1" = "ubuntu25.04" ]; then
+if  [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.10" ] || [ "$1" = "ubuntu25.04" ] || [ "$1" = "debian13" ]; 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" ] || [ "$1" = "ubuntu25.04" ]; then
+if  [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.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" = "ubuntu25.04" ] || [ "$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" = "ubuntu25.10" ] || [ "$1" = "ubuntu22.04" ] || [ "$1" = "ubuntu20.04" ] || [ "$1" = "ubuntu20.10" ] || [ "$1" = "debian11" ] || [ "$1" = "debian12tg10" ]  || [ "$1" = "debian12" ]  || [ "$1" = "debian13" ] ; 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" ] || [ "$1" = "ubuntu25.04" ]; then
+	if [ "$1" = "ubuntu24.04" ] || [ "$1" = "ubuntu24.10" ] || [ "$1" = "ubuntu25.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.19.0 → nxsconfigserver-2.20.0}/.github/workflows/tests.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [debian12, debian11, debian10, ubuntu25.04, ubuntu24.04, ubuntu22.04]
+        os: [debian13, debian12tg10, debian12, debian11, ubuntu25.10, ubuntu24.04, ubuntu22.04]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
@@ -47,33 +47,6 @@ jobs:
           OSYS: ${{ matrix.os }}
         run: .ci/run.sh ${OSYS} 3
       - name: Stop the docker
-        run: docker container stop ndts
-
-  python2_tests:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        os: [debian10]
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-      - name: Update bash files
         run: |
-          chmod +x .ci/run.sh
-          chmod +x .ci/install.sh
-      - name: Build the docker
-        env:
-          OSYS: ${{ matrix.os }}
-        run: docker build -t ndts .ci/${OSYS}_py2
-      - name: Run the docker
-        run: docker run  --name  ndts -d -it -v `pwd`:/home/tango  ndts
-      - name: install tango and nxsconfigserver
-        env:
-          OSYS: ${{ matrix.os }}
-        run: .ci/install.sh ${OSYS} 2
-      - name: run tests
-        env:
-          OSYS: ${{ matrix.os }}
-        run: .ci/run.sh ${OSYS} 2
-      - name: Stop the docker
-        run: docker container stop ndts
+             docker exec  --user root ndts  /bin/bash -c "chown -R 1001 /home/tango "
+             docker container stop ndts

{nxsconfigserver-2.19.0 → nxsconfigserver-2.20.0}/ChangeLog

@@ -1,3 +1,7 @@
+2026-01-16 Jan Kotanski <jankotan@gmail.com>
+	* add MergedXML attribute  (#88)
+	* tagged as v2.20.0
+
 2025-07-29 Jan Kotanski <jankotan@gmail.com>
 	* clear the link name  (#79)
 	* tagged as v2.19.0

{nxsconfigserver-2.19.0 → nxsconfigserver-2.20.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.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">
+    <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/nexdatas.configserver" 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>
@@ -411,6 +411,18 @@
       <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
       <properties description="JSON list of datasources to which links will be added" label="Datasources to which extra links will be added" unit="" standardUnit="" displayUnit="" format="" maxValue="" minValue="" maxAlarm="" minAlarm="" maxWarning="" minWarning="" deltaTime="" deltaValue=""/>
     </attributes>
+    <attributes name="MergedXML" attType="Scalar" rwType="READ" displayLevel="EXPERT" polledPeriod="0" maxX="" maxY="" allocReadMember="true" isDynamic="false">
+      <dataType xsi:type="pogoDsl:StringType"/>
+      <changeEvent fire="false" libCheckCriteria="false"/>
+      <archiveEvent fire="false" libCheckCriteria="false"/>
+      <dataReadyEvent fire="false" libCheckCriteria="true"/>
+      <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
+      <properties description="XML for merged components without applied variables " label="XML for merged components" unit="" standardUnit="" displayUnit="" format="" maxValue="" minValue="" maxAlarm="" minAlarm="" maxWarning="" minWarning="" deltaTime="" deltaValue=""/>
+      <readExcludedStates>ON</readExcludedStates>
+      <readExcludedStates>RUNNING</readExcludedStates>
+      <writeExcludedStates>ON</writeExcludedStates>
+      <writeExcludedStates>RUNNING</writeExcludedStates>
+    </attributes>
     <states name="ON" description="Server is ON">
       <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
     </states>

{nxsconfigserver-2.19.0/nxsconfigserver.egg-info → nxsconfigserver-2.20.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxsconfigserver
-Version: 2.19.0
+Version: 2.20.0
 Summary: Configuration Server for Nexus Data Writer
 Home-page: http://github.com/jkotan/nexdatas/nxsconfigserver
 Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic
@@ -98,21 +98,22 @@ with proper privileges.
 Debian packages
 ^^^^^^^^^^^^^^^
 
-Debian Bookworm, Bullseye, Buster and as well as Ubuntu Plucky, Noble, Jammy  packages can be found in the HDRI repository.
+Debian Trixie, Bookworm, Bullseye and as well as Ubuntu Questing, Noble, Jammy  packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 
 .. code-block:: console
 
 	  $ sudo su
-	  $ wget -q -O - http://repos.pni-hdri.de/debian_repo.pub.gpg | apt-key add -
+	  $ curl -s http://repos.pni-hdri.de/debian_repo.pub.gpg | gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/debian-hdri-repo.gpg --import
+	  $ chmod 644 /etc/apt/trusted.gpg.d/debian-hdri-repo.gpg
 
-and then download the corresponding source list, e.g. for bookworm
+and then download the corresponding source list, e.g. for trixie
 
 .. code-block:: console
 
 	  $ cd /etc/apt/sources.list.d
-	  $ wget http://repos.pni-hdri.de/bookworm-pni-hdri.list
+	  $ wget http://repos.pni-hdri.de/trixie-pni-hdri.sources
 
 Finally, for python2 packages
 

{nxsconfigserver-2.19.0 → nxsconfigserver-2.20.0}/README.rst

@@ -71,21 +71,22 @@ with proper privileges.
 Debian packages
 ^^^^^^^^^^^^^^^
 
-Debian Bookworm, Bullseye, Buster and as well as Ubuntu Plucky, Noble, Jammy  packages can be found in the HDRI repository.
+Debian Trixie, Bookworm, Bullseye and as well as Ubuntu Questing, Noble, Jammy  packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 
 .. code-block:: console
 
 	  $ sudo su
-	  $ wget -q -O - http://repos.pni-hdri.de/debian_repo.pub.gpg | apt-key add -
+	  $ curl -s http://repos.pni-hdri.de/debian_repo.pub.gpg | gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/debian-hdri-repo.gpg --import
+	  $ chmod 644 /etc/apt/trusted.gpg.d/debian-hdri-repo.gpg
 
-and then download the corresponding source list, e.g. for bookworm
+and then download the corresponding source list, e.g. for trixie
 
 .. code-block:: console
 
 	  $ cd /etc/apt/sources.list.d
-	  $ wget http://repos.pni-hdri.de/bookworm-pni-hdri.list
+	  $ wget http://repos.pni-hdri.de/trixie-pni-hdri.sources
 
 Finally, for python2 packages
 

{nxsconfigserver-2.19.0 → nxsconfigserver-2.20.0}/doc_html/Attributes.html

@@ -109,6 +109,16 @@
 		<td> OPERATOR </td>
 		<td> JSON list of datasources to which links will be added </td>
 	</tr>
+	<tr>
+		<td> <a href="AttrMergedXML.html"> MergedXML </a> </td>
+		<td> false </td>
+		<td> false </td>
+		<td> Scalar </td>
+		<td> READ </td>
+		<td> Tango::DEV_STRING </td>
+		<td> EXPERT </td>
+		<td> XML for merged components without applied variables  </td>
+	</tr>
 </table>
 <br><br>
 <hr>

{nxsconfigserver-2.19.0 → nxsconfigserver-2.20.0}/doc_html/FullDocument.html

@@ -55,6 +55,7 @@
 				<li> <a href="FullDocument.html#attrLinkDataSources"> LinkDataSources </a>
 				<li> <a href="FullDocument.html#attrCanFailDataSources"> CanFailDataSources </a>
 				<li> <a href="FullDocument.html#attrExtraLinkDataSources"> ExtraLinkDataSources </a>
+				<li> <a href="FullDocument.html#attrMergedXML"> MergedXML </a>
 			</ul>
 			<li> <a href="FullDocument.html#states">       States       </a>
 		</ul>
@@ -1898,6 +1899,16 @@
 		<td> OPERATOR </td>
 		<td> JSON list of datasources to which links will be added </td>
 	</tr>
+	<tr>
+		<td> <a href="AttrMergedXML.html"> MergedXML </a> </td>
+		<td> false </td>
+		<td> false </td>
+		<td> Scalar </td>
+		<td> READ </td>
+		<td> Tango::DEV_STRING </td>
+		<td> EXPERT </td>
+		<td> XML for merged components without applied variables  </td>
+	</tr>
 </table>
 <br><br>
 <hr>
@@ -3409,6 +3420,169 @@
 </table>
 <br><br>
 <hr>
+<a name="attrMergedXML"> </a>
+<br><br><br>
+<font size="+1"><u><b> Attribute MergedXML : </b></u></font>
+<ul>
+	XML for merged components without applied variables 
+</ul>
+<br><br><br>
+<Table Border=0 Cellpadding=0 CELLSPACING=20>
+	<TR>
+		<TD ALIGN="left" VALIGN=top>
+			<Table Border=2 Cellpadding=3 CELLSPACING=0>
+				<tr bgcolor="#CCCCFF" class="TableHeadingColor">
+				<td colspan=0> <font size=+1> <center><b> Attribute Definition </b></font></center></td>
+				</tr>
+				<tr>
+					<td> Attribute Type </td>
+					<td> Scalar </td>
+				</tr>
+				<tr>
+					<td> R/W Type </td>
+					<td> READ </td>
+				</tr>
+				<tr>
+					<td> Data Type </td>
+					<td> Tango::DEV_STRING </td>
+				</tr>
+				<tr>
+					<td> Display Level </td>
+					<td> EXPERT </td>
+				</tr>
+				<tr>
+					<td> Inherited </td>
+					<td> false </td>
+				</tr>
+				<tr>
+					<td> Abstract </td>
+					<td> false </td>
+				</tr>
+				<tr>
+					<td> Polling Period </td>
+					<td> Not polled </td>
+				</tr>
+				<tr>
+					<td> Memorized </td>
+					<td> Not set </td>
+				</tr>
+			<Tr BGCOLOR="#CCCCFF"><Td><Hr></Td><Td><Hr></Td></Tr>
+				<tr>
+					<td> Read NOT allowed for </td>
+					<td> <font size="-1">  <li> ON </li>  <li> RUNNING </li> </font> </td>
+				</tr>
+			</table>
+		</td>
+		<TD ALIGN="Center" VALIGN=top>
+			<Table Border=2 Cellpadding=3 CELLSPACING=0>
+				<tr bgcolor="#CCCCFF" class="TableHeadingColor">
+				<td colspan=0> <font size=+1> <center><b> Attribute Properties </b></font></center></td>
+				</tr>
+				<tr>
+					<td> label </td>
+					<td> XML for merged components </td>
+				</tr>
+				<tr>
+					<td> unit </td>
+					<td>  </td>
+				</tr>
+				<tr>
+					<td> standard unit </td>
+					<td>  </td>
+				</tr>
+				<tr>
+					<td> display unit </td>
+					<td>  </td>
+				</tr>
+				<tr>
+					<td> format </td>
+					<td>  </td>
+				</tr>
+				<tr>
+					<td> max_value </td>
+					<td>  </td>
+				</tr>
+				<tr>
+					<td> min_value </td>
+					<td>  </td>
+				</tr>
+				<tr>
+					<td> max_alarm </td>
+					<td>  </td>
+				</tr>
+				<tr>
+					<td> min_alarm </td>
+					<td>  </td>
+				</tr>
+				<tr>
+					<td> max_warning </td>
+					<td>  </td>
+				</tr>
+				<tr>
+					<td> min_warning </td>
+					<td>  </td>
+				</tr>
+				<tr>
+					<td> delta_time </td>
+					<td>  </td>
+				</tr>
+				<tr>
+					<td> delta_val </td>
+					<td>  </td>
+				</tr>
+			</table>
+		</td>
+		<TD ALIGN="Right" VALIGN=top>
+			<Table Border=2 Cellpadding=3 CELLSPACING=0>
+				<tr bgcolor="#CCCCFF" class="TableHeadingColor">
+				<td colspan=0> <font size=+1> <center><b> Attribute Event Criteria </b></font></center></td>
+				</tr>
+				<tr>
+					<td> Periodic </td>
+					<td> Not set </td>
+				</tr>
+				<tr>
+					<td> Relative Change </td>
+					<td> Not set </td>
+				</tr>
+				<tr>
+					<td> Absolute Change </td>
+					<td> Not set </td>
+				</tr>
+			<Tr BGCOLOR="#CCCCFF"><Td><Hr></Td><Td><Hr></Td></Tr>
+				<tr>
+					<td> Archive Periodic </td>
+					<td> Not set </td>
+				</tr>
+				<tr>
+					<td> Archive Relative Change </td>
+					<td> Not set </td>
+				</tr>
+				<tr>
+					<td> Archive Absolute Change </td>
+					<td> Not set </td>
+				</tr>
+			<Tr BGCOLOR="#CCCCFF"><Td><Hr></Td><Td><Hr></Td></Tr>
+				<tr>
+					<td> Push Change event by user code </td>
+					<td> false </td>
+				</tr>
+			<Tr BGCOLOR="#CCCCFF"><Td> </Td><Td> </Td></Tr>
+				<tr>
+					<td> Push Archive event by user code </td>
+					<td> false </td>
+				</tr>
+			<Tr BGCOLOR="#CCCCFF"><Td> </Td><Td> </Td></Tr>
+				<tr>
+					<td> Push DataReady event by user code </td>
+					<td> false </td>
+				</tr>
+			</table>
+		</td>
+	</TR>
+</table>
+<br><br>
+<hr>
 <br><br>
 <hr>
 <a name="states"> </a>

{nxsconfigserver-2.19.0 → nxsconfigserver-2.20.0}/nxsconfigserver/Merger.py

@@ -77,6 +77,8 @@ class Merger(object):
 
         #: (:obj:`xml.etree.ElementTree.Element`) DOM root node
         self.__root = None
+        #: (:obj:`bool`) do not merge node on false
+        self.skip = False
         #: (:obj:`list` <:obj:`str`> ) tags which cannot have the same siblings
         self.singles = ['strategy', 'dimensions', 'definition',
                         'record', 'device', 'query', 'database',
@@ -223,11 +225,14 @@ class Merger(object):
             text1 = unicode(self.__getText(elem1)).strip()
             text2 = unicode(self.__getText(elem2)).strip()
             if text1 != text2 and text1 and text2:
-                raise IncompatibleNodeError(
-                    "Incompatible \n%s element value\n%s \n%s "
-                    % (str(self.__getAncestors(elem1, ancestors)),
-                       text1, text2),
-                    [elem1, elem2])
+                if not self.skip:
+                    raise IncompatibleNodeError(
+                        "Incompatible \n%s element value\n%s \n%s "
+                        % (str(self.__getAncestors(elem1, ancestors)),
+                           text1, text2),
+                        [elem1, elem2])
+                else:
+                    status = False
         return status
 
     def __checkAttributes(self, elem1, elem2):

{nxsconfigserver-2.19.0 → nxsconfigserver-2.20.0}/nxsconfigserver/NXSConfigServer.py

@@ -135,6 +135,26 @@ class NXSConfigServer(tango.LatestDeviceImpl):
             return False
         return True
 
+    def read_MergedXML(self, attr):
+        """ Read MergedXML attribute
+
+        :param attr: xml string attribute
+        :type attr: :class:`tango.Attribute`
+        """
+        self.debug_stream("In read_MergedXML()")
+        attr.set_value(self.xmlc.mergedxml)
+
+    def is_MergedXML_allowed(self, _):
+        """ MergedXML attribute 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 read_Selection(self, attr):
         """ Read Selection attribute
 
@@ -765,6 +785,7 @@ class NXSConfigServer(tango.LatestDeviceImpl):
 
         :brief: Creates the NDTS configuration script from the
                 given components. The result is strored in XMLString
+                and MergedXML
 
         :param argin:  DevVarStringArray    list of component names
         :type argin: :obj:`list` <:obj:`str`>
@@ -1316,6 +1337,16 @@ class NXSConfigServerClass(tango.DeviceClass):
              "it contains the resulting XML configuration.",
              'Display level': tango.DispLevel.EXPERT,
         }],
+        'MergedXML':
+        [[tango.DevString,
+          tango.SCALAR,
+          tango.READ],
+         {
+             'label': "XML for merged components",
+             'description':
+             "XML for merged components without applied variables ",
+             'Display level': tango.DispLevel.EXPERT,
+         }],
         'Selection':
         [[tango.DevString,
           tango.SCALAR,

{nxsconfigserver-2.19.0 → nxsconfigserver-2.20.0}/nxsconfigserver/Release.py

@@ -20,4 +20,4 @@
 """ release version module """
 
 #: version number
-__version__ = "2.19.0"
+__version__ = "2.20.0"

{nxsconfigserver-2.19.0 → nxsconfigserver-2.20.0}/nxsconfigserver/XMLConfigurator.py

@@ -86,6 +86,8 @@ class XMLConfigurator(object):
         self._streams = StreamSet(weakref.ref(server) if server else None)
         #: (:obj:`str`) XML config string
         self.xmlstring = ""
+        #: (:obj:`str`) Merged coponents in XML string without variables
+        self.mergedxml = ""
         #: (:obj:`str`) component selection
         self.selection = "{}"
         #: (:obj:`str`) JSON string with arguments to connect to database
@@ -976,13 +978,18 @@ class XMLConfigurator(object):
             allnames = self.dependentComponents(
                 list(set(self.__mydb.mandatory() + names)))
             comps = self.__mydb.components(list(set(allnames)))
+            xml = self.__merge(comps, skip=withVariables)
             if withVariables:
-                cpvars = self.__variableComponentValues(comps)
-                comps = [self.__attachVariables(cp, cpvars) for cp in comps]
-            xml = self.__merge(comps)
+                self.mergedxml = xml or ""
+                if xml is not None:
+                    comps = [xml]
+                    cpvars = self.__variableComponentValues(comps)
+                    comps = [self.__attachVariables(cp, cpvars)
+                             for cp in comps]
+                    xml = self.__merge(comps)
         return xml if xml is not None else ""
 
-    def __merge(self, xmls):
+    def __merge(self, xmls, skip=False):
         """ merges the give component xmls
 
         :param xmls: list of component xmls
@@ -996,6 +1003,7 @@ class XMLConfigurator(object):
         mgr.extralinkdatasources = json.loads(self.extralinkdatasources)
         mgr.canfaildatasources = json.loads(self.canfaildatasources)
         mgr.extralinkpath = self.__splitExtraPath(self.extraLinkPath)
+        mgr.skip = skip
         mgr.collect(xmls)
         mgr.merge()
         return mgr.toString()

{nxsconfigserver-2.19.0 → nxsconfigserver-2.20.0/nxsconfigserver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxsconfigserver
-Version: 2.19.0
+Version: 2.20.0
 Summary: Configuration Server for Nexus Data Writer
 Home-page: http://github.com/jkotan/nexdatas/nxsconfigserver
 Author: Jan Kotanski, Eugen Wintersberger , Halil Pasic
@@ -98,21 +98,22 @@ with proper privileges.
 Debian packages
 ^^^^^^^^^^^^^^^
 
-Debian Bookworm, Bullseye, Buster and as well as Ubuntu Plucky, Noble, Jammy  packages can be found in the HDRI repository.
+Debian Trixie, Bookworm, Bullseye and as well as Ubuntu Questing, Noble, Jammy  packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 
 .. code-block:: console
 
 	  $ sudo su
-	  $ wget -q -O - http://repos.pni-hdri.de/debian_repo.pub.gpg | apt-key add -
+	  $ curl -s http://repos.pni-hdri.de/debian_repo.pub.gpg | gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/debian-hdri-repo.gpg --import
+	  $ chmod 644 /etc/apt/trusted.gpg.d/debian-hdri-repo.gpg
 
-and then download the corresponding source list, e.g. for bookworm
+and then download the corresponding source list, e.g. for trixie
 
 .. code-block:: console
 
 	  $ cd /etc/apt/sources.list.d
-	  $ wget http://repos.pni-hdri.de/bookworm-pni-hdri.list
+	  $ wget http://repos.pni-hdri.de/trixie-pni-hdri.sources
 
 Finally, for python2 packages
 

{nxsconfigserver-2.19.0 → nxsconfigserver-2.20.0}/test/NXSConfigServer_test.py

@@ -134,6 +134,12 @@ class NXSConfigServerTest(XMLConfigurator_test.XMLConfiguratorTest):
     def getXML(self, xmlc):
         return xmlc.XMLString
 
+    # gets xmlconfiguration
+    # \param xmlc configuration instance
+    # \returns xml configuration string
+    def getMergedXML(self, xmlc):
+        return xmlc.MergedXML
+
 
 if __name__ == '__main__':
     unittest.main()

{nxsconfigserver-2.19.0 → nxsconfigserver-2.20.0}/test/XMLConfigurator_test.py

@@ -173,6 +173,12 @@ class XMLConfiguratorTest(unittest.TestCase):
     def getXML(self, xmlc):
         return xmlc.xmlstring
 
+    # gets merged xmlconfiguration
+    # \param xmlc configuration instance
+    # \returns xml configuration string
+    def getMergedXML(self, xmlc):
+        return xmlc.mergedxml
+
     # sets selection configuration
     # \param selectionc configuration instance
     # \param selection selection configuration string
@@ -1196,9 +1202,11 @@ class XMLConfiguratorTest(unittest.TestCase):
 
         self.getXML(el)
         self.assertEqual(self.getXML(el), '')
+        self.assertEqual(self.getMergedXML(el), '')
         self.assertEqual(el.createConfiguration([]), None)
         self.getXML(el)
         self.assertEqual(self.getXML(el), '')
+        self.assertEqual(self.getMergedXML(el), '')
         el.setMandatoryComponents(man)
         el.close()
 
@@ -1241,12 +1249,19 @@ class XMLConfiguratorTest(unittest.TestCase):
 
         self.assertEqual(el.createConfiguration([name]), None)
         xml = self.getXML(el)
+        mxml = self.getMergedXML(el)
         checkxmls(
             self,
             xml,
             '<?xml version=\'1.0\' encoding=\'utf8\'?>'
             '<definition><group type="NXentry"/>'
             '</definition>')
+        checkxmls(
+            self,
+            mxml,
+            '<?xml version=\'1.0\' encoding=\'utf8\'?>'
+            '<definition><group type="NXentry"/>'
+            '</definition>')
 
         self.assertEqual(el.deleteComponent(name), None)
         self.__cmps.pop()
@@ -1280,6 +1295,7 @@ class XMLConfiguratorTest(unittest.TestCase):
         name = "mcs_test_component"
         xml = "<?xml version='1.0' encoding='utf8'?><definition>" \
               + "<group type='NXentry' name='$var.myentry'/></definition>"
+        oxml = xml
         while name in avc:
             name = name + '_1'
 #        print(avc
@@ -1299,21 +1315,29 @@ class XMLConfiguratorTest(unittest.TestCase):
 
         self.assertEqual(el.createConfiguration([name]), None)
         xml = self.getXML(el)
+        mxml = self.getMergedXML(el)
         checkxmls(
             self,
             xml,
             '<?xml version=\'1.0\' encoding=\'utf8\'?><definition>'
             '<group name="" type="NXentry"/></definition>')
+        checkxmls(
+            self,
+            mxml, oxml)
 
         el.variables = '{"myentry":"entry1"}'
         self.assertEqual(el.createConfiguration([name]), None)
 
         xml = self.getXML(el)
+        mxml = self.getMergedXML(el)
         checkxmls(
             self,
             xml,
             '<?xml version=\'1.0\' encoding=\'utf8\'?><definition>'
             '<group name="entry1" type="NXentry"/></definition>')
+        checkxmls(
+            self,
+            mxml, oxml)
 
         self.assertEqual(el.deleteComponent(name), None)
         self.__cmps.pop()
@@ -1376,16 +1400,23 @@ class XMLConfiguratorTest(unittest.TestCase):
 
         self.assertEqual(el.createConfiguration([name]), None)
         xml = self.getXML(el)
+        mxml = self.getMergedXML(el)
         checkxmls(
             self,
             xml,
             '<?xml version=\'1.0\' encoding=\'utf8\'?><definition>'
             '<group name="" type="NXentry"/></definition>')
+        checkxmls(
+            self,
+            mxml,
+            '<?xml version=\'1.0\' encoding=\'utf8\'?><definition>'
+            '<group name="$var.myentry" type="NXentry"/></definition>')
 
         el.variables = '{}'
         self.assertEqual(el.createConfiguration([name, name2]), None)
 
         xml = self.getXML(el)
+        mxml = self.getMergedXML(el)
         checkxmls(
             self,
             xml,
@@ -1394,11 +1425,19 @@ class XMLConfiguratorTest(unittest.TestCase):
             '<doc>$var(myentry=entry2)</doc>'
             '</definition>'
         )
+        checkxmls(
+            self,
+            mxml,
+            '<?xml version=\'1.0\' encoding=\'utf8\'?><definition>'
+            '<doc>$var(myentry=entry2)</doc>'
+            '<group type="NXentry" name="$var.myentry" /></definition>'
+        )
 
         el.variables = '{"myentry":"entry1"}'
         self.assertEqual(el.createConfiguration([name, name2]), None)
 
         xml = self.getXML(el)
+        mxml = self.getMergedXML(el)
         checkxmls(
             self,
             xml,
@@ -1406,6 +1445,12 @@ class XMLConfiguratorTest(unittest.TestCase):
             '<group name="entry1" type="NXentry"/>'
             '<doc>$var(myentry=entry2)</doc>'
             '</definition>')
+        checkxmls(
+            self,
+            mxml,
+            '<?xml version=\'1.0\' encoding=\'utf8\'?><definition>'
+            '<doc>$var(myentry=entry2)</doc>'
+            '<group type="NXentry" name="$var.myentry" /></definition>')
 
         self.assertEqual(el.deleteComponent(name2), None)
         self.__cmps.pop()