Skip to content

Commit 8370f18

Browse files
tribeirotribeiro
committed
Merge branch 'develop'
* develop: Fix initialization script in users notebook to enable users to build topics from the jupyter server. Fix EFD compose file to deploy database in private network. Adds compose files for jupyter notebooks and a compose file for CSCs to be launched at the summit network. Adds EFD setup files, ATDome and ATHexapod.
2 parents 8b70d15 + ec8a06c commit 8370f18

20 files changed

+444
-44
lines changed

‎AT_CSC/ATDome/ATDome.yaml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
$schema: http://json-schema.org/draft-07/schema#
2+
$id: https://github.com/lsst-ts/ts_ATDome/blob/master/schema/ATDome.yaml
3+
# title must end with one or more spaces followed by the schema version, which must begin with "v"
4+
title: ATDome v1
5+
description: Schema for ATDome configuration files
6+
type: object
7+
properties:
8+
host:
9+
description: IP address of the TCP/IP interface
10+
type: string
11+
format: hostname
12+
default: "192.168.1.46"
13+
port:
14+
description: Port number of the TCP/IP interface
15+
type: integer
16+
default: 17310
17+
connection_timeout:
18+
description: Time limit for connecting to the TCP/IP interface (sec)
19+
type: number
20+
exclusiveMinimum: 0
21+
default: 10
22+
read_timeout:
23+
description: Time limit for reading data from the TCP/IP interface (sec)
24+
type: number
25+
exclusiveMinimum: 0
26+
default: 10
27+
required:
28+
- host
29+
- port
30+
- connection_timeout
31+
- read_timeout
32+
additionalProperties: false

‎AT_CSC/ATPTG/docker-compose.yaml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@ services:
66
environment:
77
- OSPL_URI=${OSPL_URI}
88
- LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
9-
network_mode: "host"
9+
networks:
10+
control-network:
11+
ipv4_address: "192.168.1.203"
1012
volumes:
1113
- ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
14+
15+
networks:
16+
default:
17+
external:
18+
name: control-network
19+
control-network:
20+
external: true

‎AT_CSC/README.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
Compose files for CSCs that talk to real hardware. No simmmulators!
1+
2+
Compose files for CSCs that talk to real hardware. No simmulators!
3+
4+
Use the compose file in this directory to launch all the CSCs.

‎AT_CSC/docker-compose.yaml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
version: '3.6'
2+
3+
services:
4+
5+
atptg:
6+
image: tiagorib/ptkernel:rc0.5_sal3.9
7+
container_name: atptg
8+
environment:
9+
- LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
10+
networks:
11+
control-network:
12+
ipv4_address: "192.168.1.211"
13+
14+
atdome-csc:
15+
image: lsstts/at_dome:3.9-0.5
16+
container_name: atdome
17+
environment:
18+
- LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
19+
networks:
20+
control-network:
21+
ipv4_address: "192.168.1.212"
22+
23+
atdometrajectory-sim:
24+
image: lsstts/at_dome_trajectory_sim:3.9-0.6a
25+
container_name: atdometrajectory
26+
environment:
27+
- LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
28+
networks:
29+
control-network:
30+
ipv4_address: "192.168.1.213"
31+
32+
HexapodCSC:
33+
image: lsstts/ts_athexapod:3.9-dm-19762
34+
container_name: athexapod
35+
environment:
36+
- LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
37+
networks:
38+
control-network:
39+
ipv4_address: "192.168.1.214"
40+
volumes:
41+
- ./ATHexapod/startCSC.sh:/home/saluser/startCSC.sh
42+
- ./ATHexapod/tcpConfiguration.yaml:/home/saluser/repos/ts_salobjATHexapod/bin/settingFiles/Test/1/tcpConfiguration.yaml
43+
entrypoint: ["/home/saluser/startCSC.sh"]
44+
45+
ataos:
46+
image: lsstts/ataos:DM-19890
47+
container_name: ataos
48+
environment:
49+
- LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
50+
networks:
51+
control-network:
52+
ipv4_address: "192.168.1.215"
53+
54+
networks:
55+
default:
56+
external:
57+
name: control-network
58+
control-network:
59+
external: true

