From bf7448f412f9132b9e31fc4b339ee77c77463a8f Mon Sep 17 00:00:00 2001 From: sriramvu Date: Fri, 3 Aug 2018 16:10:34 +0530 Subject: [PATCH 1/3] Update service.json --- .../stable/2018-01-10/service.json | 114 +++++++++++++++++- 1 file changed, 112 insertions(+), 2 deletions(-) diff --git a/specification/recoveryservicessiterecovery/resource-manager/Microsoft.RecoveryServices/stable/2018-01-10/service.json b/specification/recoveryservicessiterecovery/resource-manager/Microsoft.RecoveryServices/stable/2018-01-10/service.json index a1d3b033f60f..4380a76e3b10 100644 --- a/specification/recoveryservicessiterecovery/resource-manager/Microsoft.RecoveryServices/stable/2018-01-10/service.json +++ b/specification/recoveryservicessiterecovery/resource-manager/Microsoft.RecoveryServices/stable/2018-01-10/service.json @@ -1,4 +1,4 @@ -{ +{ "swagger": "2.0", "info": { "version": "2018-01-10", @@ -6167,6 +6167,10 @@ "recoveryBootDiagStorageAccountId": { "description": "The boot diagnostic storage account.", "type": "string" + }, + "diskEncryptionInfo": { + "$ref": "#/definitions/DiskEncryptionInfo", + "description": "The recovery disk encryption information." } }, "x-ms-discriminator-value": "A2A" @@ -6364,6 +6368,30 @@ "format": "double", "description": "The data pending at source virtual machine in MB.", "type": "number" + }, + "isDiskEncrypted": { + "description": "A value indicating whether vm has encrypted os disk or not.", + "type": "boolean" + }, + "secretIdentifier": { + "description": "The secret URL / identifier (BEK).", + "type": "string" + }, + "dekKeyVaultArmId": { + "description": "The KeyVault resource id for secret (BEK).", + "type": "string" + }, + "isDiskKeyEncrypted": { + "description": "A value indicating whether disk key got encrypted or not.", + "type": "boolean" + }, + "keyIdentifier": { + "description": "The key URL / identifier (KEK).", + "type": "string" + }, + "kekKeyVaultArmId": { + "description": "The KeyVault resource id for key (KEK).", + "type": "string" } } }, @@ -6434,6 +6462,30 @@ "format": "double", "description": "The data pending at source virtual machine in MB.", "type": "number" + }, + "isDiskEncrypted": { + "description": "A value indicating whether vm has encrypted os disk or not.", + "type": "boolean" + }, + "secretIdentifier": { + "description": "The secret URL / identifier (BEK).", + "type": "string" + }, + "dekKeyVaultArmId": { + "description": "The KeyVault resource id for secret (BEK).", + "type": "string" + }, + "isDiskKeyEncrypted": { + "description": "A value indicating whether disk key got encrypted or not.", + "type": "boolean" + }, + "keyIdentifier": { + "description": "The key URL / identifier (KEK).", + "type": "string" + }, + "kekKeyVaultArmId": { + "description": "The KeyVault resource id for key (KEK).", + "type": "string" } } }, @@ -6739,6 +6791,10 @@ "recoveryBootDiagStorageAccountId": { "description": "The boot diagnostic storage account.", "type": "string" + }, + "diskEncryptionInfo": { + "$ref": "#/definitions/DiskEncryptionInfo", + "description": "The recovery disk encryption information." } }, "x-ms-discriminator-value": "A2A" @@ -6798,6 +6854,10 @@ "recoveryBootDiagStorageAccountId": { "description": "The boot diagnostic storage account.", "type": "string" + }, + "diskEncryptionInfo": { + "$ref": "#/definitions/DiskEncryptionInfo", + "description": "The recovery os disk encryption information." } }, "x-ms-discriminator-value": "A2A" @@ -7627,6 +7687,34 @@ } } }, + "DiskEncryptionInfo": { + "description": "Recovery disk encryption info (BEK and KEK).", + "type": "object", + "properties": { + "diskEncryptionKeyInfo": { + "$ref": "#/definitions/DiskEncryptionKeyInfo", + "description": "The recovery KeyVault reference for secret." + }, + "keyEncryptionKeyInfo": { + "$ref": "#/definitions/KeyEncryptionKeyInfo", + "description": "The recovery KeyVault reference for key." + } + } + }, + "DiskEncryptionKeyInfo": { + "description": "Disk Encryption Key Information (BitLocker Encryption Key (BEK) on Windows).", + "type": "object", + "properties": { + "secretIdentifier": { + "description": "The secret url / identifier.", + "type": "string" + }, + "keyVaultResourceArmId": { + "description": "The KeyVault resource ARM id for secret.", + "type": "string" + } + } + }, "DiskVolumeDetails": { "description": "Volume details.", "type": "object", @@ -11029,6 +11117,20 @@ }, "x-ms-discriminator-value": "JobTaskDetails" }, + "KeyEncryptionKeyInfo": { + "description": "Key Encryption Key (KEK) information.", + "type": "object", + "properties": { + "keyIdentifier": { + "description": "The key url / identifier.", + "type": "string" + }, + "keyVaultResourceArmId": { + "description": "The KeyVault resource ARM id for key.", + "type": "string" + } + } + }, "LogicalNetwork": { "description": "Logical network data model.", "type": "object", @@ -14462,6 +14564,10 @@ "recoveryNicIpAddressType": { "description": "IP allocation type for recovery VM.", "type": "string" + }, + "enableAcceleratedNetworkingOnRecovery": { + "description": "A value indicating whether the NIC has accerated networking enabled.", + "type": "boolean" } } }, @@ -14484,6 +14590,10 @@ "selectionType": { "description": "Selection type for failover.", "type": "string" + }, + "enableAcceleratedNetworkingOnRecovery": { + "description": "Whether the NIC has accerated networking enabled.", + "type": "boolean" } } }, @@ -14884,4 +14994,4 @@ ] } ] -} \ No newline at end of file +} From 8e84b1187cfac84087075e9a6369d829f2925817 Mon Sep 17 00:00:00 2001 From: vivekkothakota <40490368+vivekkothakota@users.noreply.github.com> Date: Fri, 17 Aug 2018 18:21:46 +0530 Subject: [PATCH 2/3] CheckNameAvailability --- ...onCheckNameAvailability_AlreadyExists.json | 20 ++++ ...cationCheckNameAvailability_Available.json | 20 ++++ .../stable/2018-02-02/migrate.json | 99 +++++++++++++++++++ 3 files changed, 139 insertions(+) create mode 100644 specification/migrate/resource-manager/Microsoft.Migrate/stable/2018-02-02/examples/LocationCheckNameAvailability_AlreadyExists.json create mode 100644 specification/migrate/resource-manager/Microsoft.Migrate/stable/2018-02-02/examples/LocationCheckNameAvailability_Available.json diff --git a/specification/migrate/resource-manager/Microsoft.Migrate/stable/2018-02-02/examples/LocationCheckNameAvailability_AlreadyExists.json b/specification/migrate/resource-manager/Microsoft.Migrate/stable/2018-02-02/examples/LocationCheckNameAvailability_AlreadyExists.json new file mode 100644 index 000000000000..593f41435387 --- /dev/null +++ b/specification/migrate/resource-manager/Microsoft.Migrate/stable/2018-02-02/examples/LocationCheckNameAvailability_AlreadyExists.json @@ -0,0 +1,20 @@ +{ + "parameters": { + "api-version": "2018-02-02", + "subscriptionId": "subid", + "locationName": "eastus", + "parameters": { + "name": "existingprojectname", + "type": "Microsoft.Migrate/projects" + } + }, + "responses": { + "200": { + "body": { + "nameAvailable": false, + "reason": "AlreadyExists", + "message": "The Migration project name 'existingprojectname' already exists for the given subscription. Please choose another name." + } + } + } +} diff --git a/specification/migrate/resource-manager/Microsoft.Migrate/stable/2018-02-02/examples/LocationCheckNameAvailability_Available.json b/specification/migrate/resource-manager/Microsoft.Migrate/stable/2018-02-02/examples/LocationCheckNameAvailability_Available.json new file mode 100644 index 000000000000..5bfd0dc932cf --- /dev/null +++ b/specification/migrate/resource-manager/Microsoft.Migrate/stable/2018-02-02/examples/LocationCheckNameAvailability_Available.json @@ -0,0 +1,20 @@ +{ + "parameters": { + "api-version": "2018-02-02", + "subscriptionId": "subid", + "locationName": "eastus", + "parameters": { + "name": "newprojectname", + "type": "Microsoft.Migrate/projects" + } + }, + "responses": { + "200": { + "body": { + "nameAvailable": true, + "reason": "Available", + "message": "The Migration project name 'newprojectname' is available for the given subscription" + } + } + } +} diff --git a/specification/migrate/resource-manager/Microsoft.Migrate/stable/2018-02-02/migrate.json b/specification/migrate/resource-manager/Microsoft.Migrate/stable/2018-02-02/migrate.json index 80b82e574a6b..e88911af65a1 100644 --- a/specification/migrate/resource-manager/Microsoft.Migrate/stable/2018-02-02/migrate.json +++ b/specification/migrate/resource-manager/Microsoft.Migrate/stable/2018-02-02/migrate.json @@ -1767,9 +1767,108 @@ } }, "description": "An error response from the Azure Migrate service." + }, + "CheckNameAvailabilityParameters": { + "properties": { + "name": { + "type": "string", + "description": "The name to check for availability" + }, + "type": { + "type": "string", + "enum": [ "Microsoft.Migrate/projects" ], + "x-ms-enum": { + "name": "Type", + "modelAsString": false + }, + "description": "The resource type. Must be set to Microsoft.Migrate/projects" + } + }, + "required": [ + "name", + "type" + ], + "description": "Parameters for a check name availability request." + }, + "CheckNameAvailabilityResult": { + "properties": { + "nameAvailable": { + "readOnly": true, + "type": "boolean", + "description": "Gets a boolean value that indicates whether the name is available for you to use. If true, the name is available. If false, the name has already been taken or invalid and cannot be used." + }, + "reason": { + "readOnly": true, + "type": "string", + "enum": [ + "Available", + "Invalid", + "AlreadyExists" + ], + "x-ms-enum": { + "name": "NameAvailabilityReason", + "modelAsString": false + }, + "description": "Gets the reason that a project name could not be used. The Reason element is only returned if NameAvailable is false." + }, + "message": { + "readOnly": true, + "type": "string", + "description": "Gets an error message explaining the Reason value in more detail." + } + }, + "description": "The CheckNameAvailability operation response." } }, "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Migrate/locations/{locationName}/checkNameAvailability": { + "post": { + "operationId": "Location_CheckNameAvailability", + "description": "Checks whether the project name is available in the specified region.", + "x-ms-examples": { + "LocationCheckNameAvailability_Available": { "$ref": "./examples/LocationCheckNameAvailability_Available.json" }, + "LocationCheckNameAvailability_AlreadyExists": { "$ref": "./examples/LocationCheckNameAvailability_AlreadyExists.json" } + }, + "parameters": [ + { + "name": "locationName", + "in": "path", + "required": true, + "type": "string", + "description": "The desired region for the name check." + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/CheckNameAvailabilityParameters" + }, + "description": "Properties needed to check the availability of a name." + } + ], + "responses": { + "200": { + "description": "Success. Returns details about whether a project name is available.", + "schema": { + "$ref": "#/definitions/CheckNameAvailabilityResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + } + }, "/subscriptions/{subscriptionId}/providers/Microsoft.Migrate/locations/{locationName}/assessmentOptions": { "get": { "summary": "Get the assessment options.", From d03c6dea3b66c13d511a0c2a6706d2030c8dfc7b Mon Sep 17 00:00:00 2001 From: vivekkothakota <40490368+vivekkothakota@users.noreply.github.com> Date: Fri, 17 Aug 2018 18:54:46 +0530 Subject: [PATCH 3/3] FIxed Parameter name fixed couple of parameters name --- .../Microsoft.Migrate/stable/2018-02-02/migrate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/migrate/resource-manager/Microsoft.Migrate/stable/2018-02-02/migrate.json b/specification/migrate/resource-manager/Microsoft.Migrate/stable/2018-02-02/migrate.json index e88911af65a1..0f01c742a3e7 100644 --- a/specification/migrate/resource-manager/Microsoft.Migrate/stable/2018-02-02/migrate.json +++ b/specification/migrate/resource-manager/Microsoft.Migrate/stable/2018-02-02/migrate.json @@ -1838,10 +1838,10 @@ "description": "The desired region for the name check." }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "#/parameters/api-version" }, { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "#/parameters/subscriptionId" }, { "name": "parameters",