Skip to content

Commit ed43136

Browse files
committed
filling the properties of the output of import/export operations using the input values
1 parent e2a51a8 commit ed43136

File tree

4 files changed

+59
-22
lines changed

4 files changed

+59
-22
lines changed

src/ResourceManager/Sql/Commands.Sql/ImportExport/Model/AzureSqlDatabaseImportExportBaseModel.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,22 @@ public string OperationStatusLink
109109
/// Gets or sets the error message returned from the server.
110110
/// </summary>
111111
public string ErrorMessage { get; set; }
112+
113+
/// <summary>
114+
/// Copies the model to a new class
115+
/// </summary>
116+
internal virtual AzureSqlDatabaseImportExportBaseModel Copy()
117+
{
118+
return new AzureSqlDatabaseImportExportBaseModel()
119+
{
120+
ResourceGroupName = ResourceGroupName,
121+
ServerName = ServerName,
122+
AdministratorLogin = AdministratorLogin,
123+
AuthenticationType = AuthenticationType,
124+
DatabaseName = DatabaseName,
125+
StorageKeyType = StorageKeyType,
126+
StorageUri = StorageUri
127+
};
128+
}
112129
}
113130
}

src/ResourceManager/Sql/Commands.Sql/ImportExport/Model/AzureSqlDatabaseImportModel.cs

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,26 @@ public string ServiceObjectiveName
4848
public int DatabaseMaxSizeBytes
4949
{
5050
get; set;
51-
}
51+
}
52+
53+
/// <summary>
54+
/// Copies the model to a new class
55+
/// </summary>
56+
internal override AzureSqlDatabaseImportExportBaseModel Copy()
57+
{
58+
return new AzureSqlDatabaseImportModel()
59+
{
60+
ResourceGroupName = ResourceGroupName,
61+
ServerName = ServerName,
62+
AdministratorLogin = AdministratorLogin,
63+
AuthenticationType = AuthenticationType,
64+
DatabaseName = DatabaseName,
65+
StorageKeyType = StorageKeyType,
66+
StorageUri = StorageUri,
67+
Edition = Edition,
68+
ServiceObjectiveName = ServiceObjectiveName,
69+
DatabaseMaxSizeBytes = DatabaseMaxSizeBytes
70+
};
71+
}
5272
}
5373
}

src/ResourceManager/Sql/Commands.Sql/ImportExport/Service/ImportExportDatabaseAdapter.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public AzureSqlDatabaseImportExportBaseModel Export(AzureSqlDatabaseImportExport
6767

6868
ImportExportResponse response = Communicator.Export(exportRequest.ResourceGroupName, exportRequest.ServerName,
6969
exportRequest.DatabaseName, parameters, Util.GenerateTracingId());
70-
return CreateImportExportResponse(response);
70+
return CreateImportExportResponse(response, exportRequest);
7171
}
7272

7373
/// <summary>
@@ -97,7 +97,7 @@ public AzureSqlDatabaseImportExportBaseModel Import(AzureSqlDatabaseImportModel
9797

9898
ImportExportResponse response = Communicator.Import(importRequest.ResourceGroupName, importRequest.ServerName, parameters, Util.GenerateTracingId());
9999

100-
return CreateImportExportResponse(response);
100+
return CreateImportExportResponse(response, importRequest);
101101
}
102102

103103
/// <summary>
@@ -115,7 +115,8 @@ public AzureSqlDatabaseImportExportStatusModel GetStatus(string operationStatusL
115115
LastModifiedTime = resposne.LastModifiedTime,
116116
QueuedTime = resposne.QueuedTime,
117117
StatusMessage = resposne.StatusMessage,
118-
Status = resposne.Status.ToString()
118+
Status = resposne.Status.ToString(),
119+
OperationStatusLink = operationStatusLink
119120
};
120121

121122
return status;
@@ -126,14 +127,13 @@ public AzureSqlDatabaseImportExportStatusModel GetStatus(string operationStatusL
126127
/// </summary>
127128
/// <param name="response">Server Response</param>
128129
/// <returns>Response Model</returns>
129-
private AzureSqlDatabaseImportExportBaseModel CreateImportExportResponse(ImportExportResponse response)
130+
private AzureSqlDatabaseImportExportBaseModel CreateImportExportResponse(ImportExportResponse response, AzureSqlDatabaseImportExportBaseModel originalModel)
130131
{
131-
return new AzureSqlDatabaseImportExportBaseModel()
132-
{
133-
OperationStatusLink = response.OperationStatusLink,
134-
Status = response.Status.ToString(),
135-
ErrorMessage = response.Error == null ? "" : response.Error.Message
136-
};
132+
AzureSqlDatabaseImportExportBaseModel model = originalModel == null ? new AzureSqlDatabaseImportExportBaseModel() : originalModel.Copy();
133+
model.OperationStatusLink = response.OperationStatusLink;
134+
model.Status = response.Status.ToString();
135+
model.ErrorMessage = response.Error == null ? "" : response.Error.Message;
136+
return model;
137137
}
138138
}
139139
}

src/ResourceManager/Sql/Commands.Sql/Microsoft.Azure.Commands.Sql.dll-Help.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8390,13 +8390,13 @@ Tags :</maml:para>
83908390
<maml:para>This command creates an export request for a database.</maml:para>
83918391
<maml:para />
83928392
<maml:para />
8393-
<maml:para>ResourceGroupName :
8394-
ServerName :
8395-
DatabaseName :
8393+
<maml:para>ResourceGroupName : resourcegroup01
8394+
ServerName : server01
8395+
DatabaseName : database01
83968396
StorageKeyType : StorageAccessKey
83978397
StorageKey :
8398-
StorageUri :
8399-
AdministratorLogin :
8398+
StorageUri : http://account01.blob.core.windows.net/bacpacs/database01.bacpac
8399+
AdministratorLogin : user
84008400
AdministratorLoginPassword :
84018401
AuthenticationType : None
84028402
OperationStatusLink : https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource01/providers/Microsoft.Sql/servers/server01/databases/database01/importExportOperationResults/00000000-00
@@ -8757,13 +8757,13 @@ ErrorMessage :</maml:para>
87578757
<maml:para>This command creates an import request to import a bacpac to a new database.</maml:para>
87588758
<maml:para />
87598759
<maml:para />
8760-
<maml:para>ResourceGroupName :
8761-
ServerName :
8762-
DatabaseName :
8760+
<maml:para>ResourceGroupName : resourcegroup01
8761+
ServerName : server01
8762+
DatabaseName : database01
87638763
StorageKeyType : StorageAccessKey
8764-
StorageKey :
8765-
StorageUri :
8766-
AdministratorLogin :
8764+
StorageKey :
8765+
StorageUri : http://account01.blob.core.windows.net/bacpacs/database01.bacpac
8766+
AdministratorLogin : user
87678767
AdministratorLoginPassword :
87688768
AuthenticationType : None
87698769
OperationStatusLink : https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource01/providers/Microsoft.Sql/servers/server01/databases/database01/importExportOperationResults/00000000-00

0 commit comments

Comments
 (0)