Skip to content

Beautify minigraph generator: align code output#1111

Merged
liat-grozovik merged 1 commit intosonic-net:masterfrom
nazariig:master-cfggen
Sep 18, 2019
Merged

Beautify minigraph generator: align code output#1111
liat-grozovik merged 1 commit intosonic-net:masterfrom
nazariig:master-cfggen

Conversation

@nazariig
Copy link
Contributor

Signed-off-by: Nazarii Hnydyn nazariig@mellanox.com

Description of PR

Improved minigraph config generator: aligned code output

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • Test case(new/improvement)

Approach

How did you do it?

  • Fixed jinja2 templates

How did you verify/test it?

  • Tested with the next topologies: t0/t1/t1-lag/ptf32
diff --git a/test/sonic.ptf32.xml b/test/sonic.ptf32.xml
index c807734..62e5f1e 100644
--- a/test/sonic.ptf32.xml
+++ b/test/sonic.ptf32.xml
@@ -1364,12 +1364,13 @@
           <AttachTo>VTY_LINE</AttachTo>
           <InAcl>ssh-only</InAcl>
           <Type>SSH</Type>
-        </AclInterface>        <AclInterface>
+        </AclInterface>
+        <AclInterface>
           <AttachTo>etp17a;etp1;etp17b;etp2;etp17c;etp3;etp17d;etp4;etp21a;etp5;etp21b;etp6;etp23;etp7;etp24;etp8;etp25;etp9;etp26;etp10;etp27;etp11;etp28;etp12;etp29;etp13;etp30;etp14;etp31;etp15;etp32;etp16</AttachTo>
           <InAcl>DataAcl</InAcl>
           <Type>DataPlane</Type>
         </AclInterface>
-</AclInterfaces>
+      </AclInterfaces>
       <DownstreamSummaries/>
       <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
     </DeviceDataPlaneInfo>
diff --git a/test/sonic.t0.xml b/test/sonic.t0.xml
index 3c4d64e..e437765 100644
--- a/test/sonic.t0.xml
+++ b/test/sonic.t0.xml
@@ -220,7 +220,7 @@
       <VlanInterfaces>
         <VlanInterface>
           <Name>Vlan1000</Name>
-           <AttachTo>etp2;etp3;etp4;etp5;etp6;etp7;etp8;etp9;etp10;etp11;etp12;etp13;etp14;etp15;etp16;etp17a;etp17b;etp17c;etp17d;etp21a;etp21b;etp23;etp24;etp25</AttachTo>
+          <AttachTo>etp2;etp3;etp4;etp5;etp6;etp7;etp8;etp9;etp10;etp11;etp12;etp13;etp14;etp15;etp16;etp17a;etp17b;etp17c;etp17d;etp21a;etp21b;etp23;etp24;etp25</AttachTo>
           <NoDhcpRelay>False</NoDhcpRelay>
           <StaticDHCPRelay>0.0.0.0/0</StaticDHCPRelay>
           <Type i:nil="true"/>
@@ -298,12 +298,13 @@
           <AttachTo>VTY_LINE</AttachTo>
           <InAcl>ssh-only</InAcl>
           <Type>SSH</Type>
-        </AclInterface>        <AclInterface>
+        </AclInterface>
+        <AclInterface>
           <AttachTo>PortChannel0001;PortChannel0002;PortChannel0003;PortChannel0004</AttachTo>
           <InAcl>DataAcl</InAcl>
           <Type>DataPlane</Type>
         </AclInterface>
-</AclInterfaces>
+      </AclInterfaces>
       <DownstreamSummaries/>
       <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
     </DeviceDataPlaneInfo>
diff --git a/test/sonic.t1-lag.xml b/test/sonic.t1-lag.xml
index ae20f7d..02b30ca 100644
--- a/test/sonic.t1-lag.xml
+++ b/test/sonic.t1-lag.xml
@@ -1084,12 +1084,13 @@
           <AttachTo>VTY_LINE</AttachTo>
           <InAcl>ssh-only</InAcl>
           <Type>SSH</Type>
-        </AclInterface>        <AclInterface>
+        </AclInterface>
+        <AclInterface>
           <AttachTo>PortChannel0002;PortChannel0005;PortChannel0008;PortChannel0011;PortChannel0014;PortChannel0017;PortChannel0020;PortChannel0023;etp17a;etp17b;etp17c;etp17d;etp21a;etp21b;etp23;etp24;etp25;etp26;etp27;etp28;etp29;etp30;etp31;etp32</AttachTo>
           <InAcl>DataAcl</InAcl>
           <Type>DataPlane</Type>
         </AclInterface>
-</AclInterfaces>
+      </AclInterfaces>
       <DownstreamSummaries/>
       <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
     </DeviceDataPlaneInfo>
