Add cmdlets to get/set storage file metrics

src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj

@@ -67,9 +67,9 @@
       <HintPath>..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.Storage, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Azure.Management.Storage, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.Azure.Management.Storage.3.0.0\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -118,9 +118,9 @@
     <Reference Include="Microsoft.WindowsAzure.Management.Storage">
       <HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Storage, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.WindowsAzure.Storage, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\WindowsAzure.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
+      <HintPath>..\..\packages\WindowsAzure.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

src/Common/Commands.Common.Storage/StorageUtilities.cs

@@ -48,11 +48,14 @@ public static CloudStorageAccount GenerateCloudStorageAccount(Arm.IStorageManage
                 Uri blobEndpoint = storageServiceResponse.StorageAccount.PrimaryEndpoints.Blob;
                 Uri queueEndpoint = storageServiceResponse.StorageAccount.PrimaryEndpoints.Queue;
                 Uri tableEndpoint = storageServiceResponse.StorageAccount.PrimaryEndpoints.Table;
+                Uri fileEndpoint = storageServiceResponse.StorageAccount.PrimaryEndpoints.File;
+
                 return new CloudStorageAccount(
                     GenerateStorageCredentials(storageClient, resourceGroupName, accountName),
                     blobEndpoint,
                     queueEndpoint,
-                    tableEndpoint, null);
+                    tableEndpoint, 
+                    fileEndpoint);
             }
             else
             {
@@ -61,8 +64,8 @@ public static CloudStorageAccount GenerateCloudStorageAccount(Arm.IStorageManage
                         Convert.ToBase64String(Encoding.UTF8.GetBytes(Guid.NewGuid().ToString()))),
                     new Uri(string.Format("https://{0}.blob.core.windows.net", accountName)),
                     new Uri(string.Format("https://{0}.queue.core.windows.net", accountName)),
-                    new Uri(string.Format("https://{0}.table.core.windows.net", accountName)),
-                    null);
+                    new Uri(string.Format("https://{0}.table.core.windows.net", accountName)),                    
+                    new Uri(string.Format("https://{0}.file.core.windows.net", accountName)));
             }
         }
 

src/Common/Commands.Common.Storage/packages.config

@@ -6,7 +6,7 @@
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.Storage" version="3.0.0" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
   <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
@@ -22,5 +22,5 @@
   <package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="System.Spatial" version="5.6.4" targetFramework="net45" />
-  <package id="WindowsAzure.Storage" version="5.0.0" targetFramework="net45" />
+  <package id="WindowsAzure.Storage" version="6.0.0" targetFramework="net45" />
 </packages>

src/Common/Storage/Commands.Storage.ScenarioTest/Commands.Storage.ScenarioTest.csproj

@@ -86,7 +86,7 @@
       <HintPath>..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.2.0.3\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Storage">
-      <HintPath>..\..\..\packages\WindowsAzure.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
+      <HintPath>..\..\..\packages\WindowsAzure.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>

src/Common/Storage/Commands.Storage.ScenarioTest/packages.config

@@ -13,6 +13,6 @@
   <package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="System.Spatial" version="5.6.4" targetFramework="net45" />
-  <package id="WindowsAzure.Storage" version="5.0.0" targetFramework="net45" />
+  <package id="WindowsAzure.Storage" version="6.0.0" targetFramework="net45" />
   <package id="xunit.runner.visualstudio" version="2.1.0-beta4-build1109" targetFramework="net45" />
 </packages>

src/Common/Storage/Commands.Storage.StorageTestLib/Commands.Storage.StorageTestLib.csproj

@@ -65,7 +65,7 @@
       <HintPath>..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.2.0.3\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Storage">
-      <HintPath>..\..\..\packages\WindowsAzure.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
+      <HintPath>..\..\..\packages\WindowsAzure.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>

src/Common/Storage/Commands.Storage.StorageTestLib/packages.config

@@ -7,6 +7,6 @@
   <package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="System.Spatial" version="5.6.4" targetFramework="net45" />
