Skip to content

Commit 050a696

Browse files
wangxinwangxin
authored
Update repository URL after repository migration (sonic-net#6277)
What is the motivation for this PR? The sonic-mgmt repository has been migrated to new location: https://github.com/sonic-net/sonic-mgmt The URLs embedded in docs and code need to be updated for this change. How did you do it? This change updated all the URLs in docs and code. This change also merged a duplicated entry in test_mark_conditions.yaml: cacl/test_cacl_application.py::test_multiasic_cacl_application Signed-off-by: Xin Wang <xiwang5@microsoft.com>
1 parent 9298743 commit 050a696

File tree

97 files changed

+640
-650
lines changed

Some content is hidden

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

97 files changed

+640
-650
lines changed

‎.github/ISSUE_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ information within 7 days, we cannot debug your issue and will close it. We
1010
will, however, reopen it if you later provide the information.
1111
1212
For more information about reporting issues, see
13-
https://github.com/Azure/SONiC/wiki#report-issues
13+
https://github.com/sonic-net/SONiC/wiki#report-issues
1414
1515
---------------------------------------------------
1616
GENERAL SUPPORT INFORMATION

‎.github/PULL_REQUEST_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
Please make sure you've read and understood our contributing guidelines;
3-
https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md
3+
https://github.com/sonic-net/SONiC/blob/gh-pages/CONTRIBUTING.md
44
55
Please provide following information to help code review process a bit easier:
66
-->

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Management and automation code used for SONiC testbed deployment, tests and repo
88

99
# Contribution guide
1010
All contributors must sign a contribution license agreement before contributions can be accepted.
11-
[How to become a contributer](https://github.com/Azure/SONiC/wiki/Becoming-a-contributor)
11+
[How to become a contributer](https://github.com/sonic-net/SONiC/wiki/Becoming-a-contributor)
1212

1313
### GitHub Workflow
1414

‎ansible/dualtor/config_simulated_y_cable.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939

4040
# Inject mux simulator config
4141
# Below step is required after these PRs are merged:
42-
# * https://github.com/Azure/sonic-platform-common/pull/213
43-
# * https://github.com/Azure/sonic-platform-daemons/pull/197
42+
# * https://github.com/sonic-net/sonic-platform-common/pull/213
43+
# * https://github.com/sonic-net/sonic-platform-daemons/pull/197
4444
# For the simulated y_cable driver to work, basic configuration information of the mux simulator is required.
4545
# When /etc/sonic/mux_simulator.json file is found on DUT, xcvrd will try to load simulated y_cable driver.
4646
# Otherwise, xcvrd will try to get cable vendor and model, then load corresponding y_cable driver based on

‎ansible/library/multi-asic_aware_module_requirements.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Requirements for designing a customized ansible module to support multi-ASIC
22

3-
PR https://github.com/Azure/SONiC/pull/644 introduced the HLD to support multi ASIC. In the future, multi DUT or Chassis will be supported by SONiC as well. Some of the customized ansible modules need to be updated to support testing of the upcoming new architectures. This document tries to propose some requirements for designing customized ansible modules that need to deal with multi-ASIC. The target is to have a clean and easy to use interface for calling these ansible modules in scripts testing multi DUT and multi ASIC system. Meanwhile, the ansible modules need to maintain backward compatibility for single DUT and single ASIC testing.
3+
PR https://github.com/sonic-net/SONiC/pull/644 introduced the HLD to support multi ASIC. In the future, multi DUT or Chassis will be supported by SONiC as well. Some of the customized ansible modules need to be updated to support testing of the upcoming new architectures. This document tries to propose some requirements for designing customized ansible modules that need to deal with multi-ASIC. The target is to have a clean and easy to use interface for calling these ansible modules in scripts testing multi DUT and multi ASIC system. Meanwhile, the ansible modules need to maintain backward compatibility for single DUT and single ASIC testing.
44

55
## Requirements
66

@@ -73,7 +73,7 @@ duthosts.foo(asic_index="all")
7373

7474
## How to detect a multi ASIC system
7575

76-
According to https://github.com/Azure/SONiC/pull/644, multi ASIC system should have file `/usr/share/sonic/device/<platform>/asic.conf`:
76+
According to https://github.com/sonic-net/SONiC/pull/644, multi ASIC system should have file `/usr/share/sonic/device/<platform>/asic.conf`:
7777

7878
Sample asic.conf:
7979
```

‎ansible/library/port_alias.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
Description:
2121
Minigraph file is using SONiC device alias to describe the interface name, it's vendor and and hardware platform dependent
2222
This module is used to find the correct port_config.ini for the hwsku and return Ansible ansible_facts.port_alias
23-
The definition of this mapping is specified in http://github.com/azure/sonic-buildimage/device
23+
The definition of this mapping is specified in http://github.com/sonic-net/sonic-buildimage/device
2424
You should build docker-sonic-mgmt from sonic-buildimage and run Ansible from sonic-mgmt docker container
2525
For multi-asic platforms, port_config.ini for each asic will be parsed to get the port_alias information.
2626
When bringing up the testbed, port-alias will only contain external interfaces, so that vs image can come up with
@@ -245,10 +245,10 @@ def main():
245245
slotid = None
246246
if 'switchids' in m_args and m_args['switchids'] != None and len(m_args['switchids']):
247247
switchids = m_args['switchids']
248-
248+
249249
if 'slotid' in m_args and m_args['slotid'] != None:
250250
slotid = m_args['slotid']
251-
# When this script is invoked on sonic-mgmt docker, num_asic
251+
# When this script is invoked on sonic-mgmt docker, num_asic
252252
# parameter is passed.
253253
if m_args['num_asic'] is not None:
254254
num_asic = m_args['num_asic']

‎ansible/roles/test/files/acstests/IP_decap_test.py

+41-41
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
'''
2-
Owner: Dor Marcus <Dorm@mellanox.com>
2+
Owner: Dor Marcus <Dorm@mellanox.com>
33
Created on: 12/09/2017
4-
Description: This file contains the Decapasulation test for SONIC, to test Decapsulation of IPv4 with double and triple encapsulated packets
5-
6-
Design is available in https://github.com/Azure/SONiC/wiki/IPv4-Decapsulation-test
7-
4+
Description: This file contains the Decapasulation test for SONIC, to test Decapsulation of IPv4 with double and triple encapsulated packets
5+
6+
Design is available in https://github.com/sonic-net/SONiC/wiki/IPv4-Decapsulation-test
7+
88
Precondition: Before the test start, all routes need to be defined as in the route_info.txt file, in addition to the decap rule that need to be set as the dspc_mode
99
topology: The test need to run on non-lag systems with at least 31 active ports
10-
11-
Usage: Examples of how to start the test
12-
ptf --test-dir /root/dor/ ip_decap_test_red --platform remote -t "verbose=True;route_info='/tmp/route_info.txt';lo_ip='10.1.0.32';router_mac='00:02:03:04:05:00';dscp_mode='pipe'" --log-dir /tmp/logs --verbose
13-
Parameters: route_info - The route_info file location
10+
11+
Usage: Examples of how to start the test
12+
ptf --test-dir /root/dor/ ip_decap_test_red --platform remote -t "verbose=True;route_info='/tmp/route_info.txt';lo_ip='10.1.0.32';router_mac='00:02:03:04:05:00';dscp_mode='pipe'" --log-dir /tmp/logs --verbose
13+
Parameters: route_info - The route_info file location
1414
lo_ip - The loop_back IP that is configured in the decap rule
1515
router_mac - The mac of the router_mac
1616
dscp_mode - The rule for the dscp parameter in the decap packet that is configured in the JSON file ('pipe' for inner and 'uniform' for outer)
17-
17+
1818
'''
1919

2020
#---------------------------------------------------------------------
@@ -63,13 +63,13 @@ def setUp(self):
6363
self.dataplane = ptf.dataplane_instance
6464
self.router_mac = self.test_params['router_mac']
6565
#-----------------------------------------------------------------
66-
66+
6767
def send_and_verify(self, dst_ip, expected_ports, src_port, triple_encap = False):
6868
'''
69-
@summary: This function builds encap packet, send and verify their arrival, When a packet will not arrived as expected an exeption will be throwen
69+
@summary: This function builds encap packet, send and verify their arrival, When a packet will not arrived as expected an exeption will be throwen
7070
@dst_ip: the destination ip for the inner IP header
71-
@expected_ports: list of ports that a packet can arrived from
72-
@src_port: the physical port that the packet will be sent from
71+
@expected_ports: list of ports that a packet can arrived from
72+
@src_port: the physical port that the packet will be sent from
7373
@triple_encap: Bool if to send triple encapsulated packet
7474
'''
7575
#setting parameters
@@ -88,13 +88,13 @@ def send_and_verify(self, dst_ip, expected_ports, src_port, triple_encap = False
8888
else:
8989
print("ERROR: no dscp is configured")
9090
exit()
91-
91+
9292
#building the packets and the expected packets
9393
if (not triple_encap):
94-
#for the double encap packet we will use IP header with TCP header without mac
94+
#for the double encap packet we will use IP header with TCP header without mac
9595
inner_pkt = simple_ip_only_packet(ip_dst=dst_ip, ip_src=inner_src_ip, ip_ttl=64)
9696
#after the decap process the retuning packet will be normal tcp packet, The TTL is taked from the inner layer and redused by one
97-
exp_pkt = simple_tcp_packet(pktlen=114,
97+
exp_pkt = simple_tcp_packet(pktlen=114,
9898
eth_dst=dst_mac,
9999
eth_src=router_mac,
100100
ip_dst=dst_ip,
@@ -108,8 +108,8 @@ def send_and_verify(self, dst_ip, expected_ports, src_port, triple_encap = False
108108
inner_pkt = scapy.IP(src=inner_src_ip, dst=dst_ip, tos=tos_in, ttl=64, id=1, ihl=None,proto =4) / inner_pkt2
109109
inner_pkt = inner_pkt/("".join([chr(x) for x in xrange(100 - len(inner_pkt))]))
110110
#The expected packet is also built by scapy, and the TTL is taked from the inner layer and redused by one
111-
exp_pkt = scapy.Ether(dst=dst_mac, src=router_mac)/inner_pkt
112-
exp_pkt['IP'].tos = exp_tos #this parameter is taken by the decap rule configuration
111+
exp_pkt = scapy.Ether(dst=dst_mac, src=router_mac)/inner_pkt
112+
exp_pkt['IP'].tos = exp_tos #this parameter is taken by the decap rule configuration
113113
exp_pkt['IP'].ttl = 63
114114

115115
pkt = simple_ipv4ip_packet(
@@ -118,17 +118,17 @@ def send_and_verify(self, dst_ip, expected_ports, src_port, triple_encap = False
118118
ip_src='1.1.1.1',
119119
ip_dst=self.test_params['lo_ip'],
120120
ip_tos=tos_out,
121-
ip_ttl=random.randint(2, 63),
121+
ip_ttl=random.randint(2, 63),
122122
inner_frame=inner_pkt)
123-
123+
124124
#send and verify the return packets
125125
masked_exp_pkt = Mask(exp_pkt)
126126
masked_exp_pkt.set_do_not_care_scapy(scapy.Ether, "dst")
127127
masked_exp_pkt.set_do_not_care_scapy(scapy.Ether, "src")
128128
send_packet(self, src_port, pkt)
129129
(match_index, rcv_pkt) = verify_packet_any_port(self, masked_exp_pkt, expected_ports)
130130
#-----------------------------------------------------------------
131-
131+
132132
def runTest(self):
133133
test_result = True
134134
random.seed(1)
@@ -140,50 +140,50 @@ def runTest(self):
140140
#running on the routes_info file and extractin ECMP route and unicast route
141141
for prefix, port_index_list in self.route_info.iteritems():
142142
dest_ip_addr = prefix.split("/")[0]
143-
144-
if (self.is_ipv6_address(dest_ip_addr)):
143+
144+
if (self.is_ipv6_address(dest_ip_addr)):
145145
continue
146-
146+
147147
if (len(port_index_list) > 1):
148148
for port_index in port_index_list:
149-
if (len(port_index)> 0):
149+
if (len(port_index)> 0):
150150
default_route_ports.append(int(port_index))
151151
default_route_dst_ip = dest_ip_addr
152-
elif (len(port_index_list) == 1):
152+
elif (len(port_index_list) == 1):
153153
unicast_ip = dest_ip_addr
154154
unicast_dst_port = [int(port_index_list[0])]
155-
#when found unicast and ECMP routes stop
156-
if ((unicast_ip != 'none') and (len(default_route_ports) != 0)):
155+
#when found unicast and ECMP routes stop
156+
if ((unicast_ip != 'none') and (len(default_route_ports) != 0)):
157157
break
158-
158+
159159
#Sending double and triple encapsulated packets from all ports with unicast and ECMP IP routes
160160
for src_port in range(PORT_COUNT):
161-
161+
162162
try:
163163
self.send_and_verify(default_route_dst_ip, default_route_ports, src_port)
164164
except:
165-
print("ERROR: failed to send encap packet with default route from port: " + str(src_port))
165+
print("ERROR: failed to send encap packet with default route from port: " + str(src_port))
166166
test_result = False
167-
168-
try:
167+
168+
try:
169169
self.send_and_verify(default_route_dst_ip, default_route_ports, src_port, True)
170170
except:
171-
print("ERROR: failed to send triple encap packet with default route from port: " + str(src_port))
171+
print("ERROR: failed to send triple encap packet with default route from port: " + str(src_port))
172172
test_result = False
173-
174-
try:
173+
174+
try:
175175
self.send_and_verify(unicast_ip, unicast_dst_port, src_port)
176176
except:
177177
print("ERROR: failed to send encap packet with unicast route from port: " + str(src_port))
178178
test_result = False
179-
180-
try:
179+
180+
try:
181181
self.send_and_verify(unicast_ip, unicast_dst_port, src_port, True)
182182
except:
183183
print("ERROR: faield to send triple encap packet with unicast route from port: " + str(src_port))
184184
test_result = False
185-
185+
186186
assert(test_result)
187187
#---------------------------------------------------------------------
188188

189-
189+

‎ansible/roles/test/files/acstests/acltb_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Description:
33
44
This file contains the ACL test for SONiC testbed
5-
Implemented according to the https://github.com/Azure/SONiC/wiki/ACL-test-plan
5+
Implemented according to the https://github.com/sonic-net/SONiC/wiki/ACL-test-plan
66
77
Usage:
88
Examples of how to use:

‎ansible/roles/test/files/acstests/everflow_tb_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'''
22
Description: This file contains the Everflow test for SONiC testbed
33
4-
Implemented according to the https://github.com/Azure/SONiC/wiki/Everflow-test-plan
4+
Implemented according to the https://github.com/sonic-net/SONiC/wiki/Everflow-test-plan
55
66
Usage: Examples of how to use:
77
ptf --test-dir acstests everflow_tb_test.EverflowTest --platform remote -t 'router_mac="00:02:03:04:05:00";src_port="20";dst_ports="21,22";session_src_ip="1.1.1.1";session_dst_ip="2.2.2.2";session_ttl="64";session_dscp="0";verbose=True'

‎ansible/roles/test/files/ptftests/IP_decap_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Description: This file contains the decapasulation test for SONIC, to test decapsulation of IPv4 with double and
33
triple encapsulated packets
44
5-
Design is available in https://github.com/Azure/SONiC/wiki/IPv4-Decapsulation-test
5+
Design is available in https://github.com/sonic-net/SONiC/wiki/IPv4-Decapsulation-test
66
77
Precondition: Before the test start, all routes need to be defined as in the fib_info.txt file, in addition to the
88
decap rule that need to be set as the dspc_mode

‎ansible/roles/test/files/ptftests/fib_test.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'''
22
Description: This file contains the FIB test for SONIC
33
4-
Design is available in https://github.com/Azure/SONiC/wiki/FIB-Scale-Test-Plan
4+
Design is available in https://github.com/sonic-net/SONiC/wiki/FIB-Scale-Test-Plan
55
66
Usage: Examples of how to use log analyzer
77
ptf --test-dir ptftests fib_test.FibTest --platform-dir ptftests --qlen=2000 --platform remote \
@@ -42,7 +42,7 @@ class FibTest(BaseTest):
4242
@summary: Overview of functionality
4343
Test routes advertised by BGP peers of SONIC are working properly.
4444
The setup of peers is described in 'VM set' section in
45-
https://github.com/Azure/sonic-mgmt/blob/master/docs/ansible/README.testbed.md
45+
https://github.com/sonic-net/sonic-mgmt/blob/master/docs/ansible/README.testbed.md
4646
4747
Routes advertized by the peers have ECMP groups. The purpose of the test is to make sure
4848
that packets are forwarded through one of the ports specified in route's ECMP group.

‎ansible/roles/test/files/ptftests/py3/README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# why migrate docker-ptf
44

55

6-
As of January 1, 2020, Python 2 is no longer supported by the Python core team, that's why we have to migrate our code from Python2 to python3.
6+
As of January 1, 2020, Python 2 is no longer supported by the Python core team, that's why we have to migrate our code from Python2 to python3.
77

8-
`docker-ptf` is our first goal, because it's a separated docker container and only scripts under `ansible/role/test/files/ptftests` in `sonic-mgmt` repo run in `docker-ptf`.
8+
`docker-ptf` is our first goal, because it's a separated docker container and only scripts under `ansible/role/test/files/ptftests` in `sonic-mgmt` repo run in `docker-ptf`.
99

1010
The dependency is not very complicated and it's much easier to start with it.
1111

@@ -18,7 +18,7 @@ Migration includes 4 stages:
1818
## Stage 1: Prepare Python3 virtual environment in docker-ptf
1919
Add Python3 virtual environment in docker-ptf, we will keep Python2 in this stage for incremental migration.
2020

21-
[PR](https://github.com/Azure/sonic-buildimage/pull/10599) to address this.
21+
[PR](https://github.com/sonic-net/sonic-buildimage/pull/10599) to address this.
2222

2323
`/root/env-python3/bin/ptf` is installed and will be used for `ptftests` Python3 scripts.
2424

@@ -41,7 +41,7 @@ The command looks like this:
4141
`2to3 --write --nobackups ansible/role/test/files/ptftests/your_script`
4242

4343
Here is the [doc](https://docs.python.org/3/library/2to3.html) for 2to3.
44-
44+
4545

4646
If it is not available on your host, you need to first install the following packages:
4747

@@ -83,14 +83,14 @@ if MACSEC_SUPPORTED:
8383

8484
If your scripts involves the following library scripts, please create a **soft link** under `py3` for them after modification. Other remained scripts of Python2 will still use them. They will be used for both sides during the period of migration.
8585
- `lmp.py`
86-
- `fib.py`
86+
- `fib.py`
8787
- `fib_test.py`
8888
- `device_connection.py`
8989

9090
**Important: These library scripts should be both Python2 and Python3 compatible.**
9191

9292

93-
Please check [this PR](https://github.com/Azure/sonic-mgmt/pull/5490) for reference.
93+
Please check [this PR](https://github.com/sonic-net/sonic-mgmt/pull/5490) for reference.
9494

9595
**3. Update `tests` script to call virtual env ptf**
9696

@@ -120,13 +120,13 @@ And it will also call your modified ptftests scripts under subfolder `py3`.
120120

121121
That's the difference of usage between Python2 and Python3 script.
122122

123-
Please take [DHCP Relay PR](https://github.com/Azure/sonic-mgmt/pull/5534) and [dir bcast RP](https://github.com/Azure/sonic-mgmt/pull/5540)for reference.
123+
Please take [DHCP Relay PR](https://github.com/sonic-net/sonic-mgmt/pull/5534) and [dir bcast RP](https://github.com/sonic-net/sonic-mgmt/pull/5540)for reference.
124124

125125

126126

127127
**4. Run test cases with correct docker-ptf image to do verification**
128128

129-
`2to3` only does some common format or syntax changes, it's not enough.
129+
`2to3` only does some common format or syntax changes, it's not enough.
130130

131131
For Python3, scripts use `ptf 0.9.3` and `scapy 2.4.5`, some packet format could be different, we have to retest scripts manually before submit PR.
132132

‎ansible/roles/test/files/tools/loganalyzer/loganalyzer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
to verify no failures are detected in the system logs while
88
it can be that traffic/functionality works.
99
10-
Design is available in https://github.com/Azure/SONiC/wiki/LogAnalyzer
10+
Design is available in https://github.com/sonic-net/SONiC/wiki/LogAnalyzer
1111
1212
Usage: Examples of how to use log analyzer
1313
sudo python loganalyzer.py --out_dir /home/hrachya/projects/loganalyzer/log.analyzer.results --action analyze --run_id myTest114 --logs file3.log -m /home/hrachya/projects/loganalyzer/match.file.1.log,/home/hrachya/projects/loganalyzer/match.file.2.log -i ignore.file.1.log,ignore.file.2.log -v

0 commit comments

Comments
 (0)