[Azure Stack] Updates to Subscriptions module (Azure#8898)

* commit dd09a40 Author: bganapa <bganapa@microsoft.com> Date: Tue Mar 17 17:32:10 2020 -0700 Update to camelCasing for resourceGroups commit 4212dd0 Author: bganapa <bganapa@microsoft.com> Date: Tue Mar 17 17:30:07 2020 -0700 Update to camelCasing for resourcegroups commit 594441b Author: Rakesh Kumar <rakku@microsoft.com> Date: Tue Nov 26 14:06:28 2019 -0800 Rakku stackadmin issue (Azure#7852) * network admin module changes * remove readme.azsautogen.md from network * rename new[ModuleName] to [ModuleName]Definition for AcquiredPlan, DirectoryTenant, Offer, OfferDelegation, Plan and Subscription * fix for enum naming error in github issue Azure#7822 commit ac4e40d Author: Rakesh Kumar <rakku@microsoft.com> Date: Wed Nov 20 16:47:44 2019 -0800 Subscription Admin module parameter renaming (Azure#7816) * network admin module changes * remove readme.azsautogen.md from network * rename new[ModuleName] to [ModuleName]Definition for AcquiredPlan, DirectoryTenant, Offer, OfferDelegation, Plan and Subscription commit 9e551f0 Author: bganapa <bganapa@microsoft.com> Date: Tue Nov 12 11:44:22 2019 -0800 Reset to Stackadmin2 (Azure#7766) * Fix example * Fix examples * Address PR comments
00Kai0 · Oct 12, 2020 · 71e88cb · 71e88cb
1 parent 241bb04
commit 71e88cb
Show file tree

Hide file tree

Showing 18 changed files with 170 additions and 53 deletions.
diff --git a/...-manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/AcquiredPlan.json b/...-manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/AcquiredPlan.json
@@ -146,7 +146,7 @@
             "$ref": "Subscriptions.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "#/parameters/NewAcquiredPlanParameter"
+            "$ref": "#/parameters/AcquiredPlanDefinitionParameter"
           }
         ],
         "responses": {
@@ -268,8 +268,8 @@
       "type": "string",
       "x-ms-parameter-location": "method"
     },
-    "NewAcquiredPlanParameter": {
-      "name": "newAcquiredPlan",
+    "AcquiredPlanDefinitionParameter": {
+      "name": "acquiredPlanDefinition",
       "in": "body",
       "description": "The new acquired plan.",
       "required": true,

diff --git a/...ger/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/DelegatedProvider.json b/...ger/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/DelegatedProvider.json
@@ -76,7 +76,7 @@
           "200": {
             "description": "OK",
             "schema": {
-              "$ref": "Subscriptions.json#/definitions/Subscription"
+              "$ref": "Subscriptions.json#/definitions/SubscriptionDefinition"
             }
           }
         }

diff --git a/...nager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/DirectoryTenant.json b/...nager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/DirectoryTenant.json
@@ -146,7 +146,7 @@
             "$ref": "Subscriptions.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "#/parameters/NewDirectoryTenantParameter"
+            "$ref": "#/parameters/DirectoryTenantDefinitionParameter"
           }
         ],
         "responses": {
@@ -220,9 +220,9 @@
       "in": "path",
       "x-ms-parameter-location": "method"
     },
