Removed locale from request body (Azure#33749)

abdulgagit · web-flow · commit c9d1fa5a56b1 · 2025-05-22T17:20:34.000-07:00
* Removed locale from request body

* Added properties around request body

* Fixed Swagger ModelValidation

* Updated example file

* ModelValidation fix
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2024-08-01-preview/examples/CreateOrUpdateMigrationMapping.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2024-08-01-preview/examples/CreateOrUpdateMigrationMapping.json
@@ -3,21 +3,22 @@
     "billingAccountName": "57151837",
     "api-version": "2024-08-01-preview",
     "parameters": {
-      "destinationBillingScope": "/providers/Microsoft.Billing/billingAccounts/8a1d33b5-73a1-5e7f-4b29-5afaebaba7e4:03059466-caec-4aa5-b458-2071484f7d32_2019-05-31/billingProfiles/APS5-RFWH-BG7-PGB",
-      "status": "Draft"
+      "properties": {
+        "destinationBillingScope": "/providers/Microsoft.Billing/billingAccounts/8a1d33b5-73a1-5e7f-4b29-5afaebaba7e4:03059466-caec-4aa5-b458-2071484f7d32_2019-05-31/billingProfiles/APS5-RFWH-BG7-PGB",
+        "status": "Draft"
+      }
     }
   },
   "responses": {
     "200": {
       "body": {
-        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/migrations/default",
+        "id": "/providers/Microsoft.Billing/billingAccounts/57151837/migrations/default",
         "name": "default",
-        "type": "Microsoft.Billing/billingAccounts/migrations/default",
+        "type": "Microsoft.Billing/billingAccounts/migrations",
         "properties": {
           "destinationBillingScope": "/providers/Microsoft.Billing/billingAccounts/8a1d33b5-73a1-5e7f-4b29-5afaebaba7e4:03059466-caec-4aa5-b458-2071484f7d32_2019-05-31/billingProfiles/APS5-RFWH-BG7-PGB",
-          "status": "Draft",
-          "transferId": null,
-          "products": []
+          "status": "NotStarted",
+          "transferId": null
         }
       }
     }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2024-08-01-preview/examples/GetMigrationMapping.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2024-08-01-preview/examples/GetMigrationMapping.json
@@ -6,14 +6,13 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/migrations/default",
+        "id": "/providers/Microsoft.Billing/billingAccounts/57151837/migrations/default",
         "name": "default",
-        "type": "Microsoft.Billing/billingAccounts/migrations/default",
+        "type": "Microsoft.Billing/billingAccounts/migrations",
         "properties": {
           "destinationBillingScope": "/providers/Microsoft.Billing/billingAccounts/8a1d33b5-73a1-5e7f-4b29-5afaebaba7e4:03059466-caec-4aa5-b458-2071484f7d32_2019-05-31/billingProfiles/APS5-RFWH-BG7-PGB",
           "status": "Completed",
-          "transferId": "4a74dc9e-a863-4c88-b11e-e76aa2f4a05d",
-          "products": []
+          "transferId": "4a74dc9e-a863-4c88-b11e-e76aa2f4a05d"
         }
       }
     }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2024-08-01-preview/examples/InitiateMigration.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2024-08-01-preview/examples/InitiateMigration.json
@@ -3,30 +3,22 @@
     "billingAccountName": "57151837",
     "api-version": "2024-08-01-preview",
     "parameters": {
-      "destinationBillingScope": "/providers/Microsoft.Billing/billingAccounts/8a1d33b5-73a1-5e7f-4b29-5afaebaba7e4:03059466-caec-4aa5-b458-2071484f7d32_2019-05-31/billingProfiles/APS5-RFWH-BG7-PGB",
-      "status": "InProgress",
-      "locale": "en-us"
+      "properties": {
+        "destinationBillingScope": "/providers/Microsoft.Billing/billingAccounts/8a1d33b5-73a1-5e7f-4b29-5afaebaba7e4:03059466-caec-4aa5-b458-2071484f7d32_2019-05-31/billingProfiles/APS5-RFWH-BG7-PGB",
+        "status": "InProgress"
+      }
     }
   },
   "responses": {
     "200": {
       "body": {
-        "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/migrations/default",
+        "id": "/providers/Microsoft.Billing/billingAccounts/57151837/migrations/default",
         "name": "default",
-        "type": "Microsoft.Billing/billingAccounts/migrations/default",
+        "type": "Microsoft.Billing/billingAccounts/migrations",
         "properties": {
           "destinationBillingScope": "/providers/Microsoft.Billing/billingAccounts/8a1d33b5-73a1-5e7f-4b29-5afaebaba7e4:03059466-caec-4aa5-b458-2071484f7d32_2019-05-31/billingProfiles/APS5-RFWH-BG7-PGB",
-          "status": "Completed",
-          "transferId": "4a74dc9e-a863-4c88-b11e-e76aa2f4a05d",
-          "products": [
-            {
-              "productType": "AzureSubscription",
-              "productId": "43566850-63bf-40d2-a2cb-763eb62d7f3b",
-              "name": "OpenAI Staging",
-              "skuDescription": "MS-AZR-0003P",
-              "status": "Completed"
-            }
-          ]
+          "status": "InProgress",
+          "transferId": "4a74dc9e-a863-4c88-b11e-e76aa2f4a05d"
         }
       }
     }
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2024-08-01-preview/migration.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2024-08-01-preview/migration.json
@@ -77,7 +77,7 @@
             "description": "Migration details.",
             "required": true,
             "schema": {
-              "$ref": "./types.json#/definitions/Migration"
+              "$ref": "#/definitions/MigrationDetails"
             }
           }
         ],