-  <package id="WindowsAzure.Storage" version="5.0.0" targetFramework="net45" />
+  <package id="WindowsAzure.Storage" version="6.0.0" targetFramework="net45" />
   <package id="xunit.runner.visualstudio" version="2.1.0-beta4-build1109" targetFramework="net45" />
 </packages>

src/Common/Storage/Commands.Storage.Test/Commands.Storage.Test.csproj

@@ -123,7 +123,7 @@
       <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Storage">
-      <HintPath>..\..\..\packages\WindowsAzure.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
+      <HintPath>..\..\..\packages\WindowsAzure.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Storage.DataMovement, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

src/Common/Storage/Commands.Storage.Test/File/Cmdlet/GetAzureStorageFileTest.cs

@@ -76,33 +76,34 @@ public void GetFileFromSubDirectoryTest_UsingShareObjectWithPath()
         {
             var share = this.MockChannel.GetShareReference(ShareName);
             var dir = share.GetRootDirectoryReference().GetDirectoryReference("dir");
-            var listItems = Enumerable.Range(0, 10).Select(x => dir.GetFileReference(string.Format("file{0}", x))).Cast<IListFileItem>()
-                .Concat(Enumerable.Range(0, 5).Select(x => dir.GetDirectoryReference(string.Format("dir{0}", x)))).ToArray();
 
-            this.ListFilesAndAssertResults(
-                () => this.CmdletInstance.RunCmdlet(
-                    Constants.ShareParameterSetName,
-                    new KeyValuePair<string, object>("Share", share),
-                    new KeyValuePair<string, object>("Path", dir.Name)),
-                listItems,
-                dir);
+            this.MockChannel.SetsAvailableDirectories(dir.Name);
+
+            this.CmdletInstance.RunCmdlet(
+                    Constants.ShareNameParameterSetName,
+                    new KeyValuePair<string, object>("ShareName", ShareName),
+                    new KeyValuePair<string, object>("Path", dir.Name));
+
+            List<IListFileItem> fileList = new List<IListFileItem>();
+            fileList.Add(dir);
+            this.MockCmdRunTime.OutputPipeline.AssertListFileItems(fileList);
         }
 
         [TestMethod]
         public void GetFileFromSubDirectoryTest_UsingShareNameWithPath()
         {
             var share = this.MockChannel.GetShareReference(ShareName);
             var dir = share.GetRootDirectoryReference().GetDirectoryReference("dir");
-            var listItems = Enumerable.Range(0, 10).Select(x => dir.GetFileReference(string.Format("file{0}", x))).Cast<IListFileItem>()
-                .Concat(Enumerable.Range(0, 5).Select(x => dir.GetDirectoryReference(string.Format("dir{0}", x)))).ToArray();
+            this.MockChannel.SetsAvailableDirectories(dir.Name);
 
-            this.ListFilesAndAssertResults(
-                () => this.CmdletInstance.RunCmdlet(
+            this.CmdletInstance.RunCmdlet(
                     Constants.ShareNameParameterSetName,
                     new KeyValuePair<string, object>("ShareName", ShareName),
-                    new KeyValuePair<string, object>("Path", dir.Name)),
-                listItems,
-                dir);
+                    new KeyValuePair<string, object>("Path", dir.Name));
+
+            List<IListFileItem> fileList = new List<IListFileItem>();
+            fileList.Add(dir);
+            this.MockCmdRunTime.OutputPipeline.AssertListFileItems(fileList);
         }
 
         [TestMethod]

src/Common/Storage/Commands.Storage.Test/Service/MockStorageFileManagement.cs