‎AT_EFD/dimm_command_setup.sh‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/usr/bin/env bash
2+
3+
# Source this file when starting the container to set it up
4+
5+
echo "#"
6+
echo "# Loading LSST Stack"
7+
source /opt/lsst/software/stack/loadLSST.bash
8+
setup lsst_distrib
9+
echo "#"
10+
echo "# Loading sal environment"
11+
source repos/ts_sal/setup.env
12+
echo "#"
13+
echo "# Setting up sal, salobj and scriptqueue"
14+
15+
setup ts_xml -t current
16+
setup ts_sal -t current
17+
setup ts_salobj -t current
18+
setup ts_scriptqueue -t current
19+
20+
~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_command_efdwriter
21+
#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_event_efdwriter &> /dev/null &
22+
#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_telemetry_efdwriter &> /dev/null &
23+
24+
/bin/bash --rcfile /home/saluser/.bash_rc

‎AT_EFD/dimm_event_setup.sh‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/usr/bin/env bash
2+
3+
# Source this file when starting the container to set it up
4+
5+
echo "#"
6+
echo "# Loading LSST Stack"
7+
source /opt/lsst/software/stack/loadLSST.bash
8+
setup lsst_distrib
9+
echo "#"
10+
echo "# Loading sal environment"
11+
source repos/ts_sal/setup.env
12+
echo "#"
13+
echo "# Setting up sal, salobj and scriptqueue"
14+
15+
setup ts_xml -t current
16+
setup ts_sal -t current
17+
setup ts_salobj -t current
18+
setup ts_scriptqueue -t current
19+
20+
#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_command_efdwriter &> /dev/null &
21+
~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_event_efdwriter
22+
#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_telemetry_efdwriter &> /dev/null &
23+
24+
/bin/bash --rcfile /home/saluser/.bash_rc

‎AT_EFD/dimm_setup.sh‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/usr/bin/env bash
2+
3+
# Source this file when starting the container to set it up
4+
5+
echo "#"
6+
echo "# Loading LSST Stack"
7+
source /opt/lsst/software/stack/loadLSST.bash
8+
setup lsst_distrib
9+
echo "#"
10+
echo "# Loading sal environment"
11+
source repos/ts_sal/setup.env
12+
echo "#"
13+
echo "# Setting up sal, salobj and scriptqueue"
14+
15+
setup ts_xml -t current
16+
setup ts_sal -t current
17+
setup ts_salobj -t current
18+
setup ts_scriptqueue -t current
19+
20+
#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_command_efdwriter &> /dev/null &
21+
#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_event_efdwriter &> /dev/null &
22+
#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_telemetry_efdwriter &> /dev/null &
23+
24+
/bin/bash --rcfile /home/saluser/.bash_rc

‎AT_EFD/dimm_telemetry_setup.sh‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/usr/bin/env bash
2+
3+
# Source this file when starting the container to set it up
4+
5+
echo "#"
6+
echo "# Loading LSST Stack"
7+
source /opt/lsst/software/stack/loadLSST.bash
8+
setup lsst_distrib
9+
echo "#"
10+
echo "# Loading sal environment"
11+
source repos/ts_sal/setup.env
12+
echo "#"
13+
echo "# Setting up sal, salobj and scriptqueue"
14+
15+
setup ts_xml -t current
16+
setup ts_sal -t current
17+
setup ts_salobj -t current
18+
setup ts_scriptqueue -t current
19+
20+
#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_command_efdwriter &> /dev/null &
21+
#~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_event_efdwriter &> /dev/null &
22+
~/repos/ts_sal/test/DIMM/cpp/src/sacpp_DIMM_telemetry_efdwriter
23+
24+
/bin/bash --rcfile /home/saluser/.bash_rc

0 commit comments

Comments
 (0)