@@ -119,7 +119,8 @@
         "properties": {
           "$ref": "./types.json#/definitions/Migration"
         }
-      }
+      },
+      "x-ms-azure-resource": true
     }
   },
   "securityDefinitions": {
diff --git a/specification/billing/resource-manager/Microsoft.Billing/preview/2024-08-01-preview/types.json b/specification/billing/resource-manager/Microsoft.Billing/preview/2024-08-01-preview/types.json
@@ -31,48 +31,6 @@
       },
       "x-ms-azure-resource": true
     },
-    "Products": {
-      "description": "Product Details.",
-      "type": "object",
-      "properties": {
-        "productType": {
-          "description": "product type",
-          "type": "string",
-          "readOnly": true
-        },
-        "productId": {
-          "description": "product Id",
-          "type": "string",
-          "readOnly": true
-        },
-        "name": {
-          "description": "product name",
-          "type": "string",
-          "readOnly": true
-        },
-        "skuDescription": {
-          "description": "product sku description",
-          "type": "string",
-          "readOnly": true
-        },
-        "status": {
-          "description": "product transfer status",
-          "enum": [
-            "NotStarted",
-            "InProgress",
-            "Completed",
-            "Failed"
-          ],
-          "type": "string",
-          "readOnly": true,
-          "x-ms-enum": {
-            "name": "TransferProductStatus",
-            "modelAsString": true
-          }
-        }
-      },
-      "readOnly": true
-    },
     "Migration": {
       "description": "Migration Details.",
       "type": "object",
@@ -96,20 +54,10 @@
             "modelAsString": true
           }
         },
-        "locale": {
-          "description": "Locale for notifications. Optional property, used only for migrate enrollment",
-          "type": "string"
-        },
         "transferId": {
           "description": "Transfer Id",
           "type": "string",
           "readOnly": true
-        },
-        "products": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/Products"
-          }
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,13 @@`
`6`	`6`	`"responses": {`
`7`	`7`	`"200": {`
`8`	`8`	`"body": {`
`9`		`- "id": "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/migrations/default",`
	`9`	`+ "id": "/providers/Microsoft.Billing/billingAccounts/57151837/migrations/default",`
`10`	`10`	`"name": "default",`
`11`		`- "type": "Microsoft.Billing/billingAccounts/migrations/default",`
	`11`	`+ "type": "Microsoft.Billing/billingAccounts/migrations",`
`12`	`12`	`"properties": {`
`13`	`13`	`"destinationBillingScope": "/providers/Microsoft.Billing/billingAccounts/8a1d33b5-73a1-5e7f-4b29-5afaebaba7e4:03059466-caec-4aa5-b458-2071484f7d32_2019-05-31/billingProfiles/APS5-RFWH-BG7-PGB",`
`14`	`14`	`"status": "Completed",`
`15`		`- "transferId": "4a74dc9e-a863-4c88-b11e-e76aa2f4a05d",`
`16`		`- "products": []`
	`15`	`+ "transferId": "4a74dc9e-a863-4c88-b11e-e76aa2f4a05d"`
`17`	`16`	`}`
`18`	`17`	`}`
`19`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@`
`77`	`77`	`"description": "Migration details.",`
`78`	`78`	`"required": true,`
`79`	`79`	`"schema": {`
`80`		`- "$ref": "./types.json#/definitions/Migration"`
	`80`	`+ "$ref": "#/definitions/MigrationDetails"`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`	`],`
`@@ -119,7 +119,8 @@`
`119`	`119`	`"properties": {`
`120`	`120`	`"$ref": "./types.json#/definitions/Migration"`
`121`	`121`	`}`
`122`		`- }`
	`122`	`+ },`
	`123`	`+ "x-ms-azure-resource": true`
`123`	`124`	`}`
`124`	`125`	`},`
`125`	`126`	`"securityDefinitions": {`