From 79a716613b1a003c5eedd376bd0c85acf8d95459 Mon Sep 17 00:00:00 2001
From: Gino Tosti <gino.tosti@unipg.it>
Date: Fri, 9 Jul 2021 16:45:18 +0200
Subject: [PATCH] added blobber, controller and monitoring controller in test
CDB and updated the script that create the test CDB; added generation of
random integer value to Int16 node in simulation server
---
GenDevice/createEmptyCDB.py | 17 ++++----
.../AlarmSystemConfiguration.xml | 10 +++++
.../Administrative/Categories/Categories.xml | 14 +++++++
.../ReductionDefinitions.xml | 16 ++++++++
.../CDB/Alarms/AlarmDefinitions/.DS_Store | Bin 0 -> 8196 bytes
.../BACIProperty/BACIProperty.xml | 22 +++++++++++
.../BaciPropTest#testDoubleVar.xml | 22 +++++++++++
.../BaciPropTest#testEnumVar.xml | 22 +++++++++++
.../BaciPropTest#testPatternVar.xml | 22 +++++++++++
.../DPSInterface/DPSInterface | 22 +++++++++++
.../AlarmDefinitions/Manager/Manager.xml | 24 ++++++++++++
.../Alarms/AlarmDefinitions/TestFF/TestFF.xml | 22 +++++++++++
.../TMCDB/MONITOR_BLOBBER/MONITOR_BLOBBER.xml | 13 ++++++
.../TMCDB/MONITOR_CONTROL/MONITOR_CONTROL.xml | 14 +++++++
templates/CDB/MACI/Components/Components.xml | 13 ++++++
.../bilboContainer/bilboContainer.xml | 24 ++++++++++++
.../frodoContainer/frodoContainer.xml | 25 ++++++++++++
.../monColTestCont/monColTestCont.xml | 18 +++++++++
.../CDB/MACI/Managers/Manager/Manager.xml | 37 ++++++++++++++++++
templates/minserver.tmpl | 4 ++
20 files changed, 353 insertions(+), 8 deletions(-)
create mode 100755 templates/CDB/Alarms/Administrative/AlarmSystemConfiguration/AlarmSystemConfiguration.xml
create mode 100755 templates/CDB/Alarms/Administrative/Categories/Categories.xml
create mode 100755 templates/CDB/Alarms/Administrative/ReductionDefinitions/ReductionDefinitions.xml
create mode 100755 templates/CDB/Alarms/AlarmDefinitions/.DS_Store
create mode 100755 templates/CDB/Alarms/AlarmDefinitions/BACIProperty/BACIProperty.xml
create mode 100755 templates/CDB/Alarms/AlarmDefinitions/BaciPropTest#testDoubleVar/BaciPropTest#testDoubleVar.xml
create mode 100755 templates/CDB/Alarms/AlarmDefinitions/BaciPropTest#testEnumVar/BaciPropTest#testEnumVar.xml
create mode 100755 templates/CDB/Alarms/AlarmDefinitions/BaciPropTest#testPatternVar/BaciPropTest#testPatternVar.xml
create mode 100755 templates/CDB/Alarms/AlarmDefinitions/DPSInterface/DPSInterface
create mode 100755 templates/CDB/Alarms/AlarmDefinitions/Manager/Manager.xml
create mode 100755 templates/CDB/Alarms/AlarmDefinitions/TestFF/TestFF.xml
create mode 100755 templates/CDB/MACI/Components/ARCHIVE/TMCDB/MONITOR_BLOBBER/MONITOR_BLOBBER.xml
create mode 100755 templates/CDB/MACI/Components/ARCHIVE/TMCDB/MONITOR_CONTROL/MONITOR_CONTROL.xml
create mode 100755 templates/CDB/MACI/Components/Components.xml
create mode 100755 templates/CDB/MACI/Containers/bilboContainer/bilboContainer.xml
create mode 100644 templates/CDB/MACI/Containers/frodoContainer/frodoContainer.xml
create mode 100755 templates/CDB/MACI/Containers/monColTestCont/monColTestCont.xml
create mode 100644 templates/CDB/MACI/Managers/Manager/Manager.xml
diff --git a/GenDevice/createEmptyCDB.py b/GenDevice/createEmptyCDB.py
index b528224..e212273 100755
--- a/GenDevice/createEmptyCDB.py
+++ b/GenDevice/createEmptyCDB.py
@@ -103,13 +103,18 @@ def createCBDBaseDir(dirname):
def createCDBDirs():
basedir=os.environ["ACS_CDB"]
- templatedir=os.environ["PYGEN"]+"/templates/Alarms"
+ templatedir=os.environ["PYGEN"]+ "/templates/CDB" #/templates/Alarms"
print (basedir)
if basedir=="":
print ("ACS_CDB variable is not defined")
return False
else:
- almadir = basedir+"/CDB/alma"
+ alarmdir=basedir+"/CDB" #"/CDB/Alarms"
+ if os.path.exists(alarmdir):
+ print ("dir:",alarmdir," already exists")
+ else:
+ shutil.copytree(templatedir,alarmdir)
+ """almadir = basedir+"/CDB/alma"
if createDir(almadir):
srt="directory:"+almadir+" created"
print (srt)
@@ -130,12 +135,8 @@ def createCDBDirs():
if createDir(managerdir):
print ("directory:"+managerdir+" created")
else:
- print ("error creting directory:"+managerdir)
- alarmdir=basedir+"/CDB/Alarms"
- if os.path.exists(alarmdir):
- print ("dir:",alarmdir," already exists")
- else:
- shutil.copytree(templatedir,alarmdir)
+ print ("error creting directory:"+managerdir)"""
+
def createManagerXml():
basedir=os.environ["ACS_CDB"]
managerdir = basedir+"/CDB/MACI/Managers/Manager"
diff --git a/templates/CDB/Alarms/Administrative/AlarmSystemConfiguration/AlarmSystemConfiguration.xml b/templates/CDB/Alarms/Administrative/AlarmSystemConfiguration/AlarmSystemConfiguration.xml
new file mode 100755
index 0000000..92b045a
--- /dev/null
+++ b/templates/CDB/Alarms/Administrative/AlarmSystemConfiguration/AlarmSystemConfiguration.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<alarm-system-configuration
+ xmlns="urn:schemas-cosylab-com:acsalarm-alarmservice:1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+
+ <configuration-property name="Implementation">CERN</configuration-property>
+</alarm-system-configuration>
+
diff --git a/templates/CDB/Alarms/Administrative/Categories/Categories.xml b/templates/CDB/Alarms/Administrative/Categories/Categories.xml
new file mode 100755
index 0000000..a666900
--- /dev/null
+++ b/templates/CDB/Alarms/Administrative/Categories/Categories.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<categories
+ xmlns="urn:schemas-cosylab-com:acsalarm-categories:1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <category is-default="true" path="CATEGORY1">
+ <description>Test category 1</description>
+ <alarms>
+ <FaultFamily>BaciPropTest#testDoubleVar</FaultFamily>
+ <FaultFamily>BaciPropTest#testPatternVar</FaultFamily>
+ <FaultFamily>TestFF</FaultFamily>
+ <FaultFamily>AnotherFF</FaultFamily>
+ </alarms>
+ </category>
+</categories>
diff --git a/templates/CDB/Alarms/Administrative/ReductionDefinitions/ReductionDefinitions.xml b/templates/CDB/Alarms/Administrative/ReductionDefinitions/ReductionDefinitions.xml
new file mode 100755
index 0000000..5b74d69
--- /dev/null
+++ b/templates/CDB/Alarms/Administrative/ReductionDefinitions/ReductionDefinitions.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ - Sample configuration of alarm reduction links.
+ -->
+<reduction-definitions
+ xmlns="urn:schemas-cosylab-com:AcsAlarmSystem:1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+<!--
+ <links-to-create/>
+
+ <thresholds/>
+-->
+
+</reduction-definitions>
+
diff --git a/templates/CDB/Alarms/AlarmDefinitions/.DS_Store b/templates/CDB/Alarms/AlarmDefinitions/.DS_Store
new file mode 100755
index 0000000000000000000000000000000000000000..2403ba9c27a33ce820d120fe327b552f6125d28f
GIT binary patch
literal 8196
zcmZQzU|@7AO)+F(kYHe7;9!8z0^AH(0Z1N%F(jFwB61+}7#IW?7y=lI81fkk7*ZLE
zpmL+sXb6mkz-S1JhQMeDjE2DA3IRrlb2xC+`w-btax?@+LtsRP0H}OWfVAxy9H4Xq
zga%15FfuTJy8w&~3@oq!Vg&aC7(j9$tsokt6-0xyGBAQzU^Bp485p5j8NuBUkUjyh
zQH%^=?F@`yn?d4W?F@`yn;94wA=()jp*Ax@dnk+$?F@_%?F@`y+rdVT5~Cq78Ukn`
z0P4H*FgP(dGB`7MqV(TO7%EeWlXH^t^K(FX4yU4=bi?4}{M-VF!OWZt3=BBc=H|P&
zB<18MK}Q`TW0Uqc;#Z$SlKO%SWVe8e0x1S3hD3&BhD^BULKspRiWy26lo?8(EEk4+
zhEj$kh8%`ehA@Uih9WdSsWLDykYx@I|B`7I*03PUEG*$9K}0yYGUPFoGUQ?nBW3U?
z65+5$F#|{VknEP+e5_$ZvN>47MVg3k31CQMC;_LYB8EJyp`*sYz(A%+IKqf*)3AmV
znWkY0FCGRLh5&|O22X}OXo#eN^Is}jp7H|cdmL(U_!+0!IN~3tdMxf{XYgf6WXNMk
zWJm`MU!u8o8Uq6ZnhG3l#88DbywOx)aSs~<tekRVa6>MLQ6$iu>BPXmfFh5>k!WhL
zIuS(;76(Gg`%!Y}h5$3f=@Ov+zbgX+uJM0}s!?(@1V%$(ScU*2i%YNzsOkW<^Rf95
z)Yk^}rxT!(Aa$VbI3uWE4(`mO4g@elCKbV|85tlwc}50EPo9y10i<;R2Lh5AQn6HL
XXf-lg#X4I5V|1**u{%l()eryxyqbUc
literal 0
HcmV?d00001
diff --git a/templates/CDB/Alarms/AlarmDefinitions/BACIProperty/BACIProperty.xml b/templates/CDB/Alarms/AlarmDefinitions/BACIProperty/BACIProperty.xml
new file mode 100755
index 0000000..3dd5571
--- /dev/null
+++ b/templates/CDB/Alarms/AlarmDefinitions/BACIProperty/BACIProperty.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fault-family name="BACIProperty"
+ xmlns="urn:schemas-cosylab-com:acsalarm-fault-family:1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
+ <alarm-source>ALARM_SYSTEM_SOURCES</alarm-source>
+ <help-url>http://tempuri.org</help-url>
+ <contact name="Test"/>
+ <fault-code value="1">
+ <priority>1</priority>
+ <problem-description>BACI property</problem-description>
+ </fault-code>
+ <fault-code value="2">
+ <priority>1</priority>
+ <problem-description>BACI property (LOW)</problem-description>
+ </fault-code>
+ <fault-code value="3">
+ <priority>1</priority>
+ <problem-description>BACI property (HIGH)</problem-description>
+ </fault-code>
+ <fault-member-default>
+ </fault-member-default>
+</fault-family>
diff --git a/templates/CDB/Alarms/AlarmDefinitions/BaciPropTest#testDoubleVar/BaciPropTest#testDoubleVar.xml b/templates/CDB/Alarms/AlarmDefinitions/BaciPropTest#testDoubleVar/BaciPropTest#testDoubleVar.xml
new file mode 100755
index 0000000..6c3c468
--- /dev/null
+++ b/templates/CDB/Alarms/AlarmDefinitions/BaciPropTest#testDoubleVar/BaciPropTest#testDoubleVar.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fault-family name="BaciPropTest#testDoubleVar"
+ xmlns="urn:schemas-cosylab-com:acsalarm-fault-family:1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
+ <alarm-source>ALARM_SYSTEM_SOURCES</alarm-source>
+ <help-url>http://tempuri.org</help-url>
+ <contact name="Test"/>
+ <fault-code value="1">
+ <priority>1</priority>
+ <problem-description>BACI property</problem-description>
+ </fault-code>
+ <fault-code value="2">
+ <priority>1</priority>
+ <problem-description>BACI property (LOW)</problem-description>
+ </fault-code>
+ <fault-code value="3">
+ <priority>1</priority>
+ <problem-description>BACI property (HIGH)</problem-description>
+ </fault-code>
+ <fault-member-default>
+ </fault-member-default>
+</fault-family>
diff --git a/templates/CDB/Alarms/AlarmDefinitions/BaciPropTest#testEnumVar/BaciPropTest#testEnumVar.xml b/templates/CDB/Alarms/AlarmDefinitions/BaciPropTest#testEnumVar/BaciPropTest#testEnumVar.xml
new file mode 100755
index 0000000..2515b9e
--- /dev/null
+++ b/templates/CDB/Alarms/AlarmDefinitions/BaciPropTest#testEnumVar/BaciPropTest#testEnumVar.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fault-family name="BaciPropTest#testEnumVar"
+ xmlns="urn:schemas-cosylab-com:acsalarm-fault-family:1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
+ <alarm-source>ALARM_SYSTEM_SOURCES</alarm-source>
+ <help-url>http://tempuri.org</help-url>
+ <contact name="Test"/>
+ <fault-code value="1">
+ <priority>1</priority>
+ <problem-description>BACI property</problem-description>
+ </fault-code>
+ <fault-code value="2">
+ <priority>1</priority>
+ <problem-description>BACI property (LOW)</problem-description>
+ </fault-code>
+ <fault-code value="3">
+ <priority>1</priority>
+ <problem-description>BACI property (HIGH)</problem-description>
+ </fault-code>
+ <fault-member-default>
+ </fault-member-default>
+</fault-family>
diff --git a/templates/CDB/Alarms/AlarmDefinitions/BaciPropTest#testPatternVar/BaciPropTest#testPatternVar.xml b/templates/CDB/Alarms/AlarmDefinitions/BaciPropTest#testPatternVar/BaciPropTest#testPatternVar.xml
new file mode 100755
index 0000000..600a981
--- /dev/null
+++ b/templates/CDB/Alarms/AlarmDefinitions/BaciPropTest#testPatternVar/BaciPropTest#testPatternVar.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fault-family name="BaciPropTest#testPatternVar"
+ xmlns="urn:schemas-cosylab-com:acsalarm-fault-family:1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
+ <alarm-source>ALARM_SYSTEM_SOURCES</alarm-source>
+ <help-url>http://tempuri.org</help-url>
+ <contact name="Test"/>
+ <fault-code value="1">
+ <priority>1</priority>
+ <problem-description>BACI property</problem-description>
+ </fault-code>
+ <fault-code value="2">
+ <priority>1</priority>
+ <problem-description>BACI property (LOW)</problem-description>
+ </fault-code>
+ <fault-code value="3">
+ <priority>1</priority>
+ <problem-description>BACI property (HIGH)</problem-description>
+ </fault-code>
+ <fault-member-default>
+ </fault-member-default>
+</fault-family>
diff --git a/templates/CDB/Alarms/AlarmDefinitions/DPSInterface/DPSInterface b/templates/CDB/Alarms/AlarmDefinitions/DPSInterface/DPSInterface
new file mode 100755
index 0000000..232a83f
--- /dev/null
+++ b/templates/CDB/Alarms/AlarmDefinitions/DPSInterface/DPSInterface
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fault-family name="DPSInterface"
+ xmlns="urn:schemas-cosylab-com:acsalarm-fault-family:1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
+ <alarm-source>ALARM_SYSTEM_SOURCES</alarm-source>
+ <help-url>http://tempuri.org</help-url>
+ <contact name="Vito" />
+ <fault-code value="1">
+ <priority>1</priority>
+ <problem-description>BACI property with aanother FF, FM</problem-description>
+ </fault-code>
+ <fault-code value="2">
+ <priority>1</priority>
+ <problem-description>BACI property with a another FF, FM (LOW)</problem-description>
+ </fault-code>
+ <fault-code value="3">
+ <priority>1</priority>
+ <problem-description>BACI property with a another FF, FM (HIGH)</problem-description>
+ </fault-code>
+ <fault-member-default>
+ </fault-member-default>
+</fault-family>
diff --git a/templates/CDB/Alarms/AlarmDefinitions/Manager/Manager.xml b/templates/CDB/Alarms/AlarmDefinitions/Manager/Manager.xml
new file mode 100755
index 0000000..0a39232
--- /dev/null
+++ b/templates/CDB/Alarms/AlarmDefinitions/Manager/Manager.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fault-family name="Manager" xmlns="urn:schemas-cosylab-com:acsalarm-fault-family:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <alarm-source>ALARM_SYSTEM_SOURCES</alarm-source>
+ <help-url>http://tempuri.org</help-url>
+ <contact name="Alessandro Caproni"/>
+
+ <fault-code value="1">
+ <priority>3</priority>
+ <problem-description>Container crashed</problem-description>
+ </fault-code>
+
+ <fault-code value="2">
+ <priority>2</priority>
+ <problem-description>Filesystem error affecting manager state recovery after restart.</problem-description>
+ </fault-code>
+
+ <!-- Having a default fault member is necessary for alarms on container/client crashes (FC=1),
+ because for these the manager uses FM=<clientName> which cannot be configured statically.
+ -->
+ <fault-member-default/>
+
+ <fault-member name="Prevayler"/>
+
+</fault-family>
diff --git a/templates/CDB/Alarms/AlarmDefinitions/TestFF/TestFF.xml b/templates/CDB/Alarms/AlarmDefinitions/TestFF/TestFF.xml
new file mode 100755
index 0000000..9856e2f
--- /dev/null
+++ b/templates/CDB/Alarms/AlarmDefinitions/TestFF/TestFF.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fault-family name="TestFF"
+ xmlns="urn:schemas-cosylab-com:acsalarm-fault-family:1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
+ <alarm-source>ALARM_SYSTEM_SOURCES</alarm-source>
+ <help-url>http://tempuri.org</help-url>
+ <contact name="ACS developer"/>
+ <fault-code value="1">
+ <priority>1</priority>
+ <problem-description>BACI property with a new FF, FM</problem-description>
+ </fault-code>
+ <fault-code value="2">
+ <priority>1</priority>
+ <problem-description>BACI property with a new FF, FM (LOW)</problem-description>
+ </fault-code>
+ <fault-code value="3">
+ <priority>1</priority>
+ <problem-description>BACI property with a new FF, FM (HIGH)</problem-description>
+ </fault-code>
+ <fault-member-default>
+ </fault-member-default>
+</fault-family>
diff --git a/templates/CDB/MACI/Components/ARCHIVE/TMCDB/MONITOR_BLOBBER/MONITOR_BLOBBER.xml b/templates/CDB/MACI/Components/ARCHIVE/TMCDB/MONITOR_BLOBBER/MONITOR_BLOBBER.xml
new file mode 100755
index 0000000..6aff104
--- /dev/null
+++ b/templates/CDB/MACI/Components/ARCHIVE/TMCDB/MONITOR_BLOBBER/MONITOR_BLOBBER.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Component xmlns="urn:schemas-cosylab-com:Component:1.0"
+ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
+ xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ Name="ARCHIVE/TMCDB/MONITOR_BLOBBER"
+ Code="alma.acs.monitoring.blobber.BlobberHelper"
+ Type="IDL:alma/MonitorArchiver/Blobber:1.0"
+ Container="monColTestCont"
+ Default="true"
+ ImplLang="java" />
+
+
diff --git a/templates/CDB/MACI/Components/ARCHIVE/TMCDB/MONITOR_CONTROL/MONITOR_CONTROL.xml b/templates/CDB/MACI/Components/ARCHIVE/TMCDB/MONITOR_CONTROL/MONITOR_CONTROL.xml
new file mode 100755
index 0000000..07dd4c1
--- /dev/null
+++ b/templates/CDB/MACI/Components/ARCHIVE/TMCDB/MONITOR_CONTROL/MONITOR_CONTROL.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Component xmlns="urn:schemas-cosylab-com:Component:1.0"
+ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
+ xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ Name="ARCHIVE/TMCDB/MONITOR_CONTROL"
+ Code="alma.acs.monitoring.controller.ControllerHelper"
+ Type="IDL:alma/MonitorArchiver/Controller:1.0"
+ Container="monColTestCont"
+ Default="true"
+ Autostart="true"
+ ImplLang="java" />
+
+
diff --git a/templates/CDB/MACI/Components/Components.xml b/templates/CDB/MACI/Components/Components.xml
new file mode 100755
index 0000000..be4a2d8
--- /dev/null
+++ b/templates/CDB/MACI/Components/Components.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Components xmlns="urn:schemas-cosylab-com:Components:1.0"
+ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
+ xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <e Name="MONITOR_COLLECTOR_TEST"
+ Code="MonitorCollector"
+ Type="IDL:alma/TMCDB/MonitorCollector:1.0"
+ ImplLang="cpp"
+ Container="bilboContainer" />
+</Components>
+
+
diff --git a/templates/CDB/MACI/Containers/bilboContainer/bilboContainer.xml b/templates/CDB/MACI/Containers/bilboContainer/bilboContainer.xml
new file mode 100755
index 0000000..8135cea
--- /dev/null
+++ b/templates/CDB/MACI/Containers/bilboContainer/bilboContainer.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Container xmlns="urn:schemas-cosylab-com:Container:1.0"
+ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
+ xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:log="urn:schemas-cosylab-com:LoggingConfig:1.0"
+ Timeout="20.0"
+ UseIFR="1"
+ ManagerRetry="10"
+ ImplLang="cpp">
+ <Autoload>
+ <cdb:e string="baci" />
+ </Autoload>
+ <LoggingConfig
+ centralizedLogger="Log"
+ minLogLevel="2"
+ dispatchPacketSize="0"
+ immediateDispatchLevel="99">
+ </LoggingConfig>
+</Container>
+
+
+
+
diff --git a/templates/CDB/MACI/Containers/frodoContainer/frodoContainer.xml b/templates/CDB/MACI/Containers/frodoContainer/frodoContainer.xml
new file mode 100644
index 0000000..4f77571
--- /dev/null
+++ b/templates/CDB/MACI/Containers/frodoContainer/frodoContainer.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Container
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:schemas-cosylab-com:Container:1.0"
+ xmlns:log="urn:schemas-cosylab-com:LoggingConfig:1.0"
+ ImplLang="java"
+ ServerThreads="99"
+ >
+
+ <Autoload>
+ </Autoload>
+
+ <LoggingConfig
+ centralizedLogger="Log"
+ minLogLevel="4"
+ dispatchPacketSize="10"
+ immediateDispatchLevel="99">
+ <log:e Name="jacorb@frodoContainer"
+ minLogLevel="8" minLogLevelLocal="8" />
+ <log:e Name="UnknownSlf4j@frodoContainer"
+ minLogLevel="8" minLogLevelLocal="8" />
+ </LoggingConfig>
+
+</Container>
+
\ No newline at end of file
diff --git a/templates/CDB/MACI/Containers/monColTestCont/monColTestCont.xml b/templates/CDB/MACI/Containers/monColTestCont/monColTestCont.xml
new file mode 100755
index 0000000..cab7aad
--- /dev/null
+++ b/templates/CDB/MACI/Containers/monColTestCont/monColTestCont.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<Container
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:schemas-cosylab-com:Container:1.0"
+ xmlns:log="urn:schemas-cosylab-com:LoggingConfig:1.0"
+ ImplLang="java"
+ >
+
+ <Autoload>
+ </Autoload>
+
+ <LoggingConfig minLogLevel="2" minLogLevelLocal="2">
+ <log:e Name="jacorb@frodoContainer" minLogLevel="5" minLogLevelLocal="5" />
+ </LoggingConfig>
+
+</Container>
+
diff --git a/templates/CDB/MACI/Managers/Manager/Manager.xml b/templates/CDB/MACI/Managers/Manager/Manager.xml
new file mode 100644
index 0000000..d06f6e2
--- /dev/null
+++ b/templates/CDB/MACI/Managers/Manager/Manager.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Manager xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
+ xmlns="urn:schemas-cosylab-com:Manager:1.0"
+ xmlns:log="urn:schemas-cosylab-com:LoggingConfig:1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ Timeout="50.0"
+ ClientPingInterval="10.0"
+ ContainerPingInterval="10.0"
+ AdministratorPingInterval="10.0">
+
+ <Startup>
+ </Startup>
+
+ <ServiceComponents>
+ <cdb:e string="AcsAlarmService" />
+ <cdb:e string="ACSLogSvc" />
+ <cdb:e string="Log" />
+ <cdb:e string="LogFactory" />
+ <cdb:e string="NotifyEventChannelFactory" />
+ <cdb:e string="MC_NotifyEventChannelFactory" />
+ <cdb:e string="LoggingNotifyEventChannelFactory" />
+ <cdb:e string="MC_LoggingNotifyEventChannelFactory" />
+ <cdb:e string="AlarmNotifyEventChannelFactory" />
+ <cdb:e string="MC_AlarmNotifyEventChannelFactory" />
+ <cdb:e string="ArchivingChannel@ARCHIVING.channels" />
+ <cdb:e string="LoggingChannel@LOGGING.channels" />
+ <cdb:e string="AlarmChannel" />
+ <cdb:e string="InterfaceRepository" />
+ <cdb:e string="CDB" />
+ </ServiceComponents>
+
+ <LoggingConfig>
+ <log:e Name="jacorb@Manager" minLogLevel="5" minLogLevelLocal="4" />
+ </LoggingConfig>
+
+</Manager>
+
\ No newline at end of file
diff --git a/templates/minserver.tmpl b/templates/minserver.tmpl
index 72d2c7c..4e9cb70 100644
--- a/templates/minserver.tmpl
+++ b/templates/minserver.tmpl
@@ -75,6 +75,10 @@ class VarUpdater(Thread):
v.set_value(v.get_value()+random.uniform(-5,5))
else:
v.set_value(random.uniform(-5,5))
+ if ty==ua.VariantType.Int16:
+ v.set_value(random.randint(0,8),ua.VariantType.Int16)
+ if ty==ua.VariantType.Int32:
+ v.set_value(random.randint(0,8),ua.VariantType.Int32)
time.sleep(2)
--
GitLab