diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Helpers/NetworkManagementTestUtilities.cs b/sdk/network/Azure.ResourceManager.Network/tests/Helpers/NetworkManagementTestUtilities.cs index f947fbbcef83..8684d64da771 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Helpers/NetworkManagementTestUtilities.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Helpers/NetworkManagementTestUtilities.cs @@ -39,7 +39,7 @@ public static async Task GetResourceLocation(ArmClient client, string re } string[] parts = resourceType.Split('/'); string providerName = parts[0]; - ProviderInfo provider = await client.GetProviderAsync(providerName); + var provider = (await client.GetProviderAsync(providerName)).Value; foreach (var resource in provider.ResourceTypes) { if (string.Equals(resource.ResourceType, parts[1], StringComparison.OrdinalIgnoreCase)) diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Helpers/NetworkServiceClientTestBase.cs b/sdk/network/Azure.ResourceManager.Network/tests/Helpers/NetworkServiceClientTestBase.cs index 1f3f01e3114b..76ac87184b61 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Helpers/NetworkServiceClientTestBase.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Helpers/NetworkServiceClientTestBase.cs @@ -7,10 +7,10 @@ using System.Threading.Tasks; using Azure.Core.TestFramework; -using Azure.ResourceManager.Compute; using Azure.ResourceManager.Resources; using Azure.ResourceManager.Resources.Models; -//using Azure.ResourceManager.Storage; +using Azure.ResourceManager.Compute; +using Azure.ResourceManager.Compute.Models; using Azure.ResourceManager.Network.Models; using Azure.ResourceManager.Network.Tests.Tests; using Azure.ResourceManager.TestFramework; @@ -22,6 +22,7 @@ namespace Azure.ResourceManager.Network.Tests.Helpers [RunFrequency(RunTestFrequency.Manually)] public class NetworkServiceClientTestBase : ManagementRecordedTestBase { + private const string dummySSHKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+wWK73dCr+jgQOAxNsHAnNNNMEMWOHYEccp6wJm2gotpr9katuF/ZAdou5AaW1C61slRkHRkpRRX9FA9CYBiitZgvCCz+3nWNN7l/Up54Zps/pHWGZLHNJZRYyAB6j5yVLMVHIHriY49d/GZTZVNB8GoJv9Gakwc/fuEZYYl4YDFiGMBP///TzlI4jhiJzjKnEvqPFki5p2ZRJqcbCiF4pJrxUQR/RXqVFQdbRLZgYfJ8xGB878RENq3yQ39d8dVOkq4edbkzwcUmwwwkYVPIoDGsYLaRHnG+To7FvMeyO7xDVQkMKzopTQV8AuKpyvpqu0a9pWOMaiCyDytO7GGN you@me.com"; public NetworkServiceClientTestBase(bool isAsync) : base(isAsync) { } @@ -30,9 +31,6 @@ public NetworkServiceClientTestBase(bool isAsync) : base(isAsync) public static TimeSpan ZeroPollingInterval { get; } = TimeSpan.FromSeconds(0); public Dictionary Tags { get; internal set; } - //public ResourcesManagementClient ResourceManagementClient { get; set; } - //public StorageManagementClient StorageManagementClient { get; set; } - //public ComputeManagementClient ComputeManagementClient { get; set; } public ArmClient ArmClient { get; set; } public Resources.Subscription Subscription @@ -56,118 +54,183 @@ public Resources.ResourceGroup GetResourceGroup(string name) return Subscription.GetResourceGroups().Get(name).Value; } - //public NetworkInterfacesOperations NetworkInterfacesOperations { get; set; } - //public ProvidersOperations ProvidersOperations { get; set; } - //public ResourceGroupsOperations ResourceGroupsOperations { get; set; } - //public ResourcesOperations ResourcesOperations { get; set; } - //public NetworkManagementOperations ServiceOperations { get; set; } - //public PrivateLinkServicesOperations PrivateLinkServicesOperations { get; set; } - protected void Initialize() { - //ResourceManagementClient = GetResourceManagementClient(); - //StorageManagementClient = GetStorageManagementClient(); - //ComputeManagementClient = GetComputeManagementClient(); ArmClient = GetArmClient(); + } - //NetworkInterfacesOperations = NetworkManagementClient.NetworkInterfaces; - //ProvidersOperations = ResourceManagementClient.Providers; - //ResourceGroupsOperations = ResourceManagementClient.ResourceGroups; - //ResourcesOperations = ResourceManagementClient.Resources; - //ServiceOperations = NetworkManagementClient.NetworkManagement; - //PrivateLinkServicesOperations = NetworkManagementClient.PrivateLinkServices; + protected async Task CreateResourceGroup(string name) + { + return (await Subscription.GetResourceGroups().CreateOrUpdateAsync(name, new ResourceGroupData(TestEnvironment.Location))).Value; + } + protected async Task CreateResourceGroup(string name,string location) + { + return (await Subscription.GetResourceGroups().CreateOrUpdateAsync(name, new ResourceGroupData(location))).Value; } - //protected ResourcesManagementClient GetResourceManagementClient() - //{ - // var options = InstrumentClientOptions(new ResourcesManagementClientOptions()); + public async Task CreateLinuxVM(string vmName, string networkInterfaceName, string location, ResourceGroup resourceGroup) + { + var vnet = await CreateVirtualNetwork(Recording.GenerateAssetName("vnet_"), Recording.GenerateAssetName("subnet_"), location, resourceGroup.GetVirtualNetworks()); + var networkInterface = await CreateNetworkInterface(networkInterfaceName, null, vnet.Data.Subnets[0].Id, location, Recording.GenerateAssetName("ipconfig_"), resourceGroup.GetNetworkInterfaces()); + var adminUsername = Recording.GenerateAssetName("vmadmin"); - // return CreateClient( - // TestEnvironment.SubscriptionId, - // TestEnvironment.Credential, - // options); - //} + return (await resourceGroup.GetVirtualMachines().CreateOrUpdateAsync(vmName, new VirtualMachineData(location) + { + HardwareProfile = new HardwareProfile() + { + VmSize = VirtualMachineSizeTypes.StandardF2 + }, + OsProfile = new OSProfile() + { + AdminUsername = adminUsername, + ComputerName = vmName, + LinuxConfiguration = new LinuxConfiguration() + { + DisablePasswordAuthentication = true, + Ssh = new SshConfiguration() + { + PublicKeys = { + new SshPublicKeyInfo() + { + Path = $"/home/{adminUsername}/.ssh/authorized_keys", + KeyData = dummySSHKey, + } + } + } + } + }, + NetworkProfile = new Compute.Models.NetworkProfile() + { + NetworkInterfaces = + { + new NetworkInterfaceReference() + { + Id = networkInterface.Id, + Primary = true, + } + } + }, + StorageProfile = new StorageProfile() + { + OsDisk = new OSDisk(DiskCreateOptionTypes.FromImage) + { + Name = $"{vmName}_os_disk", + OsType = OperatingSystemTypes.Linux, + Caching = CachingTypes.ReadWrite, + ManagedDisk = new ManagedDiskParameters() + { + StorageAccountType = StorageAccountTypes.StandardLRS + } + }, + ImageReference = new ImageReference() + { + Publisher = "Canonical", + Offer = "UbuntuServer", + Sku = "16.04-LTS", + Version = "latest", + } + } + })).Value; + } - //private StorageManagementClient GetStorageManagementClient() - //{ - // return InstrumentClient(new StorageManagementClient(TestEnvironment.SubscriptionId, - // TestEnvironment.Credential, - // InstrumentClientOptions(new StorageManagementClientOptions()))); - //} + public async Task CreateWindowsVM(string vmName, string networkInterfaceName, string location, ResourceGroup resourceGroup) + { + var vnet = await CreateVirtualNetwork(Recording.GenerateAssetName("vnet_"), Recording.GenerateAssetName("subnet_"), location, resourceGroup.GetVirtualNetworks()); + var networkInterface = await CreateNetworkInterface(networkInterfaceName, null, vnet.Data.Subnets[0].Id, location, Recording.GenerateAssetName("ipconfig_"), resourceGroup.GetNetworkInterfaces()); - //private ComputeManagementClient GetComputeManagementClient() + return (await resourceGroup.GetVirtualMachines().CreateOrUpdateAsync(vmName, new VirtualMachineData(location) + { + HardwareProfile = new HardwareProfile() + { + VmSize = VirtualMachineSizeTypes.StandardD1V2 + }, + OsProfile = new OSProfile() + { + AdminUsername = Recording.GenerateAssetName("vmadmin"), + AdminPassword = Recording.GenerateAlphaNumericId("vmadminpass"), + ComputerName = vmName, + }, + NetworkProfile = new Compute.Models.NetworkProfile() + { + NetworkInterfaces = + { + new NetworkInterfaceReference() + { + Id = networkInterface.Id, + Primary = true, + } + } + }, + StorageProfile = new StorageProfile() + { + OsDisk = new OSDisk(DiskCreateOptionTypes.FromImage) + { + Name = $"{vmName}_os_disk", + OsType = OperatingSystemTypes.Windows, + Caching = CachingTypes.ReadWrite, + ManagedDisk = new ManagedDiskParameters() + { + StorageAccountType = StorageAccountTypes.StandardLRS + } + }, + ImageReference = new ImageReference() + { + Publisher = "MicrosoftWindowsServer", + Offer = "WindowsServer", + Sku = "2016-Datacenter", + Version = "latest", + } + } + })).Value; + } + + // TODO: we should try to create using template after new `Azure.ResourceManager.Resource` is available + //public async Task CreateVm( + // string resourceGroupName, + // string location, + // string virtualMachineName, + // string storageAccountName, + // string networkInterfaceName, + // string networkSecurityGroupName, + // string diagnosticsStorageAccountName, + // string deploymentName, + // string adminPassword) //{ - // return InstrumentClient(new ComputeManagementClient(TestEnvironment.SubscriptionId, - // TestEnvironment.Credential, - // InstrumentClientOptions(new ComputeManagementClientOptions()))); - //} + // string deploymentParams = "{" + + // "\"resourceGroupName\": {\"value\": \"" + resourceGroupName + "\"}," + + // "\"location\": {\"value\": \"" + location + "\"}," + + // "\"virtualMachineName\": { \"value\": \"" + virtualMachineName + "\"}," + + // "\"virtualMachineSize\": { \"value\": \"Standard_DS1_v2\"}," + + // "\"adminUsername\": { \"value\": \"netanalytics32\"}," + + // "\"storageAccountName\": { \"value\": \"" + storageAccountName + "\"}," + + // "\"routeTableName\": { \"value\": \"" + resourceGroupName + "RT\"}," + + // "\"virtualNetworkName\": { \"value\": \"" + resourceGroupName + "-vnet\"}," + + // "\"networkInterfaceName\": { \"value\": \"" + networkInterfaceName + "\"}," + + // "\"networkSecurityGroupName\": { \"value\": \"" + networkSecurityGroupName + "\"}," + + // "\"adminPassword\": { \"value\": \"" + adminPassword + "\"}," + + // "\"storageAccountType\": { \"value\": \"Premium_LRS\"}," + + // "\"diagnosticsStorageAccountName\": { \"value\": \"" + diagnosticsStorageAccountName + "\"}," + + // "\"diagnosticsStorageAccountId\": { \"value\": \"Microsoft.Storage/storageAccounts/" + diagnosticsStorageAccountName + "\"}," + + // "\"diagnosticsStorageAccountType\": { \"value\": \"Standard_LRS\"}," + + // "\"addressPrefix\": { \"value\": \"10.17.3.0/24\"}," + + // "\"subnetName\": { \"value\": \"default\"}, \"subnetPrefix\": { \"value\": \"10.17.3.0/24\"}," + + // "\"publicIpAddressName\": { \"value\": \"" + virtualMachineName + "-ip\"}," + + // "\"publicIpAddressType\": { \"value\": \"Dynamic\"}" + + // "}"; + // string templateString = File.ReadAllText(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "TestData", "DeploymentTemplate.json")); - protected async Task> CreateResourceGroup(string name) - { - return await Subscription.GetResourceGroups().CreateOrUpdateAsync(name, new ResourceGroupData(TestEnvironment.Location)); - } - protected async Task> CreateResourceGroup(string name,string location) - { - return await Subscription.GetResourceGroups().CreateOrUpdateAsync(name, new ResourceGroupData(location)); - } - - public async Task CreateVm( - //ResourcesManagementClient resourcesClient, - string resourceGroupName, - string location, - string virtualMachineName, - string storageAccountName, - string networkInterfaceName, - string networkSecurityGroupName, - string diagnosticsStorageAccountName, - string deploymentName, - string adminPassword) - { - //string deploymentParams = "{" + - // "\"resourceGroupName\": {\"value\": \"" + resourceGroupName + "\"}," + - // "\"location\": {\"value\": \"" + location + "\"}," + - // "\"virtualMachineName\": { \"value\": \"" + virtualMachineName + "\"}," + - // "\"virtualMachineSize\": { \"value\": \"Standard_DS1_v2\"}," + - // "\"adminUsername\": { \"value\": \"netanalytics32\"}," + - // "\"storageAccountName\": { \"value\": \"" + storageAccountName + "\"}," + - // "\"routeTableName\": { \"value\": \"" + resourceGroupName + "RT\"}," + - // "\"virtualNetworkName\": { \"value\": \"" + resourceGroupName + "-vnet\"}," + - // "\"networkInterfaceName\": { \"value\": \"" + networkInterfaceName + "\"}," + - // "\"networkSecurityGroupName\": { \"value\": \"" + networkSecurityGroupName + "\"}," + - // "\"adminPassword\": { \"value\": \"" + adminPassword + "\"}," + - // "\"storageAccountType\": { \"value\": \"Premium_LRS\"}," + - // "\"diagnosticsStorageAccountName\": { \"value\": \"" + diagnosticsStorageAccountName + "\"}," + - // "\"diagnosticsStorageAccountId\": { \"value\": \"Microsoft.Storage/storageAccounts/" + diagnosticsStorageAccountName + "\"}," + - // "\"diagnosticsStorageAccountType\": { \"value\": \"Standard_LRS\"}," + - // "\"addressPrefix\": { \"value\": \"10.17.3.0/24\"}," + - // "\"subnetName\": { \"value\": \"default\"}, \"subnetPrefix\": { \"value\": \"10.17.3.0/24\"}," + - // "\"publicIpAddressName\": { \"value\": \"" + virtualMachineName + "-ip\"}," + - // "\"publicIpAddressType\": { \"value\": \"Dynamic\"}" + - // "}"; - //string templateString = File.ReadAllText(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "TestData", "DeploymentTemplate.json")); - - //DeploymentProperties deploymentProperties = new DeploymentProperties(DeploymentMode.Incremental) - //{ - // Template = templateString, - // Parameters = deploymentParams - //}; - //Deployment deploymentModel = new Deployment(deploymentProperties); - - //Operation deploymentWait = await resourcesClient.Deployments.StartCreateOrUpdateAsync(resourceGroupName, deploymentName, deploymentModel); - //await deploymentWait.WaitForCompletionAsync(); - ResourceGroup rg = await ArmClient.DefaultSubscription.GetResourceGroups().CreateOrUpdateAsync(resourceGroupName, new ResourceGroupData(location)); - NetworkInterface nic = await rg.GetNetworkInterfaces().CreateOrUpdateAsync(networkInterfaceName, new NetworkInterfaceData()); - var vnetData = new VirtualNetworkData(); - vnetData.AddressSpace = new AddressSpace(); - vnetData.AddressSpace.AddressPrefixes.Add("10.0.0.0/24"); - VirtualNetwork vnet = await rg.GetVirtualNetworks().CreateOrUpdateAsync("myvnet", vnetData); - var subnetData = new SubnetData(); - subnetData.AddressPrefix = "10.0.0.0/28"; - Subnet subnet = await vnet.GetSubnets().CreateOrUpdateAsync("default", subnetData); - VirtualMachineData vmData = new VirtualMachineData(location); - return await rg.GetVirtualMachines().CreateOrUpdateAsync(virtualMachineName, vmData); - } + // DeploymentProperties deploymentProperties = new DeploymentProperties(DeploymentMode.Incremental) + // { + // Template = templateString, + // Parameters = deploymentParams + // }; + // Deployment deploymentModel = new Deployment(deploymentProperties); + + // Operation deploymentWait = await resourcesClient.Deployments.StartCreateOrUpdateAsync(resourceGroupName, deploymentName, deploymentModel); + // await deploymentWait.WaitForCompletionAsync(); + //} + // TODO: we should decide after preview whehter we need to support compute resources like vmss in Network SDK //public async Task CreateVmss(ResourcesManagementClient resourcesClient, string resourceGroupName, string deploymentName) //{ // string templateString = File.ReadAllText(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "TestData", "VmssDeploymentTemplate.json")); diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Helpers/ResourcesManagementTestUtilities.cs b/sdk/network/Azure.ResourceManager.Network/tests/Helpers/ResourcesManagementTestUtilities.cs index daa707e2ddbd..472e8f66eb96 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Helpers/ResourcesManagementTestUtilities.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Helpers/ResourcesManagementTestUtilities.cs @@ -23,7 +23,7 @@ public static async Task GetResourceLocation(ArmClient client, string re string location = null; string[] parts = resourceType.Split('/'); string providerName = parts[0]; - ProviderInfo provider = await client.GetProviderAsync(providerName); + var provider = (await client.GetProviderAsync(providerName)).Value; foreach (var resource in provider.ResourceTypes) { if (string.Equals(resource.ResourceType, parts[1], StringComparison.OrdinalIgnoreCase)) diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/ApplicationGatewayTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/ApplicationGatewayTests.cs index 7bbac355b012..52220df508aa 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/ApplicationGatewayTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/ApplicationGatewayTests.cs @@ -7,8 +7,6 @@ using System.Security.Cryptography.X509Certificates; using System.Threading.Tasks; using Azure.Core.TestFramework; -using Azure.ResourceManager.Compute; -using Azure.ResourceManager.Compute.Models; using Azure.ResourceManager.Resources; using Azure.ResourceManager.Resources.Models; using Azure.ResourceManager.Network.Models; diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/ApplicationSecurityGroupTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/ApplicationSecurityGroupTests.cs index 49d92ae9e076..91c753f1c6d2 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/ApplicationSecurityGroupTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/ApplicationSecurityGroupTests.cs @@ -38,7 +38,7 @@ public void ClearChallengeCacheforRecord() public async Task GetContainer() { var resourceGroup = await CreateResourceGroup(Recording.GenerateAssetName("test_application_security_group_")); - return resourceGroup.Value.GetApplicationSecurityGroups(); + return resourceGroup.GetApplicationSecurityGroups(); } [Test] diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/CheckConnectivityTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/CheckConnectivityTests.cs index a6f461f34475..3e4b4b2b3ed2 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/CheckConnectivityTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/CheckConnectivityTests.cs @@ -36,28 +36,19 @@ public void ClearChallengeCacheforRecord() //} [Test] + [RecordedTest] public async Task CheckConnectivityVmToInternetTest() { string resourceGroupName = Recording.GenerateAssetName("azsmnet"); string location = "westus2"; - ResourceGroup rg = await ArmClient.DefaultSubscription.GetResourceGroups().CreateOrUpdateAsync(resourceGroupName, new ResourceGroupData(location)); + var resourceGroup = await CreateResourceGroup(resourceGroupName, location); string virtualMachineName = Recording.GenerateAssetName("azsmnet"); string networkInterfaceName = Recording.GenerateAssetName("azsmnet"); string networkSecurityGroupName = virtualMachineName + "-nsg"; //Deploy VM with a template - VirtualMachine vm = await CreateVm( - resourceGroupName: resourceGroupName, - location: location, - virtualMachineName: virtualMachineName, - storageAccountName: Recording.GenerateAssetName("azsmnet"), - networkInterfaceName: networkInterfaceName, - networkSecurityGroupName: networkSecurityGroupName, - diagnosticsStorageAccountName: Recording.GenerateAssetName("azsmnet"), - deploymentName: Recording.GenerateAssetName("azsmnet"), - adminPassword: Recording.GenerateAlphaNumericId("AzureSDKNetworkTest#") - ); + var vm = await CreateWindowsVM(virtualMachineName, networkInterfaceName, location, resourceGroup); //Deploy networkWatcherAgent on VM VirtualMachineExtensionData parameters = new VirtualMachineExtensionData(location) diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/CheckDnsAvailabilityTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/CheckDnsAvailabilityTests.cs index 2f334b426447..0e28aca95c7a 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/CheckDnsAvailabilityTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/CheckDnsAvailabilityTests.cs @@ -31,14 +31,12 @@ public void ClearChallengeCacheforRecord() //} [Test] + [RecordedTest] public async Task CheckDnsAvailabilityTest() { - string location = await NetworkManagementTestUtilities.GetResourceLocation(ArmClient, "Microsoft.Network/publicIPAddresses"); - location = location.Replace(" ", ""); - string domainNameLabel = Recording.GenerateAssetName("domainnamelabel"); - Response dnsNameAvailability = await ArmClient.DefaultSubscription.CheckDnsNameAvailabilityAsync(location, domainNameLabel); + Response dnsNameAvailability = await ArmClient.DefaultSubscription.CheckDnsNameAvailabilityAsync(TestEnvironment.Location, domainNameLabel); Assert.True(dnsNameAvailability.Value.Available); } diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/ConnectionMonitorTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/ConnectionMonitorTests.cs index 2a4a092f0718..761d660d9f24 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/ConnectionMonitorTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/ConnectionMonitorTests.cs @@ -50,23 +50,13 @@ public async Task PutConnectionMonitorTest() string resourceGroupName = Recording.GenerateAssetName("azsmnet"); string location = "westus2"; - ResourceGroup rg = await ArmClient.DefaultSubscription.GetResourceGroups().CreateOrUpdateAsync(resourceGroupName, new ResourceGroupData(location)); + var resourceGroup = await CreateResourceGroup(resourceGroupName, location); string virtualMachineName = Recording.GenerateAssetName("azsmnet"); string networkInterfaceName = Recording.GenerateAssetName("azsmnet"); string networkSecurityGroupName = virtualMachineName + "-nsg"; //Deploy VM with a template - VirtualMachine vm = await CreateVm( - resourceGroupName: resourceGroupName, - location: location, - virtualMachineName: virtualMachineName, - storageAccountName: Recording.GenerateAssetName("azsmnet"), - networkInterfaceName: networkInterfaceName, - networkSecurityGroupName: networkSecurityGroupName, - diagnosticsStorageAccountName: Recording.GenerateAssetName("azsmnet"), - deploymentName: Recording.GenerateAssetName("azsmnet"), - adminPassword: Recording.GenerateAlphaNumericId("AzureSDKNetworkTest#") - ); + var vm = await CreateWindowsVM(virtualMachineName, networkInterfaceName, location, resourceGroup); //Deploy networkWatcherAgent on VM VirtualMachineExtensionData parameters = new VirtualMachineExtensionData(location) @@ -117,24 +107,14 @@ public async Task StartConnectionMonitorTest() string resourceGroupName = Recording.GenerateAssetName("azsmnet"); string location = "westus2"; - ResourceGroup rg = await ArmClient.DefaultSubscription.GetResourceGroups().CreateOrUpdateAsync(resourceGroupName, new ResourceGroupData(location)); + var resourceGroup = await CreateResourceGroup(resourceGroupName, location); string virtualMachineName = Recording.GenerateAssetName("azsmnet"); string networkInterfaceName = Recording.GenerateAssetName("azsmnet"); string networkSecurityGroupName = virtualMachineName + "-nsg"; //Deploy VM with a template - VirtualMachine vm = await CreateVm( - resourceGroupName: resourceGroupName, - location: location, - virtualMachineName: virtualMachineName, - storageAccountName: Recording.GenerateAssetName("azsmnet"), - networkInterfaceName: networkInterfaceName, - networkSecurityGroupName: networkSecurityGroupName, - diagnosticsStorageAccountName: Recording.GenerateAssetName("azsmnet"), - deploymentName: Recording.GenerateAssetName("azsmnet"), - adminPassword: Recording.GenerateAlphaNumericId("AzureSDKNetworkTest#") - ); + var vm = await CreateWindowsVM(virtualMachineName, networkInterfaceName, location, resourceGroup); //Deploy networkWatcherAgent on VM VirtualMachineExtensionData parameters = new VirtualMachineExtensionData(location) @@ -185,23 +165,13 @@ public async Task StopConnectionMonitorTest() string resourceGroupName = Recording.GenerateAssetName("azsmnet"); string location = "westus2"; - ResourceGroup rg = await ArmClient.DefaultSubscription.GetResourceGroups().CreateOrUpdateAsync(resourceGroupName, new ResourceGroupData(location)); + var resourceGroup = await CreateResourceGroup(resourceGroupName, location); string virtualMachineName = Recording.GenerateAssetName("azsmnet"); string networkInterfaceName = Recording.GenerateAssetName("azsmnet"); string networkSecurityGroupName = virtualMachineName + "-nsg"; //Deploy VM with a template - VirtualMachine vm = await CreateVm( - resourceGroupName: resourceGroupName, - location: location, - virtualMachineName: virtualMachineName, - storageAccountName: Recording.GenerateAssetName("azsmnet"), - networkInterfaceName: networkInterfaceName, - networkSecurityGroupName: networkSecurityGroupName, - diagnosticsStorageAccountName: Recording.GenerateAssetName("azsmnet"), - deploymentName: Recording.GenerateAssetName("azsmnet"), - adminPassword: Recording.GenerateAlphaNumericId("AzureSDKNetworkTest#") - ); + var vm = await CreateWindowsVM(virtualMachineName, networkInterfaceName, location, resourceGroup); //Deploy networkWatcherAgent on VM VirtualMachineExtensionData parameters = new VirtualMachineExtensionData(location) @@ -251,23 +221,13 @@ public async Task QueryConnectionMonitorTest() string resourceGroupName = Recording.GenerateAssetName("azsmnet"); string location = "westus2"; - ResourceGroup rg = await ArmClient.DefaultSubscription.GetResourceGroups().CreateOrUpdateAsync(resourceGroupName, new ResourceGroupData(location)); + var resourceGroup = await CreateResourceGroup(resourceGroupName, location); string virtualMachineName = Recording.GenerateAssetName("azsmnet"); string networkInterfaceName = Recording.GenerateAssetName("azsmnet"); string networkSecurityGroupName = virtualMachineName + "-nsg"; //Deploy VM with a template - VirtualMachine vm = await CreateVm( - resourceGroupName: resourceGroupName, - location: location, - virtualMachineName: virtualMachineName, - storageAccountName: Recording.GenerateAssetName("azsmnet"), - networkInterfaceName: networkInterfaceName, - networkSecurityGroupName: networkSecurityGroupName, - diagnosticsStorageAccountName: Recording.GenerateAssetName("azsmnet"), - deploymentName: Recording.GenerateAssetName("azsmnet"), - adminPassword: Recording.GenerateAlphaNumericId("AzureSDKNetworkTest#") - ); + var vm = await CreateWindowsVM(virtualMachineName, networkInterfaceName, location, resourceGroup); //Deploy networkWatcherAgent on VM VirtualMachineExtensionData parameters = new VirtualMachineExtensionData(location) @@ -323,23 +283,13 @@ public async Task UpdateConnectionMonitorTest() string resourceGroupName = Recording.GenerateAssetName("azsmnet"); string location = "westus2"; - ResourceGroup rg = await ArmClient.DefaultSubscription.GetResourceGroups().CreateOrUpdateAsync(resourceGroupName, new ResourceGroupData(location)); + var resourceGroup = await CreateResourceGroup (resourceGroupName, location); string virtualMachineName = Recording.GenerateAssetName("azsmnet"); string networkInterfaceName = Recording.GenerateAssetName("azsmnet"); string networkSecurityGroupName = virtualMachineName + "-nsg"; //Deploy VM with a template - VirtualMachine vm = await CreateVm( - resourceGroupName: resourceGroupName, - location: location, - virtualMachineName: virtualMachineName, - storageAccountName: Recording.GenerateAssetName("azsmnet"), - networkInterfaceName: networkInterfaceName, - networkSecurityGroupName: networkSecurityGroupName, - diagnosticsStorageAccountName: Recording.GenerateAssetName("azsmnet"), - deploymentName: Recording.GenerateAssetName("azsmnet"), - adminPassword: Recording.GenerateAlphaNumericId("AzureSDKNetworkTest#") - ); + var vm = await CreateWindowsVM(virtualMachineName, networkInterfaceName, location, resourceGroup); //Deploy networkWatcherAgent on VM VirtualMachineExtensionData parameters = new VirtualMachineExtensionData(location) @@ -388,23 +338,13 @@ public async Task DeleteConnectionMonitorTest() string resourceGroupName = Recording.GenerateAssetName("azsmnet"); string location = "westus2"; - ResourceGroup rg = await ArmClient.DefaultSubscription.GetResourceGroups().CreateOrUpdateAsync(resourceGroupName, new ResourceGroupData(location)); + var resourceGroup = await CreateResourceGroup (resourceGroupName, location); string virtualMachineName = Recording.GenerateAssetName("azsmnet"); string networkInterfaceName = Recording.GenerateAssetName("azsmnet"); string networkSecurityGroupName = virtualMachineName + "-nsg"; //Deploy VM with a template - VirtualMachine vm = await CreateVm( - resourceGroupName: resourceGroupName, - location: location, - virtualMachineName: virtualMachineName, - storageAccountName: Recording.GenerateAssetName("azsmnet"), - networkInterfaceName: networkInterfaceName, - networkSecurityGroupName: networkSecurityGroupName, - diagnosticsStorageAccountName: Recording.GenerateAssetName("azsmnet"), - deploymentName: Recording.GenerateAssetName("azsmnet"), - adminPassword: Recording.GenerateAlphaNumericId("AzureSDKNetworkTest#") - ); + var vm = await CreateWindowsVM(virtualMachineName, networkInterfaceName, location, resourceGroup); //Deploy networkWatcherAgent on VM VirtualMachineExtensionData parameters = new VirtualMachineExtensionData(location) diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/DdosProtectionPlanTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/DdosProtectionPlanTests.cs index 7db9f3e52e22..3ae4af18a00a 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/DdosProtectionPlanTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/DdosProtectionPlanTests.cs @@ -30,7 +30,7 @@ public async Task ClearChallengeCacheforRecord() { Initialize(); } - resourceGroup = (await CreateResourceGroup(Recording.GenerateAssetName(NamePrefix))).Value; + resourceGroup = await CreateResourceGroup(Recording.GenerateAssetName(NamePrefix)); } [TearDown] diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/ExpandResourceTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/ExpandResourceTests.cs index 0532e15ebb27..99ce05efed6a 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/ExpandResourceTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/ExpandResourceTests.cs @@ -51,12 +51,12 @@ public async Task ExpandResourceTest() lbPublicIpName, lbDomaingNameLabel, location, - resourceGroup.Value.GetPublicIPAddresses()); + resourceGroup.GetPublicIPAddresses()); // Create Vnet string vnetName = Recording.GenerateAssetName("azsmnet"); string subnetName = Recording.GenerateAssetName("azsmnet"); - VirtualNetwork vnet = await CreateVirtualNetwork(vnetName, subnetName, location, resourceGroup.Value.GetVirtualNetworks()); + VirtualNetwork vnet = await CreateVirtualNetwork(vnetName, subnetName, location, resourceGroup.GetVirtualNetworks()); // Create Nics string nic1name = Recording.GenerateAssetName("azsmnet"); @@ -69,7 +69,7 @@ public async Task ExpandResourceTest() vnet.Data.Subnets[0].Id, location, "ipconfig", - resourceGroup.Value.GetNetworkInterfaces()); + resourceGroup.GetNetworkInterfaces()); NetworkInterface nic2 = await CreateNetworkInterface( nic2name, @@ -77,7 +77,7 @@ public async Task ExpandResourceTest() vnet.Data.Subnets[0].Id, location, "ipconfig", - resourceGroup.Value.GetNetworkInterfaces()); + resourceGroup.GetNetworkInterfaces()); NetworkInterface nic3 = await CreateNetworkInterface( nic3name, @@ -85,7 +85,7 @@ public async Task ExpandResourceTest() vnet.Data.Subnets[0].Id, location, "ipconfig", - resourceGroup.Value.GetNetworkInterfaces()); + resourceGroup.GetNetworkInterfaces()); // Create the LoadBalancer var lbName = Recording.GenerateAssetName("azsmnet"); @@ -186,7 +186,7 @@ public async Task ExpandResourceTest() }; // Create the loadBalancer - var loadBalancerContainer = resourceGroup.Value.GetLoadBalancers(); + var loadBalancerContainer = resourceGroup.GetLoadBalancers(); Operation putLoadBalancerOperation = await loadBalancerContainer.StartCreateOrUpdateAsync(lbName, loadBalancer); await putLoadBalancerOperation.WaitForCompletionAsync(); Response getLoadBalancer = await loadBalancerContainer.GetAsync(lbName); @@ -205,7 +205,7 @@ public async Task ExpandResourceTest() nic3.Data.IpConfigurations.First().LoadBalancerBackendAddressPools.Add(getLoadBalancer.Value.Data.BackendAddressPools.First()); // Put Nics - var networkInterfaceContainer = resourceGroup.Value.GetNetworkInterfaces(); + var networkInterfaceContainer = resourceGroup.GetNetworkInterfaces(); var createOrUpdateOperation1 = await networkInterfaceContainer.StartCreateOrUpdateAsync(nic1name, nic1.Data); await createOrUpdateOperation1.WaitForCompletionAsync(); @@ -269,7 +269,7 @@ public async Task ExpandResourceTest() } // Get subnet with expanded ipconfigurations - Response subnet = await resourceGroup.Value.GetVirtualNetworks().Get(vnetName).Value.GetSubnets().GetAsync( + Response subnet = await resourceGroup.GetVirtualNetworks().Get(vnetName).Value.GetSubnets().GetAsync( subnetName, "IPConfigurations"); @@ -282,7 +282,7 @@ public async Task ExpandResourceTest() } // Get publicIPAddress with expanded ipconfigurations - Response publicip = await resourceGroup.Value.GetPublicIPAddresses().GetAsync( + Response publicip = await resourceGroup.GetPublicIPAddresses().GetAsync( lbPublicIpName, "IPConfiguration"); @@ -307,7 +307,7 @@ public async Task ExpandResourceTest() await networkInterfaceContainer.Get(nic3name).Value.StartDeleteAsync(); // Delete all PublicIPAddresses - await resourceGroup.Value.GetPublicIPAddresses().Get(lbPublicIpName).Value.StartDeleteAsync(); + await resourceGroup.GetPublicIPAddresses().Get(lbPublicIpName).Value.StartDeleteAsync(); } } } diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/FlowLogTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/FlowLogTests.cs index 6cb651494011..62ada265d3ee 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/FlowLogTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/FlowLogTests.cs @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +#if false using System.Threading.Tasks; using Azure.Core.TestFramework; using Azure.ResourceManager.Resources; @@ -49,7 +50,7 @@ public async Task FlowLogApiTest() var networkSecurityGroup = new NetworkSecurityGroupData() { Location = location, }; // Put Nsg - var securityGroupContainer = resourceGroup.Value.GetNetworkSecurityGroups(); + var securityGroupContainer = resourceGroup.GetNetworkSecurityGroups(); var putNsgResponseOperation = await securityGroupContainer.StartCreateOrUpdateAsync(networkSecurityGroupName, networkSecurityGroup); await putNsgResponseOperation.WaitForCompletionAsync();; // Get NSG @@ -59,7 +60,7 @@ public async Task FlowLogApiTest() var properties = new NetworkWatcherData { Location = location }; //Create network Watcher - var networkWatcherContainer = resourceGroup.Value.GetNetworkWatchers(); + var networkWatcherContainer = resourceGroup.GetNetworkWatchers(); await networkWatcherContainer.CreateOrUpdateAsync(networkWatcherName, properties); //Create storage @@ -147,3 +148,4 @@ public async Task FlowLogApiTest() } } } +#endif diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/GatewayOperationsTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/GatewayOperationsTests.cs index 7ac8a7f54bf5..5806f102101f 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/GatewayOperationsTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/GatewayOperationsTests.cs @@ -193,7 +193,7 @@ public async Task LocalNettworkGatewayOperationsApisTest() } }; - var localNetworkGatewayContainer = resourceGroup.Value.GetLocalNetworkGateways(); + var localNetworkGatewayContainer = resourceGroup.GetLocalNetworkGateways(); var putLocalNetworkGatewayResponseOperation = await localNetworkGatewayContainer.StartCreateOrUpdateAsync(localNetworkGatewayName, localNetworkGateway); Response putLocalNetworkGatewayResponse = await putLocalNetworkGatewayResponseOperation.WaitForCompletionAsync(); Assert.AreEqual("Succeeded", putLocalNetworkGatewayResponse.Value.Data.ProvisioningState.ToString()); @@ -270,7 +270,7 @@ public async Task VirtualNetworkGatewayConnectionWithBgpTest() } }; - var localNetworkGatewayContainer = resourceGroup.Value.GetLocalNetworkGateways(); + var localNetworkGatewayContainer = resourceGroup.GetLocalNetworkGateways(); var putLocalNetworkGatewayResponseOperation = await localNetworkGatewayContainer.StartCreateOrUpdateAsync(localNetworkGatewayName, localNetworkGateway); Response putLocalNetworkGatewayResponse = await putLocalNetworkGatewayResponseOperation.WaitForCompletionAsync(); Assert.AreEqual("Succeeded", putLocalNetworkGatewayResponse.Value.Data.ProvisioningState.ToString()); @@ -281,15 +281,15 @@ public async Task VirtualNetworkGatewayConnectionWithBgpTest() string publicIpName = Recording.GenerateAssetName("azsmnet"); string domainNameLabel = Recording.GenerateAssetName("azsmnet"); - PublicIPAddress nic1publicIp = await CreateDefaultPublicIpAddress(publicIpName, domainNameLabel, location, resourceGroup.Value.GetPublicIPAddresses()); + PublicIPAddress nic1publicIp = await CreateDefaultPublicIpAddress(publicIpName, domainNameLabel, location, resourceGroup.GetPublicIPAddresses()); Console.WriteLine("PublicIPAddress(Gateway Ip) :{0}", nic1publicIp.Id); // b. Create Virtual Network using Put VirtualNetwork API string vnetName = Recording.GenerateAssetName("azsmnet"); string subnetName = "GatewaySubnet"; - await CreateVirtualNetwork(vnetName, subnetName, location,resourceGroup.Value.GetVirtualNetworks()); - Response getSubnetResponse = await resourceGroup.Value.GetVirtualNetworks().Get(vnetName).Value.GetSubnets().GetAsync(subnetName); + await CreateVirtualNetwork(vnetName, subnetName, location,resourceGroup.GetVirtualNetworks()); + Response getSubnetResponse = await resourceGroup.GetVirtualNetworks().Get(vnetName).Value.GetSubnets().GetAsync(subnetName); Console.WriteLine("Virtual Network GatewaySubnet Id: {0}", getSubnetResponse.Value.Id); //c. CreateVirtualNetworkGateway API (Also, Set Default local network site) @@ -332,7 +332,7 @@ public async Task VirtualNetworkGatewayConnectionWithBgpTest() } }; - var virtualNetworkGatewayContainer = resourceGroup.Value.GetVirtualNetworkGateways(); + var virtualNetworkGatewayContainer = resourceGroup.GetVirtualNetworkGateways(); var putVirtualNetworkGatewayResponseOperation = await virtualNetworkGatewayContainer.StartCreateOrUpdateAsync(virtualNetworkGatewayName, virtualNetworkGateway); Response putVirtualNetworkGatewayResponse = await putVirtualNetworkGatewayResponseOperation.WaitForCompletionAsync(); Assert.AreEqual("Succeeded", putVirtualNetworkGatewayResponse.Value.Data.ProvisioningState.ToString()); @@ -353,7 +353,7 @@ public async Task VirtualNetworkGatewayConnectionWithBgpTest() EnableBgp = true }; - var virtualNetworkGatewayConnectionContainer = resourceGroup.Value.GetVirtualNetworkGatewayConnections(); + var virtualNetworkGatewayConnectionContainer = resourceGroup.GetVirtualNetworkGatewayConnections(); var putVirtualNetworkGatewayConnectionResponseOperation = await virtualNetworkGatewayConnectionContainer.StartCreateOrUpdateAsync(VirtualNetworkGatewayConnectionName, virtualNetworkGatewayConneciton); Response putVirtualNetworkGatewayConnectionResponse = await putVirtualNetworkGatewayConnectionResponseOperation.WaitForCompletionAsync(); Assert.AreEqual("Succeeded", putVirtualNetworkGatewayConnectionResponse.Value.Data.ProvisioningState.ToString()); @@ -419,7 +419,7 @@ public async Task VirtualNetworkGatewayConnectionWithIpsecPoliciesTest() } }; - var localNetworkGatewayContainer = resourceGroup.Value.GetLocalNetworkGateways(); + var localNetworkGatewayContainer = resourceGroup.GetLocalNetworkGateways(); var putLocalNetworkGatewayResponseOperation = await localNetworkGatewayContainer.StartCreateOrUpdateAsync(localNetworkGatewayName, localNetworkGateway); Response putLocalNetworkGatewayResponse = await putLocalNetworkGatewayResponseOperation.WaitForCompletionAsync(); Assert.AreEqual("Succeeded", putLocalNetworkGatewayResponse.Value.Data.ProvisioningState.ToString()); @@ -430,15 +430,15 @@ public async Task VirtualNetworkGatewayConnectionWithIpsecPoliciesTest() string publicIpName = Recording.GenerateAssetName("azsmnet"); string domainNameLabel = Recording.GenerateAssetName("azsmnet"); - PublicIPAddress nic1publicIp = await CreateDefaultPublicIpAddress(publicIpName, domainNameLabel, location, resourceGroup.Value.GetPublicIPAddresses()); + PublicIPAddress nic1publicIp = await CreateDefaultPublicIpAddress(publicIpName, domainNameLabel, location, resourceGroup.GetPublicIPAddresses()); Console.WriteLine("PublicIPAddress(Gateway Ip) :{0}", nic1publicIp.Id); // b. Create Virtual Network using Put VirtualNetwork API string vnetName = Recording.GenerateAssetName("azsmnet"); string subnetName = "GatewaySubnet"; - await CreateVirtualNetwork(vnetName, subnetName, location, resourceGroup.Value.GetVirtualNetworks()); - Response getSubnetResponse = await resourceGroup.Value.GetVirtualNetworks().Get(vnetName).Value.GetSubnets().GetAsync(subnetName); + await CreateVirtualNetwork(vnetName, subnetName, location, resourceGroup.GetVirtualNetworks()); + Response getSubnetResponse = await resourceGroup.GetVirtualNetworks().Get(vnetName).Value.GetSubnets().GetAsync(subnetName); Console.WriteLine("Virtual Network GatewaySubnet Id: {0}", getSubnetResponse.Value.Id); //c. CreateVirtualNetworkGateway API (Also, Set Default local network site) @@ -475,7 +475,7 @@ public async Task VirtualNetworkGatewayConnectionWithIpsecPoliciesTest() } }; - var virtualNetworkGatewayContainer = resourceGroup.Value.GetVirtualNetworkGateways(); + var virtualNetworkGatewayContainer = resourceGroup.GetVirtualNetworkGateways(); var putVirtualNetworkGatewayResponseOperation = await virtualNetworkGatewayContainer.StartCreateOrUpdateAsync(virtualNetworkGatewayName, virtualNetworkGateway); Response putVirtualNetworkGatewayResponse = await putVirtualNetworkGatewayResponseOperation.WaitForCompletionAsync(); Assert.AreEqual("Succeeded", putVirtualNetworkGatewayResponse.Value.Data.ProvisioningState.ToString()); @@ -498,7 +498,7 @@ public async Task VirtualNetworkGatewayConnectionWithIpsecPoliciesTest() virtualNetworkGatewayConnection.UsePolicyBasedTrafficSelectors = true; - var virtualNetworkGatewayConnectionContainer = resourceGroup.Value.GetVirtualNetworkGatewayConnections(); + var virtualNetworkGatewayConnectionContainer = resourceGroup.GetVirtualNetworkGatewayConnections(); var putVirtualNetworkGatewayConnectionResponseOperation = await virtualNetworkGatewayConnectionContainer.StartCreateOrUpdateAsync(VirtualNetworkGatewayConnectionName, virtualNetworkGatewayConnection); Response putVirtualNetworkGatewayConnectionResponse = await putVirtualNetworkGatewayConnectionResponseOperation.WaitForCompletionAsync(); Assert.AreEqual("Succeeded", putVirtualNetworkGatewayConnectionResponse.Value.Data.ProvisioningState.ToString()); @@ -619,7 +619,7 @@ public async Task VirtualNetworkGatewayConnectionOperationsApisTest() } }; - var localNetworkGatewayContainer = resourceGroup.Value.GetLocalNetworkGateways(); + var localNetworkGatewayContainer = resourceGroup.GetLocalNetworkGateways(); var putLocalNetworkGatewayResponseOperation = await localNetworkGatewayContainer.StartCreateOrUpdateAsync(localNetworkGatewayName, localNetworkGateway); Response putLocalNetworkGatewayResponse = await putLocalNetworkGatewayResponseOperation.WaitForCompletionAsync(); Assert.AreEqual("Succeeded", putLocalNetworkGatewayResponse.Value.Data.ProvisioningState.ToString()); @@ -630,16 +630,16 @@ public async Task VirtualNetworkGatewayConnectionOperationsApisTest() string publicIpName = Recording.GenerateAssetName("azsmnet"); string domainNameLabel = Recording.GenerateAssetName("azsmnet"); - PublicIPAddress nic1publicIp = await CreateDefaultPublicIpAddress(publicIpName, domainNameLabel, location, resourceGroup.Value.GetPublicIPAddresses()); + PublicIPAddress nic1publicIp = await CreateDefaultPublicIpAddress(publicIpName, domainNameLabel, location, resourceGroup.GetPublicIPAddresses()); Console.WriteLine("PublicIPAddress(Gateway Ip) :{0}", nic1publicIp.Id); // b. Create Virtual Network using Put VirtualNetwork API string vnetName = Recording.GenerateAssetName("azsmnet"); string subnetName = "GatewaySubnet"; - await CreateVirtualNetwork(vnetName, subnetName, location, resourceGroup.Value.GetVirtualNetworks()); + await CreateVirtualNetwork(vnetName, subnetName, location, resourceGroup.GetVirtualNetworks()); - Response getSubnetResponse = await resourceGroup.Value.GetVirtualNetworks().Get(vnetName).Value.GetSubnets().GetAsync(subnetName); + Response getSubnetResponse = await resourceGroup.GetVirtualNetworks().Get(vnetName).Value.GetSubnets().GetAsync(subnetName); Console.WriteLine("Virtual Network GatewaySubnet Id: {0}", getSubnetResponse.Value.Id); //c. CreateVirtualNetworkGateway API (Also, Set Default local network site) @@ -675,7 +675,7 @@ public async Task VirtualNetworkGatewayConnectionOperationsApisTest() } }; - var virtualNetworkGatewayContainer = resourceGroup.Value.GetVirtualNetworkGateways(); + var virtualNetworkGatewayContainer = resourceGroup.GetVirtualNetworkGateways(); var putVirtualNetworkGatewayResponseOperation = await virtualNetworkGatewayContainer.StartCreateOrUpdateAsync(virtualNetworkGatewayName, virtualNetworkGateway); Response putVirtualNetworkGatewayResponse = await putVirtualNetworkGatewayResponseOperation.WaitForCompletionAsync(); Assert.AreEqual("Succeeded", putVirtualNetworkGatewayResponse.Value.Data.ProvisioningState.ToString()); @@ -695,7 +695,7 @@ public async Task VirtualNetworkGatewayConnectionOperationsApisTest() SharedKey = "abc" }; - var virtualNetworkGatewayConnectionContainer = resourceGroup.Value.GetVirtualNetworkGatewayConnections(); + var virtualNetworkGatewayConnectionContainer = resourceGroup.GetVirtualNetworkGatewayConnections(); var putVirtualNetworkGatewayConnectionResponseOperation = await virtualNetworkGatewayConnectionContainer.StartCreateOrUpdateAsync(VirtualNetworkGatewayConnectionName, virtualNetworkGatewayConneciton); Response putVirtualNetworkGatewayConnectionResponse = await putVirtualNetworkGatewayConnectionResponseOperation.WaitForCompletionAsync(); Assert.AreEqual("Succeeded", putVirtualNetworkGatewayConnectionResponse.Value.Data.ProvisioningState.ToString()); diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/LoadBalancerTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/LoadBalancerTests.cs index 200a58927498..c9e7296ed84a 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/LoadBalancerTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/LoadBalancerTests.cs @@ -51,7 +51,7 @@ public async Task LoadBalancerApiTestAsync() lbPublicIpName, lbDomaingNameLabel, location, - resourceGroup.Value.GetPublicIPAddresses()); + resourceGroup.GetPublicIPAddresses()); // Create the LoadBalancer string lbName = Recording.GenerateAssetName("azsmnet"); @@ -153,9 +153,9 @@ public async Task LoadBalancerApiTestAsync() }; // Create the loadBalancer - var putLoadBalancerOperation = await resourceGroup.Value.GetLoadBalancers().StartCreateOrUpdateAsync(lbName, loadBalancer); + var putLoadBalancerOperation = await resourceGroup.GetLoadBalancers().StartCreateOrUpdateAsync(lbName, loadBalancer); await putLoadBalancerOperation.WaitForCompletionAsync(); - Response getLoadBalancer = await resourceGroup.Value.GetLoadBalancers().GetAsync(lbName); + Response getLoadBalancer = await resourceGroup.GetLoadBalancers().GetAsync(lbName); // Verify the GET LoadBalancer Assert.AreEqual(lbName, getLoadBalancer.Value.Data.Name); @@ -185,7 +185,7 @@ public async Task LoadBalancerApiTestAsync() Assert.NotNull(getLoadBalancer.Value.Data.ResourceGuid); // Verify List LoadBalancer - AsyncPageable listLoadBalancerAP = resourceGroup.Value.GetLoadBalancers().GetAllAsync(); + AsyncPageable listLoadBalancerAP = resourceGroup.GetLoadBalancers().GetAllAsync(); List listLoadBalancer = await listLoadBalancerAP.ToEnumerableAsync(); Has.One.EqualTo(listLoadBalancer); Assert.AreEqual(lbName, listLoadBalancer.First().Data.Name); @@ -200,7 +200,7 @@ public async Task LoadBalancerApiTestAsync() Assert.NotNull(listLoadBalancerSubscription.First().Data.Etag); // Verify List BackendAddressPools in LoadBalancer - var backendAddressPoolContainer = resourceGroup.Value.GetLoadBalancers().Get(lbName).Value.GetBackendAddressPools(); + var backendAddressPoolContainer = resourceGroup.GetLoadBalancers().Get(lbName).Value.GetBackendAddressPools(); AsyncPageable listLoadBalancerBackendAddressPoolsAP = backendAddressPoolContainer.GetAllAsync(); List listLoadBalancerBackendAddressPools = await listLoadBalancerBackendAddressPoolsAP.ToEnumerableAsync(); Has.One.EqualTo(listLoadBalancerBackendAddressPools); @@ -213,7 +213,7 @@ public async Task LoadBalancerApiTestAsync() Assert.NotNull(getLoadBalancerBackendAddressPool.Value.Data.Etag); // Verify List FrontendIPConfigurations in LoadBalancer - var loadBalancerContainer = resourceGroup.Value.GetLoadBalancers(); + var loadBalancerContainer = resourceGroup.GetLoadBalancers(); var loadBalancerOperations = loadBalancerContainer.Get(lbName).Value; AsyncPageable listLoadBalancerFrontendIPConfigurationsAP = loadBalancerOperations.GetLoadBalancerFrontendIPConfigurationsAsync(); List listLoadBalancerFrontendIPConfigurations = await listLoadBalancerFrontendIPConfigurationsAP.ToEnumerableAsync(); @@ -327,7 +327,7 @@ public async Task LoadBalancerApiTestWithDynamicIp() string vnetName = Recording.GenerateAssetName("azsmnet"); string subnetName = Recording.GenerateAssetName("azsmnet"); - VirtualNetwork vnet = await CreateVirtualNetwork(vnetName, subnetName, location, resourceGroup.Value.GetVirtualNetworks()); + VirtualNetwork vnet = await CreateVirtualNetwork(vnetName, subnetName, location, resourceGroup.GetVirtualNetworks()); // Create the LoadBalancer string lbName = Recording.GenerateAssetName("azsmnet"); @@ -430,7 +430,7 @@ public async Task LoadBalancerApiTestWithDynamicIp() var putLoadBalancerOperation = await loadBalancerContainer.StartCreateOrUpdateAsync(lbName, loadbalancerparamater); await putLoadBalancerOperation.WaitForCompletionAsync(); ; - Response getLoadBalancer = await resourceGroup.Value.GetLoadBalancers().GetAsync(lbName); + Response getLoadBalancer = await resourceGroup.GetLoadBalancers().GetAsync(lbName); // Verify the GET LoadBalancer Assert.AreEqual(lbName, getLoadBalancer.Value.Data.Name); @@ -498,7 +498,7 @@ public async Task LoadBalancerApiTestWithStaticIp() string vnetName = Recording.GenerateAssetName("azsmnet"); string subnetName = Recording.GenerateAssetName("azsmnet"); - VirtualNetwork vnet = await CreateVirtualNetwork(vnetName, subnetName, location, resourceGroup.Value.GetVirtualNetworks()); + VirtualNetwork vnet = await CreateVirtualNetwork(vnetName, subnetName, location, resourceGroup.GetVirtualNetworks()); // Create the LoadBalancer string lbName = Recording.GenerateAssetName("azsmnet"); @@ -669,7 +669,7 @@ public async Task LoadBalancerApiTestWithDistributionPolicy() string vnetName = Recording.GenerateAssetName("azsmnet"); string subnetName = Recording.GenerateAssetName("azsmnet"); - VirtualNetwork vnet = await CreateVirtualNetwork(vnetName, subnetName, location, resourceGroup.Value.GetVirtualNetworks()); + VirtualNetwork vnet = await CreateVirtualNetwork(vnetName, subnetName, location, resourceGroup.GetVirtualNetworks()); // Create the LoadBalancer string lbName = Recording.GenerateAssetName("azsmnet"); @@ -766,7 +766,7 @@ public async Task LoadBalancerApiTestWithDistributionPolicy() }; // Create the loadBalancer - var loadBalancerContainer = resourceGroup.Value.GetLoadBalancers(); + var loadBalancerContainer = resourceGroup.GetLoadBalancers(); await loadBalancerContainer.StartCreateOrUpdateAsync(lbName, loadbalancerparamater); Response getLoadBalancer = await loadBalancerContainer.GetAsync(lbName); @@ -845,7 +845,7 @@ public async Task CreateEmptyLoadBalancer() var loadbalancerparamater = new LoadBalancerData() { Location = location, }; // Create the loadBalancer - var loadBalancerContainer = resourceGroup.Value.GetLoadBalancers(); + var loadBalancerContainer = resourceGroup.GetLoadBalancers(); var putLoadBalancerOperation = await loadBalancerContainer.StartCreateOrUpdateAsync(lbname, loadbalancerparamater); await putLoadBalancerOperation.WaitForCompletionAsync(); ; @@ -882,7 +882,7 @@ public async Task UpdateLoadBalancerRule() string vnetName = Recording.GenerateAssetName("azsmnet"); string subnetName = Recording.GenerateAssetName("azsmnet"); - VirtualNetwork vnet = await CreateVirtualNetwork(vnetName, subnetName, location, resourceGroup.Value.GetVirtualNetworks()); + VirtualNetwork vnet = await CreateVirtualNetwork(vnetName, subnetName, location, resourceGroup.GetVirtualNetworks()); // Create the LoadBalancer with an lb rule and no probe string lbname = Recording.GenerateAssetName("azsmnet"); @@ -933,7 +933,7 @@ public async Task UpdateLoadBalancerRule() }; // Create the loadBalancer - var loadBalancerContainer = resourceGroup.Value.GetLoadBalancers(); + var loadBalancerContainer = resourceGroup.GetLoadBalancers(); await loadBalancerContainer.StartCreateOrUpdateAsync(lbname, loadbalancerparamater); Response getLoadBalancer = await loadBalancerContainer.GetAsync(lbname); @@ -1005,22 +1005,22 @@ public async Task LoadBalancerApiNicAssociationTest() string lbPublicIpName = Recording.GenerateAssetName("azsmnet"); string lbDomaingNameLabel = Recording.GenerateAssetName("azsmnet"); - PublicIPAddress lbPublicIp = await CreateDefaultPublicIpAddress(lbPublicIpName, lbDomaingNameLabel, location, resourceGroup.Value.GetPublicIPAddresses()); + PublicIPAddress lbPublicIp = await CreateDefaultPublicIpAddress(lbPublicIpName, lbDomaingNameLabel, location, resourceGroup.GetPublicIPAddresses()); // Create Vnet string vnetName = Recording.GenerateAssetName("azsmnet"); string subnetName = Recording.GenerateAssetName("azsmnet"); - VirtualNetwork vnet = await CreateVirtualNetwork(vnetName, subnetName, location, resourceGroup.Value.GetVirtualNetworks()); + VirtualNetwork vnet = await CreateVirtualNetwork(vnetName, subnetName, location, resourceGroup.GetVirtualNetworks()); // Create Nics string nic1name = Recording.GenerateAssetName("azsmnet"); string nic2name = Recording.GenerateAssetName("azsmnet"); string nic3name = Recording.GenerateAssetName("azsmnet"); - NetworkInterface nic1 = await CreateNetworkInterface(nic1name, null, vnet.Data.Subnets[0].Id, location, "ipconfig", resourceGroup.Value.GetNetworkInterfaces()); - NetworkInterface nic2 = await CreateNetworkInterface(nic2name, null, vnet.Data.Subnets[0].Id, location, "ipconfig", resourceGroup.Value.GetNetworkInterfaces()); - NetworkInterface nic3 = await CreateNetworkInterface(nic3name, null, vnet.Data.Subnets[0].Id, location, "ipconfig", resourceGroup.Value.GetNetworkInterfaces()); + NetworkInterface nic1 = await CreateNetworkInterface(nic1name, null, vnet.Data.Subnets[0].Id, location, "ipconfig", resourceGroup.GetNetworkInterfaces()); + NetworkInterface nic2 = await CreateNetworkInterface(nic2name, null, vnet.Data.Subnets[0].Id, location, "ipconfig", resourceGroup.GetNetworkInterfaces()); + NetworkInterface nic3 = await CreateNetworkInterface(nic3name, null, vnet.Data.Subnets[0].Id, location, "ipconfig", resourceGroup.GetNetworkInterfaces()); // Create the LoadBalancer string lbName = Recording.GenerateAssetName("azsmnet"); @@ -1121,7 +1121,7 @@ public async Task LoadBalancerApiNicAssociationTest() }; // Create the loadBalancer - var loadBalancerContainer = resourceGroup.Value.GetLoadBalancers(); + var loadBalancerContainer = resourceGroup.GetLoadBalancers(); var putLoadBalancerOperation = await loadBalancerContainer.StartCreateOrUpdateAsync(lbName, loadBalancer); await putLoadBalancerOperation.WaitForCompletionAsync(); ; @@ -1134,7 +1134,7 @@ public async Task LoadBalancerApiNicAssociationTest() nic2.Data.IpConfigurations.First().LoadBalancerInboundNatRules.Add(getLoadBalancer.Value.Data.InboundNatRules[1]); // Put Nics - var networkInterfaceContainer = resourceGroup.Value.GetNetworkInterfaces(); + var networkInterfaceContainer = resourceGroup.GetNetworkInterfaces(); var nic1Operation = await networkInterfaceContainer.StartCreateOrUpdateAsync(nic1name, nic1.Data); await nic1Operation.WaitForCompletionAsync(); @@ -1191,7 +1191,7 @@ public async Task LoadBalancerNatPoolTest() string lbPublicIpName = Recording.GenerateAssetName("azsmnet"); string lbDomaingNameLabel = Recording.GenerateAssetName("azsmnet"); - PublicIPAddress lbPublicIp = await CreateDefaultPublicIpAddress(lbPublicIpName, lbDomaingNameLabel, location, resourceGroup.Value.GetPublicIPAddresses()); + PublicIPAddress lbPublicIp = await CreateDefaultPublicIpAddress(lbPublicIpName, lbDomaingNameLabel, location, resourceGroup.GetPublicIPAddresses()); // Create the LoadBalancer string lbName = Recording.GenerateAssetName("azsmnet"); @@ -1230,7 +1230,7 @@ public async Task LoadBalancerNatPoolTest() }; // Create the loadBalancer - var loadBalancerContainer = resourceGroup.Value.GetLoadBalancers(); + var loadBalancerContainer = resourceGroup.GetLoadBalancers(); await loadBalancerContainer.StartCreateOrUpdateAsync(lbName, loadBalancer); Response getLoadBalancer = await loadBalancerContainer.GetAsync(lbName); diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/NetworkInterfaceTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/NetworkInterfaceTests.cs index 955a39d29002..5f7ba2c65e71 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/NetworkInterfaceTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/NetworkInterfaceTests.cs @@ -62,7 +62,7 @@ public async Task NetworkInterfaceApiTest() }; // Put PublicIPAddress - var publicIPAddressContainer = resourceGroup.Value.GetPublicIPAddresses(); + var publicIPAddressContainer = resourceGroup.GetPublicIPAddresses(); var putPublicIpAddressResponseOperation = await publicIPAddressContainer.StartCreateOrUpdateAsync(publicIpName, publicIp); Response putPublicIpAddressResponse = await putPublicIpAddressResponseOperation.WaitForCompletionAsync(); ; @@ -90,7 +90,7 @@ public async Task NetworkInterfaceApiTest() Subnets = { new SubnetData() { Name = subnetName, AddressPrefix = "10.0.0.0/24" } } }; - var virtualNetworkContainer = resourceGroup.Value.GetVirtualNetworks(); + var virtualNetworkContainer = resourceGroup.GetVirtualNetworks(); var putVnetResponseOperation = await virtualNetworkContainer.StartCreateOrUpdateAsync(vnetName, vnet); var vnetResponse = await putVnetResponseOperation.WaitForCompletionAsync(); ; @@ -122,7 +122,7 @@ public async Task NetworkInterfaceApiTest() }; // Test NIC apis - var networkInterfaceContainer = resourceGroup.Value.GetNetworkInterfaces(); + var networkInterfaceContainer = resourceGroup.GetNetworkInterfaces(); var putNicResponseOperation = await networkInterfaceContainer.StartCreateOrUpdateAsync(nicName, nicParameters); await putNicResponseOperation.WaitForCompletionAsync(); ; @@ -141,7 +141,7 @@ public async Task NetworkInterfaceApiTest() Assert.NotNull(getNicResponse.Value.Data.ResourceGuid); // Verify List IpConfigurations in NetworkInterface - var networkInterfaceOperations = resourceGroup.Value.GetNetworkInterfaces().Get(nicName).Value; + var networkInterfaceOperations = resourceGroup.GetNetworkInterfaces().Get(nicName).Value; AsyncPageable listNicIpConfigurationsAP = networkInterfaceOperations.GetNetworkInterfaceIPConfigurationsAsync(); List listNicIpConfigurations = await listNicIpConfigurationsAP.ToEnumerableAsync(); Assert.AreEqual(ipConfigName, listNicIpConfigurations.First().Name); @@ -218,7 +218,7 @@ public async Task NetworkInterfaceWithAcceleratedNetworkingTest() } }; - var virtualNetworkContainer = resourceGroup.Value.GetVirtualNetworks(); + var virtualNetworkContainer = resourceGroup.GetVirtualNetworks(); var putVnetResponseOperation = await virtualNetworkContainer.StartCreateOrUpdateAsync(vnetName, vnet); await putVnetResponseOperation.WaitForCompletionAsync(); ; @@ -250,7 +250,7 @@ public async Task NetworkInterfaceWithAcceleratedNetworkingTest() }; // Test NIC apis - var networkInterfaceContainer = resourceGroup.Value.GetNetworkInterfaces(); + var networkInterfaceContainer = resourceGroup.GetNetworkInterfaces(); var putNicResponseOperation = await networkInterfaceContainer.StartCreateOrUpdateAsync(nicName, nicParameters); await putNicResponseOperation.WaitForCompletionAsync(); ; @@ -296,7 +296,7 @@ public async Task NetworkInterfaceMultiIpConfigTest() }; // Put PublicIPAddress - var publicIPAddressContainer = resourceGroup.Value.GetPublicIPAddresses(); + var publicIPAddressContainer = resourceGroup.GetPublicIPAddresses(); var putPublicIpAddressResponseOperation = await publicIPAddressContainer.StartCreateOrUpdateAsync(publicIpName, publicIp); Response putPublicIpAddressResponse = await putPublicIpAddressResponseOperation.WaitForCompletionAsync(); ; @@ -323,7 +323,7 @@ public async Task NetworkInterfaceMultiIpConfigTest() Subnets = { new SubnetData() { Name = subnetName, AddressPrefix = "10.0.0.0/24" } } }; - var virtualNetworkContainer = resourceGroup.Value.GetVirtualNetworks(); + var virtualNetworkContainer = resourceGroup.GetVirtualNetworks(); var putVnetResponseOperation = await virtualNetworkContainer.StartCreateOrUpdateAsync(vnetName, vnet); await putVnetResponseOperation.WaitForCompletionAsync(); ; @@ -367,7 +367,7 @@ public async Task NetworkInterfaceMultiIpConfigTest() }; // Test NIC apis - var networkInterfaceContainer = resourceGroup.Value.GetNetworkInterfaces(); + var networkInterfaceContainer = resourceGroup.GetNetworkInterfaces(); var putNicResponseOperation = await networkInterfaceContainer.StartCreateOrUpdateAsync(nicName, nicParameters); await putNicResponseOperation.WaitForCompletionAsync(); ; @@ -441,7 +441,7 @@ public async Task AssertMultiIpConfigOnDifferentSubnetFails() } }; - var virtualNetworkContainer = resourceGroup.Value.GetVirtualNetworks(); + var virtualNetworkContainer = resourceGroup.GetVirtualNetworks(); var putVnetResponseOperation = await virtualNetworkContainer.StartCreateOrUpdateAsync(vnetName, vnet); await putVnetResponseOperation.WaitForCompletionAsync(); ; @@ -484,7 +484,7 @@ public async Task AssertMultiIpConfigOnDifferentSubnetFails() try { // Test NIC apis - var putNicResponseOperation = await resourceGroup.Value.GetNetworkInterfaces().StartCreateOrUpdateAsync(nicName, nicParameters); + var putNicResponseOperation = await resourceGroup.GetNetworkInterfaces().StartCreateOrUpdateAsync(nicName, nicParameters); Response putNicResponse = await putNicResponseOperation.WaitForCompletionAsync(); ; } @@ -515,7 +515,7 @@ public async Task NetworkInterfaceDnsSettingsTest() Subnets = { new SubnetData() { Name = subnetName, AddressPrefix = "10.0.0.0/24", } } }; - var virtualNetworkContainer = resourceGroup.Value.GetVirtualNetworks(); + var virtualNetworkContainer = resourceGroup.GetVirtualNetworks(); var putVnetResponseOperation = await virtualNetworkContainer.StartCreateOrUpdateAsync(vnetName, vnet); await putVnetResponseOperation.WaitForCompletionAsync(); ; @@ -548,7 +548,7 @@ public async Task NetworkInterfaceDnsSettingsTest() }; // Test NIC apis - var networkInterfaceContainer = resourceGroup.Value.GetNetworkInterfaces(); + var networkInterfaceContainer = resourceGroup.GetNetworkInterfaces(); var putNicResponseOperation = await networkInterfaceContainer.StartCreateOrUpdateAsync(nicName, nicParameters); await putNicResponseOperation.WaitForCompletionAsync(); ; @@ -604,7 +604,7 @@ public async Task NetworkInterfaceApiIPv6MultiCATest() }; // Put PublicIPAddress - var publicIPAddressContainer = resourceGroup.Value.GetPublicIPAddresses(); + var publicIPAddressContainer = resourceGroup.GetPublicIPAddresses(); var putPublicIpAddressResponseOperation = await publicIPAddressContainer.StartCreateOrUpdateAsync(publicIpName, publicIp); Response putPublicIpAddressResponse = await putPublicIpAddressResponseOperation.WaitForCompletionAsync(); ; @@ -632,7 +632,7 @@ public async Task NetworkInterfaceApiIPv6MultiCATest() Subnets = { new SubnetData() { Name = subnetName, AddressPrefix = "10.0.0.0/24" } } }; - var virtualNetworkContainer = resourceGroup.Value.GetVirtualNetworks(); + var virtualNetworkContainer = resourceGroup.GetVirtualNetworks(); var putVnetResponseOperation = await virtualNetworkContainer.StartCreateOrUpdateAsync(vnetName, vnet); await putVnetResponseOperation.WaitForCompletionAsync(); ; @@ -681,7 +681,7 @@ public async Task NetworkInterfaceApiIPv6MultiCATest() }; // Test NIC apis - var networkInterfaceContainer = resourceGroup.Value.GetNetworkInterfaces(); + var networkInterfaceContainer = resourceGroup.GetNetworkInterfaces(); var putNicResponseOperation = await networkInterfaceContainer.StartCreateOrUpdateAsync(nicName, nicParameters); await putNicResponseOperation.WaitForCompletionAsync(); ; @@ -751,7 +751,7 @@ public async Task NetworkInterfaceDnsSettingsTestIdnsSuffix() Subnets = { new SubnetData() { Name = subnetName, AddressPrefix = "10.0.0.0/24" } } }; - var virtualNetworkContainer = resourceGroup.Value.GetVirtualNetworks(); + var virtualNetworkContainer = resourceGroup.GetVirtualNetworks(); var putVnetResponseOperation = await virtualNetworkContainer.StartCreateOrUpdateAsync(vnetName, vnet); await putVnetResponseOperation.WaitForCompletionAsync(); ; @@ -785,7 +785,7 @@ public async Task NetworkInterfaceDnsSettingsTestIdnsSuffix() }; // Test NIC apis - var networkInterfaceContainer = resourceGroup.Value.GetNetworkInterfaces(); + var networkInterfaceContainer = resourceGroup.GetNetworkInterfaces(); var putNicResponseOperation = await networkInterfaceContainer.StartCreateOrUpdateAsync(nicName, nicParameters); await putNicResponseOperation.WaitForCompletionAsync(); ; @@ -838,7 +838,7 @@ public async Task NetworkInterfaceEnableIPForwardingTest() Subnets = { new SubnetData() { Name = subnetName, AddressPrefix = "10.0.0.0/24", } } }; - var virtualNetworkContainer = resourceGroup.Value.GetVirtualNetworks(); + var virtualNetworkContainer = resourceGroup.GetVirtualNetworks(); var putVnetResponseOperation = await virtualNetworkContainer.StartCreateOrUpdateAsync(vnetName, vnet); await putVnetResponseOperation.WaitForCompletionAsync(); ; @@ -867,7 +867,7 @@ public async Task NetworkInterfaceEnableIPForwardingTest() }; // Test NIC apis - var networkInterfaceContainer = resourceGroup.Value.GetNetworkInterfaces(); + var networkInterfaceContainer = resourceGroup.GetNetworkInterfaces(); var putNicResponseOperation = await networkInterfaceContainer.StartCreateOrUpdateAsync(nicName, nicParameters); await putNicResponseOperation.WaitForCompletionAsync(); ; @@ -920,7 +920,7 @@ public async Task NetworkInterfaceNetworkSecurityGroupTest() Subnets = { new SubnetData() { Name = subnetName, AddressPrefix = "10.0.0.0/24", } } }; - var virtualNetworkContainer = resourceGroup.Value.GetVirtualNetworks(); + var virtualNetworkContainer = resourceGroup.GetVirtualNetworks(); var putVnetResponseOperation = await virtualNetworkContainer.StartCreateOrUpdateAsync(vnetName, vnet); Response putVnetResponse = await putVnetResponseOperation.WaitForCompletionAsync(); ; @@ -947,7 +947,7 @@ public async Task NetworkInterfaceNetworkSecurityGroupTest() }; // Put Nsg - var networkSecurityGroupContainer = resourceGroup.Value.GetNetworkSecurityGroups(); + var networkSecurityGroupContainer = resourceGroup.GetNetworkSecurityGroups(); var putNsgResponseOperation = await networkSecurityGroupContainer.StartCreateOrUpdateAsync(networkSecurityGroupName, networkSecurityGroup); Response putNsgResponse = await putNsgResponseOperation.WaitForCompletionAsync(); ; @@ -976,7 +976,7 @@ public async Task NetworkInterfaceNetworkSecurityGroupTest() }; // Test NIC apis - var networkInterfaceContainer = resourceGroup.Value.GetNetworkInterfaces(); + var networkInterfaceContainer = resourceGroup.GetNetworkInterfaces(); var putNicResponseOperation = await networkInterfaceContainer.StartCreateOrUpdateAsync(nicName, nicParameters); await putNicResponseOperation.WaitForCompletionAsync(); ; @@ -1027,7 +1027,7 @@ public async Task NetworkInterfaceEffectiveNetworkSecurityGroupTest() Subnets = { new SubnetData() { Name = subnetName, AddressPrefix = "10.0.0.0/24", } } }; - var virtualNetworkContainer = resourceGroup.Value.GetVirtualNetworks(); + var virtualNetworkContainer = resourceGroup.GetVirtualNetworks(); var putVnetResponseOperation = await virtualNetworkContainer.StartCreateOrUpdateAsync(vnetName, vnet); Response putVnetResponse = await putVnetResponseOperation.WaitForCompletionAsync(); ; @@ -1054,7 +1054,7 @@ public async Task NetworkInterfaceEffectiveNetworkSecurityGroupTest() }; // Put Nsg - var networkSecurityGroupContainer = resourceGroup.Value.GetNetworkSecurityGroups(); + var networkSecurityGroupContainer = resourceGroup.GetNetworkSecurityGroups(); var putNsgResponseOperation = await networkSecurityGroupContainer.StartCreateOrUpdateAsync(networkSecurityGroupName, networkSecurityGroup); Response putNsgResponse = await putNsgResponseOperation.WaitForCompletionAsync(); ; @@ -1083,7 +1083,7 @@ public async Task NetworkInterfaceEffectiveNetworkSecurityGroupTest() }; // Test NIC apis - var networkInterfaceContainer = resourceGroup.Value.GetNetworkInterfaces(); + var networkInterfaceContainer = resourceGroup.GetNetworkInterfaces(); var putNicResponseOperation = await networkInterfaceContainer.StartCreateOrUpdateAsync(nicName, nicParameters); await putNicResponseOperation.WaitForCompletionAsync(); ; @@ -1145,7 +1145,7 @@ public async Task NetworkInterfaceEffectiveRouteTableTest() routeTable.Routes.Add(route1); // Put RouteTable - var routeTableContainer = resourceGroup.Value.GetRouteTables(); + var routeTableContainer = resourceGroup.GetRouteTables(); var putRouteTableResponseOperation = await routeTableContainer.StartCreateOrUpdateAsync(routeTableName, routeTable); Response putRouteTableResponse = await putRouteTableResponseOperation.WaitForCompletionAsync(); ; @@ -1159,7 +1159,7 @@ public async Task NetworkInterfaceEffectiveRouteTableTest() Subnets = { new SubnetData() { Name = subnetName, AddressPrefix = "10.0.0.0/24", RouteTable = putRouteTableResponse.Value.Data } } }; - var virtualNetworkContainer = resourceGroup.Value.GetVirtualNetworks(); + var virtualNetworkContainer = resourceGroup.GetVirtualNetworks(); var putVnetResponseOperation = await virtualNetworkContainer.StartCreateOrUpdateAsync(vnetName, vnet); Response putVnetResponse = await putVnetResponseOperation.WaitForCompletionAsync(); ; @@ -1185,7 +1185,7 @@ public async Task NetworkInterfaceEffectiveRouteTableTest() }; // Test NIC apis - var networkInterfaceContainer = resourceGroup.Value.GetNetworkInterfaces(); + var networkInterfaceContainer = resourceGroup.GetNetworkInterfaces(); var putNicResponseOperation = await networkInterfaceContainer.StartCreateOrUpdateAsync(nicName, nicParameters); await putNicResponseOperation.WaitForCompletionAsync(); ; diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/NetworkSecurityGroupTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/NetworkSecurityGroupTests.cs index a6d5f386f8d2..a8a249262ca2 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/NetworkSecurityGroupTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/NetworkSecurityGroupTests.cs @@ -46,7 +46,7 @@ public async Task NetworkSecurityGroupApiTest() var networkSecurityGroup = new NetworkSecurityGroupData() { Location = location, }; // Put Nsg - var networkSecurityGroupContainer = resourceGroup.Value.GetNetworkSecurityGroups(); + var networkSecurityGroupContainer = resourceGroup.GetNetworkSecurityGroups(); var putNsgResponseOperation = await networkSecurityGroupContainer.StartCreateOrUpdateAsync(networkSecurityGroupName, networkSecurityGroup); Response putNsgResponse = await putNsgResponseOperation.WaitForCompletionAsync();; Assert.AreEqual("Succeeded", putNsgResponse.Value.Data.ProvisioningState.ToString()); @@ -137,7 +137,7 @@ public async Task NetworkSecurityGroupWithRulesApiTest() }; // Put Nsg - var networkSecurityGroupContainer = resourceGroup.Value.GetNetworkSecurityGroups(); + var networkSecurityGroupContainer = resourceGroup.GetNetworkSecurityGroups(); var putNsgResponseOperation = await networkSecurityGroupContainer.StartCreateOrUpdateAsync(networkSecurityGroupName, networkSecurityGroup); Response putNsgResponse = await putNsgResponseOperation.WaitForCompletionAsync();; Assert.AreEqual("Succeeded", putNsgResponse.Value.Data.ProvisioningState.ToString()); diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/NetworkWatcherTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/NetworkWatcherTests.cs index e73606a20c04..cbb75d4e8ca2 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/NetworkWatcherTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/NetworkWatcherTests.cs @@ -46,7 +46,7 @@ public async Task ClearChallengeCacheforRecord() private async Task GetContainer() { var resourceGroup = await CreateResourceGroup(Recording.GenerateAssetName("nw")); - return resourceGroup.Value.GetNetworkWatchers(); + return resourceGroup.GetNetworkWatchers(); } [Test] diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/NextHopTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/NextHopTests.cs index 32cf89545989..106750794f81 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/NextHopTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/NextHopTests.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Threading.Tasks; using Azure.Core.TestFramework; -using Azure.ResourceManager.Compute.Models; using Azure.ResourceManager.Resources; using Azure.ResourceManager.Resources.Models; using Azure.ResourceManager.Network.Models; @@ -36,28 +35,19 @@ public void ClearChallengeCacheforRecord() //} [Test] + [RecordedTest] public async Task NextHopApiTest() { string resourceGroupName = Recording.GenerateAssetName("azsmnet"); string location = "westus2"; - ResourceGroup rg = await ArmClient.DefaultSubscription.GetResourceGroups().CreateOrUpdateAsync(resourceGroupName, new ResourceGroupData(location)); + var resourceGroup = await CreateResourceGroup(resourceGroupName, location); string virtualMachineName = Recording.GenerateAssetName("azsmnet"); string networkSecurityGroupName = virtualMachineName + "-nsg"; string networkInterfaceName = Recording.GenerateAssetName("azsmnet"); //Deploy VM wih VNet,Subnet and Route Table from template - VirtualMachine vm = await CreateVm( - resourceGroupName: resourceGroupName, - location: location, - virtualMachineName: virtualMachineName, - storageAccountName: Recording.GenerateAssetName("azsmnet"), - networkInterfaceName: networkInterfaceName, - networkSecurityGroupName: networkSecurityGroupName, - diagnosticsStorageAccountName: Recording.GenerateAssetName("azsmnet"), - deploymentName: Recording.GenerateAssetName("azsmnet"), - adminPassword: Recording.GenerateAlphaNumericId("AzureSDKNetworkTest#") - ); + var vm = await CreateLinuxVM(virtualMachineName, networkInterfaceName, location, resourceGroup); //TODO:There is no need to perform a separate create NetworkWatchers operation //Create Network Watcher @@ -65,7 +55,7 @@ public async Task NextHopApiTest() //NetworkWatcher properties = new NetworkWatcher { Location = location }; //await networkWatcherContainer.CreateOrUpdateAsync(resourceGroupName, networkWatcherName, properties); - var networkInterfaceContainer = GetNetworkInterfaceContainer(resourceGroupName); + var networkInterfaceContainer = resourceGroup.GetNetworkInterfaces(); string sourceIPAddress = networkInterfaceContainer .GetAsync(networkInterfaceName).Result.Value.Data.IpConfigurations .FirstOrDefault().PrivateIPAddress; @@ -75,7 +65,7 @@ public async Task NextHopApiTest() NextHopParameters nhProperties2 = new NextHopParameters(vm.Id, sourceIPAddress, "12.11.12.14"); - var networkWatcherContainer = GetNetworkWatcherContainer(resourceGroupName); + var networkWatcherContainer = resourceGroup.GetNetworkWatchers(); var networkWatcherResponse = await networkWatcherContainer.GetAsync("NetworkWatcher_westus2"); var getNextHop1Operation = await networkWatcherResponse.Value.StartGetNextHopAsync(nhProperties1); Response getNextHop1 = await getNextHop1Operation.WaitForCompletionAsync();; @@ -83,7 +73,7 @@ public async Task NextHopApiTest() var getNextHop2Operation = await networkWatcherResponse.Value.StartGetNextHopAsync(nhProperties2); Response getNextHop2 = await getNextHop2Operation.WaitForCompletionAsync();; - Response routeTable = await GetRouteTableContainer(resourceGroupName).GetAsync(resourceGroupName + "RT"); + Response routeTable = await resourceGroup.GetRouteTables().GetAsync(resourceGroupName + "RT"); //Validation Assert.AreEqual("10.0.1.2", getNextHop1.Value.NextHopIpAddress); diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/PacketCaptureTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/PacketCaptureTests.cs index 71663eb6dd19..9d25057dc49b 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/PacketCaptureTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/PacketCaptureTests.cs @@ -37,28 +37,19 @@ public void ClearChallengeCacheforRecord() //} [Test] + [RecordedTest] public async Task PacketCaptureApiTest() { string resourceGroupName = Recording.GenerateAssetName("azsmnet"); string location = "westus2"; - ResourceGroup rg = await ArmClient.DefaultSubscription.GetResourceGroups().CreateOrUpdateAsync(resourceGroupName, new ResourceGroupData(location)); + var resourceGroup = await CreateResourceGroup(resourceGroupName, location); string virtualMachineName = Recording.GenerateAssetName("azsmnet"); string networkInterfaceName = Recording.GenerateAssetName("azsmnet"); string networkSecurityGroupName = virtualMachineName + "-nsg"; //Deploy VM with template - VirtualMachine vm = await CreateVm( - resourceGroupName: resourceGroupName, - location: location, - virtualMachineName: virtualMachineName, - storageAccountName: Recording.GenerateAssetName("azsmnet"), - networkInterfaceName: networkInterfaceName, - networkSecurityGroupName: networkSecurityGroupName, - diagnosticsStorageAccountName: Recording.GenerateAssetName("azsmnet"), - deploymentName: Recording.GenerateAssetName("azsmnet"), - adminPassword: Recording.GenerateAlphaNumericId("AzureSDKNetworkTest#") - ); + var vm = await CreateWindowsVM(virtualMachineName, networkInterfaceName, location, resourceGroup); //Deploy networkWatcherAgent on VM VirtualMachineExtensionData parameters = new VirtualMachineExtensionData(location) diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/PrivateEndpointTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/PrivateEndpointTests.cs index 9df25dab9dae..118f6ab457cc 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/PrivateEndpointTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/PrivateEndpointTests.cs @@ -29,7 +29,7 @@ public async Task ClearChallengeCacheforRecord() { Initialize(); } - resourceGroup = (await CreateResourceGroup(Recording.GenerateAssetName("pe_rg"))).Value; + resourceGroup = (await CreateResourceGroup(Recording.GenerateAssetName("pe_rg"))); } // TODO: create it through resource management, or we can instrutment ArmClient? diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/PrivateLinkServicesTest.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/PrivateLinkServicesTest.cs index 98dd3bdf1d0a..e21387f70ced 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/PrivateLinkServicesTest.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/PrivateLinkServicesTest.cs @@ -33,11 +33,11 @@ public void ClearChallengeCacheforRecord() //} [Test] + [RecordedTest] + [Ignore("Investigate how we can do this right later")] public async Task CheckPrivateLinkServiceVisibilityTest() { - string resourceGroupName = Recording.GenerateAssetName("cplsrg"); - string location = await NetworkManagementTestUtilities.GetResourceLocation(ArmClient, "Microsoft.Network/connections"); - ResourceGroup rg = await ArmClient.DefaultSubscription.GetResourceGroups().CreateOrUpdateAsync(resourceGroupName, new ResourceGroupData(location)); + var resourceGroup = await CreateResourceGroup(Recording.GenerateAssetName("cplsrg")); var param = new CheckPrivateLinkServiceVisibilityRequest() { PrivateLinkServiceAlias = "mypls.00000000-0000-0000-0000-000000000000.azure.privatelinkservice" diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/PublicIpAddressTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/PublicIpAddressTests.cs index 35d2901197f1..47a8dd57aff3 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/PublicIpAddressTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/PublicIpAddressTests.cs @@ -58,7 +58,7 @@ public async Task PublicIpAddressApiTest() }; // Put PublicIPAddress - var publicIPAddressContainer = resourceGroup.Value.GetPublicIPAddresses(); + var publicIPAddressContainer = resourceGroup.GetPublicIPAddresses(); var putPublicIpAddressResponseOperation = await publicIPAddressContainer.StartCreateOrUpdateAsync(publicIpName, publicIp); Response putPublicIpAddressResponse = await putPublicIpAddressResponseOperation.WaitForCompletionAsync();; Assert.AreEqual("Succeeded", putPublicIpAddressResponse.Value.Data.ProvisioningState.ToString()); @@ -94,7 +94,6 @@ public async Task PublicIpAddressApiTestWithIdletTimeoutAndReverseFqdn() { string resourceGroupName = Recording.GenerateAssetName("csmrg"); - string location = await ResourcesManagementTestUtilities.GetResourceLocation(ArmClient, "Microsoft.Network/publicIPAddresses"); var resourceGroup = await CreateResourceGroup(resourceGroupName); // Create the parameter for PUT PublicIPAddress @@ -104,7 +103,7 @@ public async Task PublicIpAddressApiTestWithIdletTimeoutAndReverseFqdn() var publicIp = new PublicIPAddressData() { - Location = location, + Location = TestEnvironment.Location, Tags = { { "key", "value" } }, PublicIPAllocationMethod = IPAllocationMethod.Dynamic, DnsSettings = new PublicIPAddressDnsSettings() { DomainNameLabel = domainNameLabel, }, @@ -112,7 +111,7 @@ public async Task PublicIpAddressApiTestWithIdletTimeoutAndReverseFqdn() }; // Put PublicIPAddress - var publicIPAddressContainer = resourceGroup.Value.GetPublicIPAddresses(); + var publicIPAddressContainer = resourceGroup.GetPublicIPAddresses(); var putPublicIpAddressResponseOperation = await publicIPAddressContainer.StartCreateOrUpdateAsync(publicIpName, publicIp); Response putPublicIpAddressResponse = await putPublicIpAddressResponseOperation.WaitForCompletionAsync();; Assert.AreEqual("Succeeded", putPublicIpAddressResponse.Value.Data.ProvisioningState.ToString()); @@ -159,7 +158,6 @@ public async Task PublicIpAddressApiTestIPv6() { string resourceGroupName = Recording.GenerateAssetName("csmrg"); - string location = await ResourcesManagementTestUtilities.GetResourceLocation(ArmClient, "Microsoft.Network/publicIPAddresses"); var resourceGroup = await CreateResourceGroup(resourceGroupName); // Create the parameter for PUT PublicIPAddress @@ -168,7 +166,7 @@ public async Task PublicIpAddressApiTestIPv6() var ipv6PublicIp = new PublicIPAddressData() { - Location = location, + Location = TestEnvironment.Location, Tags = { { "key", "value" } }, PublicIPAllocationMethod = IPAllocationMethod.Dynamic, DnsSettings = new PublicIPAddressDnsSettings() @@ -179,7 +177,7 @@ public async Task PublicIpAddressApiTestIPv6() }; // Put PublicIPAddress - var publicIPAddressContainer = resourceGroup.Value.GetPublicIPAddresses(); + var publicIPAddressContainer = resourceGroup.GetPublicIPAddresses(); var putPublicIpAddressResponseOperation = await publicIPAddressContainer.StartCreateOrUpdateAsync(ipv6PublicIpName, ipv6PublicIp); Response putPublicIpAddressResponse = await putPublicIpAddressResponseOperation.WaitForCompletionAsync();; Assert.AreEqual("Succeeded", putPublicIpAddressResponse.Value.Data.ProvisioningState.ToString()); @@ -218,7 +216,7 @@ public async Task PublicIpAddressApiTestIPv6() var ipv4PublicIp = new PublicIPAddressData() { - Location = location, + Location = TestEnvironment.Location, Tags = { { "key", "value" } }, PublicIPAllocationMethod = IPAllocationMethod.Dynamic, DnsSettings = new PublicIPAddressDnsSettings() diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/PublicIpPrefixTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/PublicIpPrefixTests.cs index ea668aa8c4fd..0bd511c62829 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/PublicIpPrefixTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/PublicIpPrefixTests.cs @@ -38,7 +38,7 @@ public void ClearChallengeCacheforRecord() public async Task GetContainer() { var resourceGroup = await CreateResourceGroup(Recording.GenerateAssetName("test_public_ip_prefix_")); - return resourceGroup.Value.GetPublicIPPrefixes(); + return resourceGroup.GetPublicIPPrefixes(); } [Test] diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/RouteFilterTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/RouteFilterTests.cs index 8f811f0fb706..837818b57bb5 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/RouteFilterTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/RouteFilterTests.cs @@ -41,7 +41,7 @@ public void ClearChallengeCacheforRecord() private async Task GetContainer() { var resourceGroup = await CreateResourceGroup(Recording.GenerateAssetName("route_filter_test_")); - return resourceGroup.Value.GetRouteFilters(); + return resourceGroup.GetRouteFilters(); } [Test] diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/RouteTableTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/RouteTableTests.cs index 70dcaa8a63e4..3bc8de26e680 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/RouteTableTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/RouteTableTests.cs @@ -44,7 +44,7 @@ public async Task EmptyRouteTableTest() var routeTable = new RouteTableData() { Location = location, }; // Put RouteTable - var routeTableContainer = resourceGroup.Value.GetRouteTables(); + var routeTableContainer = resourceGroup.GetRouteTables(); var putRouteTableResponseOperation = await routeTableContainer.StartCreateOrUpdateAsync(routeTableName, routeTable); Response putRouteTableResponse = await putRouteTableResponseOperation.WaitForCompletionAsync();; Assert.AreEqual("Succeeded", putRouteTableResponse.Value.Data.ProvisioningState.ToString()); @@ -97,7 +97,7 @@ public async Task RouteTableApiTest() routeTable.Routes.Add(route1); // Put RouteTable - var routeTableContainer = resourceGroup.Value.GetRouteTables(); + var routeTableContainer = resourceGroup.GetRouteTables(); var putRouteTableResponseOperation = await routeTableContainer.StartCreateOrUpdateAsync(routeTableName, routeTable); Response putRouteTableResponse = await putRouteTableResponseOperation.WaitForCompletionAsync();; Assert.AreEqual("Succeeded", putRouteTableResponse.Value.Data.ProvisioningState.ToString()); @@ -176,7 +176,7 @@ public async Task SubnetRouteTableTest() routeTable.Routes.Add(route1); // Put RouteTable - var routeTableContainer = resourceGroup.Value.GetRouteTables(); + var routeTableContainer = resourceGroup.GetRouteTables(); var putRouteTableResponseOperation = await routeTableContainer.StartCreateOrUpdateAsync(routeTableName, routeTable); Response putRouteTableResponse = await putRouteTableResponseOperation.WaitForCompletionAsync();; Assert.AreEqual("Succeeded", putRouteTableResponse.Value.Data.ProvisioningState.ToString()); @@ -216,7 +216,7 @@ public async Task SubnetRouteTableTest() } }; - var putVnetResponseOperation = await resourceGroup.Value.GetVirtualNetworks().StartCreateOrUpdateAsync(vnetName, vnet); + var putVnetResponseOperation = await resourceGroup.GetVirtualNetworks().StartCreateOrUpdateAsync(vnetName, vnet); Response putVnetResponse = await putVnetResponseOperation.WaitForCompletionAsync();; Assert.AreEqual("Succeeded", putVnetResponse.Value.Data.ProvisioningState.ToString()); diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/RouteTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/RouteTests.cs index c994a10f2b70..40b03744094a 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/RouteTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/RouteTests.cs @@ -57,7 +57,7 @@ public async Task RoutesApiTest() routeTable.Routes.Add(route1); // Put RouteTable - var routeTableContainer = resourceGroup.Value.GetRouteTables(); + var routeTableContainer = resourceGroup.GetRouteTables(); var putRouteTableResponseOperation = await routeTableContainer.StartCreateOrUpdateAsync(routeTableName, routeTable); Response putRouteTableResponse = await putRouteTableResponseOperation.WaitForCompletionAsync();; Assert.AreEqual("Succeeded", putRouteTableResponse.Value.Data.ProvisioningState.ToString()); @@ -170,7 +170,7 @@ public async Task RoutesHopTypeTest() routeTable.Routes.Add(route1); // Put RouteTable - var routeTableContainer = resourceGroup.Value.GetRouteTables(); + var routeTableContainer = resourceGroup.GetRouteTables(); var putRouteTableResponseOperation = await routeTableContainer.StartCreateOrUpdateAsync(routeTableName, routeTable); Response putRouteTableResponse = await putRouteTableResponseOperation.WaitForCompletionAsync();; diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/SecurityRuleTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/SecurityRuleTests.cs index 69e0ac3257db..0cf1117ecd85 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/SecurityRuleTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/SecurityRuleTests.cs @@ -67,7 +67,7 @@ public async Task SecurityRuleWithRulesApiTest() }; // Put Nsg - var networkSecurityGroupContainer = resourceGroup.Value.GetNetworkSecurityGroups(); + var networkSecurityGroupContainer = resourceGroup.GetNetworkSecurityGroups(); var putNsgResponseOperation = await networkSecurityGroupContainer.StartCreateOrUpdateAsync(networkSecurityGroupName, networkSecurityGroup); Response putNsgResponse = await putNsgResponseOperation.WaitForCompletionAsync();; Assert.AreEqual("Succeeded", putNsgResponse.Value.Data.ProvisioningState.ToString()); diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/SubnetTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/SubnetTests.cs index e9729c507c53..25917011332b 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/SubnetTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/SubnetTests.cs @@ -58,7 +58,7 @@ public async Task SubnetApiTest() Subnets = { new SubnetData() { Name = subnet1Name, AddressPrefix = "10.0.0.0/24", } } }; - var virtualNetworkContainer = resourceGroup.Value.GetVirtualNetworks(); + var virtualNetworkContainer = resourceGroup.GetVirtualNetworks(); var putVnetResponseOperation = await virtualNetworkContainer.StartCreateOrUpdateAsync(vnetName, vnet); var vnetResponse = await putVnetResponseOperation.WaitForCompletionAsync();; // Create a Subnet @@ -121,7 +121,7 @@ public async Task SubnetResourceNavigationLinksTest() Subnets = { new SubnetData() { Name = subnetName, AddressPrefix = "10.0.0.0/24", } } }; - var virtualNetworkContainer = resourceGroup.Value.GetVirtualNetworks(); + var virtualNetworkContainer = resourceGroup.GetVirtualNetworks(); var putVnetResponseOperation = await virtualNetworkContainer.StartCreateOrUpdateAsync(vnetName, vnet); var vnetResponse = await putVnetResponseOperation.WaitForCompletionAsync();; Response getSubnetResponse = await vnetResponse.Value.GetSubnets().GetAsync(subnetName); diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/TopologyTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/TopologyTests.cs index 09daa7f78104..3080bb1a3018 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/TopologyTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/TopologyTests.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Threading.Tasks; using Azure.Core.TestFramework; -using Azure.ResourceManager.Compute.Models; using Azure.ResourceManager.Resources; using Azure.ResourceManager.Resources.Models; using Azure.ResourceManager.Network.Models; @@ -36,32 +35,24 @@ public void ClearChallengeCacheforRecord() //} [Test] + [RecordedTest] public async Task TopologyApiTest() { string resourceGroupName1 = Recording.GenerateAssetName("azsmnet"); string resourceGroupName2 = Recording.GenerateAssetName("azsmnet"); string location = "westus2"; - ResourceGroup rg1 = await ArmClient.DefaultSubscription.GetResourceGroups().CreateOrUpdateAsync(resourceGroupName1, new ResourceGroupData(location)); + var resourceGroup1 = await CreateResourceGroup(resourceGroupName1, location); string virtualMachineName = Recording.GenerateAssetName("azsmnet"); string networkSecurityGroupName = virtualMachineName + "-nsg"; string networkInterfaceName = Recording.GenerateAssetName("azsmnet"); //Deploy Vm from template - VirtualMachine vm1 = await CreateVm( - resourceGroupName: resourceGroupName1, - location: location, - virtualMachineName: virtualMachineName, - storageAccountName: Recording.GenerateAssetName("azsmnet"), - networkInterfaceName: networkInterfaceName, - networkSecurityGroupName: networkSecurityGroupName, - diagnosticsStorageAccountName: Recording.GenerateAssetName("azsmnet"), - deploymentName: Recording.GenerateAssetName("azsmnet"), - adminPassword: Recording.GenerateAlphaNumericId("AzureSDKNetworkTest#") - ); + var vm = await CreateWindowsVM(virtualMachineName, networkInterfaceName, location, resourceGroup1); - ResourceGroup rg2 = await ArmClient.DefaultSubscription.GetResourceGroups().CreateOrUpdateAsync(resourceGroupName2, new ResourceGroupData(location)); + // TODO: where is this used? + var resourceGropu2 = await CreateResourceGroup(resourceGroupName2, location); //TODO:There is no need to perform a separate create NetworkWatchers operation //Create NetworkWatcher @@ -83,9 +74,9 @@ public async Task TopologyApiTest() //Verify that topology contain information about acreated VM Assert.AreEqual(virtualMachineName, vmResource.Name); - Assert.AreEqual(vm1.Id, vmResource.Id); + Assert.AreEqual(vm.Id, vmResource.Id); Assert.AreEqual(networkInterfaceName, vmResource.Associations.FirstOrDefault().Name); - Assert.AreEqual(vm1.Data.NetworkProfile.NetworkInterfaces.FirstOrDefault().Id, vmResource.Associations.FirstOrDefault().ResourceId); + Assert.AreEqual(vm.Data.NetworkProfile.NetworkInterfaces.FirstOrDefault().Id, vmResource.Associations.FirstOrDefault().ResourceId); Assert.AreEqual("Contains", vmResource.Associations.FirstOrDefault().AssociationType.ToString()); } } diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/TroubleshootTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/TroubleshootTests.cs index 341e4f330e21..929549ae6b26 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/TroubleshootTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/TroubleshootTests.cs @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +#if false using System.Collections.Generic; using System.Threading.Tasks; using Azure.Core.TestFramework; @@ -43,7 +44,7 @@ public async Task TroubleshootApiTest() string resourceGroupName = Recording.GenerateAssetName("azsmnet"); string location = "westus2"; - ResourceGroup rg = await ArmClient.DefaultSubscription.GetResourceGroups().CreateOrUpdateAsync(resourceGroupName, new ResourceGroupData(location)); + var resourceGroup = CreateResourceGroup(resourceGroupName, location); // CreateVirtualNetworkGateway API // Prerequisite:- Create PublicIPAddress(Gateway Ip) using Put PublicIPAddress API @@ -118,3 +119,4 @@ public async Task TroubleshootApiTest() } } } +#endif diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/UsageTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/UsageTests.cs index a9bc345fac13..7dbbe8a40edf 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/UsageTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/UsageTests.cs @@ -44,7 +44,7 @@ public async Task UsageTest() NetworkSecurityGroupData networkSecurityGroup = new NetworkSecurityGroupData() { Location = location, }; // Put Nsg - var networkSecurityGroupContainer = resourceGroup.Value.GetNetworkSecurityGroups(); + var networkSecurityGroupContainer = resourceGroup.GetNetworkSecurityGroups(); var putNsgResponseOperation = await networkSecurityGroupContainer.StartCreateOrUpdateAsync(networkSecurityGroupName, networkSecurityGroup); Response putNsgResponse = await putNsgResponseOperation.WaitForCompletionAsync();; Assert.AreEqual("Succeeded", putNsgResponse.Value.Data.ProvisioningState.ToString()); diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/VerifyIpFlowTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/VerifyIpFlowTests.cs index 3211c39e156c..2def184921c8 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/VerifyIpFlowTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/VerifyIpFlowTests.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Threading.Tasks; using Azure.Core.TestFramework; -using Azure.ResourceManager.Compute.Models; using Azure.ResourceManager.Resources; using Azure.ResourceManager.Resources.Models; using Azure.ResourceManager.Network.Models; @@ -36,30 +35,21 @@ public void ClearChallengeCacheforRecord() //} [Test] + [RecordedTest] [Ignore("Track2: The NetworkWathcer is involved, so disable the test")] public async Task VerifyIpFlowApiTest() { string resourceGroupName = Recording.GenerateAssetName("azsmnet"); string location = "westus2"; - ResourceGroup rg = await ArmClient.DefaultSubscription.GetResourceGroups().CreateOrUpdateAsync(resourceGroupName, new ResourceGroupData(location)); + var resourceGroup = await CreateResourceGroup(resourceGroupName, location); string virtualMachineName1 = Recording.GenerateAssetName("azsmnet"); string networkInterfaceName1 = Recording.GenerateAssetName("azsmnet"); string networkSecurityGroupName = virtualMachineName1 + "-nsg"; //Deploy VM with a template - VirtualMachine vm = await CreateVm( - resourceGroupName: resourceGroupName, - location: location, - virtualMachineName: virtualMachineName1, - storageAccountName: Recording.GenerateAssetName("azsmnet"), - networkInterfaceName: networkInterfaceName1, - networkSecurityGroupName: networkSecurityGroupName, - diagnosticsStorageAccountName: Recording.GenerateAssetName("azsmnet"), - deploymentName: Recording.GenerateAssetName("azsmnet"), - adminPassword: Recording.GenerateAlphaNumericId("AzureSDKNetworkTest#") - ); + var vm = await CreateWindowsVM(virtualMachineName1, networkInterfaceName1, location, resourceGroup); //TODO:There is no need to perform a separate create NetworkWatchers operation //Create network Watcher diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/ViewNsgRuleTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/ViewNsgRuleTests.cs index 1ef9e50403d7..7dabba827fd5 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/ViewNsgRuleTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/ViewNsgRuleTests.cs @@ -5,7 +5,6 @@ using System.Linq; using System.Threading.Tasks; using Azure.Core.TestFramework; -using Azure.ResourceManager.Compute.Models; using Azure.ResourceManager.Resources; using Azure.ResourceManager.Resources.Models; using Azure.ResourceManager.Network.Models; @@ -37,30 +36,21 @@ public void ClearChallengeCacheforRecord() //} [Test] + [RecordedTest] [Ignore("Track2: The NetworkWathcer is involved, so disable the test")] public async Task ViewNsgRuleApiTest() { string resourceGroupName = Recording.GenerateAssetName("azsmnet"); string location = "westus2"; - ResourceGroup rg = await ArmClient.DefaultSubscription.GetResourceGroups().CreateOrUpdateAsync(resourceGroupName, new ResourceGroupData(location)); + var resourceGroup = await CreateResourceGroup(resourceGroupName, location); string virtualMachineName = Recording.GenerateAssetName("azsmnet"); string networkInterfaceName = Recording.GenerateAssetName("azsmnet"); string networkSecurityGroupName = virtualMachineName + "-nsg"; //Deploy VM with template - VirtualMachine vm = await CreateVm( - resourceGroupName: resourceGroupName, - location: location, - virtualMachineName: virtualMachineName, - storageAccountName: Recording.GenerateAssetName("azsmnet"), - networkInterfaceName: networkInterfaceName, - networkSecurityGroupName: networkSecurityGroupName, - diagnosticsStorageAccountName: Recording.GenerateAssetName("azsmnet"), - deploymentName: Recording.GenerateAssetName("azsmnet"), - adminPassword: Recording.GenerateAlphaNumericId("AzureSDKNetworkTest#") - ); + var vm = await CreateLinuxVM(virtualMachineName, networkInterfaceName, location, resourceGroup); //TODO:There is no need to perform a separate create NetworkWatchers operation //Create network Watcher diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/VirtualNetworkPeeringTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/VirtualNetworkPeeringTests.cs index c53168cb36a7..98aeb5a3f58d 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/VirtualNetworkPeeringTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/VirtualNetworkPeeringTests.cs @@ -63,7 +63,7 @@ public async Task VirtualNetworkPeeringApiTest() }; // Put Vnet - var virtualNetworkContainer = resourceGroup.Value.GetVirtualNetworks(); + var virtualNetworkContainer = resourceGroup.GetVirtualNetworks(); var putVnetResponseOperation = await virtualNetworkContainer.StartCreateOrUpdateAsync(vnetName, vnet); Response putVnetResponse = await putVnetResponseOperation.WaitForCompletionAsync();; Assert.AreEqual("Succeeded", putVnetResponse.Value.Data.ProvisioningState.ToString()); @@ -84,7 +84,7 @@ public async Task VirtualNetworkPeeringApiTest() Response remoteVirtualNetwork = await remoteVirtualNetworkOperation.WaitForCompletionAsync();; // Get Peerings in the vnet - var virtualNetworkPeeringContainer =resourceGroup.Value.GetVirtualNetworks().Get(vnetName).Value.GetVirtualNetworkPeerings(); + var virtualNetworkPeeringContainer =resourceGroup.GetVirtualNetworks().Get(vnetName).Value.GetVirtualNetworkPeerings(); AsyncPageable listPeeringAP = virtualNetworkPeeringContainer.GetAllAsync(); List listPeering = await listPeeringAP.ToEnumerableAsync(); Assert.IsEmpty(listPeering); diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/VirtualNetworkTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/VirtualNetworkTests.cs index cb2e9f77e916..c822bf5e341a 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/VirtualNetworkTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/VirtualNetworkTests.cs @@ -61,7 +61,7 @@ public async Task VirtualNetworkApiTest() }; // Put Vnet - var virtualNetworkContainer = resourceGroup.Value.GetVirtualNetworks(); + var virtualNetworkContainer = resourceGroup.GetVirtualNetworks(); var putVnetResponseOperation = await virtualNetworkContainer.StartCreateOrUpdateAsync(vnetName, vnet); Response putVnetResponse = await putVnetResponseOperation.WaitForCompletionAsync();; Assert.AreEqual("Succeeded", putVnetResponse.Value.Data.ProvisioningState.ToString()); @@ -127,7 +127,7 @@ public async Task VirtualNetworkCheckIpAddressAvailabilityTest() }; // Put Vnet - var virtualNetworkContainer = resourceGroup.Value.GetVirtualNetworks(); + var virtualNetworkContainer = resourceGroup.GetVirtualNetworks(); var putVnetResponseOperation = await virtualNetworkContainer.StartCreateOrUpdateAsync(vnetName, vnet); Response putVnetResponse = await putVnetResponseOperation.WaitForCompletionAsync();; Assert.AreEqual("Succeeded", putVnetResponse.Value.Data.ProvisioningState.ToString()); @@ -156,7 +156,7 @@ public async Task VirtualNetworkCheckIpAddressAvailabilityTest() } }; - var putNicResponseOperation = await resourceGroup.Value.GetNetworkInterfaces().StartCreateOrUpdateAsync(nicName, nicParameters); + var putNicResponseOperation = await resourceGroup.GetNetworkInterfaces().StartCreateOrUpdateAsync(nicName, nicParameters); await putNicResponseOperation.WaitForCompletionAsync();; // Check Ip Address availability API @@ -202,7 +202,7 @@ public async Task VirtualNetworkPeeringTest() }; // Put Vnet - var virtualNetworkContainer = resourceGroup.Value.GetVirtualNetworks(); + var virtualNetworkContainer = resourceGroup.GetVirtualNetworks(); var putVnetResponseOperation = await virtualNetworkContainer.StartCreateOrUpdateAsync(vnet1Name, vnet); Response putVnetResponse = await putVnetResponseOperation.WaitForCompletionAsync();; Assert.AreEqual("Succeeded", putVnetResponse.Value.Data.ProvisioningState.ToString()); @@ -313,7 +313,7 @@ public async Task VirtualNetworkUsageTest() }; // Put Vnet - var virtualNetworkContainer = resourceGroup.Value.GetVirtualNetworks(); + var virtualNetworkContainer = resourceGroup.GetVirtualNetworks(); var putVnetResponseOperation = await virtualNetworkContainer.StartCreateOrUpdateAsync(vnetName, vnet); Response putVnetResponse = await putVnetResponseOperation.WaitForCompletionAsync();; Assert.AreEqual("Succeeded", putVnetResponse.Value.Data.ProvisioningState.ToString()); @@ -348,7 +348,7 @@ public async Task VirtualNetworkUsageTest() } }; - var networkInterfaceContainer = resourceGroup.Value.GetNetworkInterfaces(); + var networkInterfaceContainer = resourceGroup.GetNetworkInterfaces(); var putNicResponseOperation = await networkInterfaceContainer.StartCreateOrUpdateAsync(nicName, nicParameters); var nicResponse = await putNicResponseOperation.WaitForCompletionAsync();; // Get Vnet usage again diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/VmssNetworkInterfaceTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/VmssNetworkInterfaceTests.cs index 239a498004fa..f67ba854e9f1 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/VmssNetworkInterfaceTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/VmssNetworkInterfaceTests.cs @@ -49,9 +49,9 @@ public async Task VmssNetworkInterfaceApiTest() { string resourceGroupName = Recording.GenerateAssetName("azsmnet"); - string location = await NetworkManagementTestUtilities.GetResourceLocation(ResourceManagementClient, "Microsoft.Compute/virtualMachineScaleSets"); + string location = await NetworkManagementTestUtilities.GetResourceLocation(ArmClient, "Microsoft.Compute/virtualMachineScaleSets"); string deploymentName = Recording.GenerateAssetName("vmss"); - await ResourceGroupsOperations.CreateOrUpdateAsync(resourceGroupName, new Resources.Models.ResourceGroup(location)); + var resourceGroup = CreateResourceGroup(resourceGroupName, location); await CreateVmss(ResourceManagementClient, resourceGroupName, deploymentName); diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/VmssPublicIpAddressTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/VmssPublicIpAddressTests.cs index 693dd7e6b6dd..eca537a35120 100644 --- a/sdk/network/Azure.ResourceManager.Network/tests/Tests/VmssPublicIpAddressTests.cs +++ b/sdk/network/Azure.ResourceManager.Network/tests/Tests/VmssPublicIpAddressTests.cs @@ -50,9 +50,9 @@ public async Task VmssPublicIpAddressApiTest() { string resourceGroupName = Recording.GenerateAssetName("azsmnet"); - string location = await NetworkManagementTestUtilities.GetResourceLocation(ResourceManagementClient, "Microsoft.Compute/virtualMachineScaleSets"); + string location = await NetworkManagementTestUtilities.GetResourceLocation(ArmClient, "Microsoft.Compute/virtualMachineScaleSets"); string deploymentName = Recording.GenerateAssetName("vmss"); - await ResourceGroupsOperations.CreateOrUpdateAsync(resourceGroupName, new Resources.Models.ResourceGroup(location)); + var resourceGroup = CreateResourceGroup(resourceGroupName, location); await CreateVmss(ResourceManagementClient, resourceGroupName, deploymentName); diff --git a/sdk/resourcemanager/Azure.ResourceManager.Core/src/Generated/GenericResourceExpandedOperations.cs b/sdk/resourcemanager/Azure.ResourceManager.Core/src/Generated/GenericResourceExpandedOperations.cs deleted file mode 100644 index 0f4c3726d7d6..000000000000 --- a/sdk/resourcemanager/Azure.ResourceManager.Core/src/Generated/GenericResourceExpandedOperations.cs +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using System; -using System.Threading; -using System.Threading.Tasks; - -namespace Azure.ResourceManager.Core -{ - /// - /// A class representing the operations that can be performed over a specific ArmResource. - /// - public class GenericResourceExpandedOperations : ResourceOperationsBase - { - /// - /// Initializes a new instance of the class. - /// - /// The resource operations to copy the options from. - /// The identifier of the resource that is the target of operations. - internal GenericResourceExpandedOperations(ResourceOperationsBase operations, TenantResourceIdentifier id) - : base(operations, id) - { - } - - /// - protected override ResourceType ValidResourceType => throw new NotImplementedException(); - - /// - public override Response Get(CancellationToken cancellationToken = default) - { - throw new NotImplementedException(); - } - - /// - public override Task> GetAsync(CancellationToken cancellationToken = default) - { - throw new NotImplementedException(); - } - } -}