Skip to content

Commit e9b782d

Browse files
huangpfhuangpf
committed
Update AddAzureVhdCommand
1 parent 6791640 commit e9b782d

File tree

8 files changed

+972
-55
lines changed

8 files changed

+972
-55
lines changed

‎src/CLU/Microsoft.Azure.Commands.Compute/Microsoft.Azure.Commands.Compute.xproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,8 @@
1414
<PropertyGroup>
1515
<SchemaVersion>2.0</SchemaVersion>
1616
</PropertyGroup>
17+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
18+
<ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
19+
</PropertyGroup>
1720
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
1821
</Project>

‎src/CLU/Microsoft.Azure.Commands.Compute/Models/PSSyncOutputEvents.cs

Lines changed: 60 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ public PSSyncOutputEvents(PSCmdlet cmdlet)
3636
{
3737
this.cmdlet = cmdlet;
3838
// TODO: CLU
39-
this.runspace = RunspaceFactory.CreateRunspace(null);
39+
this.runspace = RunspaceFactory.CreateRunspace(InitialSessionState.CreateDefault());
4040
//this.runspace = RunspaceFactory.CreateRunspace(this.cmdlet.Host);
41-
this.runspace.Open();
41+
//this.runspace.Open();
4242
}
4343

4444
private static string FormatDuration(TimeSpan ts)
@@ -47,7 +47,7 @@ private static string FormatDuration(TimeSpan ts)
4747
{
4848
return String.Format("{0:00}:{1:00}:{2:00}", ts.Hours, ts.Minutes, ts.Seconds);
4949
}
50-
return String.Format(Rsrc.ResourceManager.GetString("PSSyncOutputEventsFormatDuration"), ts.Days, ts.Hours, ts.Minutes, ts.Seconds);
50+
return String.Format(Rsrc.PSSyncOutputEventsFormatDuration, ts.Days, ts.Hours, ts.Minutes, ts.Seconds);
5151
}
5252

5353
public void ProgressCopyStatus(ProgressRecord record)
@@ -57,13 +57,13 @@ public void ProgressCopyStatus(ProgressRecord record)
5757

5858
public void ProgressCopyStatus(double precentComplete, double avgThroughputMbps, TimeSpan remainingTime)
5959
{
60-
LogProgress(0, Rsrc.ResourceManager.GetString("PSSyncOutputEventsCopying"), precentComplete, remainingTime, avgThroughputMbps);
60+
LogProgress(0, Rsrc.PSSyncOutputEventsCopying, precentComplete, remainingTime, avgThroughputMbps);
6161
}
6262

6363
public void ProgressCopyComplete(TimeSpan elapsed)
6464
{
65-
LogProgressComplete(0, Rsrc.ResourceManager.GetString("PSSyncOutputEventsCopying"));
66-
LogMessage(Rsrc.ResourceManager.GetString("PSSyncOutputEventsElapsedTimeForCopy"), FormatDuration(elapsed));
65+
LogProgressComplete(0, Rsrc.PSSyncOutputEventsCopying);
66+
LogMessage(Rsrc.PSSyncOutputEventsElapsedTimeForCopy, FormatDuration(elapsed));
6767
}
6868

6969
public void ProgressUploadStatus(ProgressRecord record)
@@ -73,75 +73,87 @@ public void ProgressUploadStatus(ProgressRecord record)
7373

7474
public void ProgressUploadStatus(double precentComplete, double avgThroughputMbps, TimeSpan remainingTime)
7575
{
76-
LogProgress(0, Rsrc.ResourceManager.GetString("PSSyncOutputEventsUploading"), precentComplete, remainingTime, avgThroughputMbps);
76+
LogProgress(0, Rsrc.PSSyncOutputEventsUploading, precentComplete, remainingTime, avgThroughputMbps);
7777
}
7878