-    "NewDirectoryTenantParameter": {
+    "DirectoryTenantDefinitionParameter": {
       "description": "New directory tenant properties.",
-      "name": "newTenant",
+      "name": "tenantDefinition",
       "required": true,
       "in": "body",
       "schema": {

diff --git a/...esource-manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/Offer.json b/...esource-manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/Offer.json
@@ -49,7 +49,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers": {
       "get": {
         "x-ms-examples": {
           "Get the list of offers under a resource group.": {
@@ -85,7 +85,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}": {
       "get": {
         "x-ms-examples": {
           "Get the specified offer.": {
@@ -145,7 +145,7 @@
             "$ref": "Subscriptions.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "#/parameters/NewOfferParameter"
+            "$ref": "#/parameters/OfferDefinitionParameter"
           }
         ],
         "responses": {
@@ -198,7 +198,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/metrics": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/metrics": {
       "get": {
         "x-ms-examples": {
           "Get the offer metrics.": {
@@ -234,7 +234,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/metricDefinitions": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/metricDefinitions": {
       "get": {
         "x-ms-examples": {
           "Get the metric definitions.": {
@@ -270,7 +270,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/link": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/link": {
       "post": {
         "x-ms-examples": {
           "Links a plan to an offer.": {
@@ -309,7 +309,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/unlink": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/unlink": {
       "post": {
         "x-ms-examples": {
           "Unlink a plan from an offer.": {
@@ -508,9 +508,9 @@
     }
   },
   "parameters": {
-    "NewOfferParameter": {
+    "OfferDefinitionParameter": {
       "description": "New offer.",
-      "name": "newOffer",
+      "name": "offerDefinition",
       "in": "body",
       "required": true,
       "schema": {

diff --git a/...nager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/OfferDelegation.json b/...nager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/OfferDelegation.json
@@ -121,7 +121,7 @@
             "$ref": "Subscriptions.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "#/parameters/NewOfferDelegationParameter"
+            "$ref": "#/parameters/OfferDelegationDefinitionParameter"
           }
         ],
         "responses": {
@@ -231,9 +231,9 @@
       "type": "string",
       "x-ms-parameter-location": "method"
     },
-    "NewOfferDelegationParameter": {
+    "OfferDelegationDefinitionParameter": {
       "description": "New offer delegation parameter.",
-      "name": "newOfferDelegation",
+      "name": "offerDelegationDefinition",
       "in": "body",
       "required": true,
       "schema": {

diff --git a/...resource-manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/Plan.json b/...resource-manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/Plan.json
@@ -49,7 +49,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/plans": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/plans": {
       "get": {
         "x-ms-examples": {
           "Get the list of plans under a resource group.": {
@@ -85,7 +85,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/plans/{plan}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/plans/{plan}": {
       "get": {
         "x-ms-examples": {
           "Get the specified plan.": {
@@ -145,7 +145,7 @@
             "$ref": "Subscriptions.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "#/parameters/NewPlanParameter"
+            "$ref": "#/parameters/PlanDefinitionParameter"
           }
         ],
         "responses": {
@@ -346,9 +346,9 @@
     }
   },
   "parameters": {
-    "NewPlanParameter": {
+    "PlanDefinitionParameter": {
       "description": "New plan.",
-      "name": "newPlan",
+      "name": "planDefinition",
       "in": "body",
       "required": true,
       "schema": {

diff --git a/...manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/Subscriptions.json b/...manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/Subscriptions.json
@@ -238,7 +238,7 @@
         "x-ms-pageable": {
           "nextLinkName": null
         },
-        "x-ms-odata": "#/definitions/Subscription"
+        "x-ms-odata": "#/definitions/SubscriptionDefinition"
       }
     },
     "/subscriptions/{subscriptionId}/providers/Microsoft.Subscriptions.Admin/checkNameAvailability": {
@@ -274,7 +274,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/providers/Microsoft.Subscriptions.Admin/subscriptions/{subscription}": {
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Subscriptions.Admin/subscriptions/{targetSubscriptionId}": {
       "get": {
         "x-ms-examples": {
           "Get a specified subscription.": {
@@ -291,7 +291,7 @@
             "$ref": "#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "#/parameters/SubscriptionParameter"
+            "$ref": "#/parameters/TargetSubscriptionIdParameter"
           },
           {
             "$ref": "#/parameters/ApiVersionParameter"
@@ -301,7 +301,7 @@
           "200": {
             "description": "OK",
             "schema": {
-              "$ref": "#/definitions/Subscription"
+              "$ref": "#/definitions/SubscriptionDefinition"
             }
           }
         }
@@ -322,10 +322,10 @@
             "$ref": "#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "#/parameters/SubscriptionParameter"
+            "$ref": "#/parameters/TargetSubscriptionIdParameter"
           },
           {
-            "$ref": "#/parameters/NewSubscriptionParameter"
+            "$ref": "#/parameters/SubscriptionDefinitionParameter"
           },
           {
             "$ref": "#/parameters/ApiVersionParameter"
@@ -335,13 +335,13 @@
           "201": {
             "description": "Created",
             "schema": {
-              "$ref": "#/definitions/Subscription"
+              "$ref": "#/definitions/SubscriptionDefinition"
             }
           },
           "200": {
             "description": "OK",
             "schema": {
-              "$ref": "#/definitions/Subscription"
+              "$ref": "#/definitions/SubscriptionDefinition"
             }
           }
         }
@@ -362,7 +362,7 @@
             "$ref": "#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "#/parameters/SubscriptionParameter"
+            "$ref": "#/parameters/TargetSubscriptionIdParameter"
           },
           {
             "$ref": "#/parameters/ApiVersionParameter"
@@ -767,8 +767,8 @@
         }
       }
     },
-    "Subscription": {
-      "description": "List of supported operations.",
+    "SubscriptionDefinition": {
+      "description": "Subscription object properties.",
       "type": "object",
       "properties": {
         "delegatedProviderSubscriptionId": {
@@ -820,7 +820,7 @@
           "type": "array",
           "description": "Subscription definition.",
           "items": {
-            "$ref": "#/definitions/Subscription"
+            "$ref": "#/definitions/SubscriptionDefinition"
           }
         },
         "nextLink": {
@@ -1215,20 +1215,20 @@
       "required": true,
       "x-ms-parameter-location": "method"
     },
-    "SubscriptionParameter": {
-      "description": "Subscription parameter.",
-      "name": "subscription",
+    "TargetSubscriptionIdParameter": {
+      "description": "The target subscription ID.",
+      "name": "targetSubscriptionId",
       "in": "path",
       "type": "string",
       "required": true,
       "x-ms-parameter-location": "method"
     },
-    "NewSubscriptionParameter": {
+    "SubscriptionDefinitionParameter": {
       "description": "Subscription parameter.",
-      "name": "newSubscription",
+      "name": "subscriptionDefinition",
       "in": "body",
       "schema": {
-        "$ref": "#/definitions/Subscription"
+        "$ref": "#/definitions/SubscriptionDefinition"
       },
       "required": true,
       "x-ms-parameter-location": "method"

diff --git a/...ptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/AcquiredPlan/Create.json b/...ptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/AcquiredPlan/Create.json
@@ -5,7 +5,7 @@
     "api-version": "2015-11-01",
     "targetSubscriptionId": "8158498d-27b1-4ccf-9aa1-de0f925731e6",
     "planAcquisitionId": "718c7f7c-4868-479a-98ce-5caaa8f158c8",
-    "newAcquiredPlan": {
+    "acquiredPlanDefinition": {
       "properties": {
         "acquisitionId": "718c7f7c-4868-479a-98ce-5caaa8f158c8",
         "id": "/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/providers/Microsoft.Subscriptions/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/acquiredPlans/718c7f7c-4868-479a-98ce-5caaa8f158c8",

diff --git a/...ons/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/DirectoryTenant/Create.json b/...ons/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/DirectoryTenant/Create.json
@@ -4,7 +4,7 @@
     "location": "local",
     "api-version": "2015-11-01",
     "tenant": "azurestackci05.onmicrosoft.in",
-    "newTenant": "eb90516e-65d7-4bf6-8537-8322e9172832",
+    "tenantDefinition": "eb90516e-65d7-4bf6-8537-8322e9172832",
     "resourceGroupName": "system.local"
   },
   "responses": {

diff --git a/...subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/Offer/Create.json b/...subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/Offer/Create.json
@@ -5,7 +5,7 @@
     "api-version": "2015-11-01",
     "offer": "sampleoffer1",
     "resourceGroupName": "RG1",
-    "newOffer": {
+    "offerDefinition": {
       "properties": {
         "name": "testOffer1",
         "displayName": "Test Offer",

diff --git a/...ons/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/OfferDelegation/Create.json b/...ons/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/OfferDelegation/Create.json
@@ -6,7 +6,7 @@
     "resourceGroupName": "cnur9852subscrrg374",
     "offer": "cnur9852tenantoffer374",
     "offerDelegationName": "testOfferDelegation",
-    "newOfferDelegation": "newDelegationName"
+    "offerDelegationDefinition": "newDelegationName"
   },
   "responses": {
     "200": {

diff --git a/.../subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/Plan/Create.json b/.../subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/Plan/Create.json
@@ -5,7 +5,7 @@
     "api-version": "2015-11-01",
     "resourceGroupName": "plans",
     "plan": "testplan",
-    "newPlan": {
+    "planDefinition": {
       "properties": {
         "description": "test plan",
         "displayName": "testplans",

diff --git a/...ft.Subscriptions.Admin/preview/2015-11-01/examples/Subscriptions/CheckIdentityHealth.json b/...ft.Subscriptions.Admin/preview/2015-11-01/examples/Subscriptions/CheckIdentityHealth.json
@@ -9,7 +9,7 @@
       "body": {
         "reportStartTimeUtc": "2017-08-01T00:00:00.00Z",
         "reportEndTimeUtc": "2017-08-01T00:00:00.00Z",
-        "status": "",
+        "status": "Unknown",
         "directoryTenants": [
           {
             "tenantId": "",

diff --git a/...tions/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/Subscriptions/Create.json b/...tions/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/Subscriptions/Create.json
@@ -1,10 +1,11 @@
 {
   "parameters": {
     "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
+    "targetSubscriptionId": "c79389af-4480-48cc-8fa2-ee8ced8e843d",
     "location": "local",
     "api-version": "2015-11-01",
     "subscription": "test",
-    "newSubscription": {
+    "subscriptionDefinition": {
       "properties": {
         "delegatedProviderSubscriptionId": "d16dfcf0-44cc-4498-9937-08b94159d27b",
         "displayName": "Test Subscription",

diff --git a/...tions/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/Subscriptions/Delete.json b/...tions/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/Subscriptions/Delete.json
@@ -1,5 +1,6 @@
 {
   "parameters": {
+    "targetSubscriptionId": "c79389af-4480-48cc-8fa2-ee8ced8e843d",
     "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
     "location": "local",
     "api-version": "2015-11-01",

diff --git a/...riptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/Subscriptions/Get.json b/...riptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/examples/Subscriptions/Get.json
@@ -1,6 +1,7 @@
 {
   "parameters": {
     "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
+    "targetSubscriptionId": "c79389af-4480-48cc-8fa2-ee8ced8e843d",
     "location": "local",
     "api-version": "2015-11-01",
     "subscription": "test"