Skip to content

Commit 113fc12

Browse files
wangxinbotwangxinCopilot
authored andcommitted
[container_upgrade] Convert parameters.json from string to list format (sonic-net#23343)
Convert docker parameters from single string format to list format for better readability and to align with the internal repo format, reducing merge conflicts during public-to-internal sync. Update create_parameters_mapping() to join the list with spaces, producing the same runtime result as before. Signed-off-by: Xin Wang <[email protected]> Co-authored-by: Xin Wang <[email protected]> Co-authored-by: Copilot <[email protected]> Signed-off-by: selldinesh <[email protected]>
1 parent 080b7e0 commit 113fc12

File tree

2 files changed

+73
-9
lines changed

2 files changed

+73
-9
lines changed

tests/container_upgrade/container_upgrade_helper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def create_testcase_mapping(testcase_file):
9393
def create_parameters_mapping(containers, parameters_file):
9494
with open(parameters_file, 'r') as file:
9595
data = json.load(file)
96-
container_parameters = {container: details['parameters'] for container, details in data.items()}
96+
container_parameters = {container: ' '.join(details['parameters']) for container, details in data.items()}
9797

9898
return container_parameters
9999

Lines changed: 72 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,90 @@
11
{
22
"docker-sonic-telemetry": {
3-
"parameters": ""
3+
"parameters": []
44
},
55
"docker-sonic-gnmi": {
6-
"parameters": "--net=host --pid=host --userns=host --uts=host --cap-add=SYS_ADMIN --cap-add=SYS_BOOT --cap-add=SYS_PTRACE --cap-add=NET_ADMIN --cap-add=DAC_OVERRIDE --security-opt apparmor=unconfined --security-opt seccomp=unconfined -v /etc/sonic:/etc/sonic:ro -v /etc/localtime:/etc/localtime:ro -v /etc/fips/fips_enable:/etc/fips/fips_enable:ro -v /usr/share/sonic/templates/rsyslog-container.conf.j2:/usr/share/sonic/templates/rsyslog-container.conf.j2:ro -v /var/run/dbus:/var/run/dbus:rw -v /var/run/redis:/var/run/redis:rw -v /var/run/redis-chassis:/var/run/redis-chassis:ro --env RUNTIME_OWNER=local"
6+
"parameters": [
7+
"--net=host",
8+
"--pid=host",
9+
"--userns=host",
10+
"--uts=host",
11+
"--cap-add=SYS_ADMIN",
12+
"--cap-add=SYS_BOOT",
13+
"--cap-add=SYS_PTRACE",
14+
"--cap-add=NET_ADMIN",
15+
"--cap-add=DAC_OVERRIDE",
16+
"--security-opt apparmor=unconfined",
17+
"--security-opt seccomp=unconfined",
18+
"-v /etc/sonic:/etc/sonic:ro",
19+
"-v /etc/localtime:/etc/localtime:ro",
20+
"-v /etc/fips/fips_enable:/etc/fips/fips_enable:ro",
21+
"-v /usr/share/sonic/templates/rsyslog-container.conf.j2:/usr/share/sonic/templates/rsyslog-container.conf.j2:ro",
22+
"-v /var/run/dbus:/var/run/dbus:rw",
23+
"-v /var/run/redis:/var/run/redis:rw",
24+
"-v /var/run/redis-chassis:/var/run/redis-chassis:ro",
25+
"--env RUNTIME_OWNER=local"
26+
]
727
},
828
"docker-gnmi-watchdog": {
9-
"parameters": "--pid=host --net=host -v /etc/localtime:/etc/localtime:ro -v /etc/sonic:/etc/sonic:ro"
29+
"parameters": [
30+
"--pid=host",
31+
"--net=host",
32+
"-v /etc/localtime:/etc/localtime:ro",
33+
"-v /etc/sonic:/etc/sonic:ro"
34+
]
1035
},
1136
"docker-sonic-bmp": {
12-
"parameters": "--net=host -v /etc/sonic:/etc/sonic:ro -v /etc/localtime:/etc/localtime:ro -v /usr/share/sonic/templates/rsyslog-container.conf.j2:/usr/share/sonic/templates/rsyslog-container.conf.j2:ro -v /var/run/redis:/var/run/redis:rw -v /var/run/redis-bmp:/var/run/redis-bmp:ro"
37+
"parameters": [
38+
"--net=host",
39+
"-v /etc/sonic:/etc/sonic:ro",
40+
"-v /etc/localtime:/etc/localtime:ro",
41+
"-v /usr/share/sonic/templates/rsyslog-container.conf.j2:/usr/share/sonic/templates/rsyslog-container.conf.j2:ro",
42+
"-v /var/run/redis:/var/run/redis:rw",
43+
"-v /var/run/redis-bmp:/var/run/redis-bmp:ro"
44+
]
1345
},
1446
"docker-bmp-watchdog": {
15-
"parameters": "--pid=host --net=host -v /etc/localtime:/etc/localtime:ro -v /etc/sonic:/etc/sonic:ro"
47+
"parameters": [
48+
"--pid=host",
49+
"--net=host",
50+
"-v /etc/localtime:/etc/localtime:ro",
51+
"-v /etc/sonic:/etc/sonic:ro"
52+
]
1653
},
1754
"docker-sonic-restapi": {
18-
"parameters": "--net=host -v /var/run/redis/redis.sock:/var/run/redis/redis.sock -v /etc/sonic/credentials:/etc/sonic/credentials:ro -v /etc/localtime:/etc/localtime:ro -v /var/run/redis:/var/run/redis:rw -v /var/run/redis-chassis:/var/run/redis-chassis:ro -v /etc/fips/fips_enable:/etc/fips/fips_enable:ro -v /usr/share/sonic/templates/rsyslog-container.conf.j2:/usr/share/sonic/templates/rsyslog-container.conf.j2:ro -e RUNTIME_OWNER=local -e NAMESPACE_PREFIX=asic -e CONTAINER_NAME=restapi -e SYSLOG_TARGET_IP=127.0.0.1"
55+
"parameters": [
56+
"--net=host",
57+
"-v /var/run/redis/redis.sock:/var/run/redis/redis.sock",
58+
"-v /etc/sonic/credentials:/etc/sonic/credentials:ro",
59+
"-v /etc/localtime:/etc/localtime:ro",
60+
"-v /var/run/redis:/var/run/redis:rw",
61+
"-v /var/run/redis-chassis:/var/run/redis-chassis:ro",
62+
"-v /etc/fips/fips_enable:/etc/fips/fips_enable:ro",
63+
"-v /usr/share/sonic/templates/rsyslog-container.conf.j2:/usr/share/sonic/templates/rsyslog-container.conf.j2:ro",
64+
"-e RUNTIME_OWNER=local",
65+
"-e NAMESPACE_PREFIX=asic",
66+
"-e CONTAINER_NAME=restapi",
67+
"-e SYSLOG_TARGET_IP=127.0.0.1"
68+
]
1969
},
2070
"docker-restapi-watchdog": {
21-
"parameters": "--net=host -v /etc/localtime:/etc/localtime:ro"
71+
"parameters": [
72+
"--net=host",
73+
"-v /etc/localtime:/etc/localtime:ro"
74+
]
2275
},
2376
"docker-restapi-sidecar": {
24-
"parameters": "--privileged --pid=host --net=host --uts=host --ipc=host -v /etc/sonic:/etc/sonic:ro -v /usr/bin/docker:/usr/bin/docker:ro -v /var/run/docker.sock:/var/run/docker.sock -v /:/hostroot:ro -e DOCKER_BIN=/usr/bin/docker"
77+
"parameters": [
78+
"--privileged",
79+
"--pid=host",
80+
"--net=host",
81+
"--uts=host",
82+
"--ipc=host",
83+
"-v /etc/sonic:/etc/sonic:ro",
84+
"-v /usr/bin/docker:/usr/bin/docker:ro",
85+
"-v /var/run/docker.sock:/var/run/docker.sock",
86+
"-v /:/hostroot:ro",
87+
"-e DOCKER_BIN=/usr/bin/docker"
88+
]
2589
}
2690
}

0 commit comments

Comments
 (0)