diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2017-11-15-preview/definitions/ConnectToSourceSqlServerTask.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2017-11-15-preview/definitions/ConnectToSourceSqlServerTask.json index 1934f08b0f26..03def3fd0d04 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2017-11-15-preview/definitions/ConnectToSourceSqlServerTask.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2017-11-15-preview/definitions/ConnectToSourceSqlServerTask.json @@ -38,16 +38,16 @@ "type": "object", "description": "Output for the task that validates connection to SQL Server and also validates source server requirements", "properties": { + "id": { + "type": "string", + "description": "Result identifier", + "readOnly": true + }, "resultType": { "description": "Type of result - database level or task level", "type": "string" } }, - "allOf": [ - { - "$ref": "./TasksCommon.json#/definitions/TaskOutput" - } - ], "required": [ "resultType" ], "discriminator": "resultType" }, diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2017-11-15-preview/definitions/ConnectToTargetSqlDbTask.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2017-11-15-preview/definitions/ConnectToTargetSqlDbTask.json index 20994f9a8832..8b79f3bfb203 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2017-11-15-preview/definitions/ConnectToTargetSqlDbTask.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2017-11-15-preview/definitions/ConnectToTargetSqlDbTask.json @@ -34,6 +34,11 @@ "type": "object", "description": "Output for the task that validates connection to SQL DB and target server requirements", "properties": { + "id": { + "type": "string", + "description": "Result identifier", + "readOnly": true + }, "databases": { "type": "string", "description": "Source databases as a map from database name to database id", @@ -52,12 +57,7 @@ "description": "Target server brand version", "readOnly": true } - }, - "allOf": [ - { - "$ref": "./TasksCommon.json#/definitions/TaskOutput" - } - ] + } } } } \ No newline at end of file diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2017-11-15-preview/definitions/GetUserTablesSqlTask.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2017-11-15-preview/definitions/GetUserTablesSqlTask.json index bec14a5f6454..c1236ddabf1f 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2017-11-15-preview/definitions/GetUserTablesSqlTask.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2017-11-15-preview/definitions/GetUserTablesSqlTask.json @@ -42,6 +42,11 @@ "type": "object", "description": "Output of the task that collects user tables for the given list of databases", "properties": { + "id": { + "type": "string", + "description": "Result identifier", + "readOnly": true + }, "databasesToTables": { "type": "string", "description": "Mapping from database name to list of tables", @@ -61,12 +66,7 @@ }, "readOnly": true } - }, - "allOf": [ - { - "$ref": "./TasksCommon.json#/definitions/TaskOutput" - } - ] + } }, "DatabaseTable": { "type": "object", diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2017-11-15-preview/definitions/MigrateSqlServerSqlDbTask.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2017-11-15-preview/definitions/MigrateSqlServerSqlDbTask.json index 44da12eca9e2..3b09e8bb79a9 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2017-11-15-preview/definitions/MigrateSqlServerSqlDbTask.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2017-11-15-preview/definitions/MigrateSqlServerSqlDbTask.json @@ -46,16 +46,16 @@ "type": "object", "description": "Output for the task that migrates on-prem SQL Server databases to Azure SQL Database", "properties": { + "id": { + "type": "string", + "description": "Result identifier", + "readOnly": true + }, "resultType": { "description": "Result type", "type": "string" } }, - "allOf": [ - { - "$ref": "./TasksCommon.json#/definitions/TaskOutput" - } - ], "required": [ "resultType" ], "discriminator": "resultType" }, diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2017-11-15-preview/definitions/TasksCommon.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2017-11-15-preview/definitions/TasksCommon.json index 21c13fed3d50..a644bd19b41e 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2017-11-15-preview/definitions/TasksCommon.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2017-11-15-preview/definitions/TasksCommon.json @@ -17,17 +17,6 @@ }, "paths": {}, "definitions": { - "TaskOutput": { - "type": "object", - "description": "Base class for all DMS task outputs", - "properties": { - "id": { - "type": "string", - "description": "Result identifier", - "readOnly": true - } - } - }, "Database": { "type": "object", "description": "Information about a single database", diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/ConnectToSourceSqlServerTask.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/ConnectToSourceSqlServerTask.json index 78b3551bb4c6..5e6f61c639c3 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/ConnectToSourceSqlServerTask.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/ConnectToSourceSqlServerTask.json @@ -38,16 +38,16 @@ "type": "object", "description": "Output for the task that validates connection to SQL Server and also validates source server requirements", "properties": { + "id": { + "type": "string", + "description": "Result identifier", + "readOnly": true + }, "resultType": { "description": "Type of result - database level or task level", "type": "string" } }, - "allOf": [ - { - "$ref": "./TasksCommon.json#/definitions/TaskOutput" - } - ], "required": [ "resultType" ], "discriminator": "resultType" }, diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/ConnectToTargetSqlDbTask.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/ConnectToTargetSqlDbTask.json index a6da8b38ef4a..2400aff74b50 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/ConnectToTargetSqlDbTask.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/ConnectToTargetSqlDbTask.json @@ -34,6 +34,11 @@ "type": "object", "description": "Output for the task that validates connection to SQL DB and target server requirements", "properties": { + "id": { + "type": "string", + "description": "Result identifier", + "readOnly": true + }, "databases": { "type": "string", "description": "Source databases as a map from database name to database id", @@ -52,12 +57,7 @@ "description": "Target server brand version", "readOnly": true } - }, - "allOf": [ - { - "$ref": "./TasksCommon.json#/definitions/TaskOutput" - } - ] + } } } } \ No newline at end of file diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/ConnectToTargetSqlMITask.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/ConnectToTargetSqlMITask.json index 578ddf9a8e05..53bff7157bd5 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/ConnectToTargetSqlMITask.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/ConnectToTargetSqlMITask.json @@ -34,6 +34,11 @@ "type": "object", "description": "Output for the task that validates connection to Azure SQL Database Managed Instance.", "properties": { + "id": { + "type": "string", + "description": "Result identifier", + "readOnly": true + }, "targetServerVersion": { "type": "string", "description": "Target server version", @@ -52,12 +57,7 @@ }, "readOnly": true } - }, - "allOf": [ - { - "$ref": "./TasksCommon.json#/definitions/TaskOutput" - } - ] + } } } } \ No newline at end of file diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/GetUserTablesSqlTask.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/GetUserTablesSqlTask.json index bef3b25403ba..c57438e94485 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/GetUserTablesSqlTask.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/GetUserTablesSqlTask.json @@ -42,6 +42,11 @@ "type": "object", "description": "Output of the task that collects user tables for the given list of databases", "properties": { + "id": { + "type": "string", + "description": "Result identifier", + "readOnly": true + }, "databasesToTables": { "type": "string", "description": "Mapping from database name to list of tables", @@ -61,12 +66,7 @@ }, "readOnly": true } - }, - "allOf": [ - { - "$ref": "./TasksCommon.json#/definitions/TaskOutput" - } - ] + } }, "DatabaseTable": { "type": "object", diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/MigrateSqlServerSqlDbTask.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/MigrateSqlServerSqlDbTask.json index 975df49e559a..4ad624a45f34 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/MigrateSqlServerSqlDbTask.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/MigrateSqlServerSqlDbTask.json @@ -46,16 +46,16 @@ "type": "object", "description": "Output for the task that migrates on-prem SQL Server databases to Azure SQL Database", "properties": { + "id": { + "type": "string", + "description": "Result identifier", + "readOnly": true + }, "resultType": { "description": "Result type", "type": "string" } }, - "allOf": [ - { - "$ref": "./TasksCommon.json#/definitions/TaskOutput" - } - ], "required": [ "resultType" ], "discriminator": "resultType" }, diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/MigrateSqlServerSqlMITask.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/MigrateSqlServerSqlMITask.json index 3c6040d13942..857f77a1be68 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/MigrateSqlServerSqlMITask.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/MigrateSqlServerSqlMITask.json @@ -51,16 +51,16 @@ "type": "object", "description": "Output for task that migrates SQL Server databases to Azure SQL Database Managed Instance.", "properties": { + "id": { + "type": "string", + "description": "Result identifier", + "readOnly": true + }, "resultType": { "description": "Result type", "type": "string" } }, - "allOf": [ - { - "$ref": "./TasksCommon.json#/definitions/TaskOutput" - } - ], "required": [ "resultType" ], "discriminator": "resultType" }, diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/TasksCommon.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/TasksCommon.json index e0bd2898a9a2..365d94539564 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/TasksCommon.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/TasksCommon.json @@ -17,17 +17,6 @@ }, "paths": {}, "definitions": { - "TaskOutput": { - "type": "object", - "description": "Base class for all DMS task outputs", - "properties": { - "id": { - "type": "string", - "description": "Result identifier", - "readOnly": true - } - } - }, "Database": { "type": "object", "description": "Information about a single database", diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/ValidateMigrationInputSqlServerSqlMITask.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/ValidateMigrationInputSqlServerSqlMITask.json index e5bdb8e2d857..dbc7112f1fdc 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/ValidateMigrationInputSqlServerSqlMITask.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/ValidateMigrationInputSqlServerSqlMITask.json @@ -50,12 +50,12 @@ "ValidateMigrationInputSqlServerSqlMITaskOutput": { "type": "object", "description": "Output for task that validates migration input for SQL to Azure SQL Managed Instance migrations", - "allOf": [ - { - "$ref": "./TasksCommon.json#/definitions/TaskOutput" - } - ], "properties": { + "id": { + "type": "string", + "description": "Result identifier", + "readOnly": true + }, "name": { "type": "string", "description": "Name of database", @@ -85,7 +85,7 @@ }, "readOnly": true }, - "backupStorageAccountErrors" : { + "backupStorageAccountErrors": { "description": "Errors associated with the storage account provided.", "type": "array", "items": {