Update Tests

Author: huangpf

examples/virtual-hard-disk/02-VirtualHardDisks.sh

@@ -5,11 +5,11 @@ printf "\n=== Managing Virtual Hard Disks in Azure Compute ===\n"
 printf "\n1. Creating a new resource group: %s and location: %s.\n" "$groupName" "$location"
 azure group create -n "$groupName" --location "$location"
 
-printf "\n2. Creating a new storage account"
-result=`azure storage account new --resourcegroupname "$groupName" --name "$groupName" --location "$location" --type "$storageAccountType"`
+printf "\n2. Creating a new storage account '%s' in type '%s'" "$storageAccountName" "$storageAccountType"
+azure storage account new --resourcegroupname "$groupName" --name "$storageAccountName" --location "$location" --type "$storageAccountType"
 
-printf "\n3. Uploading a virtual hard disk"
-result=`azure vhd add -o --resourcegroupname "$groupName" --destination https://"$groupName".blob.core.windows.net/test/test.vhd --localfilepath $BASEDIR/virtual-hard-disk/test.vhd`
+printf "\n3. Uploading a virtual hard disk to: %s" "$storageAccountName"
+azure vhd add -o --resourcegroupname "$groupName" --destination https://"$storageAccountName".blob.core.windows.net/test/test.vhd --localfilepath $BASEDIR/test.vhd
 
 printf "\n4. Downloading a virtual hard disk"
 

src/CLU/Commands.Common.ScenarioTest/ExampleScriptRunner.cs

@@ -33,6 +33,7 @@ public class ExampleScriptRunner
         string _sessionId;
         Random _generator;
         string _resourceGroupName;
+        string _storageAccountName;
         IClientFactory _clientFactory = new ClientFactory();
         TestContext _context;
         ResourceManagementClient _client;
@@ -41,6 +42,7 @@ public class ExampleScriptRunner
         const string locationKey = "location";
         const string SessionKey = "CmdletSessionID";
         const string storageAccountTypeKey = "storageAccountType";
+        const string storageAccountNameKey = "storageAccountName";
         const string DefaultStorageAccountType = "Standard_GRS";
 
         public ExampleScriptRunner(string sessionId) : this(new Random(), sessionId)
@@ -98,6 +100,7 @@ public string RunScript(string testName)
                 {
                     Trace.Listeners.Add(listener);
                     _resourceGroupName = CreateRandomName();
+                    _storageAccountName = CreateRandomName() + "sto";
                     if (File.Exists(deploymentTemplatePath))
                     {
                         DeployTemplate(deploymentTemplatePath, _resourceGroupName);
@@ -106,8 +109,8 @@ public string RunScript(string testName)
                     process.EnvironmentVariables[SessionKey] = _sessionId;
                     process.EnvironmentVariables[ResourceGroupNameKey] = _resourceGroupName;
                     process.EnvironmentVariables[locationKey] = DefaultLocation;
-                    process.EnvironmentVariables[locationKey] = DefaultLocation;
                     process.EnvironmentVariables[storageAccountTypeKey] = DefaultStorageAccountType;
+                    process.EnvironmentVariables[storageAccountNameKey] = _storageAccountName;
                     foreach (var helper in _context.EnvironmentHelpers)
                     {
                         helper.TrySetupScriptEnvironment(_context, _clientFactory, process.EnvironmentVariables);

src/CLU/Microsoft.Azure.Commands.Compute/Models/VhdDownloadContext.cs

@@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.Compute.Models
 {
     public class VhdDownloadContext
     {
-        public FileInfo LocalFilePath { get; set; }
-        public Uri Source { get; set; }
+        public string LocalFilePath { get; set; }
+        public string Source { get; set; }
     }
 }

src/CLU/Microsoft.Azure.Commands.Compute/Models/VhdDownloaderModel.cs

@@ -32,8 +32,8 @@ public static VhdDownloadContext Download(DownloaderParameters downloadParameter
 
             return new VhdDownloadContext
             {
-                LocalFilePath = new FileInfo(downloadParameters.LocalFilePath),
-                Source = downloadParameters.BlobUri.Uri
+                LocalFilePath = downloadParameters.LocalFilePath,
+                Source = downloadParameters.BlobUri.Uri.ToString()
             };
         }
     }

src/CLU/Microsoft.Azure.Commands.Compute/Models/VhdUploadContext.cs

@@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.Compute.Models
 {
     public class VhdUploadContext
     {
-        public FileInfo LocalFilePath { get; set; }
-        public Uri DestinationUri { get; set; }
+        public string LocalFilePath { get; set; }
+        public string DestinationUri { get; set; }
     }
 }

src/CLU/Microsoft.Azure.Commands.Compute/Models/VhdUploaderModel.cs

@@ -38,7 +38,7 @@ public static VhdUploadContext Upload(UploadParameters uploadParameters)
                 var synchronizer = new BlobSynchronizer(uploadContext, uploadParameters.NumberOfUploaderThreads);
                 if (synchronizer.Synchronize())
                 {
-                    return new VhdUploadContext { LocalFilePath = uploadParameters.LocalFilePath, DestinationUri = uploadParameters.DestinationUri.Uri };
+                    return new VhdUploadContext { LocalFilePath = uploadParameters.LocalFilePath.ToString(), DestinationUri = uploadParameters.DestinationUri.Uri.ToString() };
                 }
                 return null;
             }