Fix NamespaceClient.GetNamespaceInfoAsync() (#638)

* Parse out MessagingUnits * Add Messaging type as that's what broker reports * Update test for GetNamespaceInfoAsync * Approve API (minor) * Revert "Approve API (minor)" This reverts commit dd9b298. * Remove NamespaceType.Messaging * Implement workaround
Azure · Feb 12, 2019 · a4e4abb · a4e4abb
1 parent da12ac5
commit a4e4abb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/Microsoft.Azure.ServiceBus/Management/NamespaceInfoExtensions.cs b/src/Microsoft.Azure.ServiceBus/Management/NamespaceInfoExtensions.cs
@@ -57,11 +57,19 @@ private static NamespaceInfo ParseFromEntryElement(XElement xEntry)
                     case "Alias":
                         nsInfo.Alias = element.Value;
                         break;
+                    case "MessagingUnits":
+                        int.TryParse(element.Value, out var units);
+                        nsInfo.MessagingUnits = units;
+                        break;
                     case "NamespaceType":
                         if (Enum.TryParse<NamespaceType>(element.Value, out var nsType))
                         {
                             nsInfo.NamespaceType = nsType;
                         }
+                        else if (element.Value == "Messaging") // TODO: workaround till next major as it's a breaking change
+                        {
+                            nsInfo.NamespaceType = NamespaceType.ServiceBus;
+                        }
                         else
                         {
                             nsInfo.NamespaceType = NamespaceType.Others;

diff --git a/src/Microsoft.Azure.ServiceBus/Management/NamespaceType.cs b/src/Microsoft.Azure.ServiceBus/Management/NamespaceType.cs
@@ -15,7 +15,7 @@ public enum NamespaceType
 
         /// <summary>
         /// Supported only for backward compatibility.
-        /// Namespace can contain mixture of messaging entities and notification hubs. 
+        /// Namespace can contain mixture of messaging entities and notification hubs.
         /// </summary>
         Mixed = 2,
 

diff --git a/test/Microsoft.Azure.ServiceBus.UnitTests/Management/ManagementClientTests.cs b/test/Microsoft.Azure.ServiceBus.UnitTests/Management/ManagementClientTests.cs
@@ -639,7 +639,8 @@ public async Task GetNamespaceInfoTest()
         {
             var nsInfo = await client.GetNamespaceInfoAsync();
             Assert.NotNull(nsInfo);
-            Assert.Equal(MessagingSku.Standard, nsInfo.MessagingSku);   // Most CI systems generally use standard, hence this check just to ensure the API is working.
+            Assert.Equal(MessagingSku.Standard, nsInfo.MessagingSku);    // Most CI systems generally use standard, hence this check just to ensure the API is working.
+            Assert.Equal(NamespaceType.ServiceBus, nsInfo.NamespaceType); // Common namespace type used for testing is messaging.
         }
 
         public void Dispose()