Skip to content

Commit acd8855

Browse files
yaqiangzyaqiangz
committed
Merged PR 9025464: Merge branch 'master' of https://github.com/Azure/sonic-buildimage into internal
1. Resolve conflicts (introduced by this public PR: [sonic-net#16947](sonic-net#16947)) in `dockers/docker-dhcp-relay/Dockerfile.j2`: ``` <<<<<<< HEAD RUN apt-get install -y dnsmasq gcc python3-dev RUN pip3 install psutil RUN apt-get purge -y gcc python3-dev ======= {% if docker_dhcp_relay_whls.strip() %} # Copy locally-built Python wheel dependencies {{ copy_files("python-wheels/", docker_dhcp_relay_whls.split(' '), "/python-wheels/") }} # Install locally-built Python wheel dependencies {{ install_python_wheels(docker_dhcp_relay_whls.split(' ')) }} {% endif %} >>>>>>> 274d320 ``` Accepted both changes, after resolved: ``` RUN apt-get install -y dnsmasq gcc python3-dev RUN pip3 install psutil RUN apt-get purge -y gcc python3-dev {% if docker_dhcp_relay_whls.strip() %} # Copy locally-built Python wheel dependencies {{ copy_files("python-wheels/", docker_dhcp_relay_whls.split(' '), "/python-wheels/") }} # Install locally-built Python wheel dependencies {{ install_python_wheels(docker_dhcp_relay_whls.split(' ')) }} {% endif %} ``` 2. Because dnsmasq (used for ipv4 dhcp_server previously) exist in internal repo but not exist in public master repo, which would cause new added test case added by [sonic-net#16947](sonic-net#16947) in sonic-config-engine would fail. Also, we expect that dnsmasq is not running if "dhcp_server" feature is enabled. So I **add support for new added test case** and **modify template to avoid run dnsmasq when dhcp_server feature is enabled** in below commit: ![image (2).png](https://dev.azure.com/msazure/b32aa71e-8ed2-41b2-9d77-5bc261222004/_apis/git/repositories/8721f84d-7905-4f85-b5f1-0e19e8eac66b/pullRequests/9025464/attachments/image%20%282%29.png) Related work items: sonic-net#350, sonic-net#803, sonic-net#2858, sonic-net#16945, sonic-net#16996, sonic-net#17047, sonic-net#17053, sonic-net#17056, sonic-net#17057, sonic-net#17068
2 parents deb6efb + 341de0a commit acd8855

File tree

78 files changed

+3376
-2132
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+3376
-2132
lines changed

‎device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/sai_2010.xml

+171-168
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<!--
3-
Copyright (c) 2018-2021 NVIDIA CORPORATION & AFFILIATES.
3+
Copyright (c) 2018-2023 NVIDIA CORPORATION & AFFILIATES.
44
Apache-2.0
55
66
Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,177 +16,180 @@
1616
limitations under the License.
1717
-->
1818
<root>
19-
<platform_info type="2010">
19+
<platform_info type="2010">
2020

21-
<!-- Device MAC address -->
22-
<device-mac-address>00:02:03:04:05:00</device-mac-address>
21+
<!-- Device MAC address -->
22+
<device-mac-address>00:02:03:04:05:00</device-mac-address>
2323

24-
<!-- ISSU enabled -->
25-
<issu-enabled>1</issu-enabled>
24+
<!-- ISSU enabled -->
25+
<issu-enabled>1</issu-enabled>
2626

27-
<!-- Number of ports in the following port list -->
28-
<number-of-physical-ports>22</number-of-physical-ports>
27+
<!-- Number of ports in the following port list -->
28+
<number-of-physical-ports>22</number-of-physical-ports>
2929

30-
<!-- List of ports in the device -->
31-
<ports-list>
32-
<port-info>
33-
<local-port>1</local-port>
34-
<width>1</width>
35-
<module>14</module>
30+
<!-- Global port late create -->
31+
<late-create-all-ports>1</late-create-all-ports>
3632

37-
<!-- 0 none, 1=2, 2=4, 3=2,4 -->
38-
<breakout-modes>0</breakout-modes>
33+
<!-- List of ports in the device -->
34+
<ports-list>
35+
<port-info>
36+
<local-port>1</local-port>
37+
<width>1</width>
38+
<module>14</module>
3939

40-
<!-- (BITMASK) 28700 - 10Gb , 939524096 - 25Gb , 98368 - 40Gb , 3221487616 - 50Gb , 11534336 - 100Gb-->
41-
<port-speed>939524096</port-speed>
42-
</port-info>
43-
<port-info>
44-
<local-port>2</local-port>
45-
<width>1</width>
46-
<module>15</module>
47-
<breakout-modes>0</breakout-modes>
48-
<port-speed>939524096</port-speed>
49-
</port-info>
50-
<port-info>
51-
<local-port>3</local-port>
52-
<width>1</width>
53-
<module>16</module>
54-
<breakout-modes>0</breakout-modes>
55-
<port-speed>939524096</port-speed>
56-
</port-info>
57-
<port-info>
58-
<local-port>4</local-port>
59-
<width>1</width>
60-
<module>17</module>
61-
<breakout-modes>0</breakout-modes>
62-
<port-speed>939524096</port-speed>
63-
</port-info>
64-
<port-info>
65-
<local-port>5</local-port>
66-
<width>4</width>
67-
<module>19</module>
68-
<breakout-modes>3</breakout-modes>
69-
<port-speed>11534336</port-speed>
70-
</port-info>
71-
<port-info>
72-
<local-port>9</local-port>
73-
<width>4</width>
74-
<module>18</module>
75-
<breakout-modes>3</breakout-modes>
76-
<port-speed>11534336</port-speed>
77-
</port-info>
78-
<port-info>
79-
<local-port>13</local-port>
80-
<width>4</width>
81-
<module>21</module>
82-
<breakout-modes>3</breakout-modes>
83-
<port-speed>11534336</port-speed>
84-
</port-info>
85-
<port-info>
86-
<local-port>17</local-port>
87-
<width>4</width>
88-
<module>20</module>
89-
<breakout-modes>3</breakout-modes>
90-
<port-speed>11534336</port-speed>
91-
</port-info>
92-
<port-info>
93-
<local-port>33</local-port>
94-
<width>1</width>
95-
<module>10</module>
96-
<breakout-modes>0</breakout-modes>
97-
<port-speed>939524096</port-speed>
98-
</port-info>
99-
<port-info>
100-
<local-port>34</local-port>
101-
<width>1</width>
102-
<module>11</module>
103-
<breakout-modes>0</breakout-modes>
104-
<port-speed>939524096</port-speed>
105-
</port-info>
106-
<port-info>
107-
<local-port>35</local-port>
108-
<width>1</width>
109-
<module>12</module>
110-
<breakout-modes>0</breakout-modes>
111-
<port-speed>939524096</port-speed>
112-
</port-info>
113-
<port-info>
114-
<local-port>36</local-port>
115-
<width>1</width>
116-
<module>13</module>
117-
<breakout-modes>0</breakout-modes>
118-
<port-speed>939524096</port-speed>
119-
</port-info>
120-
<port-info>
121-
<local-port>37</local-port>
122-
<width>1</width>
123-
<module>6</module>
124-
<breakout-modes>0</breakout-modes>
125-
<port-speed>939524096</port-speed>
126-
</port-info>
127-
<port-info>
128-
<local-port>38</local-port>
129-
<width>1</width>
130-
<module>7</module>
131-
<breakout-modes>0</breakout-modes>
132-
<port-speed>939524096</port-speed>
133-
</port-info>
134-
<port-info>
135-
<local-port>39</local-port>
136-
<width>1</width>
137-
<module>8</module>
138-
<breakout-modes>0</breakout-modes>
139-
<port-speed>939524096</port-speed>
140-
</port-info>
141-
<port-info>
142-
<local-port>40</local-port>
143-
<width>1</width>
144-
<module>9</module>
145-
<breakout-modes>0</breakout-modes>
146-
<port-speed>939524096</port-speed>
147-
</port-info>
148-
<port-info>
149-
<local-port>41</local-port>
150-
<width>1</width>
151-
<module>2</module>
152-
<breakout-modes>0</breakout-modes>
153-
<port-speed>939524096</port-speed>
154-
</port-info>
155-
<port-info>
156-
<local-port>42</local-port>
157-
<width>1</width>
158-
<module>3</module>
159-
<breakout-modes>0</breakout-modes>
160-
<port-speed>939524096</port-speed>
161-
</port-info>
162-
<port-info>
163-
<local-port>43</local-port>
164-
<width>1</width>
165-
<module>4</module>
166-
<breakout-modes>0</breakout-modes>
167-
<port-speed>939524096</port-speed>
168-
</port-info>
169-
<port-info>
170-
<local-port>44</local-port>
171-
<width>1</width>
172-
<module>5</module>
173-
<breakout-modes>0</breakout-modes>
174-
<port-speed>939524096</port-speed>
175-
</port-info>
176-
<port-info>
177-
<local-port>45</local-port>
178-
<width>1</width>
179-
<module>0</module>
180-
<breakout-modes>0</breakout-modes>
181-
<port-speed>939524096</port-speed>
182-
</port-info>
183-
<port-info>
184-
<local-port>46</local-port>
185-
<width>1</width>
186-
<module>1</module>
187-
<breakout-modes>0</breakout-modes>
188-
<port-speed>939524096</port-speed>
189-
</port-info>
190-
</ports-list>
191-
</platform_info>
40+
<!-- 0 none, 1=2, 2=4, 3=2,4 -->
41+
<breakout-modes>0</breakout-modes>
42+
43+
<!-- (BITMASK) 28700 - 10Gb , 939524096 - 25Gb , 98368 - 40Gb , 3221487616 - 50Gb , 11534336 - 100Gb-->
44+
<port-speed>939524096</port-speed>
45+
</port-info>
46+
<port-info>
47+
<local-port>2</local-port>
48+
<width>1</width>
49+
<module>15</module>
50+
<breakout-modes>0</breakout-modes>
51+
<port-speed>939524096</port-speed>
52+
</port-info>
53+
<port-info>
54+
<local-port>3</local-port>
55+
<width>1</width>
56+
<module>16</module>
57+
<breakout-modes>0</breakout-modes>
58+
<port-speed>939524096</port-speed>
59+
</port-info>
60+
<port-info>
61+
<local-port>4</local-port>
62+
<width>1</width>
63+
<module>17</module>
64+
<breakout-modes>0</breakout-modes>
65+
<port-speed>939524096</port-speed>
66+
</port-info>
67+
<port-info>
68+
<local-port>5</local-port>
69+
<width>4</width>
70+
<module>19</module>
71+
<breakout-modes>3</breakout-modes>
72+
<port-speed>11534336</port-speed>
73+
</port-info>
74+
<port-info>
75+
<local-port>9</local-port>
76+
<width>4</width>
77+
<module>18</module>
78+
<breakout-modes>3</breakout-modes>
79+
<port-speed>11534336</port-speed>
80+
</port-info>
81+
<port-info>
82+
<local-port>13</local-port>
83+
<width>4</width>
84+
<module>21</module>
85+
<breakout-modes>3</breakout-modes>
86+
<port-speed>11534336</port-speed>
87+
</port-info>
88+
<port-info>
89+
<local-port>17</local-port>
90+
<width>4</width>
91+
<module>20</module>
92+
<breakout-modes>3</breakout-modes>
93+
<port-speed>11534336</port-speed>
94+
</port-info>
95+
<port-info>
96+
<local-port>33</local-port>
97+
<width>1</width>
98+
<module>10</module>
99+
<breakout-modes>0</breakout-modes>
100+
<port-speed>939524096</port-speed>
101+
</port-info>
102+
<port-info>
103+
<local-port>34</local-port>
104+
<width>1</width>
105+
<module>11</module>
106+
<breakout-modes>0</breakout-modes>
107+
<port-speed>939524096</port-speed>
108+
</port-info>
109+
<port-info>
110+
<local-port>35</local-port>
111+
<width>1</width>
112+
<module>12</module>
113+
<breakout-modes>0</breakout-modes>
114+
<port-speed>939524096</port-speed>
115+
</port-info>
116+
<port-info>
117+
<local-port>36</local-port>
118+
<width>1</width>
119+
<module>13</module>
120+
<breakout-modes>0</breakout-modes>
121+
<port-speed>939524096</port-speed>
122+
</port-info>
123+
<port-info>
124+
<local-port>37</local-port>
125+
<width>1</width>
126+
<module>6</module>
127+
<breakout-modes>0</breakout-modes>
128+
<port-speed>939524096</port-speed>
129+
</port-info>
130+
<port-info>
131+
<local-port>38</local-port>
132+
<width>1</width>
133+
<module>7</module>
134+
<breakout-modes>0</breakout-modes>
135+
<port-speed>939524096</port-speed>
136+
</port-info>
137+
<port-info>
138+
<local-port>39</local-port>
139+
<width>1</width>
140+
<module>8</module>
141+
<breakout-modes>0</breakout-modes>
142+
<port-speed>939524096</port-speed>
143+
</port-info>
144+
<port-info>
145+
<local-port>40</local-port>
146+
<width>1</width>
147+
<module>9</module>
148+
<breakout-modes>0</breakout-modes>
149+
<port-speed>939524096</port-speed>
150+
</port-info>
151+
<port-info>
152+
<local-port>41</local-port>
153+
<width>1</width>
154+
<module>2</module>
155+
<breakout-modes>0</breakout-modes>
156+
<port-speed>939524096</port-speed>
157+
</port-info>
158+
<port-info>
159+
<local-port>42</local-port>
160+
<width>1</width>
161+
<module>3</module>
162+
<breakout-modes>0</breakout-modes>
163+
<port-speed>939524096</port-speed>
164+
</port-info>
165+
<port-info>
166+
<local-port>43</local-port>
167+
<width>1</width>
168+
<module>4</module>
169+
<breakout-modes>0</breakout-modes>
170+
<port-speed>939524096</port-speed>
171+
</port-info>
172+
<port-info>
173+
<local-port>44</local-port>
174+
<width>1</width>
175+
<module>5</module>
176+
<breakout-modes>0</breakout-modes>
177+
<port-speed>939524096</port-speed>
178+
</port-info>
179+
<port-info>
180+
<local-port>45</local-port>
181+
<width>1</width>
182+
<module>0</module>
183+
<breakout-modes>0</breakout-modes>
184+
<port-speed>939524096</port-speed>
185+
</port-info>
186+
<port-info>
187+
<local-port>46</local-port>
188+
<width>1</width>
189+
<module>1</module>
190+
<breakout-modes>0</breakout-modes>
191+
<port-speed>939524096</port-speed>
192+
</port-info>
193+
</ports-list>
194+
</platform_info>
192195
</root>

0 commit comments

Comments
 (0)