[Azure Stack] Updates to User-Subscriptions Spec (Azure#8914)

* commit 4691c2a Author: Rakesh Kumar <[email protected]> Date: Wed Jan 29 17:46:01 2020 -0800 [AzureStack] User Subscription: rename NewSubscription to SubscriptionDefinition (Azure#8257) commit 9e551f0 Author: bganapa <[email protected]> Date: Tue Nov 12 11:44:22 2019 -0800 Reset to Stackadmin2 (Azure#7766) * Fix sub def in example * Address PR comments * Fix model validation error * Fix prettier issue
innosam · Aug 17, 2020 · 4a9731b · 4a9731b
1 parent ec1df09
commit 4a9731b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 34 deletions.
diff --git a/...-manager/user-subscriptions/Microsoft.Subscriptions/preview/2015-11-01/Subscriptions.json b/...-manager/user-subscriptions/Microsoft.Subscriptions/preview/2015-11-01/Subscriptions.json
@@ -91,7 +91,7 @@
             "$ref": "#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "#/parameters/NewSubscriptionParameter"
+            "$ref": "#/parameters/SubscriptionDefinitionParameter"
           },
           {
             "$ref": "#/parameters/ApiVersionParameter"
@@ -263,9 +263,9 @@
       "description": "Id of the subscription.",
       "x-ms-parameter-location": "method"
     },
-    "NewSubscriptionParameter": {
+    "SubscriptionDefinitionParameter": {
       "description": "Subscription parameter.",
-      "name": "newSubscription",
+      "name": "subscriptionDefinition",
       "in": "body",
       "schema": {
         "$ref": "#/definitions/Subscription"

diff --git a/...bscriptions/Microsoft.Subscriptions/preview/2015-11-01/examples/Subscriptions/Create.json b/...bscriptions/Microsoft.Subscriptions/preview/2015-11-01/examples/Subscriptions/Create.json
@@ -3,15 +3,13 @@
     "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
     "location": "local",
     "api-version": "2015-11-01",
-    "newSubscription": {
-      "properties": {
-        "displayName": "Test [email protected]",
-        "id": "",
-        "offerId": "/delegatedProviders/default/offers/TestOffer-0892f99c-8d1c-48d1-a2b3-128a931afc09",
-        "state": "Enabled",
-        "subscriptionId": "a7aeb2dd-1b1d-458c-a3dc-09070c2ece5e",
-        "tenantId": ""
-      }
+    "subscriptionDefinition": {
+      "displayName": "Test [email protected]",
+      "id": "",
+      "offerId": "/delegatedProviders/default/offers/TestOffer-0892f99c-8d1c-48d1-a2b3-128a931afc09",
+      "state": "Enabled",
+      "subscriptionId": "a7aeb2dd-1b1d-458c-a3dc-09070c2ece5e",
+      "tenantId": ""
     }
   },
   "responses": {

diff --git a/specification/azsadmin/resource-manager/user-subscriptions/readme.md b/specification/azsadmin/resource-manager/user-subscriptions/readme.md
@@ -82,33 +82,13 @@ csharp:
   clear-output-folder: true
 ```
 
-## Python
-
-These settings apply only when `--python` is specified on the command line.
-
-``` yaml $(python)
-python:
-  # override the default output folder
-  output-folder: $(output-folder)/python
-  license-header: MICROSOFT_MIT_NO_VERSION
-  payload-flattening-threshold: 2
-```
-
-### Tag: package-2015-11-01 and python
-
-These settings apply only when `--tag=package-2015-11-01 --python` is specified on the command line.
-
-``` yaml $(tag) == 'package-2015-11-01' && $(python)
-namespace: azure.mgmt.subscriptions.v2015_06_01_preview
-```
-
-## Multi-API/Profile support for AutoRest v3 generators 
+## Multi-API/Profile support for AutoRest v3 generators
 
 AutoRest V3 generators require the use of `--tag=all-api-versions` to select api files.
 
 This block is updated by an automatic script. Edits may be lost!
 
-``` yaml $(tag) == 'all-api-versions' /* autogenerated */
+``` yaml
 # include the azure profile definitions from the standard location
 require: $(this-folder)/../../../../profiles/readme.md
 
@@ -127,3 +107,22 @@ uncomment the  `exclude-file` section below and add the file paths.
 #  - $(this-folder)/Microsoft.Example/stable/2010-01-01/somefile.json
 ```
 
+## Python
+
+These settings apply only when `--python` is specified on the command line.
+
+``` yaml $(python)
+python:
+  # override the default output folder
+  output-folder: $(output-folder)/python
+  license-header: MICROSOFT_MIT_NO_VERSION
+  payload-flattening-threshold: 2
+```
+
+### Tag: package-2015-11-01 and python
+
+These settings apply only when `--tag=package-2015-11-01 --python` is specified on the command line.
+
+``` yaml $(tag) == 'package-2015-11-01' && $(python)
+namespace: azure.mgmt.subscriptions.v2015_06_01_preview
+```