added new Boolean property KafkaEnabled to enable Kafka for the Event…

… Hub namepsace (#4961)

src/SDKs/EventHub/AzSdk.RP.props

@@ -1,7 +1,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
   <PropertyGroup>
-    <AzureApiTag>EventHub_2018-01-01-preview;</AzureApiTag>
+    <AzureApiTag>EventHub_2017-04-01;</AzureApiTag>
     <PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
   </PropertyGroup>
 </Project>

src/SDKs/EventHub/EventHub.Tests/EventHub.Tests.csproj

@@ -7,17 +7,7 @@
     <Authors>Microsoft Corporation</Authors>
     <AssemblyName>EventHub.Tests</AssemblyName>    
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>  
-  <ItemGroup>
-    <Compile Remove="Tests\ScenarioTests.ConsumergroupsTests.CRUD_Length.cs" />
-    <Compile Remove="Tests\ScenarioTests.DisasterRecoveryAlertnateNameTests.CRUD.cs" />
-    <Compile Remove="Tests\ScenarioTests.DisasterRecoveryTests.CRUD.cs" />
-    <Compile Remove="Tests\ScenarioTests.EventHubskiptopTests.cs" />
-    <Compile Remove="Tests\ScenarioTests.EventHubsTests.CRUDAuthorizationRules.cs" />
-    <Compile Remove="Tests\ScenarioTests.EventHubsTests.CRUDAuthorizationRules_Length.cs" />
-    <Compile Remove="Tests\ScenarioTests.EventHubTests.CRUD.cs" />
-    <Compile Remove="Tests\ScenarioTests.NamespaceTests.CRUDAuthorizationRules.cs" />
-  </ItemGroup>
+  </PropertyGroup>
 
   <ItemGroup>
     <!-- <PackageReference Include="Microsoft.Azure.Management.EventHub" Version="1.2.0" /> -->

src/SDKs/EventHub/EventHub.Tests/TestHelper/EventHubManagementHelper.cs

@@ -24,16 +24,17 @@ public static class EventHubManagementHelper
         internal const string NamespacePrefix = "sdk-Namespace-";
         internal const string AuthorizationRulesPrefix = "sdk-Authrules-";
         internal const string DefaultNamespaceAuthorizationRule = "RootManageSharedAccessKey";
-        internal const string IPFilterRulesPrefix = "sdk-IPFilterRules-";
-        internal const string VirtualNetworkRulesPrefix = "sdk-VirtualNetworkRules-";
+        internal const string EventHubPrefix = "sdk-EventHub-";
+        internal const string ConsumerGroupPrefix = "sdk-ConsumerGroup-";
+        internal const string DisasterRecoveryPrefix = "sdk-DisasterRecovery-";
 
 
-        public static EventHub2018PreviewManagementClient GetEventHubManagementClient(MockContext context, RecordedDelegatingHandler handler)
+        public static EventHubManagementClient GetEventHubManagementClient(MockContext context, RecordedDelegatingHandler handler)
         {
             if (handler != null)
             {
                 handler.IsPassThrough = true;
-                EventHub2018PreviewManagementClient nhManagementClient = context.GetServiceClient<EventHub2018PreviewManagementClient>(handlers: handler);
+                EventHubManagementClient nhManagementClient = context.GetServiceClient<EventHubManagementClient>(handlers: handler);
                 return nhManagementClient;
             }
 

src/SDKs/EventHub/EventHub.Tests/Tests/ScenarioTests.ConsumergroupsTests.CRUD.cs

@@ -0,0 +1,115 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+
+namespace EventHub.Tests.ScenarioTests
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Net;
+    using Microsoft.Azure.Management.EventHub;
+    using Microsoft.Azure.Management.EventHub.Models;
+    using Microsoft.Rest.Azure;
+    using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
+    using TestHelper;
+    using Xunit;
+    public partial class ScenarioTests
+    {
+        [Fact]
+        public void ConsumerGroupsCreateGetUpdateDelete()
+        {
+            using (MockContext context = MockContext.Start(this.GetType().FullName))
+            {
+                InitializeClients(context);
+
+                var location = this.ResourceManagementClient.GetLocationFromProvider();
+
+                var resourceGroup = this.ResourceManagementClient.TryGetResourceGroup(location);
+                if (string.IsNullOrWhiteSpace(resourceGroup))
+                {
+                    resourceGroup = TestUtilities.GenerateName(EventHubManagementHelper.ResourceGroupPrefix);
+                    this.ResourceManagementClient.TryRegisterResourceGroup(location, resourceGroup);
+                }
+
+                var namespaceName = TestUtilities.GenerateName(EventHubManagementHelper.NamespacePrefix);
+                var createNamespaceResponse = this.EventHubManagementClient.Namespaces.CreateOrUpdate(resourceGroup, namespaceName,
+                    new EHNamespace()
+                    {
+                        Location = location,
+                        Sku = new Sku
+                        {
+                            Name = SkuName.Standard,
+                            Tier = SkuTier.Standard
+                        },
+                        Tags = new Dictionary<string, string>()
+                        {
+                            {"tag1", "value1"},
+                            {"tag2", "value2"}
+                        }
+                    });
+
+                Assert.NotNull(createNamespaceResponse);
+                Assert.Equal(createNamespaceResponse.Name, namespaceName);
+
+                TestUtilities.Wait(TimeSpan.FromSeconds(5));
+
+                // Create Eventhub
+                var eventhubName = TestUtilities.GenerateName(EventHubManagementHelper.EventHubPrefix);
+
+                var createEventhubResponse = this.EventHubManagementClient.EventHubs.CreateOrUpdate(resourceGroup, namespaceName, eventhubName,
+                new Eventhub() { MessageRetentionInDays = 5 });
+
+                Assert.NotNull(createEventhubResponse);
+                Assert.Equal(createEventhubResponse.Name, eventhubName);
+
+                //Get the created EventHub
+                var geteventhubResponse = EventHubManagementClient.EventHubs.Get(resourceGroup, namespaceName, eventhubName);
+                Assert.NotNull(geteventhubResponse);
+                Assert.Equal(EntityStatus.Active, geteventhubResponse.Status);
+                Assert.Equal(geteventhubResponse.Name, eventhubName);
+
+                // Create ConsumerGroup.
+                var consumergroupName = TestUtilities.GenerateName(EventHubManagementHelper.ConsumerGroupPrefix);
+                string UserMetadata = "Newly Created";
+                var createConsumergroupResponse = EventHubManagementClient.ConsumerGroups.CreateOrUpdate(resourceGroup, namespaceName, eventhubName, consumergroupName, new ConsumerGroup { UserMetadata = UserMetadata});
+                Assert.NotNull(createConsumergroupResponse);
+                Assert.Equal(createConsumergroupResponse.Name, consumergroupName);
+
+                // Get Created ConsumerGroup
+                var getConsumergroupGetResponse = EventHubManagementClient.ConsumerGroups.Get(resourceGroup, namespaceName, eventhubName, consumergroupName);
+                Assert.NotNull(getConsumergroupGetResponse);
+                Assert.Equal(getConsumergroupGetResponse.Name, consumergroupName);
+
+                // Get all ConsumerGroup   
+                var getSubscriptionsListAllResponse = EventHubManagementClient.ConsumerGroups.ListByEventHub(resourceGroup, namespaceName, eventhubName);
+                Assert.NotNull(getSubscriptionsListAllResponse);
+                Assert.True(getSubscriptionsListAllResponse.All(ns => ns.Id.Contains(resourceGroup)));
+
+                //Update the Created consumergroup
+                createConsumergroupResponse.UserMetadata = "Updated the user meta data";
+                var updateconsumergroupResponse = EventHubManagementClient.ConsumerGroups.CreateOrUpdate(resourceGroup, namespaceName, eventhubName, consumergroupName, createConsumergroupResponse);
+                Assert.NotNull(updateconsumergroupResponse);
+                Assert.Equal(updateconsumergroupResponse.Name, createConsumergroupResponse.Name);
+                Assert.Equal("Updated the user meta data", updateconsumergroupResponse.UserMetadata);
+
+                // Get Created ConsumerGroup
+                var getConsumergroupResponse = EventHubManagementClient.ConsumerGroups.Get(resourceGroup, namespaceName, eventhubName, consumergroupName);
+                Assert.NotNull(getConsumergroupResponse);
+                Assert.Equal(getConsumergroupResponse.Name, consumergroupName);
+                Assert.Equal(getConsumergroupResponse.UserMetadata, updateconsumergroupResponse.UserMetadata);
+
+                // Delete Created ConsumerGroup and check for the NotFound exception 
+                EventHubManagementClient.ConsumerGroups.Delete(resourceGroup, namespaceName, eventhubName, consumergroupName);
+
+                // Delete Created EventHub  and check for the NotFound exception 
+                EventHubManagementClient.EventHubs.Delete(resourceGroup, namespaceName, eventhubName);
+
+                // Delete namespace                                   
+                EventHubManagementClient.Namespaces.Delete(resourceGroup, namespaceName);
+
+                //Subscription end
+            }
+        }
+    }
+}

src/SDKs/EventHub/EventHub.Tests/Tests/ScenarioTests.ConsumergroupsTests.CRUD_Length.cs

@@ -0,0 +1,115 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+
+namespace EventHub.Tests.ScenarioTests
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Net;
+    using Microsoft.Azure.Management.EventHub;
+    using Microsoft.Azure.Management.EventHub.Models;
+    using Microsoft.Rest.Azure;
+    using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
+    using TestHelper;
+    using Xunit;
+    public partial class ScenarioTests
+    {
+        [Fact]
+        public void ConsumerGroupsCreateGetUpdateDelete_Length()
+        {
+            using (MockContext context = MockContext.Start(this.GetType().FullName))
+            {
+                InitializeClients(context);
+
+                var location = this.ResourceManagementClient.GetLocationFromProvider();
+
+                var resourceGroup = this.ResourceManagementClient.TryGetResourceGroup(location);
+                if (string.IsNullOrWhiteSpace(resourceGroup))
+                {
+                    resourceGroup = TestUtilities.GenerateName(EventHubManagementHelper.ResourceGroupPrefix);
+                    this.ResourceManagementClient.TryRegisterResourceGroup(location, resourceGroup);
+                }
+
+                var namespaceName = TestUtilities.GenerateName(EventHubManagementHelper.NamespacePrefix);
+                var createNamespaceResponse = this.EventHubManagementClient.Namespaces.CreateOrUpdate(resourceGroup, namespaceName,
+                    new EHNamespace()
+                    {
+                        Location = location,
+                        Sku = new Sku
+                        {
+                            Name = SkuName.Standard,
+                            Tier = SkuTier.Standard
+                        },
+                        Tags = new Dictionary<string, string>()
+                        {
+                            {"tag1", "value1"},
+                            {"tag2", "value2"}
+                        }
+                    });
+
+                Assert.NotNull(createNamespaceResponse);
+                Assert.Equal(createNamespaceResponse.Name, namespaceName);
+
+                TestUtilities.Wait(TimeSpan.FromSeconds(5));
+
+                // Create Eventhub
+                var eventhubName = EventHubManagementHelper.EventHubPrefix + "thisisthenamewithmorethan53charschecktoverifytheremovlaof50charsnamelengthlimit";
+
+                var createEventhubResponse = this.EventHubManagementClient.EventHubs.CreateOrUpdate(resourceGroup, namespaceName, eventhubName,
+                new Eventhub() { MessageRetentionInDays = 5 });
+
+                Assert.NotNull(createEventhubResponse);
+                Assert.Equal(createEventhubResponse.Name, eventhubName);
+
+                //Get the created EventHub
+                var geteventhubResponse = EventHubManagementClient.EventHubs.Get(resourceGroup, namespaceName, eventhubName);
+                Assert.NotNull(geteventhubResponse);
+                Assert.Equal(EntityStatus.Active, geteventhubResponse.Status);
+                Assert.Equal(geteventhubResponse.Name, eventhubName);
+
+                // Create ConsumerGroup.
+                var consumergroupName = "thisisthenamewithmorethan53charschecktoverifqwert";
+                string UserMetadata = "Newly Created";
+                var createConsumergroupResponse = EventHubManagementClient.ConsumerGroups.CreateOrUpdate(resourceGroup, namespaceName, eventhubName, consumergroupName, new ConsumerGroup { UserMetadata = UserMetadata});
+                Assert.NotNull(createConsumergroupResponse);
+                Assert.Equal(createConsumergroupResponse.Name, consumergroupName);
+
+                // Get Created ConsumerGroup
+                var getConsumergroupGetResponse = EventHubManagementClient.ConsumerGroups.Get(resourceGroup, namespaceName, eventhubName, consumergroupName);
+                Assert.NotNull(getConsumergroupGetResponse);
+                Assert.Equal(getConsumergroupGetResponse.Name, consumergroupName);
+
+                // Get all ConsumerGroup   
+                var getSubscriptionsListAllResponse = EventHubManagementClient.ConsumerGroups.ListByEventHub(resourceGroup, namespaceName, eventhubName);
+                Assert.NotNull(getSubscriptionsListAllResponse);
+                Assert.True(getSubscriptionsListAllResponse.All(ns => ns.Id.Contains(resourceGroup)));
+
+                //Update the Created consumergroup
+                createConsumergroupResponse.UserMetadata = "Updated the user meta data";
+                var updateconsumergroupResponse = EventHubManagementClient.ConsumerGroups.CreateOrUpdate(resourceGroup, namespaceName, eventhubName, consumergroupName, createConsumergroupResponse);
+                Assert.NotNull(updateconsumergroupResponse);
+                Assert.Equal(updateconsumergroupResponse.Name, createConsumergroupResponse.Name);
+                Assert.Equal("Updated the user meta data", updateconsumergroupResponse.UserMetadata);
+
+                // Get Created ConsumerGroup
+                var getConsumergroupResponse = EventHubManagementClient.ConsumerGroups.Get(resourceGroup, namespaceName, eventhubName, consumergroupName);
+                Assert.NotNull(getConsumergroupResponse);
+                Assert.Equal(getConsumergroupResponse.Name, consumergroupName);
+                Assert.Equal(getConsumergroupResponse.UserMetadata, updateconsumergroupResponse.UserMetadata);
+
+                // Delete Created ConsumerGroup and check for the NotFound exception 
+                EventHubManagementClient.ConsumerGroups.Delete(resourceGroup, namespaceName, eventhubName, consumergroupName);
+
+                // Delete Created EventHub  and check for the NotFound exception 
+                EventHubManagementClient.EventHubs.Delete(resourceGroup, namespaceName, eventhubName);
+
+                // Delete namespace                                   
+                EventHubManagementClient.Namespaces.Delete(resourceGroup, namespaceName);
+
+                //Subscription end
+            }
+        }
+    }
+}