diff --git a/MAC/Deployment/data/OTDB/BGL.base b/MAC/Deployment/data/OTDB/BGLSection.base
similarity index 80%
rename from MAC/Deployment/data/OTDB/BGL.base
rename to MAC/Deployment/data/OTDB/BGLSection.base
index 4eac2579b0884c32c0721312ab9742850adb45bd..f0ca5db04b5ab0dde474d8ac70e46f53eca82a0b 100644
--- a/MAC/Deployment/data/OTDB/BGL.base
+++ b/MAC/Deployment/data/OTDB/BGLSection.base
@@ -1,10 +1,10 @@
-# -- BGL --
+# -- BGLSection --
#
# $Id$
#
# name vers qual constr. descr.
#--------------------------------------------------------------------------------------------------------
-node BGL 1.0.0 development 'node constraint' "BGL Node Settings"
+node BGLSection 1.0.0 development 'node constraint' "BGL Node Settings"
# name vers qual constr. descr.
#--------------------------------------------------------------------------------------------------------
diff --git a/MAC/Deployment/data/OTDB/Cluster.comp b/MAC/Deployment/data/OTDB/Cluster.comp
index e2eeb7e8e53b89e5b66f8f93b2fae41e8de2092b..b6530243e06ef7c1731ae02fc4264d90ed678456 100644
--- a/MAC/Deployment/data/OTDB/Cluster.comp
+++ b/MAC/Deployment/data/OTDB/Cluster.comp
@@ -6,10 +6,10 @@
#--------------------------------------------------------------------------------------------------------
node Cluster 1.0.0 development 'node constraint' "Cluster Settings"
-# name vers qual constr. descr.
+# name vers qual constr. descr.
#--------------------------------------------------------------------------------------------------------
-uses Input 1.0.0 development 1 "Input Nodes"
-uses BGL 1.0.0 development 1 "BGL Nodes"
-uses Storage 1.0.0 development 1 "Storage Nodes"
-uses Imaging 1.0.0 development 1 "Imaging Nodes"
+uses InputSection 1.0.0 development 1 "Input Nodes"
+uses BGLSection 1.0.0 development 1 "BGL Nodes"
+uses StorageSection 1.0.0 development 1 "Storage Nodes"
+uses ImagingSection 1.0.0 development 1 "Imaging Nodes"
diff --git a/MAC/Deployment/data/OTDB/ImagingNode.list b/MAC/Deployment/data/OTDB/ImagingNode.list
index 3da9216f4d4923a22b3f38bd2ab84a463de96442..ddc48a159563fe4ef916f3b03c843e6a39996651 100644
--- a/MAC/Deployment/data/OTDB/ImagingNode.list
+++ b/MAC/Deployment/data/OTDB/ImagingNode.list
@@ -1,20 +1,19 @@
-IMG000
-IMG001
-IMG002
-IMG003
-IMG004
-IMG005
-IMG006
-IMG007
-IMG008
-IMG009
-IMG010
-IMG011
-IMG012
-IMG013
-IMG014
-IMG015
-IMG016
-IMG017
-IMG018
-IMG019
+lioff001
+lioff002
+lioff003
+lioff004
+lioff005
+lioff006
+lioff007
+lioff008
+lioff009
+lioff010
+lioff011
+lioff012
+lioff013
+lioff014
+lioff015
+lioff016
+lioff017
+lioff018
+lioff019
diff --git a/MAC/Deployment/data/OTDB/Imaging.base b/MAC/Deployment/data/OTDB/ImagingSection.base
similarity index 80%
rename from MAC/Deployment/data/OTDB/Imaging.base
rename to MAC/Deployment/data/OTDB/ImagingSection.base
index aa0c1927ff1f75c5629625e47c63ab515324849d..3f260bca6a8a9e720cd314dc86d020109f4b8eb6 100644
--- a/MAC/Deployment/data/OTDB/Imaging.base
+++ b/MAC/Deployment/data/OTDB/ImagingSection.base
@@ -1,10 +1,10 @@
-# -- Imaging --
+# -- ImagingSection --
#
# $Id$
#
# name vers qual constr. descr.
#--------------------------------------------------------------------------------------------------------
-node Imaging 1.0.0 development 'node constraint' "Imaging Node Settings"
+node ImagingSection 1.0.0 development 'node constraint' "Imaging Node Settings"
# name vers qual constr. descr.
#--------------------------------------------------------------------------------------------------------
diff --git a/MAC/Deployment/data/OTDB/Input.comp b/MAC/Deployment/data/OTDB/Input.comp
deleted file mode 100644
index 18fa94955f79d863673f9dfcb316552cf954b636..0000000000000000000000000000000000000000
--- a/MAC/Deployment/data/OTDB/Input.comp
+++ /dev/null
@@ -1,18 +0,0 @@
-# -- Input --
-#
-# $Id$
-#
-# --Input Global--
-#
-# name vers qual constr. descr.
-#--------------------------------------------------------------------------------------------------------
-node Input 1.0.0 development 'node constraint' "Input"
-
-# name dir. type unit prun. vm value constr. descr.
-#--------------------------------------------------------------------------------------------------------
-par DataSet I text - 10 0 >>Observation.MSNameMask - 'Name of the measurement set'
-par _nodes I text - 10 0 '[]' - 'Nodes used by the process'
-par _startstopType I text - 10 0 cmdline,mpirun,bgl - 'Method of starting the proces'
-par _executable I text - 10 0 - - 'The name of the executable to start'
-par _hostname I text - 10 0 - - 'The hostname of the machine to start the proces on'
-par _depends I text - 10 0 '[Imager]' - 'The processes that must be finished before this process can start'
diff --git a/MAC/Deployment/data/OTDB/InputNode.list b/MAC/Deployment/data/OTDB/InputNode.list
index 93ef2d312f95346345da4f55bf05da396beda28a..bd0eb2e75fbc5ea5592fa7986eca2f7a45bfa1ea 100644
--- a/MAC/Deployment/data/OTDB/InputNode.list
+++ b/MAC/Deployment/data/OTDB/InputNode.list
@@ -1,12 +1,12 @@
-INP000
-INP001
-INP002
-INP003
-INP004
-INP005
-INP006
-INP007
-INP008
-INP009
-INP010
-INP011
+lii001
+lii002
+lii003
+lii004
+lii005
+lii006
+lii007
+lii008
+lii009
+lii010
+lii011
+lii012
diff --git a/MAC/Deployment/data/OTDB/Input.base b/MAC/Deployment/data/OTDB/InputSection.base
similarity index 80%
rename from MAC/Deployment/data/OTDB/Input.base
rename to MAC/Deployment/data/OTDB/InputSection.base
index 489e14f362c967c4f8c0632c55a474634a2f1c2e..142221b2d4eea3b8cd5a11b8708338201daeff8e 100644
--- a/MAC/Deployment/data/OTDB/Input.base
+++ b/MAC/Deployment/data/OTDB/InputSection.base
@@ -1,10 +1,10 @@
-# -- Input --
+# -- InputSection --
#
# $Id$
#
# name vers qual constr. descr.
#--------------------------------------------------------------------------------------------------------
-node Input 1.0.0 development 'node constraint' "Input Node Settings"
+node InputSection 1.0.0 development 'node constraint' "Input Node Settings"
# name vers qual constr. descr.
#--------------------------------------------------------------------------------------------------------
diff --git a/MAC/Deployment/data/OTDB/OnlineCtrl.comp b/MAC/Deployment/data/OTDB/OnlineCtrl.comp
index 86ec36968193a8850a292d171745faefc6b4a1d9..66c0e6719b0ef6535eb7045682b7e58e1456b98a 100644
--- a/MAC/Deployment/data/OTDB/OnlineCtrl.comp
+++ b/MAC/Deployment/data/OTDB/OnlineCtrl.comp
@@ -12,7 +12,7 @@ par _hostname I text - 10 0 RS002
uses ApplCtrl 1.0.0 development 1 "The ACC controller"
-uses Input 1.0.0 development 1 "Online Applications"
+uses InputAppl 1.0.0 development 1 "Online Applications"
uses Fringe 1.0.0 development 1 "Online Applications"
uses OLAP 1.0.0 development 1 "Online Applications"
-uses Storage 1.0.0 development 1 "Online Applications"
+uses StorageAppl 1.0.0 development 1 "Online Applications"
diff --git a/MAC/Deployment/data/OTDB/Storage.comp b/MAC/Deployment/data/OTDB/Storage.comp
deleted file mode 100644
index b5090ecc951e5e23b9ea2bff639eac7d474e5ecd..0000000000000000000000000000000000000000
--- a/MAC/Deployment/data/OTDB/Storage.comp
+++ /dev/null
@@ -1,18 +0,0 @@
-# -- Storage --
-#
-# $Id$
-#
-# --Storage Global--
-#
-# name vers qual constr. descr.
-#--------------------------------------------------------------------------------------------------------
-node Storage 1.0.0 development 'node constraint' "Storage"
-
-# name dir. type unit prun. vm value constr. descr.
-#--------------------------------------------------------------------------------------------------------
-par DataSet I text - 10 0 >>Observation.MSNameMask - 'Name of the measurement set'
-par _nodes I text - 10 0 '[]' - 'Nodes used by the process'
-par _startstopType I text - 10 0 cmdline,mpirun,bgl - 'Method of starting the proces'
-par _executable I text - 10 0 - - 'The name of the executable to start'
-par _hostname I text - 10 0 - - 'The hostname of the machine to start the proces on'
-par _depends I text - 10 0 '[Imager]' - 'The processes that must be finished before this process can start'
diff --git a/MAC/Deployment/data/OTDB/StorageNode.list b/MAC/Deployment/data/OTDB/StorageNode.list
index 728a275ccc7613ef010118bfcdce9bf1838a91ce..8c185e37c9420588e56e892e8eb845155f8cd780 100644
--- a/MAC/Deployment/data/OTDB/StorageNode.list
+++ b/MAC/Deployment/data/OTDB/StorageNode.list
@@ -1,13 +1,12 @@
-STOR000
-STOR001
-STOR002
-STOR003
-STOR004
-STOR005
-STOR006
-STOR007
-STOR008
-STOR009
-STOR010
-STOR011
-STOR012
+list001
+list002
+list003
+list004
+list005
+list006
+list007
+list008
+list009
+list010
+list011
+list012
diff --git a/MAC/Deployment/data/OTDB/Storage.base b/MAC/Deployment/data/OTDB/StorageSection.base
similarity index 79%
rename from MAC/Deployment/data/OTDB/Storage.base
rename to MAC/Deployment/data/OTDB/StorageSection.base
index 394d15fac8d5e884ecf214de187623a27190bf81..a8381f59aff59c823877cca9a411b24fed5518e0 100644
--- a/MAC/Deployment/data/OTDB/Storage.base
+++ b/MAC/Deployment/data/OTDB/StorageSection.base
@@ -1,10 +1,10 @@
-# -- Storage --
+# -- StorageSection --
#
# $Id$
#
# name vers qual constr. descr.
#--------------------------------------------------------------------------------------------------------
-node Storage 1.0.0 development 'node constraint' "Storage Node Settings"
+node StorageSection 1.0.0 development 'node constraint' "Storage Node Settings"
# name vers qual constr. descr.
#--------------------------------------------------------------------------------------------------------
diff --git a/MAC/Deployment/data/OTDB/create_OTDB_comps b/MAC/Deployment/data/OTDB/create_OTDB_comps
index 9989b51295a5f60c9428da76a7552792468cc8c9..b9690186fa7cb86b7e01cb8ce4450011a12f7188 100755
--- a/MAC/Deployment/data/OTDB/create_OTDB_comps
+++ b/MAC/Deployment/data/OTDB/create_OTDB_comps
@@ -107,7 +107,7 @@ expand_marker()
echo -n "# This file was generated by $(basename $0) ${VERSION} on " ; date
cleanlist $1.list | while read nodename
do
- number=`echo ${nodename} | sed -e "s/[A-Z]//g"`
+ number=`echo ${nodename} | sed -e "s/[A-Za-z]//g"`
ipaddr=`echo $3 | sed -e "s/@/${number}/"`
(
echo ""
@@ -128,9 +128,13 @@ substitute_station()
# expand the nodes
cleanlist $1.list | while read nodename
do
- number=`echo ${nodename} | sed -e "s/[A-Z]//g"`
+ number=`echo ${nodename} | sed -e "s/[A-Za-z]//g"`
arm=`echo ${number} | awk '{ print substr($1,1,1) }'`
ring=`echo ${number} | awk '{ print substr($1,3,1) }'`
+ ststype=`echo ${nodename} | cut -c1,2`
+ if [ "${ststype}" -eq "CS" ]; then
+ number=`echo "${number} 7 / 16 * ${number} 7 % 1 - + p q" | dc`
+ fi
ipaddr=`echo $3 | sed -e "s/@@@/${number}/" | sed -e "s/@@/${arm}${ring}/"`
(
echo ""
@@ -183,19 +187,19 @@ do
grep @InputNode@ $file >/dev/null 2>&1
if [ $? -eq 0 ]; then
cleanlist $file | \
- expand_marker "InputNode" "@InputNode@" "10.130.150.@" >${outputname}
+ expand_marker "InputNode" "@InputNode@" "10.20.150.@" >${outputname}
fi
grep @StorageNode@ $file >/dev/null 2>&1
if [ $? -eq 0 ]; then
cleanlist $file | \
- expand_marker "StorageNode" "@StorageNode@" "10.130.170.@" >${outputname}
+ expand_marker "StorageNode" "@StorageNode@" "10.20.170.@" >${outputname}
fi
grep @ImagingNode@ $file >/dev/null 2>&1
if [ $? -eq 0 ]; then
cleanlist $file | \
- expand_marker "ImagingNode" "@ImagingNode@" "10.130.180.@" >${outputname}
+ expand_marker "ImagingNode" "@ImagingNode@" "10.20.160.@" >${outputname}
fi
grep @CoreStation@ $file >/dev/null 2>&1
@@ -203,10 +207,10 @@ do
(
echo -n "# This file was generated by $(basename $0) ${VERSION} on " ; date
cleanlist $file | \
- substitute_station "../PVSS/CoreStations" "@CoreStation@" "10.140.@@@.10" |\
- substitute_station "../PVSS/InRingStations" "@InRingStation@" "10.140.1@@.10" |\
- substitute_station "../PVSS/OutRingStations" "@OutRingStation@" "10.140.1@@.10" |\
- substitute_station "../PVSS/ExtRingStations" "@ExtRingStation@" "10.140.@@@.10"
+ substitute_station "../PVSS/CoreStations" "@CoreStation@" "10.151.@@@.1" |\
+ substitute_station "../PVSS/InRingStations" "@InRingStation@" "10.151.1@@.1" |\
+ substitute_station "../PVSS/OutRingStations" "@OutRingStation@" "10.151.1@@.1" |\
+ substitute_station "../PVSS/ExtRingStations" "@ExtRingStation@" "10.151.@@@.1"
) >${outputname}
fi