Commit b8c77995 authored by Andrea Orlati's avatar Andrea Orlati Committed by GitHub
Browse files

fix issue #261: The discos 'series' scripts are now availablr also for Noto... 

fix issue #261: The discos 'series' scripts are now availablr also for Noto and Medicina. In that way the startup procedure is now (#310)

ssh-based on all three telescopes. See the issue in git tracking system for more details.
parent 9add6df9

CHANGELOG.md

+5 −4
Original line number Diff line number Diff line
@@ -4,16 +4,17 @@ All notable changes to this project will be documented in this file. 
The format is based on [Keep a Changelog](http://keepachangelog.com/)

and this project adheres to [Semantic Versioning](http://semver.org/



## [Unreleased]

## [discos1.0] 07-11-2018

### Added

	

	issue #261 - Added startup procedure scripts also for Noto and Medicina. The startup command is 

	'discos --start'. Also command line scripts are now avialble 'discosup' and 'discosdown'. The console

	can be start with 'discosConsole --start'. 



### Changed



### Fixed 



- InjectCommand blocks if the system is down @aorlati





##

Medicina/Configuration/CDB/MACI/Containers/NoiseGeneratorContainer/NoiseGeneratorContainer.xml

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
<?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="30.0"

	UseIFR="true"

	ManagerRetry="10"

	ImplLang="cpp"

	Recovery="false">



	<Autoload>

		<cdb:_ string="baci" />

	</Autoload>

	

	<LoggingConfig

		centralizedLogger="Log"

		minLogLevel="5"

		minLogLevelLocal="5"

		dispatchPacketSize="0"

		immediateDispatchLevel="8"

		flushPeriodSeconds="1"

	>

	</LoggingConfig>

	

</Container>

Medicina/Misc/MedScripts/app-defaults/discosStartup.xml

+24 −25
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ 
<AcsCommandCenterProject xmlns="Alma/Acs/AcsCommandCenterProject"

    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

    creator="acc-v7.0" xsi:type="AcsCommandCenterProject">

    <mode>remote_daemon</mode>

    <servicesLocalJavaRoot>/alma/ACS-7.0/acsdata/config/defaultCDB</servicesLocalJavaRoot>

    <mode>remote_native</mode>

    <servicesLocalJavaRoot></servicesLocalJavaRoot>

    <scriptBase>0</scriptBase>

    <remoteHost>192.168.1.98</remoteHost>

    <remoteAccount></remoteAccount>

    <remoteHost>MASTERHOST</remoteHost>

    <remoteAccount>discos</remoteAccount>

    <remotePassword></remotePassword>

    <toolRunAgainstDedicatedSettings>false</toolRunAgainstDedicatedSettings>

    <toolAgainstManagerHost></toolAgainstManagerHost>
@@ -14,7 +14,7 @@ 
    <toolAgainstInterfaceRepository></toolAgainstInterfaceRepository>

    <toolAgainstNameService></toolAgainstNameService>

    <containers>

        <select>11</select>

        <select>13</select>

        <againstManagerHost></againstManagerHost>

        <againstManagerPort></againstManagerPort>

        <againstCDB></againstCDB>
@@ -25,71 +25,70 @@ 
            <heapSizeMB></heapSizeMB>

            <useDedicatedSettings>true</useDedicatedSettings>

            <scriptBase>0</scriptBase>

            <remoteHost>192.168.1.98</remoteHost>

            <remoteHost>MASTERHOST</remoteHost>

            <remoteAccount></remoteAccount>

        </container>

        <container>

            <name>WeatherStationContainer</name>

            <type>cpp</type>

            <heapSizeMB></heapSizeMB>

            <useDedicatedSettings>true</useDedicatedSettings>

            <scriptBase>0</scriptBase>

            <remoteHost>192.168.1.104</remoteHost>

            <remoteHost>MASTERHOST</remoteHost>

            <remoteAccount></remoteAccount>

        </container>

        <container>

            <name>MountContainer</name>

            <type>cpp</type>

            <heapSizeMB></heapSizeMB>

            <useDedicatedSettings>true</useDedicatedSettings>

            <scriptBase>0</scriptBase>

            <remoteHost>192.168.1.104</remoteHost>

            <remoteHost>MASTERHOST</remoteHost>

            <remoteAccount></remoteAccount>

        </container>

        <container>

            <name>AntennaContainer</name>

            <type>cpp</type>

            <heapSizeMB></heapSizeMB>

            <useDedicatedSettings>true</useDedicatedSettings>

            <scriptBase>0</scriptBase>

            <remoteHost>192.168.1.104</remoteHost>

            <remoteHost>MASTERHOST</remoteHost>

            <remoteAccount></remoteAccount>

        </container>

        <container>

            <name>ReceiversContainer</name>

            <type>cpp</type>

            <heapSizeMB></heapSizeMB>

            <useDedicatedSettings>true</useDedicatedSettings>

            <scriptBase>0</scriptBase>

            <remoteHost>192.168.1.104</remoteHost>

            <remoteHost>MASTERHOST</remoteHost>

            <remoteAccount></remoteAccount>

        </container>

        <container>

            <name>TotalPowerContainer</name>

            <type>cpp</type>

            <heapSizeMB></heapSizeMB>

            <useDedicatedSettings>true</useDedicatedSettings>

            <scriptBase>0</scriptBase>

            <remoteHost>192.168.1.104</remoteHost>

            <remoteAccount></remoteAccount>

        </container>

        <container>

            <name>NoiseGeneratorContainer</name>

            <type>cpp</type>

            <useDedicatedSettings>true</useDedicatedSettings>

            <scriptBase>0</scriptBase>

            <remoteHost>192.168.1.104</remoteHost>

            <remoteHost>MASTERHOST</remoteHost>

            <remoteAccount></remoteAccount>

        </container>

        <container>

            <name>ManagementContainer</name>

            <type>cpp</type>

            <heapSizeMB></heapSizeMB>

            <useDedicatedSettings>true</useDedicatedSettings>

            <scriptBase>0</scriptBase>

            <remoteHost>192.168.1.104</remoteHost>

            <remoteHost>MASTERHOST</remoteHost>

            <remoteAccount></remoteAccount>

        </container>

        <container>

            <name>FitsZillaContainer</name>

            <type>cpp</type>

            <heapSizeMB></heapSizeMB>

            <useDedicatedSettings>true</useDedicatedSettings>

            <scriptBase>0</scriptBase>

            <remoteHost>192.168.1.104</remoteHost>

            <remoteHost>MASTERHOST</remoteHost>

            <remoteAccount></remoteAccount>

        </container>

        <container>
@@ -98,7 +97,7 @@ 
            <heapSizeMB></heapSizeMB>

            <useDedicatedSettings>true</useDedicatedSettings>

            <scriptBase>0</scriptBase>

            <remoteHost>192.168.1.104</remoteHost>

            <remoteHost>MASTERHOST</remoteHost>

            <remoteAccount></remoteAccount>

        </container>

        <container>
@@ -107,7 +106,7 @@ 
            <heapSizeMB></heapSizeMB>

            <useDedicatedSettings>true</useDedicatedSettings>

            <scriptBase>0</scriptBase>

            <remoteHost>192.168.1.104</remoteHost>

            <remoteHost>MASTERHOST</remoteHost>

            <remoteAccount></remoteAccount>

        </container>

        <container>
@@ -116,7 +115,7 @@ 
            <heapSizeMB></heapSizeMB>

            <useDedicatedSettings>true</useDedicatedSettings>

            <scriptBase>0</scriptBase>

            <remoteHost>192.168.51.98</remoteHost>

            <remoteHost>MASTERHOST</remoteHost>

            <remoteAccount></remoteAccount>

        </container>

        <container>
@@ -125,7 +124,7 @@ 
            <heapSizeMB></heapSizeMB>

            <useDedicatedSettings>true</useDedicatedSettings>

            <scriptBase>0</scriptBase>

            <remoteHost>192.168.1.104</remoteHost>

            <remoteHost>MASTERHOST</remoteHost>

            <remoteAccount></remoteAccount>

        </container>

    </containers>

Medicina/Misc/MedScripts/src/Makefile

+29 −11
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ 
# who       when      what

# --------  --------  ----------------------------------------------

# andrea  24/01/09  created

#

# orlati  07/12/18  added installation of discosStartup.xml file for acscommandcenter

# orlati  07/12/18  changed in order to comply with new discos bootup procedure



#*******************************************************************************

# This Makefile follows VLT Standards (see Makefile(5) for more).
@@ -17,6 +18,12 @@ 
#    None

#------------------------------------------------------------------------



ifndef MANAGER_REFERENCE

	MASTER:=$(HOST)

else

	MASTER:=$(shell echo $(MANAGER_REFERENCE) | cut -d: -f 3)

endif



#

# user definable C-compilation flags

#USER_CFLAGS =
@@ -41,10 +48,16 @@ PY_PACKAGES_L = 
pppppp_MODULES	   =



#scripts addObserver and removeObserver removed from repository control as the are strictly related to the server machines configuration

SCRIPTS         = escs escsConsole

SCRIPTS_L       = addObserver removeObserver

#SCRIPTS         = escs escsConsole

#SCRIPTS_L       = addObserver removeObserver



# new bootup scripts (discos):

SCRIPTS=discosup discosdown discosConsole

SCRIPTS_L         = escs escsConsole





INSTALL_FILES      = ../app-defaults/escsStartup.xml

#INSTALL_FILES      = ../app-defaults/escsStartup.xml

INSTALL_FILES = ../app-defaults/discosStartup.xml



#

# list of all possible C-sources (used to create automatic dependencies)
@@ -67,13 +80,19 @@ ifneq ($(MAKEDIRTMP),\#error\#) 
   include $(MAKEDIR)/acsMakefile

endif



.PHONY: all

.DEFAULT_GOAL:=all



#

# TARGETS

# -------

all:	do_all

	@sed -i 's/MASTERHOST/$(MASTER)/g' ../bin/discosup

	@sed -i 's/MASTERHOST/$(MASTER)/g' ../bin/discosdown

	@echo " . . . 'all' done" 



clean : clean_all 

	@rm -f $(INTROOT)/app-defaults/discosStartup.xml

	@echo " . . . clean done"



clean_dist : clean_all clean_dist_all
@@ -83,13 +102,12 @@ man : do_man 
	@echo " . . . man page(s) done"



install : install_all

	@chmod 744 $(INTROOT)/bin/escs

	@chmod 744 $(INTROOT)/app-defaults/escsStartup.xml



#	@chmod 744 $(INTROOT)/bin/escs

#	@chmod 744 $(INTROOT)/app-defaults/escsStartup.xml

	@sed -i 's/MASTERHOST/$(MASTER)/g' $(INTROOT)/app-defaults/discosStartup.xml

	@chmod 700 $(INTROOT)/app-defaults/discosStartup.xml 

	@chmod 700 $(INTROOT)/bin/discosdown 

	@chmod 700 $(INTROOT)/bin/discosup 

	

	@echo " . . . installation done"	





#___oOo___

Medicina/Misc/MedScripts/src/discosConsole

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ CL_HELP= 
CL_STOP=



function printUsage {

   echo "Start interactive console for the ESCS system"

   echo "Start interactive console for the DISCOS system"

   echo ""

        echo "Usage: `basename $0` [OPTIONS]  "

        echo "Options: "