@@ -171,7 +171,26 @@ public void SetSharePermissions(CloudFileShare share, FileSharePermissions permi
 
         public Task FetchFileAttributesAsync(CloudFile file, AccessCondition accessCondition, FileRequestOptions options, OperationContext operationContext, CancellationToken token)
         {
-            throw new NotImplementedException();
+            if (this.availableDirectoryNames.Contains(file.Name))
+            {
+                return TaskEx.FromResult(true);
+            }
+            else
+            {
+                throw new MockupException("FileNotFound");
+            }
+        }
+
+        public Task FetchDirectoryAttributesAsync(CloudFileDirectory directory, AccessCondition accessCondition, FileRequestOptions options, OperationContext operationContext, CancellationToken cancellationToken)
+        {
+            if (this.availableDirectoryNames.Contains(directory.Name))
+            {
+                return TaskEx.FromResult(true);
+            }
+            else
+            {
+                throw new MockupException("DirectoryNotFound");
+            }
         }
 
         public Task AbortCopyAsync(CloudFile file, string copyId, AccessCondition accessCondition, FileRequestOptions requestOptions, OperationContext operationContext, CancellationToken cancellationToken)

src/Common/Storage/Commands.Storage.Test/packages.config

@@ -21,6 +21,6 @@
   <package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="System.Spatial" version="5.6.4" targetFramework="net45" />
-  <package id="WindowsAzure.Storage" version="5.0.0" targetFramework="net45" />
+  <package id="WindowsAzure.Storage" version="6.0.0" targetFramework="net45" />
   <package id="xunit.runner.visualstudio" version="2.1.0-beta4-build1109" targetFramework="net45" />
 </packages>

src/Common/Storage/Commands.Storage/Commands.Storage.csproj

@@ -111,9 +111,9 @@
     <Reference Include="Microsoft.WindowsAzure.Management">
       <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Storage, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.WindowsAzure.Storage, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\WindowsAzure.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
+      <HintPath>..\..\..\packages\WindowsAzure.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Storage.DataMovement">
       <HintPath>..\..\..\lib\Microsoft.WindowsAzure.Storage.DataMovement.dll</HintPath>

src/Common/Storage/Commands.Storage/Common/Cmdlet/GetAzureStorageServiceMetrics.cs

@@ -47,11 +47,6 @@ public GetAzureStorageServiceMetricsCommand()
         [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
         public override void ExecuteCmdlet()
         {
-            if (StorageServiceType.File == ServiceType)
-            {
-                throw new PSInvalidOperationException(Resources.FileNotSupportMetrics);
-            }
-
             ServiceProperties serviceProperties = Channel.GetStorageServiceProperties(ServiceType, GetRequestOptions(ServiceType) , OperationContext);
 
             switch (MetricsType)

src/Common/Storage/Commands.Storage/Common/Cmdlet/SetAzureStorageServiceMetrics.cs

@@ -120,11 +120,6 @@ internal MetricsLevel GetMetricsLevel(string MetricsLevel)
         [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
         public override void ExecuteCmdlet()
         {
-            if (StorageServiceType.File == ServiceType)
-            {
-                throw new PSInvalidOperationException(Resources.FileNotSupportMetrics);
-            }
-
             ServiceProperties currentServiceProperties = Channel.GetStorageServiceProperties(ServiceType, GetRequestOptions(ServiceType), OperationContext);
             ServiceProperties serviceProperties = new ServiceProperties();
             serviceProperties.Clean();

src/Common/Storage/Commands.Storage/Common/StorageCloudCmdletBase.cs

@@ -77,7 +77,7 @@ public virtual int? ConcurrentTaskCount
             }
         }
 
-                public T Channel
+        public T Channel
         {
             get;
             set;

src/Common/Storage/Commands.Storage/File/Cmdlet/GetAzureStorageFile.cs

@@ -16,6 +16,8 @@ namespace Microsoft.WindowsAzure.Commands.Storage.File.Cmdlet
 {
     using System.Globalization;
     using System.Management.Automation;
+    using System.Net;
+    using Microsoft.WindowsAzure.Storage;
     using Microsoft.WindowsAzure.Storage.File;
 
     [Cmdlet(VerbsCommon.Get, Constants.FileCmdletName, DefaultParameterSetName = Constants.ShareNameParameterSetName)]
@@ -49,13 +51,12 @@ public class GetAzureStorageFile : AzureStorageFileCmdletBase
 
         [Parameter(
             Position = 1,
-            HelpMessage = "Path to an existing directory.")]
+            HelpMessage = "Path to an existing file/directory.")]
         public string Path { get; set; }
 
         public override void ExecuteCmdlet()
         {
             CloudFileDirectory baseDirectory;
-            string[] subFolders = NamingUtil.ValidatePath(this.Path);
             switch (this.ParameterSetName)
             {
                 case Constants.DirectoryParameterSetName:
@@ -74,15 +75,65 @@ public override void ExecuteCmdlet()
                     throw new PSArgumentException(string.Format(CultureInfo.InvariantCulture, "Invalid parameter set name: {0}", this.ParameterSetName));
             }
 
-            this.RunTask(async (taskId) =>
+            if (string.IsNullOrEmpty(this.Path))
             {
-                await this.Channel.EnumerateFilesAndDirectoriesAsync(
-                    baseDirectory.GetDirectoryReferenceByPath(subFolders),
-                    item => this.OutputStream.WriteObject(taskId, item),
-                    this.RequestOptions,
-                    this.OperationContext,
-                    this.CmdletCancellationToken);
-            });
+                this.RunTask(async (taskId) =>
+                {
+                    await this.Channel.EnumerateFilesAndDirectoriesAsync(
+                        baseDirectory,
+                        item => this.OutputStream.WriteObject(taskId, item),
+                        this.RequestOptions,
+                        this.OperationContext,
+                        this.CmdletCancellationToken);
+                });
+            }
+            else
+            {
+                this.RunTask(async (taskId) =>
+                {
+                    bool foundAFolder = true;
+                    string[] subfolders = NamingUtil.ValidatePath(this.Path);
+                    CloudFileDirectory targetDir = baseDirectory.GetDirectoryReferenceByPath(subfolders);
+
+                    try
+                    {
+                        await this.Channel.FetchDirectoryAttributesAsync(
+                            targetDir,
+                            null,
+                            this.RequestOptions,
+                            this.OperationContext,
+                            this.CmdletCancellationToken);
+                    }
+                    catch (StorageException se)
+                    {
+                        if (null == se.RequestInformation
+                            || (int)HttpStatusCode.NotFound != se.RequestInformation.HttpStatusCode)
+                        {
+                            throw;
+                        }
+
+                        foundAFolder = false;
+                    }
+
+                    if (foundAFolder)
+                    {
+                        this.OutputStream.WriteObject(taskId, targetDir);
+                        return;
+                    }
+
+                    string[] filePath = NamingUtil.ValidatePath(this.Path, true);
+                    CloudFile targetFile = baseDirectory.GetFileReferenceByPath(filePath);
+
+                    await this.Channel.FetchFileAttributesAsync(
+                        targetFile,
+                        null,
+                        this.RequestOptions,
+                        this.OperationContext,
+                        this.CmdletCancellationToken);
+
+                    this.OutputStream.WriteObject(taskId, targetFile);
+                });
+            }
         }
     }
 }

src/Common/Storage/Commands.Storage/File/StorageClientExtensions.cs

@@ -48,7 +48,7 @@ public static CloudFileDirectory GetDirectoryReferenceByPath(this CloudFileDirec
                 currentDirectory = currentDirectory.GetDirectoryReference(subFolder);
             }
 
-            return currentDirectory;
+            return new CloudFileDirectory(currentDirectory.Uri, currentDirectory.Share.ServiceClient.Credentials);
         }
 
         /// <summary>
@@ -71,7 +71,9 @@ public static CloudFile GetFileReferenceByPath(this CloudFileDirectory currentDi
                 currentDirectory = currentDirectory.GetDirectoryReference(path[i]);
             }
 
-            return currentDirectory.GetFileReference(path.Last());
+            CloudFile file = currentDirectory.GetFileReference(path.Last());
+
+            return new CloudFile(file.Uri, file.Share.ServiceClient.Credentials);
         }
 
         /// <summary>