diff --git a/doc/SONiC 201904 Release Notes.md b/doc/SONiC 201904 Release Notes.md
index c501473079..49516ebbe0 100644
--- a/doc/SONiC 201904 Release Notes.md
+++ b/doc/SONiC 201904 Release Notes.md
@@ -29,7 +29,7 @@ https://github.com/sonic-net/sonic-buildimage/tree/201904
| 3 | Upgrade docker engine to 18.09 | |
| 4 | [Everflow enhancement](https://github.com/sonic-net/SONiC/blob/bb4f4a3a85935a38ec7f9625ef62cbe58c0998b4/doc/SONiC_EVERFLOW_IPv6.pdf) | |
| 5 | [Egress ACL bug fix and ACL CLI enhancement](https://github.com/sonic-net/SONiC/blob/dfa7e58292deb4d7b10d1e0ca73f296cd206e9d2/doc/acl/egress-acl-bug-fix-description.md) | |
-| 6 | [L3 RIF counter support](https://github.com/Azure/SONiC/blob/master/doc/RIF_counters.md) [PR](https://github.com/sonic-net/SONiC/pull/310) | |
+| 6 | [L3 RIF counter support](https://github.com/sonic-net/SONiC/blob/master/doc/RIF_counters.md) [PR](https://github.com/sonic-net/SONiC/pull/310) | |
| 7 | [PMon Refactoring](https://github.com/sonic-net/SONiC/tree/master/doc/pmon) | |
| 8 | BGP-EVPN support (type 5) (related HLD [Fpmsyncd](https://github.com/sonic-net/SONiC/pull/375), [vxlanmgr](https://github.com/sonic-net/SONiC/pull/369), [template](https://github.com/sonic-net/sonic-buildimage/pull/2838/files) ) | |
diff --git a/doc/SONiC_202106_Release_Notes.md b/doc/SONiC_202106_Release_Notes.md
index 8b61892aed..895cb1f2cd 100644
--- a/doc/SONiC_202106_Release_Notes.md
+++ b/doc/SONiC_202106_Release_Notes.md
@@ -50,8 +50,8 @@ Image : https://sonic-jenkins.westus2.cloudapp.azure.com/ (Example - Image for
#### 1. Telemetry for Multi-ASIC
This feature is an enhancement on sonic_db_config package for multi-asic to read different namespace redis configuration. And enhanced V2R Lookup for multi-asic, enhanced gNMI Server to initiate redis connection, enhanced gNMI Server Get and enhanced the parsing of target in gNMI Request.
-
Refer [HLD document](https://github.com/Azure/sonic-telemetry/pull/77) and below mentioned PR's for more details.
-
**Pull Requests** : [77](https://github.com/Azure/sonic-telemetry/pull/77)
+
Refer [HLD document](https://github.com/sonic-net/sonic-telemetry/pull/77) and below mentioned PR's for more details.
+
**Pull Requests** : [77](https://github.com/sonic-net/sonic-telemetry/pull/77)
#### 2. Add FRR running configuration to tech support
@@ -69,7 +69,7 @@ Refer [HLD document](https://github.com/sonic-net/sonic-utilities/pull/1249) and
#### 3. App extension with warmboot awareness
SONiC Application Extension Infrastructure is a SONiC infrastructure and framework for managing SONiC Application Packages which in this scope are SONiC compatible Docker images distributed individually from one another and from the base SONiC image.
-
Refer [HLD document](https://github.com/Azure/SONiC/blob/master/doc/sonic-application-extention/sonic-application-extention-hld.md) and below mentioned PR's for more details.
+
Refer [HLD document](https://github.com/sonic-net/SONiC/blob/master/doc/sonic-application-extention/sonic-application-extention-hld.md) and below mentioned PR's for more details.
**Pull Requests** : [682](https://github.com/sonic-net/SONiC/pull/682), [6398](https://github.com/sonic-net/sonic-buildimage/issues/6398)
#### 4. Enable/Disable auto negotiation and speed setting with number of lanes
diff --git a/doc/SONiC_202111_Release_Notes.md b/doc/SONiC_202111_Release_Notes.md
index 48f5e05964..dcf90c339b 100644
--- a/doc/SONiC_202111_Release_Notes.md
+++ b/doc/SONiC_202111_Release_Notes.md
@@ -58,7 +58,7 @@ Refer [HLD document](https://github.com/sonic-net/SONiC/blob/master/doc/acl/ACL-
#### App extension CLI generation tool
The SONiC CLI Auto-generation tool - is a utility for generating the command-line interface for third-party features, called application extensions, that provide their functionality as separate docker containers. The YANG model will be used to describe the CONFIG DB schema and CLI will be generated according to CONFIG DB schema. The YANG model will serve as an input parameter for the SONiC Auto-generation utility. The CLI should be a part of SONiC utilities and support - show, config operations.
-Refer [HLD document](https://github.com/Azure/SONiC/blob/master/doc/sonic-application-extention/sonic-application-extention-hld.md) and below mentioned PR's for more details.
+Refer [HLD document](https://github.com/sonic-net/SONiC/blob/master/doc/sonic-application-extention/sonic-application-extention-hld.md) and below mentioned PR's for more details.
**Pull Requests** : [780](https://github.com/sonic-net/SONiC/pull/780), [1644](https://github.com/sonic-net/sonic-utilities/pull/1644) & [1650](https://github.com/sonic-net/sonic-utilities/pull/1650)
#### Automatic techsupport and core dump creation
diff --git a/doc/Sonic BSL Test plan.md b/doc/Sonic BSL Test plan.md
index 1cfc989e67..b8910c8f9a 100644
--- a/doc/Sonic BSL Test plan.md
+++ b/doc/Sonic BSL Test plan.md
@@ -38,7 +38,7 @@ Verify basic sanity. This checks if the orchagent and syncd processes are runnin
Triggered before and after each test case
#### Test description
-Run sanity check - https://github.com/Azure/sonic-mgmt/blob/master/tests/common/sanity_check.py
+Run sanity check - https://github.com/sonic-net/sonic-mgmt/blob/master/tests/common/sanity_check.py
### Test case \#2
diff --git a/doc/config-generic-update-rollback/Json_Patch_Ordering_using_YANG_Models_Design.md b/doc/config-generic-update-rollback/Json_Patch_Ordering_using_YANG_Models_Design.md
index fd864d9260..926d06725d 100644
--- a/doc/config-generic-update-rollback/Json_Patch_Ordering_using_YANG_Models_Design.md
+++ b/doc/config-generic-update-rollback/Json_Patch_Ordering_using_YANG_Models_Design.md
@@ -405,7 +405,7 @@ Some fields are not allowed to be modified and can only be created, such as `/PO
SAI_PORT_ATTR_HW_LANE_LIST,
```
-The new extension `create-only` will be added to [YANG models SONiC extensions](https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/yang-models/sonic-extension.yang):
+The new extension `create-only` will be added to [YANG models SONiC extensions](https://github.com/sonic-net/sonic-buildimage/blob/master/src/sonic-yang-models/yang-models/sonic-extension.yang):
```
extension create-only {
description "During apply-patch operation the field can only be created (i.e. added) or re-created (i.e. removed then added) but cannot be modified (i.e. replaced).";
diff --git a/doc/copp/CoPP Config and Management.md b/doc/copp/CoPP Config and Management.md
index 4ea0c6d197..82f9e5d13c 100644
--- a/doc/copp/CoPP Config and Management.md
+++ b/doc/copp/CoPP Config and Management.md
@@ -15,7 +15,7 @@ The following are the high level requirements for CoPP/TRAP managment
## Current behaviour
-During SWSS start, the prebuilt [copp.json](https://github.com/Azure/sonic-swss/blob/201911/swssconfig/sample/00-copp.config.json) file is loaded as part of start script [swssconfig.sh](https://github.com/sonic-net/sonic-buildimage/blob/201911/dockers/docker-orchagent/swssconfig.sh) and written to APP DB. [CoppOrch](https://github.com/sonic-net/sonic-swss/blob/201911/orchagent/copporch.cpp) then translates it to Host trap/policer tables and programmed to SAI.
+During SWSS start, the prebuilt [copp.json](https://github.com/sonic-net/sonic-swss/blob/201911/swssconfig/sample/00-copp.config.json) file is loaded as part of start script [swssconfig.sh](https://github.com/sonic-net/sonic-buildimage/blob/201911/dockers/docker-orchagent/swssconfig.sh) and written to APP DB. [CoppOrch](https://github.com/sonic-net/sonic-swss/blob/201911/orchagent/copporch.cpp) then translates it to Host trap/policer tables and programmed to SAI.
## Proposed behaviour
@@ -63,7 +63,7 @@ state = "ok"
```
### coppmgr
-Introduce a *new* CoPP manager, that subscribes for the Config DB CoPP Tables and Feature Tables. Based on the feature enablement, ```coppmgr``` handles the logic to resolve whether a CoPP table shall be written to APP DB for orchagent consumption. Inorder to reduce changes to copporch and for backward compatibility during warmboot, ```coppmgr``` shall use the existing APP_DB schema and implement internal logic to convert the proposed ConfigDB entries to APP DB entries. Similar to existing swss managers, an entry with state "ok" shall be added to STATE_DB. `coppmgrd` must be started by [supervisord.conf](https://github.com/Azure/sonic-buildimage/blob/master/dockers/docker-orchagent/supervisord.conf) first, before any other process is started in swss. During init, ```coppmgr``` shall read the ```copp_cfg.json``` file and apply the default configuration. The default shall not be part of Config_DB entries. ```coppmgr``` shall also read from the config_db during init and apply the logic to merge if there are same entries within the ```copp_cfg.json``` file.
+Introduce a *new* CoPP manager, that subscribes for the Config DB CoPP Tables and Feature Tables. Based on the feature enablement, ```coppmgr``` handles the logic to resolve whether a CoPP table shall be written to APP DB for orchagent consumption. Inorder to reduce changes to copporch and for backward compatibility during warmboot, ```coppmgr``` shall use the existing APP_DB schema and implement internal logic to convert the proposed ConfigDB entries to APP DB entries. Similar to existing swss managers, an entry with state "ok" shall be added to STATE_DB. `coppmgrd` must be started by [supervisord.conf](https://github.com/sonic-net/sonic-buildimage/blob/master/dockers/docker-orchagent/supervisord.conf) first, before any other process is started in swss. During init, ```coppmgr``` shall read the ```copp_cfg.json``` file and apply the default configuration. The default shall not be part of Config_DB entries. ```coppmgr``` shall also read from the config_db during init and apply the logic to merge if there are same entries within the ```copp_cfg.json``` file.
Trap name added to copp_cfg.json file has to match a feature name exist in FEATURE table in Config DB.
In order to handle traps which has no associated feature (such as arp, ip2me), a new field called "always_enabled" will be added to COPP_TRAP table in Config DB.
diff --git a/doc/passw_hardening/sonic-passwh.yang b/doc/passw_hardening/sonic-passwh.yang
index 120c98c51a..be1141b52f 100644
--- a/doc/passw_hardening/sonic-passwh.yang
+++ b/doc/passw_hardening/sonic-passwh.yang
@@ -1,6 +1,6 @@
module sonic-passwh {
yang-version 1.1;
- namespace "http://github.com/Azure/sonic-passwh";
+ namespace "http://github.com/sonic-net/sonic-passwh";
prefix password;
description "PASSWORD HARDENING YANG Module for SONiC OS";
diff --git a/doc/pfc_asym/PFC_Asymmetric_Test_HLD.md b/doc/pfc_asym/PFC_Asymmetric_Test_HLD.md
index 01922c48dc..7cd2a02456 100644
--- a/doc/pfc_asym/PFC_Asymmetric_Test_HLD.md
+++ b/doc/pfc_asym/PFC_Asymmetric_Test_HLD.md
@@ -22,7 +22,7 @@
The purpose is to test functionality of Asymmetric PFC on the SONIC based DUT, closely resembling production environment.
### Scope
-The test is targeting a running SONIC system with fully functioning configuration. The purpose of the test is to perform functional testing of Asymmetric PFC on SONIC system. There will be reused existed PTF test suite for PFC Asymmetric which is located at https://github.com/Azure/sonic-mgmt/blob/master/ansible/roles/test/files/saitests/pfc_asym.py.
+The test is targeting a running SONIC system with fully functioning configuration. The purpose of the test is to perform functional testing of Asymmetric PFC on SONIC system. There will be reused existed PTF test suite for PFC Asymmetric which is located at https://github.com/sonic-net/sonic-mgmt/blob/master/ansible/roles/test/files/saitests/pfc_asym.py.
### Testbed
The test will run on the following testbeds:
@@ -39,20 +39,20 @@ There is already existed PFC asymmetric test cases which use PTF to send traffic
Test suite location
-https://github.com/Azure/sonic-mgmt/blob/master/ansible/roles/test/files/saitests/pfc_asym.py
+https://github.com/sonic-net/sonic-mgmt/blob/master/ansible/roles/test/files/saitests/pfc_asym.py
It requires several updates:
1. Packets sending speed can be increased by using multiprocessing instead of multithreading library.
-https://github.com/Azure/sonic-mgmt/blob/master/ansible/roles/test/files/saitests/pfc_asym.py#L83
+https://github.com/sonic-net/sonic-mgmt/blob/master/ansible/roles/test/files/saitests/pfc_asym.py#L83
Replace ```threading.Thread``` to use ```multiprocessing.Process``` instead.
2. Looks like there is a redundancy in generating configuration file for ARP responder.
-https://github.com/Azure/sonic-mgmt/blob/master/ansible/roles/test/files/saitests/pfc_asym.py#L56
+https://github.com/sonic-net/sonic-mgmt/blob/master/ansible/roles/test/files/saitests/pfc_asym.py#L56
Fix the loop to store file only once
diff --git a/doc/pmon/sonic_thermal_control_test_plan.md b/doc/pmon/sonic_thermal_control_test_plan.md
index 66c0d5be50..feb974fff0 100644
--- a/doc/pmon/sonic_thermal_control_test_plan.md
+++ b/doc/pmon/sonic_thermal_control_test_plan.md
@@ -38,7 +38,7 @@ Since this feature is not related to traffic and network topology, all current t
### Ansible and Pytest
-This test plan is based on platform test infrastructure as additional cases. The test will reuse current [platform test](https://github.com/Azure/SONiC-mgmt/tree/master/tests/platform) in SONiC-mgmt. New pytest test cases will be added to [test_platform_info.py](https://github.com/Azure/SONiC-mgmt/blob/master/tests/platform/test_platform_info.py). In addition, valid_policy.json, invalid_format_policy.json and invalid_value_policy.json will be added as thermal policy configuration file for test purpose.
+This test plan is based on platform test infrastructure as additional cases. The test will reuse current [platform test](https://github.com/sonic-net/SONiC-mgmt/tree/master/tests/platform) in SONiC-mgmt. New pytest test cases will be added to [test_platform_info.py](https://github.com/sonic-net/SONiC-mgmt/blob/master/tests/platform/test_platform_info.py). In addition, valid_policy.json, invalid_format_policy.json and invalid_value_policy.json will be added as thermal policy configuration file for test purpose.
#### Valid policy file
diff --git a/doc/port-config-refactor/port-config-refactor-design.md b/doc/port-config-refactor/port-config-refactor-design.md
index da99e51f2e..6dba5baece 100644
--- a/doc/port-config-refactor/port-config-refactor-design.md
+++ b/doc/port-config-refactor/port-config-refactor-design.md
@@ -20,7 +20,7 @@ There are also open PRs to begin transitioning from the "port_config.ini" file t
## 3. Files that contain "port_config.ini" related logic
-1. [daemon_base.py](https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-daemon-base/sonic_daemon_base/daemon_base.py) in [sonic-daemon-base](https://github.com/Azure/sonic-buildimage/tree/master/src/sonic-daemon-base) contains logic to get file path of "port_config.ini", it should be replaced by [portconfig.get_port_config_file_name](https://github.com/sonic-net/sonic-buildimage/blob/142d45ce98008aac6437070a3a941083494b52a8/src/sonic-config-engine/portconfig.py#L6).
+1. [daemon_base.py](https://github.com/sonic-net/sonic-buildimage/blob/master/src/sonic-daemon-base/sonic_daemon_base/daemon_base.py) in [sonic-daemon-base](https://github.com/sonic-net/sonic-buildimage/tree/master/src/sonic-daemon-base) contains logic to get file path of "port_config.ini", it should be replaced by [portconfig.get_port_config_file_name](https://github.com/sonic-net/sonic-buildimage/blob/142d45ce98008aac6437070a3a941083494b52a8/src/sonic-config-engine/portconfig.py#L6).
2. [sfputilbase.py](https://github.com/sonic-net/sonic-platform-common/blob/master/sonic_platform_base/sonic_sfp/sfputilbase.py) in [sonic-platform-common](https://github.com/sonic-net/sonic-platform-common) contains logic to parse "port_config.ini", it should be replaced by [portconfig.get_port_config](https://github.com/sonic-net/sonic-buildimage/blob/142d45ce98008aac6437070a3a941083494b52a8/src/sonic-config-engine/portconfig.py#L20). Currently sfptutilbase.py keeps 3 dictionaries and 1 list to store information gets from port_config.ini file. We will keep the current data structure of sfputilbase.py to avoid introduce too much changes which means that we need transform the output of portconfig.py to the existing data structure.
3. [sfputilhelper.py](https://github.com/sonic-net/sonic-platform-common/blob/master/sonic_platform_base/sonic_sfp/sfputilhelper.py) in [sonic-platform-common](https://github.com/sonic-net/sonic-platform-common) contains logic to parse "port_config.ini", it should be replaced by [portconfig.get_port_config](https://github.com/sonic-net/sonic-buildimage/blob/142d45ce98008aac6437070a3a941083494b52a8/src/sonic-config-engine/portconfig.py#L20). Since the current logic in sfputilhelper.py and sfputilbase.py are very similar, it is suggested to put the logic in a common place and reuse it.
4. [main.py](https://github.com/sonic-net/sonic-utilities/blob/master/sfputil/main.py) in [sonic-utilities](https://github.com/sonic-net/sonic-utilities) contains logic to get file path of "port_config.ini", it should be replaced by [portconfig.get_port_config_file_name](https://github.com/sonic-net/sonic-buildimage/blob/142d45ce98008aac6437070a3a941083494b52a8/src/sonic-config-engine/portconfig.py#L6).
diff --git a/sonic-acl.yang b/sonic-acl.yang
index 4081d1d8ad..084efd7b95 100644
--- a/sonic-acl.yang
+++ b/sonic-acl.yang
@@ -1,5 +1,5 @@
module sonic-acl {
- namespace "http://github.com/Azure/sonic-acl";
+ namespace "http://github.com/sonic-net/sonic-acl";
prefix sacl;
yang-version 1.1;