From a1c8d4d34a2f30148424e9b4a98b60502aada1dd Mon Sep 17 00:00:00 2001
From: Alan Ren <alanren@microsoft.com>
Date: Sat, 17 Oct 2020 15:38:40 -0700
Subject: [PATCH] azure-cli-iot-ext is deprecated use azure-iot now (#12970)

---
 .../notebooks/edge/deploy-sql-edge-azure.ipynb         |  6 +++++-
 .../notebooks/edge/deploy-sql-edge-multi-device.ipynb  | 10 ++++++----
 .../notebooks/edge/deploy-sql-edge-single-device.ipynb |  6 +++++-
 extensions/asde-deployment/package.json                |  6 +++---
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-azure.ipynb b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-azure.ipynb
index 28384ba60f..16c0601d3b 100644
--- a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-azure.ipynb
+++ b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-azure.ipynb
@@ -97,7 +97,11 @@
         {
             "cell_type": "code",
             "source": [
-                "run_command('az extension add --name azure-cli-iot-ext')"
+                "extensions = run_command('az extension list', returnObject=True)\r\n",
+                "extensions = [ext for ext in extensions if ext['name'] == 'azure-cli-iot-ext']\r\n",
+                "if len(extensions) > 0:\r\n",
+                "    run_command('az extension remove --name azure-cli-iot-ext')\r\n",
+                "run_command('az extension add --name azure-iot')"
             ],
             "metadata": {
                 "azdata_cell_guid": "55bb2f96-6f7f-4aa0-9daf-d0f7f9d9243c",
diff --git a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-multi-device.ipynb b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-multi-device.ipynb
index 06704c0f50..4af0ac2b21 100644
--- a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-multi-device.ipynb
+++ b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-multi-device.ipynb
@@ -92,13 +92,15 @@
         {
             "cell_type": "code",
             "source": [
-                "run_command('az extension add --name azure-cli-iot-ext')"
+                "extensions = run_command('az extension list', returnObject=True)\r\n",
+                "extensions = [ext for ext in extensions if ext['name'] == 'azure-cli-iot-ext']\r\n",
+                "if len(extensions) > 0:\r\n",
+                "    run_command('az extension remove --name azure-cli-iot-ext')\r\n",
+                "run_command('az extension add --name azure-iot')"
             ],
             "metadata": {
                 "azdata_cell_guid": "55bb2f96-6f7f-4aa0-9daf-d0f7f9d9243c",
-                "tags": [
-                    "hide_input"
-                ]
+                "tags": []
             },
             "outputs": [],
             "execution_count": null
diff --git a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-single-device.ipynb b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-single-device.ipynb
index 741b825f81..ced2594299 100644
--- a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-single-device.ipynb
+++ b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-single-device.ipynb
@@ -95,7 +95,11 @@
         {
             "cell_type": "code",
             "source": [
-                "run_command('az extension add --name azure-cli-iot-ext')"
+                "extensions = run_command('az extension list', returnObject=True)\r\n",
+                "extensions = [ext for ext in extensions if ext['name'] == 'azure-cli-iot-ext']\r\n",
+                "if len(extensions) > 0:\r\n",
+                "    run_command('az extension remove --name azure-cli-iot-ext')\r\n",
+                "run_command('az extension add --name azure-iot')"
             ],
             "metadata": {
                 "azdata_cell_guid": "55bb2f96-6f7f-4aa0-9daf-d0f7f9d9243c",
diff --git a/extensions/asde-deployment/package.json b/extensions/asde-deployment/package.json
index 8bcf81f5d4..b8e9639a87 100644
--- a/extensions/asde-deployment/package.json
+++ b/extensions/asde-deployment/package.json
@@ -387,7 +387,7 @@
             "requiredTools": [
               {
                 "name": "azure-cli",
-                "version": "2.9.1"
+                "version": "2.13.0"
               }
             ],
             "when": "type=azure-create-new"
@@ -477,7 +477,7 @@
             "requiredTools": [
               {
                 "name": "azure-cli",
-                "version": "2.9.1"
+                "version": "2.13.0"
               }
             ],
             "when": "type=azure-single-device"
@@ -570,7 +570,7 @@
             "requiredTools": [
               {
                 "name": "azure-cli",
-                "version": "2.9.1"
+                "version": "2.13.0"
               }
             ],
             "when": "type=azure-multi-device"