overload to enable vnets to be returned by location

Author: azurecoder

Elastacloud.AzureManagement.Fluent/Clients/Interfaces/IVirtualNetworkingClient.cs

@@ -24,6 +24,11 @@ interface IVirtualNetworkingClient
         /// </summary>
         IEnumerable<VirtualNetworkingUtils.VirtualNetwork> GetAvailableVirtualNetworks();
         /// <summary>
+        /// Gets the virtual networks available in the current subscription
+        /// </summary>
+        /// <param name="location">Location of the vnet e.g. North Europe</param>
+        IEnumerable<VirtualNetworkingUtils.VirtualNetwork> GetAvailableVirtualNetworks(string location);
+        /// <summary>
         /// Creates an empty VNET to add address ranges and subnets to
         /// </summary>
         string AddSubnetToAddressRange(string networkName, string addressRange, string subnetName);

Elastacloud.AzureManagement.Fluent/Clients/LinuxVirtualMachineClient.cs

@@ -95,7 +95,7 @@ private void CheckVmDeploymentIsRunning(List<LinuxVirtualMachineProperties> prop
         {
             // 1. Get the number of vms in the role and create a binary list 
             var linuxProperties = new Dictionary<string, RoleInstanceStatus>();
-            properties.ForEach(property => linuxProperties.Add(property.HostName, RoleInstanceStatus.Unknown));
+            properties.ForEach(property => linuxProperties.Add(property.HostName, RoleInstanceStatus.RoleStateUnknown));
             var vmProperties = new LinuxVirtualMachineProperties() {CloudServiceName = properties[0].CloudServiceName};
             // 2. Set the value to if the vm is running or not 
             int index = 0;
@@ -123,10 +123,11 @@ private void CheckVmDeploymentIsRunning(List<LinuxVirtualMachineProperties> prop
                     linuxProperties[vm.RoleName] = vm.Status;
                 });
                 index++;
-                Task.Delay(TimeSpan.FromSeconds(10)).RunSynchronously();
+                // TODO: advice from Zak on the best way to use task.delay instead
+                Thread.Sleep(TimeSpan.FromSeconds(10));
             }
 
-            if (index == 100)
+            if (index == 360)
             {
                 throw new FluentManagementException("timed out listening for status changes - check vms are running correctly", "LinuxVirtualMachineClient");       
             }

Elastacloud.AzureManagement.Fluent/Clients/VirtualNetworkClient.cs

@@ -41,15 +41,28 @@ public VirtualNetworkClient(string subscriptionId, X509Certificate2 managementCe
         /// <summary>
         /// Gets the available virtual networks in the correct order binding the address ranges to the subnets
         /// </summary>
-        public IEnumerable<VirtualNetworkingUtils.VirtualNetwork> GetAvailableVirtualNetworks()
+        public IEnumerable<VirtualNetworkingUtils.VirtualNetwork> GetAvailableVirtualNetworks(string location)
         {
             var command = new ListVirtualNetworksCommand()
             {
                 SubscriptionId = SubscriptionId,
                 Certificate = ManagementCertificate
             };
             command.Execute();
-            return VirtualNetworkingUtils.ConvertVNetToHierarchicalModel(command.VirtualNetworks);
+            List<VirtualNetworkSite> virtualNetworks = command.VirtualNetworks;
+            if (location != null)
+            {
+                virtualNetworks = command.VirtualNetworks.Where(network => network.Location == location).ToList();
+            }
+
+            return VirtualNetworkingUtils.ConvertVNetToHierarchicalModel(virtualNetworks);
+        }
+        /// <summary>
+        /// Used if all the locations should be returned instead of a single location
+        /// </summary>
+        public IEnumerable<VirtualNetworkingUtils.VirtualNetwork> GetAvailableVirtualNetworks()
+        {
+            return GetAvailableVirtualNetworks(null);
         }
 
         /// <summary>

Elastacloud.AzureManagement.Fluent/Properties/AssemblyInfo.cs

@@ -49,5 +49,5 @@
 
 // Make internal interfaces visible to Moq and the testing library
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2"), InternalsVisibleTo("Elastacloud.AzureManagement.Fluent.Tests")]
-[assembly: AssemblyVersion("0.5.0.96")]
-[assembly: AssemblyFileVersion("0.5.0.96")]
+[assembly: AssemblyVersion("0.5.0.97")]
+[assembly: AssemblyFileVersion("0.5.0.97")]

Elastacloud.AzureManagement.Fluent/Types/RoleInstanceStatus.cs

@@ -11,6 +11,7 @@ namespace Elastacloud.AzureManagement.Fluent.Types
     public enum RoleInstanceStatus
     {
         Unknown,
+        RoleStateUnknown,
         CreatingVM,
         StartingVM,
         CreatingRole,

Elastacloud.FluentManagement.FSTest/VirtualMachines.fsx

@@ -43,24 +43,26 @@ let properties = new LinuxVirtualMachineProperties(
                                                     AdministratorPassword = "P@ssword761",
                                                     HostName = "briskit",
                                                     RoleName = "briskit",
-                                                    CloudServiceName = "briskit1000",
+                                                    CloudServiceName = "briskit1003",
                                                     PublicEndpoints = List<InputEndpoint>([|sshEndpoint|]),
-                                                    CustomTemplateName = "b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu_DAILY_BUILD-trusty-14_04_1-LTS-amd64-server-20141202.1-en-us-30GB",
-                                                    DeploymentName = "briskit1000",
-                                                    StorageAccountName = "clustered",
-                                                    AvailabilitySet = "clustered",
-                                                    VirtualNetwork = VirtualNetworkDescriptor(
-                                                                                              VirtualNetworkName = "fsnet",
-                                                                                              SubnetName = "fred"))
+                                                    CustomTemplateName = "b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu-14_10-amd64-server-20141204-en-us-30GB",
+                                                    DeploymentName = "briskit1003",
+                                                    StorageAccountName = "clustered")//,
+                                                    //VirtualNetwork = VirtualNetworkDescriptor(
+                                                     //                                         VirtualNetworkName = "fsnet",
+                                                     //                                         SubnetName = "fred"))
 
+vmClient.LinuxVirtualMachineStatusEvent.Subscribe(fun vmstatus -> printfn "from %s to %s" (vmstatus.OldStatus.ToString()) (vmstatus.NewStatus.ToString()))
 vmClient.CreateNewVirtualMachineDeploymentFromTemplateGallery(
                                                               List<LinuxVirtualMachineProperties>([|properties|]),
-                                                              "briskit1000")
+                                                              "briskit1003")
 // test 1: Ensure that above contains no subnets when it's created and returns the address range + 1 ip
 // test 2: Receive events on state changes and ensure readyrole
-vmClient.LinuxVirtualMachineStatusEvent.Subscribe(fun vmstatus -> printfn "from %s to %s" (vmstatus.OldStatus.ToString()) (vmstatus.NewStatus.ToString()))
 // test 3: When created delete the subnet from the vnet - should generate a subnet busy exception of some sort
 let vnClient = VirtualNetworkClient(subscriptionId, (getFromBizsparkPlus subscriptionId))
+let all = vnClient.GetAvailableVirtualNetworks()
+let we = vnClient.GetAvailableVirtualNetworks("West Europe")
+let ne = vnClient.GetAvailableVirtualNetworks("North Europe")
 vnClient.AddSubnetToAddressRange("bigbadbeetleborgs", "10.0.0.0/20", "max-1")
-vnClient.RemoveSubnet("bigbadbeetleborgs", "max-1")
+vnClient.RemoveSubnet("skynet", "cluster")
 let images = vmClient.GetCurrentUbuntuImage()