From 1286dec1f4ca5fe7a8f34efbb6cc5744305462e0 Mon Sep 17 00:00:00 2001
From: Ochi <ochisamand@microsoft.com>
Date: Tue, 11 Jan 2022 18:08:41 -0800
Subject: [PATCH 1/2] Updated SubscriptionRP v2020-09-01 for s360

---
 .../stable/2020-09-01/subscriptions.json       | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/specification/subscription/resource-manager/Microsoft.Subscription/stable/2020-09-01/subscriptions.json b/specification/subscription/resource-manager/Microsoft.Subscription/stable/2020-09-01/subscriptions.json
index 12ca7c2b0664..8c22e74cae7b 100644
--- a/specification/subscription/resource-manager/Microsoft.Subscription/stable/2020-09-01/subscriptions.json
+++ b/specification/subscription/resource-manager/Microsoft.Subscription/stable/2020-09-01/subscriptions.json
@@ -46,7 +46,7 @@
           "default": {
             "description": "Describes the error if the operation is not successful.",
             "schema": {
-              "$ref": "#/definitions/ErrorResponse"
+              "$ref": "#/definitions/ErrorResponseBody"
             }
           }
         }
@@ -121,7 +121,7 @@
           "default": {
             "description": "Describes the error if the operation is not successful.",
             "schema": {
-              "$ref": "#/definitions/ErrorResponse"
+              "$ref": "#/definitions/ErrorResponseBody"
             }
           }
         }
@@ -335,13 +335,21 @@
         "error": {
           "description": "The details of the error.",
           "$ref": "#/definitions/ErrorResponse"
+        },
+        "code": {
+          "description": "Error code",
+          "type": "string"
+        },
+        "message": {
+          "description": "Error message indicating why the operation failed.",
+          "type": "string"
         }
       }
     },
     "CanceledSubscriptionId": {
       "description": "The ID of the canceled subscription",
       "properties": {
-        "value": {
+        "subscriptionId": {
           "description": "The ID of the canceled subscription",
           "type": "string",
           "readOnly": true
@@ -351,7 +359,7 @@
     "RenamedSubscriptionId": {
       "description": "The ID of the subscriptions that is being renamed",
       "properties": {
-        "value": {
+        "subscriptionId": {
           "description": "The ID of the subscriptions that is being renamed",
           "type": "string",
           "readOnly": true
@@ -361,7 +369,7 @@
     "EnabledSubscriptionId": {
       "description": "The ID of the subscriptions that is being enabled",
       "properties": {
-        "value": {
+        "subscriptionId": {
           "description": "The ID of the subscriptions that is being enabled",
           "type": "string",
           "readOnly": true

From 16d2e2ea855d9628714dc8e41e0f8319297487f3 Mon Sep 17 00:00:00 2001
From: Ochi <ochisamand@microsoft.com>
Date: Wed, 12 Jan 2022 02:52:01 -0800
Subject: [PATCH 2/2] Model validation errors are fixed

---
 .../stable/2020-09-01/examples/cancelSubscription.json          | 2 +-
 .../stable/2020-09-01/examples/enableSubscription.json          | 2 +-
 .../stable/2020-09-01/examples/renameSubscription.json          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/specification/subscription/resource-manager/Microsoft.Subscription/stable/2020-09-01/examples/cancelSubscription.json b/specification/subscription/resource-manager/Microsoft.Subscription/stable/2020-09-01/examples/cancelSubscription.json
index 74c4cf1edac7..eb9a9f7db620 100644
--- a/specification/subscription/resource-manager/Microsoft.Subscription/stable/2020-09-01/examples/cancelSubscription.json
+++ b/specification/subscription/resource-manager/Microsoft.Subscription/stable/2020-09-01/examples/cancelSubscription.json
@@ -6,7 +6,7 @@
   "responses": {
     "200": {
       "body": {
-        "value": "83aa47df-e3e9-49ff-877b-94304bf3d3ad"
+        "subscriptionId": "83aa47df-e3e9-49ff-877b-94304bf3d3ad"
       }
     }
   }
diff --git a/specification/subscription/resource-manager/Microsoft.Subscription/stable/2020-09-01/examples/enableSubscription.json b/specification/subscription/resource-manager/Microsoft.Subscription/stable/2020-09-01/examples/enableSubscription.json
index ef41bf44a0db..1693086ea985 100644
--- a/specification/subscription/resource-manager/Microsoft.Subscription/stable/2020-09-01/examples/enableSubscription.json
+++ b/specification/subscription/resource-manager/Microsoft.Subscription/stable/2020-09-01/examples/enableSubscription.json
@@ -6,7 +6,7 @@
   "responses": {
     "200": {
       "body": {
-        "value": "7948bcee-488c-47ce-941c-38e20ede803d"
+        "subscriptionId": "7948bcee-488c-47ce-941c-38e20ede803d"
       }
     }
   }
diff --git a/specification/subscription/resource-manager/Microsoft.Subscription/stable/2020-09-01/examples/renameSubscription.json b/specification/subscription/resource-manager/Microsoft.Subscription/stable/2020-09-01/examples/renameSubscription.json
index ec2cd2a69193..8ffeeb681b59 100644
--- a/specification/subscription/resource-manager/Microsoft.Subscription/stable/2020-09-01/examples/renameSubscription.json
+++ b/specification/subscription/resource-manager/Microsoft.Subscription/stable/2020-09-01/examples/renameSubscription.json
@@ -9,7 +9,7 @@
   "responses": {
     "200": {
       "body": {
-        "value": "83aa47df-e3e9-49ff-877b-94304bf3d3ad"
+        "subscriptionId": "83aa47df-e3e9-49ff-877b-94304bf3d3ad"
       }
     }
   }