Addresing comments. Reving versions.

Author: rkmanda

src/ResourceManager/IotHub/AzureRM.IotHub.psd1

@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '0.0.1'
+ModuleVersion = '1.0.0'
 
 # ID used to uniquely identify this module  
 GUID = '51A3A993-FE39-4F8F-A437-2CB751584AF5'  
@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-
+RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '2.3.0'; })
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  
@@ -90,7 +90,7 @@ PrivateData = @{
     PSData = @{
 
         # Tags applied to this module. These help with module discovery in online galleries.
-        # Tags = @()
+        Tags = 'Azure','ResourceManager','ARM','IoT','IoT Hub'
 
         # A URL to the license for this module.
         LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'

src/ResourceManager/IotHub/ChangeLog.md

@@ -0,0 +1,23 @@
+<!--
+    Please leave this section at the top of the change log.
+
+    Changes for the current release should go under the section titled "Current Release", and should adhere to the following format:
+
+    ## Current Release
+    * Overview of change #1
+        - Additional information about change #1
+    * Overview of change #2
+        - Additional information about change #2
+        - Additional information about change #2
+    * Overview of change #3
+    * Overview of change #4
+        - Additional information about change #4
+
+    ## YYYY.MM.DD - Version X.Y.Z (Previous Release)
+    * Overview of change #1
+        - Additional information about change #1
+-->
+## Current Release
+
+## Version 1.0.0
+* Adds commandlets for the Azure IoT Hub 

src/ResourceManager/IotHub/Commands.IotHub.Test/Commands.IotHub.Test.csproj

@@ -27,7 +27,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.IotHub</OutputPath>
+    <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -124,12 +124,8 @@
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
-    <None Include="ScenarioTests\Assert.ps1">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="ScenarioTests\Common.ps1">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    <None Include="ScenarioTests\Assert.ps1" />
+    <None Include="ScenarioTests\Common.ps1" />
     <None Include="ScenarioTests\IotHubTests.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/ResourceManager/IotHub/Commands.IotHub.Test/ScenarioTests/IotHubController.cs

@@ -109,7 +109,8 @@ public void RunPsTestWorkflow(
                                         .Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries)
                                         .Last();
                 helper.SetupModules(AzureModule.AzureResourceManager,
-                    "ScenarioTests\\Common.ps1",
+                    "Assert.ps1",
+                    "Common.ps1",
                     "ScenarioTests\\" + callingClassName + ".ps1",
                     helper.RMProfileModule,
                     helper.RMResourceModule,

src/ResourceManager/IotHub/Commands.IotHub/Commands.IotHub.csproj

@@ -29,6 +29,18 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"> 
+    <OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.IotHub</OutputPath> 
+    <DefineConstants>TRACE;SIGN</DefineConstants> 
+    <Optimize>true</Optimize> 
+    <DebugType>pdbonly</DebugType> 
+    <PlatformTarget>AnyCPU</PlatformTarget> 
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors> 
+    <SignAssembly>true</SignAssembly> 
+    <AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile> 
+    <DelaySign>true</DelaySign> 
+    <Prefer32Bit>false</Prefer32Bit> 
+  </PropertyGroup> 
   <ItemGroup>
     <Reference Include="Hyak.Common">
       <HintPath>..\..\..\packages\Hyak.Common.1.0.3\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
@@ -191,12 +203,7 @@
       <Link>AzureRM.IotHub.psd1</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="ResourceManagerStartup.ps1">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="MSSharedLibKey.snk">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    <None Include="MSSharedLibKey.snk" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

src/ResourceManager/IotHub/Commands.IotHub/IotHub/AddAzureRmIotHubEventHubConsumerGroup.cs

@@ -19,6 +19,7 @@ namespace Microsoft.Azure.Commands.Management.IotHub
     using Microsoft.Azure.Management.IotHub;
 
     [Cmdlet(VerbsCommon.Add, "AzureRmIotHubEventHubConsumerGroup", SupportsShouldProcess = true), OutputType(typeof(IEnumerable<string>))]
+    [Alias("Add-AzureRmIotHubEHCG")]
     public class AddAzureRmIotHubEventHubConsumerGroup : IotHubBaseCmdlet
     {
         [Parameter(

src/ResourceManager/IotHub/Commands.IotHub/IotHub/GetAzureRmEventHubConsumerGroup.cs

@@ -22,6 +22,7 @@ namespace Microsoft.Azure.Commands.Management.IotHub
     using Microsoft.Azure.Management.IotHub.Models;
 
     [Cmdlet(VerbsCommon.Get, "AzureRmIotHubEventHubConsumerGroup"), OutputType(typeof(IEnumerable<string>))]
+    [Alias("Get-AzureRmIotHubEHCG")]
     public class GetAzureRmIotHubEventHubConsumerGroup : IotHubBaseCmdlet
     {
         [Parameter(

src/ResourceManager/IotHub/Commands.IotHub/IotHub/GetAzureRmIotHub.cs

@@ -23,13 +23,12 @@ namespace Microsoft.Azure.Commands.Management.IotHub
     using Microsoft.Azure.Management.IotHub.Models;
     using Microsoft.Rest.Azure;
 
-    [Cmdlet(VerbsCommon.Get, "AzureRmIotHub", DefaultParameterSetName = "ListIotHubsBySubscription")]
+    [Cmdlet(VerbsCommon.Get, "AzureRmIotHub", DefaultParameterSetName = "ListIotHubsByResourceGroup")]
     [OutputType(typeof(PSIotHub), typeof(List<PSIotHub>))]
     public class GetAzureRmIotHub : IotHubBaseCmdlet
     {
         const string GetIotHubParameterSet = "GetIotHubByName";
         const string ListIotHubsByRGParameterSet = "ListIotHubsByResourceGroup";
-        const string ListIotHubsBySubscriptionParameterSet = "ListIotHubsBySubscription";
 
         [Parameter(
             ParameterSetName = GetIotHubParameterSet,
@@ -40,7 +39,7 @@ public class GetAzureRmIotHub : IotHubBaseCmdlet
         [Parameter(
             ParameterSetName = ListIotHubsByRGParameterSet,
             Position = 0,
-            Mandatory = true,
+            Mandatory = false,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "Name of the Resource Group")]
         [ValidateNotNullOrEmpty]
@@ -64,13 +63,18 @@ public override void ExecuteCmdlet()
                     this.WriteObject(IotHubUtils.ToPSIotHub(iotHubDescription), false);
                     break;
                 case ListIotHubsByRGParameterSet:
-                    IEnumerable<IotHubDescription> iotHubDescriptions = this.IotHubClient.IotHubResource.ListByResourceGroup(this.ResourceGroupName);
-                    this.WriteObject(IotHubUtils.ToPSIotHubs(iotHubDescriptions), true);
-                    break;
-                case ListIotHubsBySubscriptionParameterSet:
-                    IEnumerable<IotHubDescription> iotHubDescriptionsBySubscription = this.IotHubClient.IotHubResource.ListBySubscription();
-                    this.WriteObject(IotHubUtils.ToPSIotHubs(iotHubDescriptionsBySubscription), true);
-                    break;
+                    if (string.IsNullOrEmpty(this.ResourceGroupName))
+                    {
+                        IEnumerable<IotHubDescription> iotHubDescriptionsBySubscription = this.IotHubClient.IotHubResource.ListBySubscription();
+                        this.WriteObject(IotHubUtils.ToPSIotHubs(iotHubDescriptionsBySubscription), true);
+                        break;
+                    }
+                    else
+                    {
+                        IEnumerable<IotHubDescription> iotHubDescriptions = this.IotHubClient.IotHubResource.ListByResourceGroup(this.ResourceGroupName);
+                        this.WriteObject(IotHubUtils.ToPSIotHubs(iotHubDescriptions), true);
+                        break;
+                    }
                 default:
                     throw new ArgumentException("BadParameterSetName");
             }

src/ResourceManager/IotHub/Commands.IotHub/IotHub/NewAzureRmIotHubExportDevices.cs

@@ -22,7 +22,7 @@ namespace Microsoft.Azure.Commands.Management.IotHub
     using ResourceProperties = Microsoft.Azure.Commands.Management.IotHub.Properties;
 
     [Cmdlet(VerbsCommon.New, "AzureRmIotHubExportDevices", SupportsShouldProcess = true)]
-    [OutputType(typeof(JobResponse))]
+    [OutputType(typeof(PSIotHubJobResponse))]
     public class NewAzureRmIotHubExportDevices : IotHubBaseCmdlet
     {
         [Parameter(
@@ -48,12 +48,7 @@ public class NewAzureRmIotHubExportDevices : IotHubBaseCmdlet
         [ValidateNotNullOrEmpty]
         public string ExportBlobContainerUri { get; set; }
 
-        [Parameter(
-            Position = 3,
-            Mandatory = true,
-            HelpMessage = "ExcludeKeys")]
-        [ValidateNotNullOrEmpty]
-        public bool ExcludeKeys { get; set; }
+        public SwitchParameter ExcludeKeys { get; set; }
 
         public override void ExecuteCmdlet()
         {
@@ -62,7 +57,7 @@ public override void ExecuteCmdlet()
                 var exportDevicesRequest = new PSExportDevicesRequest()
                 {
                     ExportBlobContainerUri = this.ExportBlobContainerUri,
-                    ExcludeKeys = this.ExcludeKeys
+                    ExcludeKeys = this.ExcludeKeys.IsPresent
                 };
 
                 JobResponse jobResponse = this.IotHubClient.IotHubResource.ExportDevices(this.ResourceGroupName, this.Name, IotHubUtils.ToExportDevicesRequest(exportDevicesRequest));

src/ResourceManager/IotHub/Commands.IotHub/IotHub/NewAzureRmIotHubImportDevices.cs

@@ -22,7 +22,7 @@ namespace Microsoft.Azure.Commands.Management.IotHub
     using ResourceProperties = Microsoft.Azure.Commands.Management.IotHub.Properties;
 
     [Cmdlet(VerbsCommon.New, "AzureRmIotHubImportDevices", SupportsShouldProcess = true)]
-    [OutputType(typeof(JobResponse))]
+    [OutputType(typeof(PSIotHubJobResponse))]
     public class NewAzureRmIotHubImportDevices : IotHubBaseCmdlet
     {
         [Parameter(

src/ResourceManager/IotHub/Commands.IotHub/IotHub/RemoveAzureRmIotHub.cs

@@ -58,8 +58,6 @@ public override void ExecuteCmdlet()
                         throw e;
                     }
                 }
-
-                this.WriteObject("Iot Hub Deleted");
             }
         }
     }

src/ResourceManager/IotHub/Commands.IotHub/IotHub/RemoveAzureRmIotHubEventHubConsumerGroup.cs

@@ -22,6 +22,7 @@ namespace Microsoft.Azure.Commands.Management.IotHub
     using Microsoft.Azure.Management.IotHub.Models;
 
     [Cmdlet(VerbsCommon.Remove, "AzureRmIotHubEventHubConsumerGroup", SupportsShouldProcess = true), OutputType(typeof(IEnumerable<string>))]
+    [Alias("Remove-AzureRmIotHubEHCG")]
     public class RemoveAzureRmIotHubEventHubConsumerGroup : IotHubBaseCmdlet
     {
         [Parameter(
@@ -51,6 +52,7 @@ public class RemoveAzureRmIotHubEventHubConsumerGroup : IotHubBaseCmdlet
         [Parameter(
             Position = 3,
             Mandatory = true,
+            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Name of the EventHub ConsumerGroupName")]
         [ValidateNotNullOrEmpty]
         public string EventHubConsumerGroupName { get; set; }

src/ResourceManager/IotHub/Commands.IotHub/IotHub/RemoveAzureRmIotHubKey.cs

@@ -49,6 +49,7 @@ public class RemoveAzureRmIotHubKey : IotHubBaseCmdlet
         [Parameter(
             Position = 2,
             Mandatory = true,
+            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Name of the Key")]
         [ValidateNotNullOrEmpty]
         public string KeyName { get; set; }

src/ResourceManager/IotHub/Commands.IotHub/IotHub/SetAzureRmIotHub.cs

@@ -15,15 +15,13 @@
 namespace Microsoft.Azure.Commands.Management.IotHub
 {
     using System;
-    using System.Collections.Generic;
     using System.Management.Automation;
-    using System.Linq;
     using Microsoft.Azure.Commands.Management.IotHub.Common;
     using Microsoft.Azure.Commands.Management.IotHub.Models;
     using Microsoft.Azure.Management.IotHub;
     using Microsoft.Azure.Management.IotHub.Models;
 
-    [Cmdlet(VerbsCommon.Set, "AzureRmIotHub", SupportsShouldProcess = true)]
+    [Cmdlet(VerbsCommon.Set, "AzureRmIotHub", DefaultParameterSetName = "UpdateSku", SupportsShouldProcess = true)]
     [OutputType(typeof(PSIotHub))]
     public class SetAzureRmIotHub : IotHubBaseCmdlet
     {
@@ -34,55 +32,13 @@ public class SetAzureRmIotHub : IotHubBaseCmdlet
         const string UpdateOperationsMonitoringPropertiesParameterSet = "UpdateOperationsMonitoringProperties";
 
         [Parameter(
-            ParameterSetName = UpdateSkuParameterSet,
-            Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
-            HelpMessage = "Name of the Resource Group")]
-        [Parameter(
-            ParameterSetName = UpdateEventHubEndpointPropertiesParameterSet,
-            Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
-            HelpMessage = "Name of the Resource Group")]
-        [Parameter(
-            ParameterSetName = UpdateFileUploadPropertiesParameterSet,
-            Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
-            HelpMessage = "Name of the Resource Group")]
-        [Parameter(
-            ParameterSetName = UpdateCloudToDevicePropertiesParameterSet,
-            Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
-            HelpMessage = "Name of the Resource Group")]
-        [Parameter(
-            ParameterSetName = UpdateOperationsMonitoringPropertiesParameterSet,
             Mandatory = true,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "Name of the Resource Group")]
         [ValidateNotNullOrEmpty]
         public string ResourceGroupName { get; set; }
 
         [Parameter(
-            ParameterSetName = UpdateSkuParameterSet,
-            Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
-            HelpMessage = "Name of the Iot Hub")]
-        [Parameter(
-            ParameterSetName = UpdateEventHubEndpointPropertiesParameterSet,
-            Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
-            HelpMessage = "Name of the Iot Hub")]
-        [Parameter(
-            ParameterSetName = UpdateFileUploadPropertiesParameterSet,
-            Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
-            HelpMessage = "Name of the Iot Hub")]
-        [Parameter(
-            ParameterSetName = UpdateCloudToDevicePropertiesParameterSet,
-            Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
-            HelpMessage = "Name of the Iot Hub")]
-        [Parameter(
-            ParameterSetName = UpdateOperationsMonitoringPropertiesParameterSet,
             Mandatory = true,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "Name of the Iot Hub")]

src/ResourceManager/IotHub/Commands.IotHub/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.1")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyFileVersion("1.0.0")]