7979
private void LogProgress(int activityId, string activity, double precentComplete, TimeSpan remainingTime, double avgThroughputMbps)
8080
{
81-
var message = String.Format(Rsrc.ResourceManager.GetString("PSSyncOutputEventsLogProgress"),
81+
var message = String.Format(Rsrc.PSSyncOutputEventsLogProgress,
8282
precentComplete,
8383
FormatDuration(remainingTime),
8484
avgThroughputMbps);
8585
var progressCommand = String.Format(@"Write-Progress -Id {0} -Activity '{1}' -Status '{2}' -SecondsRemaining {3} -PercentComplete {4}", activityId, activity, message, (int)remainingTime.TotalSeconds, (int)precentComplete);
86+
// TODO: CLU
87+
/*
8688
using (var ps = System.Management.Automation.PowerShell.Create())
8789
{
8890
ps.Runspace = runspace;
8991
// TODO: CLU
9092
//ps.AddScript(progressCommand);
91-
ps.Invoke();
93+
//ps.Invoke();
9294
}
95+
*/
9396
}
9497

9598
private void LogProgressComplete(int activityId, string activity)
9699
{
97-
var progressCommand = String.Format(@"Write-Progress -Id {0} -Activity '{1}' -Status '{2}' -Completed", activityId, activity, Rsrc.ResourceManager.GetString("PSSyncOutputEventsLogProgressCompleteCompleted"));
100+
var progressCommand = String.Format(@"Write-Progress -Id {0} -Activity '{1}' -Status '{2}' -Completed", activityId, activity, Rsrc.PSSyncOutputEventsLogProgressCompleteCompleted);
101+
// TODO: CLU
102+
/*
98103
using (var ps = System.Management.Automation.PowerShell.Create())
99104
{
100105
ps.Runspace = runspace;
101106
// TODO: CLU
102107
//ps.AddScript(progressCommand);
103-
ps.Invoke();
108+
//ps.Invoke();
104109
}
110+
*/
105111
}
106112

107113
public void MessageCreatingNewPageBlob(long pageBlobSize)
108114
{
109-
LogMessage(Rsrc.ResourceManager.GetString("PSSyncOutputEventsCreatingNewPageBlob, pageBlobSize"));
115+
LogMessage(Rsrc.PSSyncOutputEventsCreatingNewPageBlob, pageBlobSize);
110116
}
111117

112118
private void LogMessage(string format, params object[] parameters)
113119
{
114120
var message = String.Format(format, parameters);
115121
var verboseMessage = String.Format("Write-Host '{0}'", message);
122+
// TODO: CLU
123+
/*
116124
using (var ps = System.Management.Automation.PowerShell.Create())
117125
{
118126
ps.Runspace = runspace;
119127
// TODO: CLU
120128
//ps.AddScript(verboseMessage);
121-
ps.Invoke();
129+
//ps.Invoke();
122130
}
131+
*/
123132
}
124133

125134
private void LogError(Exception e)
126135
{
136+
// TODO: CLU
137+
/*
127138
using (var ps = System.Management.Automation.PowerShell.Create())
128139
{
129140
ps.Runspace = runspace;
130141
ps.AddCommand("Write-Error");
131142
ps.AddParameter("ErrorRecord", new ErrorRecord(e, String.Empty, ErrorCategory.NotSpecified, null));
132-
ps.Invoke();
143+
//ps.Invoke();
133144
}
145+
*/
134146
}
135147

136148
public void MessageResumingUpload()
137149
{
138-
LogMessage(Rsrc.ResourceManager.GetString("PSSyncOutputEventsResumingUpload"));
150+
LogMessage(Rsrc.PSSyncOutputEventsResumingUpload);
139151
}
140152

141153
public void ProgressUploadComplete(TimeSpan elapsed)
142154
{
143-
LogProgressComplete(0, Rsrc.ResourceManager.GetString("PSSyncOutputEventsUploading"));
144-
LogMessage(Rsrc.ResourceManager.GetString("PSSyncOutputEventsElapsedTimeForUpload"), FormatDuration(elapsed));
155+
LogProgressComplete(0, Rsrc.PSSyncOutputEventsUploading);
156+
LogMessage(Rsrc.PSSyncOutputEventsElapsedTimeForUpload, FormatDuration(elapsed));
145157
}
146158

147159
public void ProgressDownloadStatus(ProgressRecord record)
@@ -151,13 +163,13 @@ public void ProgressDownloadStatus(ProgressRecord record)
151163

152164
public void ProgressDownloadStatus(double precentComplete, double avgThroughputMbps, TimeSpan remainingTime)
153165
{
154-
LogProgress(0, Rsrc.ResourceManager.GetString("PSSyncOutputEventsDownloading"), precentComplete, remainingTime, avgThroughputMbps);
166+
LogProgress(0, Rsrc.PSSyncOutputEventsDownloading, precentComplete, remainingTime, avgThroughputMbps);
155167
}
156168

157169
public void ProgressDownloadComplete(TimeSpan elapsed)
158170
{
159-
LogProgressComplete(0, Rsrc.ResourceManager.GetString("PSSyncOutputEventsDownloading"));
160-
LogMessage(Rsrc.ResourceManager.GetString("PSSyncOutputEventsElapsedTimeForDownload"), FormatDuration(elapsed));
171+
LogProgressComplete(0, Rsrc.PSSyncOutputEventsDownloading);
172+
LogMessage(Rsrc.PSSyncOutputEventsElapsedTimeForDownload, FormatDuration(elapsed));
161173
}
162174

163175
public void ProgressOperationStatus(ProgressRecord record)
@@ -167,19 +179,19 @@ public void ProgressOperationStatus(ProgressRecord record)
167179

168180
public void ProgressOperationStatus(double percentComplete, double avgThroughputMbps, TimeSpan remainingTime)
169181
{
170-
LogProgress(1, Rsrc.ResourceManager.GetString("PSSyncOutputEventsCalculatingMD5Hash"), percentComplete, remainingTime, avgThroughputMbps);
182+
LogProgress(1, Rsrc.PSSyncOutputEventsCalculatingMD5Hash, percentComplete, remainingTime, avgThroughputMbps);
171183
}
172184

173185
public void ProgressOperationComplete(TimeSpan elapsed)
174186
{
175-
LogProgressComplete(1, Rsrc.ResourceManager.GetString("PSSyncOutputEventsCalculatingMD5Hash"));
176-
LogMessage(Rsrc.ResourceManager.GetString("PSSyncOutputEventsElapsedTimeForOperation"), FormatDuration(elapsed));
187+
LogProgressComplete(1, Rsrc.PSSyncOutputEventsCalculatingMD5Hash);
188+
LogMessage(Rsrc.PSSyncOutputEventsElapsedTimeForOperation, FormatDuration(elapsed));
177189
}
178190

179191

180192
public void ErrorUploadFailedWithExceptions(IList<Exception> exceptions)
181193
{
182-
LogMessage(Rsrc.ResourceManager.GetString("PSSyncOutputEventsUploadFailedWithException"));
194+
LogMessage(Rsrc.PSSyncOutputEventsUploadFailedWithException);
183195
foreach (var exception in exceptions)
184196
{
185197
LogError(exception);
@@ -188,17 +200,17 @@ public void ErrorUploadFailedWithExceptions(IList<Exception> exceptions)
188200

189201
public void MessageCalculatingMD5Hash(string filePath)
190202
{
191-
LogMessage(Rsrc.ResourceManager.GetString("PSSyncOutputEventsCalculatingMD5HashForFile"), filePath);
203+
LogMessage(Rsrc.PSSyncOutputEventsCalculatingMD5HashForFile, filePath);
192204
}
193205

194206
public void MessageMD5HashCalculationFinished()
195207
{
196-
LogMessage(Rsrc.ResourceManager.GetString("PSSyncOutputEventsMD5HashCalculationFinished"));
208+
LogMessage(Rsrc.PSSyncOutputEventsMD5HashCalculationFinished);
197209
}
198210

199211
public void MessageRetryingAfterANetworkDisruption()
200212
{
201-
LogMessage(Rsrc.ResourceManager.GetString("PSSyncOutputEventsRetryingAfterANetworkDisruption"));
213+
LogMessage(Rsrc.PSSyncOutputEventsRetryingAfterANetworkDisruption);
202214
}
203215

204216
public void DebugRetryingAfterException(Exception lastException)
@@ -215,71 +227,80 @@ public void DebugRetryingAfterException(Exception lastException)
215227

216228
public void MessageDetectingActualDataBlocks()
217229
{
218-
LogMessage(Rsrc.ResourceManager.GetString("PSSyncOutputEventsDetectingActualDataBlocks"));
230+
LogMessage(Rsrc.PSSyncOutputEventsDetectingActualDataBlocks);
219231
}
220232

221233
public void MessageDetectingActualDataBlocksCompleted()
222234
{
223-
LogMessage(Rsrc.ResourceManager.GetString("PSSyncOutputEventsDetectingActualDataBlocksCompleted"));
235+
LogMessage(Rsrc.PSSyncOutputEventsDetectingActualDataBlocksCompleted);
224236
}
225237

226238
public void MessagePrintBlockRange(IndexRange range)
227239
{
228-
LogMessage(Rsrc.ResourceManager.GetString("PSSyncOutputEventsPrintBlockRange"), range, range.Length);
240+
LogMessage(Rsrc.PSSyncOutputEventsPrintBlockRange, range, range.Length);
229241
}
230242

231243
public void DebugEmptyBlockDetected(IndexRange range)
232244
{
233-
LogDebug(Rsrc.ResourceManager.GetString("PSSyncOutputEventsEmptyBlockDetected"), range.ToString());
245+
LogDebug(Rsrc.PSSyncOutputEventsEmptyBlockDetected, range.ToString());
234246
}
235247

236248
private void LogDebug(string format, params object[] parameters)
237249
{
238250
var message = String.Format(format, parameters);
239251
var debugMessage = String.Format("Write-Debug -Message '{0}'", message);
252+
// TODO: CLU
253+
/*
240254
using (var ps = System.Management.Automation.PowerShell.Create())
241255
{
242256
ps.Runspace = runspace;
243257
// TODO: CLU
244258
//ps.AddScript(debugMessage);
245-
ps.Invoke();
259+
//ps.Invoke();
246260
}
261+
*/
247262
}
248263

249264
public void ProgressEmptyBlockDetection(int processedRangeCount, int totalRangeCount)
250265
{
266+
// TODO: CLU
267+
/*
251268
using (var ps = System.Management.Automation.PowerShell.Create())
252269
{
253270
if (processedRangeCount >= totalRangeCount)
254271
{
255272
256-
var progressCommand1 = String.Format(@"Write-Progress -Id {0} -Activity '{1}' -Status '{2}' -Completed", 2, Rsrc.ResourceManager.GetString("PSSyncOutputEventsProgressEmptyBlockDetection"), Rsrc.ResourceManager.GetString("PSSyncOutputEventsEmptyBlockDetectionCompleted"));
273+
var progressCommand1 = String.Format(@"Write-Progress -Id {0} -Activity '{1}' -Status '{2}' -Completed", 2, Rsrc.PSSyncOutputEventsProgressEmptyBlockDetection, Rsrc.PSSyncOutputEventsEmptyBlockDetectionCompleted);
257274
ps.Runspace = runspace;
258275
// TODO: CLU
259276
//ps.AddScript(progressCommand1);
260-
ps.Invoke();
277+
//ps.Invoke();
261278
return;
262279
}
263280
264-
var progressCommand = String.Format(@"Write-Progress -Id {0} -Activity '{1}' -Status '{2}' -SecondsRemaining {3} -PercentComplete {4}", 2, Rsrc.ResourceManager.GetString("PSSyncOutputEventsProgressEmptyBlockDetection"), Rsrc.ResourceManager.GetString("PSSyncOutputEventsEmptyBlockDetectionDetecting"), -1, ((double)processedRangeCount / totalRangeCount) * 100);
281+
var progressCommand = String.Format(@"Write-Progress -Id {0} -Activity '{1}' -Status '{2}' -SecondsRemaining {3} -PercentComplete {4}", 2, Rsrc.PSSyncOutputEventsProgressEmptyBlockDetection, Rsrc.PSSyncOutputEventsEmptyBlockDetectionDetecting, -1, ((double)processedRangeCount / totalRangeCount) * 100);
265282
ps.Runspace = runspace;
266283
// TODO: CLU
267284
//ps.AddScript(progressCommand);
268-
ps.Invoke();
285+
//ps.Invoke();
269286
}
287+
*/
270288
}
271289

272290
public void WriteVerboseWithTimestamp(string message, params object[] args)
273291
{
292+
// TODO: CLU
293+
/*
274294
var messageWithTimeStamp = string.Format(CultureInfo.CurrentCulture, "{0:T} - {1}", DateTime.Now, string.Format(message, args));
275295
var progressCommand = String.Format(@"Write-Verbose -Message {0}", messageWithTimeStamp);
276296
using (var ps = System.Management.Automation.PowerShell.Create())
277297
{
278298
ps.Runspace = runspace;
279299
// TODO: CLU
280300
//ps.AddScript(progressCommand);
281-
ps.Invoke();
301+
//ps.Invoke();
282302
}
303+
*/
283304
}
284305

285306

@@ -295,7 +316,8 @@ protected virtual void Dispose(bool disposing)
295316
{
296317
if (disposing)
297318
{
298-
runspace.Dispose();
319+
// TODO: CLU
320+
//runspace.Dispose();
299321
}
300322
this.disposed = true;
301323
}

0 commit comments

Comments
 (0)