Merge pull request Azure#3478 from v-Ajnava/EventHub_pwr

cormacpayne · web-flow · commit 2208c836c006 · 2017-02-13T13:57:36.000-08:00
EventHub - Included format.ps1xml for Sku property
diff --git a/src/ResourceManager/EventHub/AzureRM.EventHub.psd1 b/src/ResourceManager/EventHub/AzureRM.EventHub.psd1
@@ -63,7 +63,7 @@ RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '2.5.0'; }
 # TypesToProcess = @()
 
 # Format files (.ps1xml) to be loaded when importing this module
-# FormatsToProcess = @()
+FormatsToProcess = '.\Microsoft.Azure.Commands.EventHub.format.ps1xml'
 
 # Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
 NestedModules = @('.\Microsoft.Azure.Commands.EventHub.dll')
diff --git a/src/ResourceManager/EventHub/ChangeLog.md b/src/ResourceManager/EventHub/ChangeLog.md
@@ -5,7 +5,7 @@
 
     ## Current Release
     * Overview of change #1
-        - Additional information about change #1
+        - Added EventHub - NameSpace, EventHub, and ConsumerGroup cmdlets #1
     * Overview of change #2
         - Additional information about change #2
         - Additional information about change #2
@@ -21,8 +21,11 @@
 
 ## Version 0.0.2
 
+* Future Breaking Change Notification: We've added a warning about removing property 'ResourceGroupName' from the returned NamespceAttributes from cmdlets New-AzureRmEventHubNamespace, Get-AzureRmEvnetHubNamespace and Set-AzureRmEvnetHubNamespace
+
 ## Version 0.0.1
 * Adds commandlets for the Azure EventHub
+
     - New-AzureRmEventHubNamespace
         - Adds a New EventHub NameSpace in the existing Resource Group.
     - Get-AzureRmEventHubNamespace
diff --git a/src/ResourceManager/EventHub/Commands.EventHub.Test/ScenarioTests/Common.ps1 b/src/ResourceManager/EventHub/Commands.EventHub.Test/ScenarioTests/Common.ps1
@@ -44,7 +44,7 @@ function Get-Location
 		}
 	}
 
-	return "WestUS"
+	return "West US"
 }
 
 <#
@@ -68,5 +68,5 @@ function Get-SecondaryLocation
 		}
 	}
 
-	return "EastUS"
+	return "East US"
 }
diff --git a/src/ResourceManager/EventHub/Commands.EventHub.Test/ScenarioTests/ConsumerGroupsTests.ps1 b/src/ResourceManager/EventHub/Commands.EventHub.Test/ScenarioTests/ConsumerGroupsTests.ps1
@@ -76,17 +76,14 @@ function ConsumerGroupsTests
     Assert-True {$createdNamespace.Count -eq 1}
 
     $found = 0
-    for ($i = 0; $i -lt $createdNamespace.Count; $i++)
-    {
-        if ($createdNamespace[$i].Name -eq $namespaceName)
+    
+        if ($createdNamespace.Name -eq $namespaceName)
         {
             $found = 1
-            Assert-AreEqual $location $createdNamespace[$i].Location
-            Assert-AreEqual $resourceGroupName $createdNamespace[$i].ResourceGroupName
-            Assert-AreEqual "EventHub" $createdNamespace[$i].NamespaceType
+            Assert-AreEqual $location $createdNamespace.Location            
             break
         }
-    }
+    
 
     Assert-True {$found -eq 0} "Namespace created earlier is not found."
 
diff --git a/src/ResourceManager/EventHub/Commands.EventHub.Test/ScenarioTests/EventHubsTests.ps1 b/src/ResourceManager/EventHub/Commands.EventHub.Test/ScenarioTests/EventHubsTests.ps1
@@ -87,20 +87,16 @@ function EventHubsTests
 	Assert-True {$createdNamespace.Count -eq 1}
 
     $found = 0
-    for ($i = 0; $i -lt $createdNamespace.Count; $i++)
-    {
-        if ($createdNamespace[$i].Name -eq $namespaceName)
+    
+        if ($createdNamespace.Name -eq $namespaceName)
         {
             $found = 1
-            Assert-AreEqual $location $createdNamespace[$i].Location
-            Assert-AreEqual $resourceGroupName $createdNamespace[$i].ResourceGroupName
-            Assert-AreEqual "EventHub" $createdNamespace[$i].NamespaceType
+            Assert-AreEqual $location $createdNamespace.Location
             break
         }
-    }
+
     Assert-True {$found -eq 0} "Namespace created earlier is not found."
 	