diff --git a/test/sonic.t1.xml b/test/sonic.t1.xml
index 9cfa9c9..196dbbf 100644
--- a/test/sonic.t1.xml
+++ b/test/sonic.t1.xml
@@ -1364,12 +1364,13 @@
           <AttachTo>VTY_LINE</AttachTo>
           <InAcl>ssh-only</InAcl>
           <Type>SSH</Type>
-        </AclInterface>        <AclInterface>
+        </AclInterface>
+        <AclInterface>
           <AttachTo>etp17a;etp1;etp17b;etp2;etp17c;etp3;etp17d;etp4;etp21a;etp5;etp21b;etp6;etp23;etp7;etp24;etp8;etp25;etp9;etp26;etp10;etp27;etp11;etp28;etp12;etp29;etp13;etp30;etp14;etp31;etp15;etp32;etp16</AttachTo>
           <InAcl>DataAcl</InAcl>
           <Type>DataPlane</Type>
         </AclInterface>
-</AclInterfaces>
+      </AclInterfaces>
       <DownstreamSummaries/>
       <DownstreamSummarySet xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution"/>
     </DeviceDataPlaneInfo>

Any platform specific information?

  • N/A

Supported testbed topology if it's a new test case?

  • N/A

Documentation

  • N/A

Signed-off-by: Nazarii Hnydyn <nazariig@mellanox.com>
@liat-grozovik liat-grozovik merged commit 2bb517f into sonic-net:master Sep 18, 2019
anders-nexthop added a commit to nexthop-ai/sonic-mgmt that referenced this pull request Feb 27, 2026
)

<!--
Please make sure you've read and understood our contributing guidelines;
https://github.com/sonic-net/SONiC/blob/gh-pages/CONTRIBUTING.md

Please provide following information to help code review process a bit
easier:
-->
### Description of PR
<!--
- Please include a summary of the change and which issue is fixed.
- Please also include relevant motivation and context. Where should
reviewer start? background context?
- List any dependencies that are required for this change.
-->

Summary:

Currently the test will fail with a KeyError somewhere random, because
it assumes it will always get at least one packet. But if the test is
badly failing, that might not be true. Better to have a clear error and
failure point.

Fixes # (issue)

### Type of change

<!--
- Fill x for your type of change.
- e.g.
- [x] Bug fix
-->

- [x] Bug fix
- [ ] Testbed and Framework(new/improvement)
- [ ] New Test case
    - [ ] Skipped for non-supported platforms
- [ ] Test case improvement


### Back port request
- [x] 202505
- [x] 202511

### Approach
#### What is the motivation for this PR?

#### How did you do it?

#### How did you verify/test it?

#### Any platform specific information?

#### Supported testbed topology if it's a new test case?

### Documentation
<!--
(If it's a new feature, new test case)
Did you update documentation/Wiki relevant to your implementation?
Link to the wiki page?
-->
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
…onic-net#7647)

Includes below commits
```
sonic-swss
05f0438 2021-05-19 | Fix build error (sonic-net#1751) [Shi Su]
1682a8d 2021-05-12 | [Bulk mode] Improve log in bulk failures (sonic-net#1740) [Shi Su]
4509e88 2021-04-27 | [routeorch] Add support for blackhole routes (sonic-net#1723) [Shi Su]
642014d 2019-10-31 | [fix] Use the same storm detection condition for queue occupancy non-zero case as the zero case (sonic-net#1111) [Wenda Ni]

sonic-utilities
97fc442 2021-05-10 | [config]: Use mod_entry when editing VLAN_INTERFACE (sonic-net#1602) [Lawrence Lee]
f60d579 2021-04-15 | [techsupport] Update show ip interface command (sonic-net#1562) [Mahesh Maddikayala]
821d29d 2021-04-14 | Fix Multi-ASIC show specific resursive route by using common parsing function (sonic-net#1560) [gechiang]

sonic-linux-kernel
61b331f 2021-05-06 | [dps200] Add dps200 PSU module driver (sonic-net#207) [schobtr]

sonic-platform-daemons
5d2960f 2021-05-17 | [xcvrd] add support for logging mux_metrics events into state DB (sonic-net#185) [vdahiya12]
a5c9207 2021-05-11 | [thermalctld] Enable stopping thermal manager (sonic-net#180) [Junchao-Mellanox]
9123f63 2021-05-10 | [muxcable] Remove Xcvrd Sleep (sonic-net#174) [Tamer Ahmed]
```
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
Submodule src/sonic-swss 98cfe56..f09ddb4:
  > [fix] Use the same storm detection condition for queue occupancy non-zero case as the zero case (sonic-net#1111)

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
[fix] Use the same storm detection condition for queue occupancy non-zero case as the zero case (sonic-net#1111)
Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants