Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
lihuay authored Sep 25, 2022
2 parents 2e83fbd + 082d655 commit 78a1e95
Show file tree
Hide file tree
Showing 186 changed files with 73,399 additions and 929 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ assignees: ''

---

**We do not triage issue for this repo. All issues are triaged in Azure/sonic-buildimage repo**
**We do not triage issue for this repo. All issues are triaged in sonic-net/sonic-buildimage repo**
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ For example:
* Use issues to keep track of what is going on

##Expectations for pull requests
Pull requests should be free of any known bugs and be accompanied by tests and appropriate documentation. Test coverage may include unit tests, integration tests such as [PTF tests](https://github.com/Azure/SONiC/wiki/HOWTO-write-a-PTF-Test) defined in the [sonic-mgmt repo](https://github.com/Azure/sonic-mgmt/tree/master/ansible/roles/test/tasks).
Pull requests should be free of any known bugs and be accompanied by tests and appropriate documentation. Test coverage may include unit tests, integration tests such as [PTF tests](https://github.com/sonic-net/SONiC/wiki/HOWTO-write-a-PTF-Test) defined in the [sonic-mgmt repo](https://github.com/sonic-net/sonic-mgmt/tree/master/ansible/roles/test/tasks).

## Commiting new test
When commiting a new feature with a new test, please complete a [test plan from the template](doc/SONiC%20Test%20Plan%20Template.md)
Expand Down
195 changes: 165 additions & 30 deletions MoM.html

Large diffs are not rendered by default.

36 changes: 15 additions & 21 deletions Supported-Devices-and-Platforms.html
Original file line number Diff line number Diff line change
Expand Up @@ -471,15 +471,15 @@ <h2><p style="text-align: left; font-family: Verdana, sans-serif; color: #2E86C1
<tr>
<td>Arista</td>
<td>7170-32CD</td>
<td class="asic_vendor">Barefoot</td>
<td class="asic_vendor">Intel</td>
<td>Tofino</td>
<td>32x100G + 2x10G</td>
<td></td>
</tr>
<tr>
<td>Arista</td>
<td>7170-64C</td>
<td class="asic_vendor">Barefoot</td>
<td class="asic_vendor">Intel</td>
<td>Tofino</td>
<td>64x100G</td>
<td></td>
Expand Down Expand Up @@ -509,25 +509,17 @@ <h2><p style="text-align: left; font-family: Verdana, sans-serif; color: #2E86C1
<td></td>
</tr>
<tr>
<td>Barefoot</td>
<td>SONiC-P4</td>
<td class="asic_vendor">Barefoot</td>
<td>P4 Emulated</td>
<td>Configurable</td>
<td></td>
</tr>
<tr>
<td>Barefoot</td>
<td>Accton</td>
<td>Wedge 100BF-32</td>
<td class="asic_vendor">Barefoot</td>
<td class="asic_vendor">Intel</td>
<td>Tofino</td>
<td>32x100G</td>
<td></td>
</tr>
<tr>
<td>Barefoot</td>
<td>Accton</td>
<td>Wedge 100BF-65X</td>
<td class="asic_vendor">Barefoot</td>
<td class="asic_vendor">Intel</td>
<td>Tofino</td>
<td>32x100G</td>
<td></td>
Expand All @@ -551,7 +543,7 @@ <h2><p style="text-align: left; font-family: Verdana, sans-serif; color: #2E86C1
<tr>
<td>Celestica</td>
<td>midstone-200i</td>
<td class="asic_vendor">Innovium</td>
<td class="asic_vendor">Marvell</td>
<td>Teralynx 7</td>
<td>128x100G</td>
<td></td>
Expand Down Expand Up @@ -749,7 +741,7 @@ <h2><p style="text-align: left; font-family: Verdana, sans-serif; color: #2E86C1
<tr>
<td>Delta</td>
<td>et-c032if</td>
<td class="asic_vendor">Innovium</td>
<td class="asic_vendor">Marvell</td>
<td>Teralynx 7</td>
<td>32x400G</td>
<td></td>
Expand Down Expand Up @@ -837,7 +829,7 @@ <h2><p style="text-align: left; font-family: Verdana, sans-serif; color: #2E86C1
<tr>
<td>Ingrasys</td>
<td>S9180-32X</td>
<td class="asic_vendor">Barefoot</td>
<td class="asic_vendor">Intel</td>
<td>Tofino</td>
<td>32x100G</td>
<td></td>
Expand All @@ -861,7 +853,7 @@ <h2><p style="text-align: left; font-family: Verdana, sans-serif; color: #2E86C1
<tr>
<td>Ingrasys</td>
<td>S9280-64X</td>
<td class="asic_vendor">Barefoot</td>
<td class="asic_vendor">Intel</td>
<td>Tofino</td>
<td>64x100G</td>
<td></td>
Expand Down Expand Up @@ -1093,7 +1085,7 @@ <h2><p style="text-align: left; font-family: Verdana, sans-serif; color: #2E86C1
<tr>
<td>Wnc</td>
<td>OSW1800</td>
<td class="asic_vendor">Barefoot</td>
<td class="asic_vendor">Intel</td>
<td>Tofino</td>
<td>48x25G + 6x100G</td>
<td></td>
Expand Down Expand Up @@ -1177,10 +1169,12 @@ <h2><p style="text-align: left; font-family: Verdana, sans-serif; color: #2E86C1
vdata = table[i].children[2].textContent;
if (vdata == "Nvidia")
vdata = "Mellanox";

if (vdata == "Intel")
vdata = "Barefoot";

if (vdata == "Marvell"){
if(table[i].children[1].textContent.search("ARM") != -1)
vdata = "Marvell-armhf";
vdata = "Marvell-armhf";
}

if(vendor_data[vdata] == "")
Expand Down
Binary file modified assets/img/all_partners2_1920x1320.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions contact.html
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ <h2>Contact</h2>
<p>Send questions, bugs, comments and ideas to sonicproject@googlegroups.com</p>
<p>Join the <a href="https://groups.google.com/forum/#!forum/sonicproject"><font color="#0000FF" size="3">mailing list</font></a> </p>
<p>Join the <a href="https://sonicswitch.slack.com"><font color="#0000FF" size="3">Slack discussion group</font></a></p>
<p>Report issues <a href="https://github.com/Azure/SONiC/issues"><font color="#0000FF" size="3">here</font></a> and provide the following:</p>
<p>Report issues <a href="https://github.com/sonic-net/SONiC/issues"><font color="#0000FF" size="3">here</font></a> and provide the following:</p>
<p> -show version output</p>
<p> -SONiC support file generated by the sudo generate_dump command</p>
</div>
Expand Down Expand Up @@ -143,4 +143,4 @@ <h2>Contact</h2>
<script src="assets/js/custom.js"></script>

</body>
</html>
</html>
Loading

0 comments on commit 78a1e95

Please sign in to comment.