-
 	# Create a EventHub
     Write-Debug " Create new eventHub "    
 	$msgRetentionInDays = 3
@@ -123,7 +119,7 @@ function EventHubsTests
     $found = 0
     for ($i = 0; $i -lt $createdEventHubList.Count; $i++)
     {
-        if ($createdEventHubList[$i].Name -eq $createdEventHub)
+        if ($createdEventHubList[$i].Name -eq $createdEventHub.Name)
         {
             $found = $found + 1
         }
@@ -190,17 +186,13 @@ function EventHubsAuthTests
 	# Assert
 	Assert-True {$createdNamespace.Count -eq 1}
     $found = 0
-    for ($i = 0; $i -lt $createdNamespace.Count; $i++)
-    {
-        if ($createdNamespace[$i].Name -eq $namespaceName)
+    
+        if ($createdNamespace.Name -eq $namespaceName)
         {
             $found = 1
-            Assert-AreEqual $location $createdNamespace[$i].Location
-            Assert-AreEqual $resourceGroupName $createdNamespace[$i].ResourceGroupName
-            Assert-AreEqual "EventHub" $createdNamespace[$i].NamespaceType
+            Assert-AreEqual $location $createdNamespace.Location
             break
         }
-    }
 
 	# Assert
     Assert-True {$found -eq 0} "Namespace created earlier is not found."
diff --git a/src/ResourceManager/EventHub/Commands.EventHub.Test/ScenarioTests/NamespaceTests.ps1 b/src/ResourceManager/EventHub/Commands.EventHub.Test/ScenarioTests/NamespaceTests.ps1
@@ -76,16 +76,13 @@ function NamespaceAuthTests
     Assert-True {$createdNamespace.Count -eq 1}
 
     $found = 0
-    for ($i = 0; $i -lt $createdNamespace.Count; $i++)
-    {
-        if ($createdNamespace[$i].Name -eq $namespaceName)
+    
+        if ($createdNamespace.Name -eq $namespaceName)
         {
             $found = 1
-            Assert-AreEqual $location $createdNamespace[$i].Location
-            Assert-AreEqual $resourceGroupName $createdNamespace[$i].ResourceGroupName           
+            Assert-AreEqual $location $createdNamespace.Location    
             break
         }
-    }
 
     Assert-True {$found -eq 0} "Namespace created earlier is not found."
 
@@ -231,17 +228,13 @@ function NamespaceTests
     Assert-True {$createdNamespace.Count -eq 1}
 
     $found = 0
-    for ($i = 0; $i -lt $createdNamespace.Count; $i++)
-    {
-        if ($createdNamespace[$i].Name -eq $namespaceName)
+    
+        if ($createdNamespace.Name -eq $namespaceName)
         {
             $found = 1
-            Assert-AreEqual $location $createdNamespace[$i].Location
-            Assert-AreEqual $resourceGroupName $createdNamespace[$i].ResourceGroupName
-            Assert-AreEqual "EventHub" $createdNamespace[$i].NamespaceType
+            Assert-AreEqual $location $createdNamespace.Location
             break
         }
-    }
 
     Assert-True {$found -eq 0} "Namespace created earlier is not found."    
 	  
@@ -260,8 +253,6 @@ function NamespaceTests
         {
             $found = 1
             Assert-AreEqual $location $allCreatedNamespace[$i].Location
-            Assert-AreEqual $secondResourceGroup $allCreatedNamespace[$i].ResourceGroupName
-            Assert-AreEqual "EventHub" $allCreatedNamespace[$i].NamespaceType
             break
         }
     }
@@ -278,16 +269,12 @@ function NamespaceTests
         {
             $found = $found + 1
             Assert-AreEqual $location $allCreatedNamespace[$i].Location
-            Assert-AreEqual $resourceGroupName $allCreatedNamespace[$i].ResourceGroupName
-            Assert-AreEqual "EventHub" $allCreatedNamespace[$i].NamespaceType
         }
 
        if ($allCreatedNamespace[$i].Name -eq $namespaceName2)
         {
             $found = $found + 1
             Assert-AreEqual $location $allCreatedNamespace[$i].Location
-            Assert-AreEqual $secondResourceGroup $allCreatedNamespace[$i].ResourceGroupName
-            Assert-AreEqual "EventHub" $allCreatedNamespace[$i].NamespaceType
         }
     }
 
