diff --git a/doc/track_2_migration_guidance.md b/doc/track_2_migration_guidance.md
index 4fb176a3f2b..34b9ddf7949 100644
--- a/doc/track_2_migration_guidance.md
+++ b/doc/track_2_migration_guidance.md
@@ -2,9 +2,9 @@
Azure CLI is built on Azure Python SDKs. Recently, Azure Python SDK team announced the next generation product, named Track 2 SDK. The old version of SDK is called Track 1 SDK. It claims that it has some advantages than Track 1 SDK. It is not compatible with Track 1 SDK. A considerable number of work days are required for Azure CLI developers to migrate their modules from Track 1 SDK to Track 2 SDK. Let's see an example of Track 2 SDK. [azure-mgmt-compute 17.0.0b1](https://pypi.org/project/azure-mgmt-compute/17.0.0b1/) introduces important breaking changes and important new features like unified authentication and asynchronous programming.
-This document summarizes typical issues and solutions when adopting Track 2 SDK in Azure CLI.
+This document summarizes the steps to apply the changes for migration, typical changes when adopting Track 2 SDK in Azure CLI.
-Example PRs:
+## Example PRs
1. [Compute PR #15750](https://github.com/Azure/azure-cli/pull/15750)
2. [Network PR #16245](https://github.com/Azure/azure-cli/pull/16245)
3. [Network PR #16350](https://github.com/Azure/azure-cli/pull/16350)
@@ -13,7 +13,16 @@ Example PRs:
6. [AppConfig PR #16376](https://github.com/Azure/azure-cli/pull/16376)
7. [AppService PR #17146](https://github.com/Azure/azure-cli/pull/17146)
-Below is a list of typical issues.
+## Steps to apply the changes for migration
+1. Upgrade the version of your SDK to track 2 SDK in [setup.py](https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/setup.py), [requirements.py3.Darwin.txt](https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/requirements.py3.Darwin.txt), [requirements.py3.Linux.txt](https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/requirements.py3.Linux.txt) and [requirements.py3.windows.txt](https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/requirements.py3.windows.txt).
+2. Run command `azdev setup` to apply track 2 SDK to your local virtual environment.
+3. Run style check with command `azdev style your_module_name` and fix the errors returned from the command.
+4. Run linter check with command `azdev linter your_module_name` and fix the errors returned from the command.
+5. Run tests with command `azdev test your_module_name --no-exitfirst` and fix the errors returned from the command.
+6. Run tests lively with command `azdev test your_module_name --live --no-exitfirst` and fix the errors returned from the command.
+7. Create the pull request for migration.
+
+## Typical changes.
1. [Long running operation function name change](#long-running-operation-function-name-change)
2. [Property name change](#property-name-change)
diff --git a/doc/track_2_migration_roadmap.md b/doc/track_2_migration_roadmap.md
index 0e1e221c516..82838199fee 100644
--- a/doc/track_2_migration_roadmap.md
+++ b/doc/track_2_migration_roadmap.md
@@ -24,154 +24,147 @@ This document provides the roadmap for Track 2 SDK migration in Azure CLI. When
- If there is no Track 2 SDK for those services, we'll release stable Track 2 SDK version for them before 03/11/2021.
- If the Track 2 SDK for those services is in preview, we'll release stable Track 2 SDK version for them before 02/11/2021.
-| Module | CAE support | Migration Status | ETA | Coordinator Team |Latest Track 2 SDK Status | Latest Track 1 SDK status | Release frequency | CLI Module or Extension |
-| --------- |:-------------:| :-----:|:-----:|:--:|:--:|:--:|:--:|:--:|
+| Module | CAE support | Migration Status | ETA |Latest Track 2 SDK Status | Latest Track 1 SDK status | Release frequency | CLI Module or Extension |
+| --------- |:-------------:| :-----:|:-----:|:--:|:--:|:--:|:--:|
|**Phase 1: Compute, Network, Storage** | | | | | | ||||
-| Network |Yes| **Completed** | 04/30/2021 | Yong |GA (17.0.0) | GA (13.0.0) | High (Once a month)| Module |
-| Storage |Yes|**Completed** | 04/30/2021 | Yong |GA (16.0.0) | GA (11.2.0) | Medium (Once two months) | Module |
-| Monitor |Yes |**Completed** | 04/30/2021 |Yong|Monitor: GA (2.0.0)
LogAnalytics: GA (8.0.0) | Monitor: Preview (0.12.0)
LogAnalytics: GA (2.0.0) | Medium (Once two months) | Module |
-| CosmosDB | Yes |**Completed** | 04/30/2021 |Yong|GA (6.0.0) | Preview (2.0.0rc1) | Medium (Once two months) |Module|
-| CDN | Yes |**Completed** | 04/30/2021 |Yong|GA (10.0.0) | GA (6.0.0) | Low (Once half year) | Module |
-| NetAppFiles | Yes |**Completed** | 04/30/2021 |Yong|GA (1.0.0) | Preview (0.15.0) | Medium (Once two months) | Module|
-| Resource | Yes |**Completed** | 04/30/2021 |Yong |GA (15.0.0) | GA (12.0.0) | Medium (Once two months) | Module |
-| DNS | Yes |**Completed** | 04/30/2021 |Yong|Preview (8.0.0b1) | GA (3.0.0) | Medium (Once two months) | Module|
-| PrivateDNS | Yes | **Completed** | 04/30/2021 |Yong|Preview (1.0.0b1) | Preview (0.1.0) |N/A | Module |
-| Application-Insights |Yes | **Completed** | 04/30/2021 |Yong|GA (1.0.0) | Vendored_Preview (0.2.0) | N/A | Extension |
-| Firewall |Yes| **Completed** | 04/30/2021 |Yong| Network: GA (17.0.0) | Network: Vendored_GA (13.0.0) | N/A | Extension |
-| Front-door | Yes | **Completed** | 04/30/2021 |Yong|Preview (1.0.0b1) | Vendored_Preview (0.3.1) | N/A | Extension |
-| VirtualWan | Yes| **Completed** | 04/30/2021 |Yong|N/A |Vendored_Preview (0.1.0) | N/A | Extension |
-| Compute | Yes|**Completed** | 04/30/2021 |Catherine|GA (18.0.0) | GA (14.0.0) | High (Once a month) | Module |
-| KeyVault | Yes|**Completed** | 04/30/2021 |Catherine|GA (8.0.0) | GA (2.2.0) | Medium (Once three months) | Module |
-| AppService | Yes | **Completed** | 04/30/2021 |Catherine|GA (1.0.0) | Preview (0.48.0) | Medium (Once three months) | Module |
+| Network |Yes| **Completed** | 04/30/2021 |GA (17.0.0) | GA (13.0.0) | High (Once a month)| Module |
+| Storage |Yes|**Completed** | 04/30/2021 |GA (16.0.0) | GA (11.2.0) | Medium (Once two months) | Module |
+| Monitor |Yes |**Completed** | 04/30/2021 |Monitor: GA (2.0.0)
LogAnalytics: GA (8.0.0) | Monitor: Preview (0.12.0)
LogAnalytics: GA (2.0.0) | Medium (Once two months) | Module |
+| CosmosDB | Yes |**Completed** | 04/30/2021 |GA (6.0.0) | Preview (2.0.0rc1) | Medium (Once two months) |Module|
+| CDN | Yes |**Completed** | 04/30/2021 |GA (10.0.0) | GA (6.0.0) | Low (Once half year) | Module |
+| NetAppFiles | Yes |**Completed** | 04/30/2021 |GA (1.0.0) | Preview (0.15.0) | Medium (Once two months) | Module|
+| Resource | Yes |**Completed** | 04/30/2021 |GA (15.0.0) | GA (12.0.0) | Medium (Once two months) | Module |
+| DNS | Yes |**Completed** | 04/30/2021 |Preview (8.0.0b1) | GA (3.0.0) | Medium (Once two months) | Module|
+| PrivateDNS | Yes | **Completed** | 04/30/2021 |Preview (1.0.0b1) | Preview (0.1.0) |N/A | Module |
+| Application-Insights |Yes | **Completed** | 04/30/2021 |GA (1.0.0) | Vendored_Preview (0.2.0) | N/A | Extension |
+| Firewall |Yes| **Completed** | 04/30/2021 | Network: GA (17.0.0) | Network: Vendored_GA (13.0.0) | N/A | Extension |
+| Front-door | Yes | **Completed** | 04/30/2021 |Preview (1.0.0b1) | Vendored_Preview (0.3.1) | N/A | Extension |
+| VirtualWan | Yes| **Completed** | 04/30/2021 |N/A |Vendored_Preview (0.1.0) | N/A | Extension |
+| Compute | Yes|**Completed** | 04/30/2021 |GA (18.0.0) | GA (14.0.0) | High (Once a month) | Module |
+| KeyVault | Yes|**Completed** | 04/30/2021 |GA (8.0.0) | GA (2.2.0) | Medium (Once three months) | Module |
+| AppService | Yes | **Completed** | 04/30/2021 |GA (1.0.0) | Preview (0.48.0) | Medium (Once three months) | Module |
|**Phase 2: Management&Governance&others** | | | | | | ||||
-| CostManagement | Yes | **Completed** | 06/30/2021 |Yong|Vendored_GA (1.2.0) | N/A | N/A | Extension |
-| RDBMS | Yes|**Completed** | 06/30/2021 |Yong|GA (8.0.0) | Preview (3.1.0rc1) | Medium (Once two months) | Module |
-| DataFactory | Yes | **Completed** | 06/30/2021 |Catherine|Vendored_SDK | N/A | N/A | Extension |
-| SQL | No |**In progress** | 06/30/2021 |Yong|GA (1.0.0) | Preview (0.25.0) | Medium (Once two months) | Module |
-| ACS | Yes |Not Started | 06/30/2021 |Catherine|ContainerService: GA (14.0.0)
ContainerInstance: GA (7.0.0) | ContainerService: GA (11.0.0)
ContainerInstance: GA (2.0.0) | Medium (Once two months) | Module |
-| ACR | Yes |Not Started | 06/30/2021 |Catherine|Preview (8.0.0b1) | Preview (3.0.0rc16) | Medium (Once two months) | Module |
-| ServiceBus | Yes |**Completed** | 06/30/2021 |Catherine|GA (6.0.0) | GA (1.0.0) | Medium (Once four months) | Module |
-| EventGrid | Yes |Not Started | 06/30/2021 |Catherine| GA (8.0.0) | Preview (3.0.0rc8) | Medium (Once three months) | Module |
-| HDInsight | Yes |Not Started | 06/30/2021 |Catherine| GA (7.0.0) | GA (2.1.0) | Medium (Once two months) | Module |
-| Kusto | Yes |Not Started | 06/30/2021 |Catherine|Preview (1.0.0b1) | Preview (0.10.0) | Medium (Once two months | Module |
-|**Phase 3** | | 33 modules (Yong: 17, Catherie: 16), 51 extensions (Yong: 26, Catherie: 25) | | | | |||
-| NatGateway || **Completed** | N/A |Yong|Network: GA (8.0.0) | Network: GA (2.2.0) | Use Network package| Module |
-| Search | |**Completed** | N/A |Yong|GA (8.0.0) | GA (3.0.0) | Low (Once a year) | Module |
-| Billing (CLI own) | |Not Started | N/A|Yong|Preview (6.0.0b1) | GA (1.0.0) | Low (Once a year) | Module |
-| DataBoxEdge (CLI own) | |Not Started | N/A|Yong|Preview (1.0.0b1) | Preview (0.2.0) | Low (Once a year) | Module |
-| DLA (CLI own)| | Not Started | N/A |Yong|N/A | DataLakeAnalytics: Preview (0.6.0) | | Module |
-| DLS (CLI own)| | Not Started | N/A (Will incorporate into storage SDK) |Yong|N/A | DataLakeStore: Preview (0.5.0) | | Module |
-| Role (CLI own) | |Not Started | N/A |Yong| Authorization: GA (1.0.0)
MSI: N/A | Authorization: Preview (0.61.0)
MSI: GA (1.0.0) | Low (Once a year) | Module |
-| Synapse | |Not Started | N/A |Yong|Preview (1.0.0b1) | Preview (0.6.0) | Medium (Once two months) | Module |
-| SQLVM | |Not Started | N/A |Yong|N/A| SQLVirtualMachine: Preview (0.5.0) | N/A | Module |
-| Security | |Not Started | N/A |Yong|GA (1.0.0) | Preview (0.6.0) | Medium (Once three months) | Module |
-| EventHub | |Not Started | N/A |Yong|GA (8.0.0) | GA (4.2.0) | Low (Once a year) | Module |
-| SignalR | |Not Started | N/A |Yong |Preview (1.0.0b1) | Preview (0.4.0) | Low (Once half year) | Module |
-| PolicyInsights | |Not Started | N/A |Yong| GA (1.0.0) | Preview (0.6.0) | Low (Once half year) | Module |
-| DMS | |Not Started | N/A |Yong|DataMigration: Preview (9.0.0b1) | DataMigration: GA (4.1.0) | Low (Once a year) | Module |
-| Redis | |Not Started | N/A |Yong|GA (12.0.0) | Preview (7.0.0rc2) | Low (Once a year) | Module |
-| DeploymentManager | |Not Started | N/A|Yong|Preview (1.0.0b1) | Preview (0.2.0) | Low (Once two years) | Module |
-| ManagedServices | |Not Started | N/A|Yong| Preview (6.0.0b1) | GA (1.0.0) | Low (Once two years) | Module |
-| IoT | | Not Started | N/A |Yong|IoTHub: GA (1.0.0)
IoTCentral: N/A
IoTHubProvisioningServices: N/A | IoTHub: Preview (0.12.0)
IoTCentral: GA (4.0.0)
IoTHubProvisioningServices: Preview (0.2.0)| | Module |
-| Relay | |Not Started | N/A|Yong|GA (1.0.0) | Preview (0.2.0) | Low (Once two years) | Module |
-| AppConfiguration | |**Completed** | N/A |Catherine|GA (1.0.1) | Preview (0.6.0) | Medium (Once three months) | Module |
-| Container | |Not Started | N/A |Catherine| ContainerInstance: GA (7.0.0) | ContainerInstance: GA (2.0.0) | Medium (Once two months) | Module |
-| Batch | |**In progress** | N/A |Catherine|GA (15.0.0) | GA (9.0.0) | Low (Once half year) | Module |
-| ServiceFabric | |**Completed** | N/A|Catherine|Preview (1.0.0) | Preview (0.5.0) | Low (Once a year) | Module |
-| ContainerInstance | |Not Started | N/A |Catherine|GA (7.0.0) | GA (2.0.0) | Low (Once a year) | Module |
-| BotService | |Not Started | N/A|Catherine|Preview (1.0.0b1) | Preview (0.2.0) | Low (Once two years) | Module |
-| Maps | |Not Started | N/A|Catherine|Preview (1.0.0b1) | Preview (0.1.0) | Low (Once three years) | Module |
-| Backup | |**In progress** | N/A|Catherine|RecoveryServices: GA (1.0.0)
RecoveryServicesBackup: N/A | RecoveryServices: Preview (0.6.0)
RecoveryServicesBackup: Preview (0.11.0) | Low (Once half year) | Module |
-| BatchAI | | Not Started | N/A |Catherine |N/A | GA (2.0.0) | | Module |
-| Lab | |Not Started | N/A |Catherine|DevTestLabs: GA (9.0.0) | DevTestLabs: GA (4.0.0) | Low (Once half year) | Module |
-| Reservations | |Not Started | N/A |Catherine|Preview (1.0.0b1) | Preview (0.8.0) | Low (Once half year) | Module |
-| CognitiveServices | |Not Started | N/A |Catherine| GA (11.0.0) | GA (6.3.0) | Low (Once half year) | Module |
-| Advisor | |Not Started | N/A |Catherine|GA (9.0.0) | GA (4.0.0) | Low (once eight months) | Module |
-| AMS | |Not Started | N/A |Catherine|Media: Preview (7.0.0b1) |Media: GA (3.0.0) | Low (Once a year) | Module |
-| Consumption | |Not Started | N/A |Catherine|GA (8.0.0) | GA (3.0.0) | Low (Once a year) | Module |
-| APIM | |Not Started | N/A |Catherine|APIManagement: GA (1.0.0) | APIManagement: Preview (0.2.0) | Low (Once a year) | Module |
-| ARO | |Not Started | N/A|Catherine|RedhatOpenShift: Preview (1.0.0b1) | RedhatOpenShift: Preview (0.1.0) | Low (Once a year) | Module |
-| HealthCareAPIs | | **Completed** | N/A |Yong|Vendored_Preview (0.3.0) | N/A | N/A | Extension |
-| Communication | | **Completed** | N/A |Yong|Vendored_SDK | N/A | N/A | Extension |
-| Footprint | | **Completed** | N/A |Yong|Vendored_SDK | N/A | N/A | Extension |
-| Logic | | **Completed** | N/A |Yong|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
-| Maintenance | | **Completed** | N/A|Yong|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
-| Peering | | **Completed** | N/A| Yong|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
-| Portal | | **Completed** | N/A |Yong|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
-| Stack-HCI | | **Completed** | N/A |Yong|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
-| RedisEnterprise | | **Completed** | N/A |Yong|N/A | Vendored_SDK | N/A | Extension |
-| Monitor-Control-Service | | **Completed** | N/A |Yong|N/A | Vendored_SDK | N/A | Extension |
-| AD | | **Completed** | N/A |Yong|N/A | Vendored_SDK | N/A | Extension |
-| Custom-Providers (CLI own) | | Not Started | N/A |Yong|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
-| Mixed-Reality (CLI own) | | Not Started | N/A|Yong|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
-| Resource-Graph (CLI own) | | Not Started | N/A |Yong|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
-| DataBox (CLI own) | | Not Started | N/A |Yong|N/A | Vendored_Preview (0.2.0) | N/A | Extension |
-| HPC-Cache (CLI own) || Not Started | N/A |Yong |N/A | Vendored_Preview (0.2.0 | N/A | Extension |
-| Log-Analytics (CLI own) | | Not Started | N/A|Yong|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
-| PowerbiDedicated (CLI own) | | Not Started | N/A |Yong|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
-| StorageSync (CLI own) | | Not Started | N/A |Yong|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
-| Storage-Preview (CLI own) | | Not Started | N/A |Yong|N/A | Vendored_SDK | N/A | Extension |
-| Storage-Blob-Preview (CLI own) | | Not Started | N/A |Yong|N/A | Vendored_SDK | N/A | Extension |
-| DB-Up (CLI own) | | Not Started | N/A |Yong|N/A | RDBMS: Vendored_GA (1.5.0)
SQL: Vendored_Preview (0.11.0) | N/A | Extension |
-| TimeSeriesInsights (CLI own) | | Not Started | N/A |Yong|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
-| Scheduled-Query (CLI own) | | Not Started | N/A|Yong |N/A | Vendored_Preview (0.1.0) | N/A | Extension |
-| Log-Analytics-Solution (CLI own) | | Not Started | N/A|Yong |N/A | Vendored_SDK | N/A | Extension |
-| Connection-Monitor-Preview (CLI own) | | Not Started | N/A|Yong |N/A | Vendored_SDK | N/A | Extension |
-| BlockChain (CLI own) | | Not Started | N/A| Yong|N/A | Vendored_GA (2.0.0) | N/A | Extension |
-| Express-Route-Cross-Connection (CLI own) || Not Started | N/A|Yong | N/A | Network: Vendored_SDK | N/A | Extension |
-| Ip-Group (CLI own) | | Not Started | N/A |Yong|N/A | Network: Vendored_SDK | N/A | Extension |
-| Virtual-Network-Tap (CLI own) | | Not Started | N/A|Yong |N/A | Network: Vendored_SDK | N/A | Extension |
-| Internet-Analyzer (CLI own) || Not Started | N/A |Yong| N/A | Frontdoor: Vendored_Preview (0.3.0) | N/A | Extension |
-| DMS-Preview | | Not Started | N/A |Yong|N/A | Vendored_GA (4.0.0) | N/A | Extension |
-| CosmosDB-Preview | | Not Started | N/A |Yong|N/A | Vendored_SDK | N/A | Extension |
-| Hack | | Not Started | N/A |Yong|N/A | Call AppService, CosmosDB, RDBMS, CognitiveServices | N/A | Extension |
-| ManagementPartner | | Not Started | N/A| Yong|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
-| RDBMS-Connect | | Not Started | N/A|Yong |N/A | Vendored_SDK | N/A | Extension |
-| NetAppFiles-Preview (Replace by NetApp in core?) | | Not Started | N/A|Yong |N/A | Vendored_SDK | N/A | Extension |
-| Account | | **Completed** | N/A |Catherine|Subscription: Vendored_Preview (0.5.0) | N/A | N/A | Extension |
-| Attestation | | **Completed** | N/A |Catherine|Vendored_SDK | N/A | N/A | Extension |
-| Automation | | **Completed** | N/A |Catherine|Vendored_SDK | N/A | N/A | Extension |
-| ConnectedMachine | | **Completed** | N/A|Catherine|Vendored_SDK | N/A | N/A | Extension |
-| DataDog | | **Completed** | N/A |Catherine|Vendored_SDK | N/A | N/A | Extension |
-| DataShare | | **Completed** | N/A |Catherine|Vendored_SDK | N/A | N/A | Extension |
-| DesktopVirtualization | | **Completed** | N/A |Catherine|Vendored_Preview (0.2.0) | N/A | N/A | Extension |
-| GuestConfig | | **Completed** | N/A |Catherine|Vendored_SDK | N/A | N/A | Extension |
-| Hardware-Secutiry-Modules | | **Completed** | N/A| Catherine|Vendored_SDK | N/A | N/A | Extension |
-| Import-Export | | **Completed** | N/A |Catherine|Vendored_SDK | N/A | N/A | Extension |
-| Resource-Mover | | **Completed** | N/A |Catherine|Vendored_SDK | N/A | N/A | Extension |
-| ProviderHub | | **Completed** | N/A |Catherine|Vendored_SDK | N/A | N/A | Extension |
-| OffAzure | | **Completed** | N/A |Catherine|Vendored_SDK | N/A | N/A | Extension |
-| HealthBot | | **Completed** | N/A |Catherine|Vendored_SDK | N/A | N/A | Extension |
-| Confluent | | **Completed** | N/A |Catherine|Vendored_SDK | N/A | N/A | Extension |
-| ACRTransfer | | **Completed** | N/A |Catherine|Vendored_SDK | N/A | N/A | Extension |
-| AlertsManagement (CLI own) | | Not Started | N/A| Catherine|N/A | Vendored_Preview (0.2.0rc2) | N/A | Extension |
-| BluePrint (CLI own) | | Not Started | N/A| Catherine|N/A | Vendored_Preview (2018-11-01-preview) | N/A | Extension |
-| CloudService (CLI own) | | Not Started | N/A|Catherine |N/A | N/A | N/A | Extension |
-| Notification-Hub (CLI own) | | Not Started | N/A| Catherine|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
-| SecurityInsight (CLI own) | | Not Started | N/A |Catherine|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
-| DataBricks (CLI own) | | Not Started | N/A|Catherine|N/A | Vendored_Preview (0.1.0 | N/A | Extension |
-| Stream-Analytics (CLI own) | | Not Started | N/A |Catherine|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
-| Swiftlet (CLI own) | | Not Started | N/A |Catherine|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
-| Image-Copy (CLI own) | | Not Started | N/A|Catherine |N/A | Vendored_SDK | N/A | Extension |
-| AKS-Preview | | Not Started | N/A |Catherine|N/A | ContainerService: Vendored_GA (0.2.0) | N/A | Extension |
-| ConnectedK8S | | Not Started | N/A |Catherine|N/A | Vendored_Preview (0.1.1) | N/A | Extension |
-| K8S-Configuration (Deprecate K8SConfiguration) | | Not Started | N/A|Catherine|N/A | Vendored_SDK) | N/A | Extension |
-| K8S-Extension | | Not Started | N/A|Catherine|N/A | Vendored_SDK) | N/A | Extension |
-| Mesh | | Not Started | N/A |Catherine|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
-| SpringCloud | | Not Started | N/A |Catherine|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
-| Support | | Not Started | N/A |Catherine|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
-| VM-Repair | | Not Started | N/A |Catherine|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
-| VMWare | | Not Started | N/A |Catherine|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
-| WebApp | | Not Started | N/A|Catherine |N/A | N/A | N/A | Extension |
-| SSH | | Not Started | N/A|Catherine |N/A | N/A | N/A | Extension |
-| Quantum | | Not Started | N/A|Catherine |N/A | Vendored_SDK | N/A | Extension |
-| CodeSpaces | | Not Started | N/A|Catherine |N/A | Vendored_SDK | N/A | Extension |
-| Dev-Spaces | | Not Started | N/A|Catherine |N/A | N/A | N/A | Extension |
-| Cli-Translator | | Not Started | N/A|Catherine |N/A | N/A | N/A | Extension |
-| AEM | | Not Started | N/A|Catherine |N/A | N/A | N/A | Extension |
-| *Below services don't exist in CLI repo*| | | | | | ||||
-| Azure Security Center | Yes | | 06/30/2021 | | | | ||
-| Sentinel| Yes | | 06/30/2021 | | | | ||
-| Azure Data Explorer| Yes | | 06/30/2021 | | | | ||
-| Azure DevOps| Yes | | 06/30/2021 | | | | ||
-| Azure Machine Learning| Yes | | 06/30/2021 | | | | ||
\ No newline at end of file
+| CostManagement | Yes | **Completed** | 06/30/2021 |Vendored_GA (1.2.0) | N/A | N/A | Extension |
+| RDBMS | Yes|**Completed** | 06/30/2021 |GA (8.0.0) | Preview (3.1.0rc1) | Medium (Once two months) | Module |
+| DataFactory | Yes | **Completed** | 06/30/2021 |Vendored_SDK | N/A | N/A | Extension |
+| ServiceBus | Yes |**Completed** | 06/30/2021 |GA (6.0.0) | GA (1.0.0) | Medium (Once four months) | Module |
+| EventGrid | Yes |**Completed** | 06/30/2021 | GA (8.0.0) | Preview (3.0.0rc8) | Medium (Once three months) | Module |
+| HDInsight | Yes |**Completed** | 06/30/2021 | GA (7.0.0) | GA (2.1.0) | Medium (Once two months) | Module |
+| Kusto | Yes |**Completed** | 06/30/2021 |Preview (1.0.0b1) | Preview (0.10.0) | Medium (Once two months | Module |
+| ACS | Yes |**Completed** | 06/30/2021 |ContainerService: GA (14.0.0)
ContainerInstance: GA (7.0.0) | ContainerService: GA (11.0.0)
ContainerInstance: GA (2.0.0) | Medium (Once two months) | Module |
+| SQL | No |**In progress** | 06/30/2021 |GA (1.0.0) | Preview (0.25.0) | Medium (Once two months) | Module |
+| ACR | Yes |**In progress** | 06/30/2021 |Preview (8.0.0b1) | Preview (3.0.0rc16) | Medium (Once two months) | Module |
+|**Phase 3** | | | | | | |||
+| NatGateway || **Completed** | N/A |Network: GA (8.0.0) | Network: GA (2.2.0) | Use Network package| Module |
+| Search | |**Completed** | N/A |GA (8.0.0) | GA (3.0.0) | Low (Once a year) | Module |
+| Synapse | |**Completed** | N/A |Preview (1.0.0b1) | Preview (0.6.0) | Medium (Once two months) | Module |
+| AppConfiguration | |**Completed** | N/A |GA (1.0.1) | Preview (0.6.0) | Medium (Once three months) | Module |
+| SignalR | |**Completed** | N/A |Preview (1.0.0b1) | Preview (0.4.0) | Low (Once half year) | Module |
+| Batch | |**Completed** | N/A |GA (15.0.0) | GA (9.0.0) | Low (Once half year) | Module |
+| Backup | |**Completed** | N/A|RecoveryServices: GA (1.0.0)
RecoveryServicesBackup: N/A | RecoveryServices: Preview (0.6.0)
RecoveryServicesBackup: Preview (0.11.0) | Low (Once half year) | Module |
+| Advisor | |**Completed** | N/A |GA (9.0.0) | GA (4.0.0) | Low (once eight months) | Module |
+| Maps | |**Completed** | N/A|Preview (1.0.0b1) | Preview (0.1.0) | Low (Once three years) | Module |
+| BatchAI (CLI own) | | **Completed** | N/A |N/A | GA (2.0.0) | | Module |
+| Billing (CLI own) | |**Completed** | N/A|Preview (6.0.0b1) | GA (1.0.0) | Low (Once a year) | Module |
+| PolicyInsights | |**Completed** | N/A | GA (1.0.0) | Preview (0.6.0) | Low (Once half year) | Module |
+| DMS | |**Completed** | N/A |DataMigration: Preview (9.0.0b1) | DataMigration: GA (4.1.0) | Low (Once a year) | Module |
+| Redis | |**Completed** | N/A |GA (12.0.0) | Preview (7.0.0rc2) | Low (Once a year) | Module |
+| CognitiveServices | |**Completed** | N/A | GA (11.0.0) | GA (6.3.0) | Low (Once half year) | Module |
+| DeploymentManager | |**Completed (deprecated)** | N/A|Preview (1.0.0b1) | Preview (0.2.0) | Low (Once two years) | Module |
+| Reservations | |**Completed (too old)** | N/A |Preview (1.0.0b1) | Preview (0.8.0) | Low (Once half year) | Module |
+| Consumption | |**Completed (too old)** | N/A |GA (8.0.0) | GA (3.0.0) | Low (Once a year) | Module |
+| DLA (CLI own)| | **Completed (too old)** | N/A |N/A | DataLakeAnalytics: Preview (0.6.0) | | Module |
+| DLS (CLI own)| | **Completed (too old)** | N/A (Will incorporate into storage SDK) |N/A | DataLakeStore: Preview (0.5.0) | | Module |
+| ManagedServices | |**Completed (too old)**| N/A| Preview (6.0.0b1) | GA (1.0.0) | Low (Once two years) | Module |
+| DataBoxEdge (CLI own) | |**In progress** | N/A|Preview (1.0.0b1) | Preview (0.2.0) | Low (Once a year) | Module |
+| AMS | |**In progress** | N/A |Media: Preview (7.0.0b1) |Media: GA (3.0.0) | Low (Once a year) | Module |
+| IoT | | **In progress** | N/A |IoTHub: GA (1.0.0)
IoTCentral: N/A
IoTHubProvisioningServices: N/A | IoTHub: Preview (0.12.0)
IoTCentral: GA (4.0.0)
IoTHubProvisioningServices: Preview (0.2.0)| | Module |
+| Security | |**In progress** | N/A |GA (1.0.0) | Preview (0.6.0) | Medium (Once three months) | Module |
+| EventHub | |**In progress** | N/A |GA (8.0.0) | GA (4.2.0) | Low (Once a year) | Module |
+| Relay | |**In progress** | N/A|GA (1.0.0) | Preview (0.2.0) | Low (Once two years) | Module |
+| BotService | |**In progress** | N/A|Preview (1.0.0b1) | Preview (0.2.0) | Low (Once two years) | Module |
+| APIM | |**In progress** | N/A |APIManagement: GA (1.0.0) | APIManagement: Preview (0.2.0) | Low (Once a year) | Module |
+| Role (CLI own) | |**TODO on demand** | N/A | Authorization: GA (1.0.0)
MSI: N/A | Authorization: Preview (0.61.0)
MSI: GA (1.0.0) | Low (Once a year) | Module |
+| SQLVM | |**Complete by the end of Sep** | N/A |N/A| SQLVirtualMachine: Preview (0.5.0) | N/A | Module |
+| ServiceFabric | |**TODO at the beginnig of Aug** | N/A|Preview (1.0.0) | Preview (0.5.0) | Low (Once a year) | Module |
+| ARO | |**TODO in July** | N/A|RedhatOpenShift: Preview (1.0.0b1) | RedhatOpenShift: Preview (0.1.0) | Low (Once a year) | Module |
+| Container | |**TODO on demand** | N/A | ContainerInstance: GA (7.0.0) | ContainerInstance: GA (2.0.0) | Medium (Once two months) | Module |
+| Lab | |Not Started | N/A |DevTestLabs: GA (9.0.0) | DevTestLabs: GA (4.0.0) | Low (Once half year) | Module |
+| HealthCareAPIs | | **Completed** | N/A |Vendored_Preview (0.3.0) | N/A | N/A | Extension |
+| Communication | | **Completed** | N/A |Vendored_SDK | N/A | N/A | Extension |
+| Footprint | | **Completed** | N/A |Vendored_SDK | N/A | N/A | Extension |
+| Logic | | **Completed** | N/A |N/A | Vendored_Preview (0.1.0) | N/A | Extension |
+| Maintenance | | **Completed** | N/A|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
+| Peering | | **Completed** | N/A|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
+| Portal | | **Completed** | N/A |N/A | Vendored_Preview (0.1.0) | N/A | Extension |
+| Stack-HCI | | **Completed** | N/A |N/A | Vendored_Preview (0.1.0) | N/A | Extension |
+| RedisEnterprise | | **Completed** | N/A |N/A | Vendored_SDK | N/A | Extension |
+| Monitor-Control-Service | | **Completed** | N/A |N/A | Vendored_SDK | N/A | Extension |
+| AD | | **Completed** | N/A |N/A | Vendored_SDK | N/A | Extension |
+| Account | | **Completed** | N/A |Subscription: Vendored_Preview (0.5.0) | N/A | N/A | Extension |
+| Attestation | | **Completed** | N/A |Vendored_SDK | N/A | N/A | Extension |
+| Automation | | **Completed** | N/A |Vendored_SDK | N/A | N/A | Extension |
+| ConnectedMachine | | **Completed** | N/A|Vendored_SDK | N/A | N/A | Extension |
+| DataDog | | **Completed** | N/A |Vendored_SDK | N/A | N/A | Extension |
+| DataShare | | **Completed** | N/A |Vendored_SDK | N/A | N/A | Extension |
+| DesktopVirtualization | | **Completed** | N/A |Vendored_Preview (0.2.0) | N/A | N/A | Extension |
+| GuestConfig | | **Completed** | N/A |Vendored_SDK | N/A | N/A | Extension |
+| Hardware-Secutiry-Modules | | **Completed** | N/A|Vendored_SDK | N/A | N/A | Extension |
+| Import-Export | | **Completed** | N/A |Vendored_SDK | N/A | N/A | Extension |
+| Resource-Mover | | **Completed** | N/A |Vendored_SDK | N/A | N/A | Extension |
+| ProviderHub | | **Completed** | N/A |Vendored_SDK | N/A | N/A | Extension |
+| OffAzure | | **Completed** | N/A |Vendored_SDK | N/A | N/A | Extension |
+| HealthBot | | **Completed** | N/A |Vendored_SDK | N/A | N/A | Extension |
+| Confluent | | **Completed** | N/A |Vendored_SDK | N/A | N/A | Extension |
+| ACRTransfer | | **Completed** | N/A |Vendored_SDK | N/A | N/A | Extension |
+| Custom-Providers (CLI own) | | **Completed** | N/A |N/A | Vendored_Preview (0.1.0) | N/A | Extension |
+| Mixed-Reality (CLI own) | | **Completed** | N/A|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
+| Resource-Graph (CLI own) | | **Completed** | N/A |N/A | Vendored_Preview (0.1.0) | N/A | Extension |
+| DataBox (CLI own) | | **Completed** | N/A |N/A | Vendored_Preview (0.2.0) | N/A | Extension |
+| HPC-Cache (CLI own) || **Completed** | N/A |N/A | Vendored_Preview (0.2.0 | N/A | Extension |
+| TimeSeriesInsights (CLI own) | | **Completed** | N/A |N/A | Vendored_Preview (0.1.0) | N/A | Extension |
+| BlockChain (CLI own) | | **Completed** | N/A|N/A | Vendored_GA (2.0.0) | N/A | Extension |
+| Internet-Analyzer (CLI own) || **Completed** | N/A | N/A | Frontdoor: Vendored_Preview (0.3.0) | N/A | Extension |
+| CosmosDB-Preview | | **Completed** | N/A |N/A | Vendored_SDK | N/A | Extension |
+| CloudService (CLI own) | | **Completed**| N/A |N/A | N/A | N/A | Extension |
+| SecurityInsight (CLI own) | | **Completed** | N/A |N/A | Vendored_Preview (0.1.0) | N/A | Extension |
+| Swiftlet (CLI own) | | **Completed** | N/A |N/A | Vendored_Preview (0.1.0) | N/A | Extension |
+| Storage-Preview (CLI own) | | **Completed** | N/A |N/A | Vendored_SDK | N/A | Extension |
+| Storage-Blob-Preview (CLI own) | | **Completed** | N/A |N/A | Vendored_SDK | N/A | Extension |
+| Scheduled-Query (CLI own) | | **Completed** | N/A |N/A | Vendored_Preview (0.1.0) | N/A | Extension |
+| PowerbiDedicated (CLI own) | | **Completed** | N/A |N/A | Vendored_Preview (0.1.0) | N/A | Extension |
+| RDBMS-Connect | | **Completed** | N/A |N/A | Vendored_SDK | N/A | Extension |
+| AKS-Preview | | **Completed** | N/A |N/A | ContainerService: Vendored_GA (0.2.0) | N/A | Extension |
+| AEM | | **Completed** | N/A |N/A | N/A | N/A | Extension |
+| Quantum | | **Completed** | N/A |N/A | Vendored_SDK | N/A | Extension |
+| StorageSync (CLI own) | | **Completed** | N/A |N/A | Vendored_Preview (0.1.0) | N/A | Extension |
+| SpringCloud | | **Completed** | N/A |N/A | Vendored_Preview (0.1.0) | N/A | Extension |
+| VMWare | | **Completed** | N/A |N/A | Vendored_Preview (0.1.0) | N/A | Extension |
+| Connection-Monitor-Preview (CLI own) | | **Completed (already moved to CLI module)** | N/A |N/A | Vendored_SDK | N/A | Extension |
+| Dev-Spaces | | **Completed (No SDK)** | N/A |N/A | N/A | N/A | Extension |
+| Cli-Translator | | **Completed (No SDK)** | N/A |N/A | N/A | N/A |
+| Image-Copy (CLI own) | | **Completed (No SDK)** | N/A |N/A | Vendored_SDK | N/A | Extension |
+| SSH | | **Completed (no SDK)** | N/A |N/A | N/A | N/A | Extension |
+| VM-Repair | | **Completed (No SDK)**| N/A |N/A | Vendored_Preview (0.1.0) | N/A | Extension |
+| NetAppFiles-Preview | | **Completed (deprecated)** | N/A |N/A | Vendored_SDK | N/A | Extension |
+| DB-Up (CLI own) | | **Completed (deprecated)** | N/A |N/A | RDBMS: Vendored_GA (1.5.0)
SQL: Vendored_Preview (0.11.0) | N/A | Extension |
+| Mesh | | **Completed (deprecated)** | N/A |N/A | Vendored_Preview (0.1.0) | N/A | Extension |
+| Hack | | **Completed (deprecated)** | N/A |N/A | Call AppService, CosmosDB, RDBMS, CognitiveServices | N/A | Extension |
+| Log-Analytics-Solution (CLI own) | | **Completed (too old)** | N/A |N/A | Vendored_SDK | N/A | Extension |
+| Express-Route-Cross-Connection (CLI own) || **Completed (too old)** | N/A | N/A | Network: Vendored_SDK | N/A | Extension |
+| Ip-Group (CLI own) | | **Completed (too old)** | N/A |N/A | Network: Vendored_SDK | N/A | Extension |
+| Virtual-Network-Tap (CLI own) | | **Completed (too old)**| N/A |N/A | Network: Vendored_SDK | N/A | Extension |
+| AlertsManagement (CLI own) | | **Completed (too old)** | N/A|N/A | Vendored_Preview (0.2.0rc2) | N/A | Extension |
+| Notification-Hub (CLI own) | | **Completed (too old)** | N/A|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
+| DataBricks (CLI own) | | **Completed (too old)** | N/A|N/A | Vendored_Preview (0.1.0 | N/A | Extension |
+| Stream-Analytics (CLI own) | | **Completed (too old)** | N/A |N/A | Vendored_Preview (0.1.0) | N/A | Extension |
+| CodeSpaces | | **Completed (too old)** | N/A |N/A | Vendored_SDK | N/A | Extension |
+| Support | | **Completed (no new features)** | N/A |N/A | Vendored_Preview (0.1.0) | N/A | Extension |
+| ManagementPartner | | **Completed (no new features)** | N/A|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
+| Log-Analytics (CLI own) | | **Completed (data plane)** | N/A|N/A | Vendored_Preview (0.1.0) | N/A | Extension |
+| ConnectedK8S | | **In progress** | N/A |N/A | Vendored_Preview (0.1.1) | N/A | Extension |
+| BluePrint (CLI own) | | **In progress** | N/A|N/A | Vendored_Preview (2018-11-01-preview) | N/A | Extension |
+| DMS-Preview | | **In progress** | N/A |N/A | Vendored_GA (4.0.0) | N/A | Extension |
+| K8S-Configuration | | **In progress**| N/A|N/A | Vendored_SDK) | N/A | Extension |
+| K8S-Extension | | **In progress** | N/A|N/A | Vendored_SDK) | N/A | Extension |
+| WebApp | | Not Started | N/A |N/A | N/A | N/A | Extension |
\ No newline at end of file