diff --git a/src/ResourceManager/EventHub/Commands.EventHub/Commands.EventHub.csproj b/src/ResourceManager/EventHub/Commands.EventHub/Commands.EventHub.csproj
@@ -153,6 +153,9 @@
     <None Include="..\AzureRM.EventHub.psd1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Microsoft.Azure.Commands.EventHub.format.ps1xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="MSSharedLibKey.snk" />
     <None Include="packages.config">
       <SubType>Designer</SubType>
diff --git a/src/ResourceManager/EventHub/Commands.EventHub/Microsoft.Azure.Commands.EventHub.format.ps1xml b/src/ResourceManager/EventHub/Commands.EventHub/Microsoft.Azure.Commands.EventHub.format.ps1xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Configuration>
+  <ViewDefinitions>
+    <View>
+      <Name>Microsoft.Azure.Commands.EventHub.Models.NamespaceAttributes</Name>
+      <ViewSelectedBy>
+        <TypeName>Microsoft.Azure.Commands.EventHub.Models.NamespaceAttributes</TypeName>
+      </ViewSelectedBy>
+      <ListControl>
+        <ListEntries>
+          <ListEntry>
+            <ListItems>
+              <ListItem>
+                <PropertyName>Name</PropertyName>
+              </ListItem>
+              <ListItem>
+                <PropertyName>Id</PropertyName>
+              </ListItem>
+              <ListItem>
+                <PropertyName>Location</PropertyName>
+              </ListItem>
+              <ListItem>
+                <Label>Sku </Label>
+                <ScriptBlock>"Name : " + $_.Sku.Name.ToString()  + " , Capacity : " +  $_.Sku.Capacity + " , Tier : " +  $_.Sku.Tier.ToString() </ScriptBlock>
+              </ListItem>
+              <ListItem>
+                <PropertyName>ProvisioningState</PropertyName>
+              </ListItem>
+              <ListItem>
+                <PropertyName>Status</PropertyName>
+              </ListItem>
+              <ListItem>
+                <PropertyName>CreatedAt</PropertyName>
+              </ListItem>
+              <ListItem>
+                <PropertyName>UpdatedAt</PropertyName>
+              </ListItem>
+              <ListItem>
+                <PropertyName>ServiceBusEndpoint</PropertyName>
+              </ListItem>
+              <ListItem>
+                <PropertyName>Enabled</PropertyName>
+              </ListItem>
+            </ListItems>
+          </ListEntry>
+        </ListEntries>
+      </ListControl>
+    </View>
+  </ViewDefinitions>
+</Configuration>
diff --git a/src/ResourceManager/EventHub/Commands.EventHub/Models/NamespaceAttributes.cs b/src/ResourceManager/EventHub/Commands.EventHub/Models/NamespaceAttributes.cs
@@ -29,28 +29,50 @@ public NamespaceAttributes(NamespaceResource evResource)
         {
             if (evResource != null)
             {
-                Sku = evResource.Sku;
-                ProvisioningState = evResource.ProvisioningState;
-                Status = (Microsoft.Azure.Commands.EventHub.Models.NamespaceState)evResource.Status;
-                CreatedAt = evResource.CreatedAt;
-                UpdatedAt = evResource.UpdatedAt;
-                ServiceBusEndpoint = evResource.ServiceBusEndpoint;               
-                Enabled = evResource.Enabled;
-                Location = evResource.Location;
+                Sku = new Sku
+                {
+                    Capacity = evResource.Sku.Capacity,
+                    Name = evResource.Sku.Name,
+                    Tier = evResource.Sku.Tier
+                };
+                if (evResource.ProvisioningState != null)
+                    ProvisioningState = evResource.ProvisioningState;
+                if(evResource.Status.HasValue)
+                    Status = (Microsoft.Azure.Commands.EventHub.Models.NamespaceState)evResource.Status;
+                if(evResource.CreatedAt.HasValue)
+                    CreatedAt = evResource.CreatedAt;
+                if(evResource.UpdatedAt.HasValue)
+                    UpdatedAt = evResource.UpdatedAt;
+                if(evResource.ServiceBusEndpoint != null)
+                    ServiceBusEndpoint = evResource.ServiceBusEndpoint;               
+                if(evResource.Enabled.HasValue)
+                    Enabled = evResource.Enabled;
+                if(evResource.Location != null)
+                    Location = evResource.Location;
+                if(evResource.Id != null)
+                    Id = evResource.Id;
+                if (evResource.Name != null)
+                    Name = evResource.Name;
                 
             }
         }
-        
+
         /// <summary>
         /// Gets or sets the name of the resource group the Namespace is in
         /// </summary>
+        [ObsoleteAttribute("ResourceGroupName property is obsolete.", false)]
         public string ResourceGroupName { get; set; }
 
         /// <summary>
         /// Gets or sets the Id of the Namespace
         /// </summary>
         public string Id { get; set; }
 
+        /// <summary>
+        /// Gets or sets the Name of the Namespace
+        /// </summary>
+        public string Name { get; set; }
+
         /// <summary>
         /// Gets or sets the Id of the Namespace
         /// </summary>
diff --git a/src/ResourceManager/EventHub/Commands.EventHub/Utilities/EventHubsClient.cs b/src/ResourceManager/EventHub/Commands.EventHub/Utilities/EventHubsClient.cs
@@ -98,23 +98,27 @@ public NamespaceAttributes UpdateNamespace(string resourceGroupName, string name
             {
                 Location = location
             };
-
+            
             if(state.HasValue)
             {
                 parameter.Status = state;
             }
 
+            Sku tempSku = new Sku();
+
             if (skuName != null)
             {
-                parameter.Sku.Name = skuName;
-                parameter.Sku.Tier = skuName;
+                tempSku.Name = skuName;
+                tempSku.Tier = skuName;
             }
 
             if (skuCapacity.HasValue)
             {
-                parameter.Sku.Capacity = skuCapacity;
+                tempSku.Capacity = skuCapacity;
             }
 
+            parameter.Sku = tempSku;
+
             if (tags != null && tags.Count() > 0)
             {
                 parameter.Tags = new Dictionary<string, string>(tags);
diff --git a/src/ResourceManager/EventHub/documentation/current-breaking-changes.md b/src/ResourceManager/EventHub/documentation/current-breaking-changes.md
@@ -0,0 +1,41 @@
+<!--
+    Please leave this section at the top of the breaking change documentation.
+
+    New breaking changes should go under the section titled "Current Breaking Changes", and should adhere to the following format:
+
+    ## Current Breaking Changes
+
+    The following cmdlets were affected this release:
+
+    **Cmdlet 1**
+    - Description of what has changed
+
+    ```powershell
+    # Old
+    # Sample of how the cmdlet was previously called
+
+    # New
+    # Sample of how the cmdlet should now be called
+    ```
+
+    ## Release X.0.0
+
+    The following cmdlets were affected this release:
+
+    **Cmdlet 1**
+    - Description of what has changed
+
+    ```powershell
+    # Old
+    # Sample of how the cmdlet was previously called
+
+    # New
+    # Sample of how the cmdlet should now be called
+    ```
+
+    Note: the above sections follow the template found in the link below: 
+
+    https://github.com/Azure/azure-powershell/blob/dev/documentation/breaking-changes/breaking-change-template.md
+-->
+
+## Current Breaking Changes
diff --git a/src/ResourceManager/EventHub/documentation/upcoming-breaking-changes.md b/src/ResourceManager/EventHub/documentation/upcoming-breaking-changes.md

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ function Get-Location`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`47`		`- return "WestUS"`
	`47`	`+ return "West US"`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`<#`
`@@ -68,5 +68,5 @@ function Get-SecondaryLocation`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`71`		`- return "EastUS"`
	`71`	`+ return "East US"`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,16 +76,13 @@ function NamespaceAuthTests`
`76`	`76`	`Assert-True {$createdNamespace.Count -eq 1}`
`77`	`77`
`78`	`78`	`$found = 0`
`79`		`- for ($i = 0; $i -lt $createdNamespace.Count; $i++)`
`80`		`- {`
`81`		`- if ($createdNamespace[$i].Name -eq $namespaceName)`
	`79`	`+`
	`80`	`+ if ($createdNamespace.Name -eq $namespaceName)`
`82`	`81`	`{`
`83`	`82`	`$found = 1`
`84`		`- Assert-AreEqual $location $createdNamespace[$i].Location`
`85`		`- Assert-AreEqual $resourceGroupName $createdNamespace[$i].ResourceGroupName`
	`83`	`+ Assert-AreEqual $location $createdNamespace.Location`
`86`	`84`	`break`
`87`	`85`	`}`
`88`		`- }`
`89`	`86`
`90`	`87`	`Assert-True {$found -eq 0} "Namespace created earlier is not found."`
`91`	`88`
`@@ -231,17 +228,13 @@ function NamespaceTests`
`231`	`228`	`Assert-True {$createdNamespace.Count -eq 1}`
`232`	`229`
`233`	`230`	`$found = 0`
`234`		`- for ($i = 0; $i -lt $createdNamespace.Count; $i++)`
`235`		`- {`
`236`		`- if ($createdNamespace[$i].Name -eq $namespaceName)`
	`231`	`+`
	`232`	`+ if ($createdNamespace.Name -eq $namespaceName)`
`237`	`233`	`{`
`238`	`234`	`$found = 1`
`239`		`- Assert-AreEqual $location $createdNamespace[$i].Location`
`240`		`- Assert-AreEqual $resourceGroupName $createdNamespace[$i].ResourceGroupName`
`241`		`- Assert-AreEqual "EventHub" $createdNamespace[$i].NamespaceType`
	`235`	`+ Assert-AreEqual $location $createdNamespace.Location`
`242`	`236`	`break`
`243`	`237`	`}`
`244`		`- }`
`245`	`238`
`246`	`239`	`Assert-True {$found -eq 0} "Namespace created earlier is not found."`
`247`	`240`
`@@ -260,8 +253,6 @@ function NamespaceTests`
`260`	`253`	`{`
`261`	`254`	`$found = 1`
`262`	`255`	`Assert-AreEqual $location $allCreatedNamespace[$i].Location`
`263`		`- Assert-AreEqual $secondResourceGroup $allCreatedNamespace[$i].ResourceGroupName`
`264`		`- Assert-AreEqual "EventHub" $allCreatedNamespace[$i].NamespaceType`
`265`	`256`	`break`
`266`	`257`	`}`
`267`	`258`	`}`
`@@ -278,16 +269,12 @@ function NamespaceTests`
`278`	`269`	`{`
`279`	`270`	`$found = $found + 1`
`280`	`271`	`Assert-AreEqual $location $allCreatedNamespace[$i].Location`
`281`		`- Assert-AreEqual $resourceGroupName $allCreatedNamespace[$i].ResourceGroupName`
`282`		`- Assert-AreEqual "EventHub" $allCreatedNamespace[$i].NamespaceType`
`283`	`272`	`}`
`284`	`273`
`285`	`274`	`if ($allCreatedNamespace[$i].Name -eq $namespaceName2)`
`286`	`275`	`{`
`287`	`276`	`$found = $found + 1`
`288`	`277`	`Assert-AreEqual $location $allCreatedNamespace[$i].Location`
`289`		`- Assert-AreEqual $secondResourceGroup $allCreatedNamespace[$i].ResourceGroupName`
`290`		`- Assert-AreEqual "EventHub" $allCreatedNamespace[$i].NamespaceType`
`291`	`278`	`}`
`292`	`279`	`}`
`293`	`280`
Original file line number	Diff line number	Diff line change
`@@ -98,23 +98,27 @@ public NamespaceAttributes UpdateNamespace(string resourceGroupName, string name`
`98`	`98`	`{`
`99`	`99`	`Location = location`
`100`	`100`	`};`
`101`		`-`
	`101`	`+`
`102`	`102`	`if(state.HasValue)`
`103`	`103`	`{`
`104`	`104`	`parameter.Status = state;`
`105`	`105`	`}`
`106`	`106`
	`107`	`+ Sku tempSku = new Sku();`
	`108`	`+`
`107`	`109`	`if (skuName != null)`
`108`	`110`	`{`
`109`		`- parameter.Sku.Name = skuName;`
`110`		`- parameter.Sku.Tier = skuName;`
	`111`	`+ tempSku.Name = skuName;`
	`112`	`+ tempSku.Tier = skuName;`
`111`	`113`	`}`
`112`	`114`
`113`	`115`	`if (skuCapacity.HasValue)`
`114`	`116`	`{`
`115`		`- parameter.Sku.Capacity = skuCapacity;`
	`117`	`+ tempSku.Capacity = skuCapacity;`
`116`	`118`	`}`
`117`	`119`
	`120`	`+ parameter.Sku = tempSku;`
	`121`	`+`
`118`	`122`	`if (tags != null && tags.Count() > 0)`
`119`	`123`	`{`
`120`	`124`	`parameter.Tags = new Dictionary<string, string>(tags);`