location as a parameter.

sergey-shandar · sergey-shandar · commit 7b16d392a313 · 2017-10-25T10:55:52.000-07:00
diff --git a/experiments/Azure.Experiments/Azure.Experiments/AzureObject.cs b/experiments/Azure.Experiments/Azure.Experiments/AzureObject.cs
@@ -15,7 +15,7 @@ public abstract class AzureObject
 
         public IEnumerable<AzureObject> Dependencies { get; }
 
-        public abstract Task CheckOrCreateAsync();
+        public abstract Task CheckOrCreateAsync(string location);
 
         public int Priority { get; }
 
@@ -74,7 +74,7 @@ public async Task<T> GetOrNullAsync()
             return Info;
         }
 
-        public async Task<T> GetOrCreateAsync()
+        public async Task<T> GetOrCreateAsync(string location)
         {
             Info = await GetOrNullAsync();
             if (Info == null)
@@ -84,9 +84,9 @@ public async Task<T> GetOrCreateAsync()
                 // avoid multiple creations of the same resource group.
                 foreach (var d in Dependencies)
                 {
-                    await d.CheckOrCreateAsync();
+                    await d.CheckOrCreateAsync(location);
                 }
-                Info = await CreateAsync();
+                Info = await CreateAsync(location);
             }
             return Info;
         }
@@ -96,12 +96,12 @@ protected AzureObject(string name, IEnumerable<AzureObject> dependencies)
         {
         }
 
-        public override Task CheckOrCreateAsync()
-            => GetOrCreateAsync();
+        public override Task CheckOrCreateAsync(string location)
+            => GetOrCreateAsync(location);
 
         protected abstract Task<T> GetOrThrowAsync();
 
-        protected abstract Task<T> CreateAsync();
+        protected abstract Task<T> CreateAsync(string location);
 
         private bool IsGetCalled;       
     }
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Compute/VirtualMachineObject.cs b/experiments/Azure.Experiments/Azure.Experiments/Compute/VirtualMachineObject.cs
@@ -27,7 +27,7 @@ public VirtualMachineObject(
             Ni = ni;
         }
 
-        protected override Task<VirtualMachine> CreateAsync()
+        protected override Task<VirtualMachine> CreateAsync(string location)
             => Client.CreateOrUpdateAsync(
                 ResourceGroupName,
                 Name,
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Network/NetworkInterfaceObject.cs b/experiments/Azure.Experiments/Azure.Experiments/Network/NetworkInterfaceObject.cs
@@ -21,13 +21,13 @@ public NetworkInterfaceObject(
             Subnet = subnet;
         }
 
-        protected override async Task<NetworkInterface> CreateAsync()
+        protected override async Task<NetworkInterface> CreateAsync(string location)
             => await Client.CreateOrUpdateAsync(
                 ResourceGroupName,
                 Name, 
                 new NetworkInterface
                 {
-                    Location = "eastus",                    
+                    Location = location,
                     IpConfigurations = new[] 
                     {
                         new NetworkInterfaceIPConfiguration
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Network/NetworkSecurityGroup.cs b/experiments/Azure.Experiments/Azure.Experiments/Network/NetworkSecurityGroup.cs
@@ -16,11 +16,11 @@ public NetworkSecurityGroupObject(
             Client = client.NetworkSecurityGroups;
         }
 
-        protected override Task<NetworkSecurityGroup> CreateAsync()
+        protected override Task<NetworkSecurityGroup> CreateAsync(string location)
             => Client.CreateOrUpdateAsync(
                 ResourceGroupName,
                 Name,
-                new NetworkSecurityGroup { Location = "eastus" });
+                new NetworkSecurityGroup { Location = location });
 
         protected override Task<NetworkSecurityGroup> GetOrThrowAsync()
             => Client.GetAsync(ResourceGroupName, Name);
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Network/PublicIpAddressObject.cs b/experiments/Azure.Experiments/Azure.Experiments/Network/PublicIpAddressObject.cs
@@ -16,7 +16,7 @@ public PublicIpAddressObject(
             Client = client.PublicIPAddresses;
         }
 
-        protected override Task<PublicIPAddress> CreateAsync()
+        protected override Task<PublicIPAddress> CreateAsync(string location)
             => Client.CreateOrUpdateAsync(
                 ResourceGroupName,
                 Name,
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Network/SubnetObject.cs b/experiments/Azure.Experiments/Azure.Experiments/Network/SubnetObject.cs
@@ -17,7 +17,7 @@ public SubnetObject(
             AddressPrefix = addressPrefix;
         }
 
-        protected override async Task<Subnet> CreateAsync()
+        protected override async Task<Subnet> CreateAsync(string location)
         {
             // The Virtual Network should be created at this point.
             var vn = Vn.Info;
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Network/VirtualNetworkObject.cs b/experiments/Azure.Experiments/Azure.Experiments/Network/VirtualNetworkObject.cs
@@ -18,7 +18,7 @@ public VirtualNetworkObject(
             AddressPrefix = addressPrefix;
         }
 
-        protected override Task<VirtualNetwork> CreateAsync()
+        protected override Task<VirtualNetwork> CreateAsync(string location)
             => Client.CreateOrUpdateAsync(
                 ResourceGroupName,
                 Name,
diff --git a/experiments/Azure.Experiments/Azure.Experiments/ResourceGroupObject.cs b/experiments/Azure.Experiments/Azure.Experiments/ResourceGroupObject.cs
@@ -17,10 +17,10 @@ public ResourceGroupObject(Context client, string name)
                 .ResourceGroups;
         }        
 
-        protected override Task<ResourceGroup> CreateAsync()
+        protected override Task<ResourceGroup> CreateAsync(string location)
             => Client.CreateOrUpdateAsync(
                 Name,
-                new ResourceGroup { Location = "eastus" });
+                new ResourceGroup { Location = location });
 
         protected override Task<ResourceGroup> GetOrThrowAsync()
             => Client.GetAsync(Name);
diff --git a/experiments/Azure.Experiments/Tests/ComputeTest.cs b/experiments/Azure.Experiments/Tests/ComputeTest.cs
@@ -14,7 +14,7 @@ public async Task ResourceGroupTest()
             var c = Credentials.Get();
             var rg = new ResourceGroupObject(c, "My");
             var info = await rg.GetOrNullAsync();
-            var infoCreate = await rg.GetOrCreateAsync();
+            var infoCreate = await rg.GetOrCreateAsync("eastus");
             // await rg.DeleteAsync(c);
         }
 
@@ -25,7 +25,7 @@ public async Task VirtualNetworkTest()
             var rg = new ResourceGroupObject(c, "My1");
             var vn = new VirtualNetworkObject(c.CreateNetwork(), "My1", rg, "192.168.0.0/16");
             var info = await vn.GetOrNullAsync();
-            var infoCreate = await vn.GetOrCreateAsync();
+            var infoCreate = await vn.GetOrCreateAsync("eastus");
         }
 
         [Fact]
@@ -34,7 +34,7 @@ public async Task PublicIpAddressTest()
             var c = Credentials.Get();
             var rg = new ResourceGroupObject(c, "MyPIA");
             var pia = new PublicIpAddressObject(c.CreateNetwork(), "MyPIA", rg);
-            var info = await pia.GetOrCreateAsync();
+            var info = await pia.GetOrCreateAsync("eastus");
         }
 
         [Fact]
@@ -43,7 +43,7 @@ public async Task NetworkSecurityGroupTest()
             var c = Credentials.Get();
             var rg = new ResourceGroupObject(c, "MyNSG");
             var nsg = new NetworkSecurityGroupObject(c.CreateNetwork(), "MyNSG", rg);
-            var info = await nsg.GetOrCreateAsync();
+            var info = await nsg.GetOrCreateAsync("eastus");
         }
 
         [Fact]
@@ -53,7 +53,7 @@ public async Task SubnetTest()
             var rg = new ResourceGroupObject(c, "MySubnet");
             var vn = new VirtualNetworkObject(c.CreateNetwork(), "MySubnet", rg, "192.168.0.0/16");
             var subnet = new SubnetObject("MySubnet", vn, "192.168.1.0/24");
-            var info = await subnet.GetOrCreateAsync();
+            var info = await subnet.GetOrCreateAsync("eastus");
         }
 
         [Fact]
@@ -67,7 +67,7 @@ public async Task NetworkInterfaceObject()
             var pia = new PublicIpAddressObject(network, "MyNI", rg);
             var nsg = new NetworkSecurityGroupObject(network, "MyNI", rg);
             var ni = new NetworkInterfaceObject(network, "MyNI", rg, subnet, pia, nsg);
-            var info = await ni.GetOrCreateAsync();
+            var info = await ni.GetOrCreateAsync("eastus");
         }
 
         [Fact]
@@ -82,7 +82,7 @@ public async Task VmObject()
             var nsg = new NetworkSecurityGroupObject(network, "MyVM", rg);
             var ni = new NetworkInterfaceObject(network, "MyVM", rg, subnet, pia, nsg);
             var vm = new VirtualMachineObject(c, "MyVM", rg, ni, "MyVMUser", "@3as54dDd");
-            var info = await vm.GetOrCreateAsync();
+            var info = await vm.GetOrCreateAsync("eastus");
         }
 
         [Fact]
diff --git a/experiments/Azure.Experiments/Tests/UnitTests.cs b/experiments/Azure.Experiments/Tests/UnitTests.cs
@@ -14,23 +14,23 @@ public class UnitTests
         public void ResourceGroupObjectTest()
         {
             var rg = new ResourceGroupObject(C, "My");
-            Assert.Equal(0, rg.Priority);
+            Assert.Equal(1, rg.Priority);
         }
 
         [Fact]
         public void VirtualNetworkObjectTest()
         {
             var rg = new ResourceGroupObject(C, "My1");
             var vn = new VirtualNetworkObject(C.CreateNetwork(), "My1", rg, "192.168.0.0/16");
-            Assert.Equal(1, vn.Priority);
+            Assert.Equal(2, vn.Priority);
         }
 
         [Fact]
         public void PublicIpAddressObjectTest()
         {
             var rg = new ResourceGroupObject(C, "MyPIA");
             var pia = new PublicIpAddressObject(C.CreateNetwork(), "MyPIA", rg);
-            Assert.Equal(1, pia.Priority);
+            Assert.Equal(2, pia.Priority);
         }
 
         //[Fact]
@@ -39,19 +39,19 @@ public void NetworkSecurityGroupTest()
             var c = Credentials.Get();
             var rg = new ResourceGroupObject(c, "MyNSG");
             var nsg = new NetworkSecurityGroupObject(c.CreateNetwork(), "MyNSG", rg);
-            Assert.Equal(1, nsg.Priority);
+            Assert.Equal(2, nsg.Priority);
         }
 
-        //[Fact]
+        [Fact]
         public void SubnetObjectTest()
         {
             var rg = new ResourceGroupObject(C, "MySubnet");
             var vn = new VirtualNetworkObject(C.CreateNetwork(), "MySubnet", rg, "192.168.0.0/16");
             var subnet = new SubnetObject("MySubnet", vn, "192.168.1.0/24");
-            Assert.Equal(2, subnet.Priority);
+            Assert.Equal(3, subnet.Priority);
         }
 
-        //[Fact]
+        [Fact]
         public void NetworkInterfaceObjectTest()
         {
             var network = C.CreateNetwork();
@@ -61,10 +61,10 @@ public void NetworkInterfaceObjectTest()
             var pia = new PublicIpAddressObject(network, "MyNI", rg);
             var nsg = new NetworkSecurityGroupObject(network, "MyNI", rg);
             var ni = new NetworkInterfaceObject(network, "MyNI", rg, subnet, pia, nsg);
-            Assert.Equal(3, ni.Priority);
+            Assert.Equal(4, ni.Priority);
         }
 
-        //[Fact]
+        [Fact]
         public void VmObjectTest()
         {
             var network = C.CreateNetwork();
@@ -75,7 +75,7 @@ public void VmObjectTest()
             var nsg = new NetworkSecurityGroupObject(network, "MyVM", rg);
             var ni = new NetworkInterfaceObject(network, "MyVM", rg, subnet, pia, nsg);
             var vm = new VirtualMachineObject(C, "MyVM", rg, ni, "MyVMUser", "@3as54dDd");
-            Assert.Equal(4, vm.Priority);
+            Assert.Equal(5, vm.Priority);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public abstract class AzureObject`
`15`	`15`
`16`	`16`	`public IEnumerable<AzureObject> Dependencies { get; }`
`17`	`17`
`18`		`- public abstract Task CheckOrCreateAsync();`
	`18`	`+ public abstract Task CheckOrCreateAsync(string location);`
`19`	`19`
`20`	`20`	`public int Priority { get; }`
`21`	`21`
`@@ -74,7 +74,7 @@ public async Task<T> GetOrNullAsync()`
`74`	`74`	`return Info;`
`75`	`75`	`}`
`76`	`76`
`77`		`- public async Task<T> GetOrCreateAsync()`
	`77`	`+ public async Task<T> GetOrCreateAsync(string location)`
`78`	`78`	`{`
`79`	`79`	`Info = await GetOrNullAsync();`
`80`	`80`	`if (Info == null)`
`@@ -84,9 +84,9 @@ public async Task<T> GetOrCreateAsync()`
`84`	`84`	`// avoid multiple creations of the same resource group.`
`85`	`85`	`foreach (var d in Dependencies)`
`86`	`86`	`{`
`87`		`- await d.CheckOrCreateAsync();`
	`87`	`+ await d.CheckOrCreateAsync(location);`
`88`	`88`	`}`
`89`		`- Info = await CreateAsync();`
	`89`	`+ Info = await CreateAsync(location);`
`90`	`90`	`}`
`91`	`91`	`return Info;`
`92`	`92`	`}`
`@@ -96,12 +96,12 @@ protected AzureObject(string name, IEnumerable<AzureObject> dependencies)`
`96`	`96`	`{`
`97`	`97`	`}`
`98`	`98`
`99`		`- public override Task CheckOrCreateAsync()`
`100`		`- => GetOrCreateAsync();`
	`99`	`+ public override Task CheckOrCreateAsync(string location)`
	`100`	`+ => GetOrCreateAsync(location);`
`101`	`101`
`102`	`102`	`protected abstract Task<T> GetOrThrowAsync();`
`103`	`103`
`104`		`- protected abstract Task<T> CreateAsync();`
	`104`	`+ protected abstract Task<T> CreateAsync(string location);`
`105`	`105`
`106`	`106`	`private bool IsGetCalled;`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public VirtualMachineObject(`
`27`	`27`	`Ni = ni;`
`28`	`28`	`}`
`29`	`29`
`30`		`- protected override Task<VirtualMachine> CreateAsync()`
	`30`	`+ protected override Task<VirtualMachine> CreateAsync(string location)`
`31`	`31`	`=> Client.CreateOrUpdateAsync(`
`32`	`32`	`ResourceGroupName,`
`33`	`33`	`Name,`
Original file line number	Diff line number	Diff line change
`@@ -21,13 +21,13 @@ public NetworkInterfaceObject(`
`21`	`21`	`Subnet = subnet;`
`22`	`22`	`}`
`23`	`23`
`24`		`- protected override async Task<NetworkInterface> CreateAsync()`
	`24`	`+ protected override async Task<NetworkInterface> CreateAsync(string location)`
`25`	`25`	`=> await Client.CreateOrUpdateAsync(`
`26`	`26`	`ResourceGroupName,`
`27`	`27`	`Name,`
`28`	`28`	`new NetworkInterface`
`29`	`29`	`{`
`30`		`- Location = "eastus",`
	`30`	`+ Location = location,`
`31`	`31`	`IpConfigurations = new[]`
`32`	`32`	`{`
`33`	`33`	`new NetworkInterfaceIPConfiguration`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public PublicIpAddressObject(`
`16`	`16`	`Client = client.PublicIPAddresses;`
`17`	`17`	`}`
`18`	`18`
`19`		`- protected override Task<PublicIPAddress> CreateAsync()`
	`19`	`+ protected override Task<PublicIPAddress> CreateAsync(string location)`
`20`	`20`	`=> Client.CreateOrUpdateAsync(`
`21`	`21`	`ResourceGroupName,`
`22`	`22`	`Name,`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public SubnetObject(`
`17`	`17`	`AddressPrefix = addressPrefix;`
`18`	`18`	`}`
`19`	`19`
`20`		`- protected override async Task<Subnet> CreateAsync()`
	`20`	`+ protected override async Task<Subnet> CreateAsync(string location)`
`21`	`21`	`{`
`22`	`22`	`// The Virtual Network should be created at this point.`
`23`	`23`	`var vn = Vn.Info;`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public VirtualNetworkObject(`
`18`	`18`	`AddressPrefix = addressPrefix;`
`19`	`19`	`}`
`20`	`20`
`21`		`- protected override Task<VirtualNetwork> CreateAsync()`
	`21`	`+ protected override Task<VirtualNetwork> CreateAsync(string location)`
`22`	`22`	`=> Client.CreateOrUpdateAsync(`
`23`	`23`	`ResourceGroupName,`
`24`	`24`	`Name,`
Original file line number	Diff line number	Diff line change
`@@ -14,23 +14,23 @@ public class UnitTests`
`14`	`14`	`public void ResourceGroupObjectTest()`
`15`	`15`	`{`
`16`	`16`	`var rg = new ResourceGroupObject(C, "My");`
`17`		`- Assert.Equal(0, rg.Priority);`
	`17`	`+ Assert.Equal(1, rg.Priority);`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`[Fact]`
`21`	`21`	`public void VirtualNetworkObjectTest()`
`22`	`22`	`{`
`23`	`23`	`var rg = new ResourceGroupObject(C, "My1");`
`24`	`24`	`var vn = new VirtualNetworkObject(C.CreateNetwork(), "My1", rg, "192.168.0.0/16");`
`25`		`- Assert.Equal(1, vn.Priority);`
	`25`	`+ Assert.Equal(2, vn.Priority);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`[Fact]`
`29`	`29`	`public void PublicIpAddressObjectTest()`
`30`	`30`	`{`
`31`	`31`	`var rg = new ResourceGroupObject(C, "MyPIA");`
`32`	`32`	`var pia = new PublicIpAddressObject(C.CreateNetwork(), "MyPIA", rg);`
`33`		`- Assert.Equal(1, pia.Priority);`
	`33`	`+ Assert.Equal(2, pia.Priority);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`//[Fact]`
`@@ -39,19 +39,19 @@ public void NetworkSecurityGroupTest()`
`39`	`39`	`var c = Credentials.Get();`
`40`	`40`	`var rg = new ResourceGroupObject(c, "MyNSG");`
`41`	`41`	`var nsg = new NetworkSecurityGroupObject(c.CreateNetwork(), "MyNSG", rg);`
`42`		`- Assert.Equal(1, nsg.Priority);`
	`42`	`+ Assert.Equal(2, nsg.Priority);`
`43`	`43`	`}`
`44`	`44`
`45`		`- //[Fact]`
	`45`	`+ [Fact]`
`46`	`46`	`public void SubnetObjectTest()`
`47`	`47`	`{`
`48`	`48`	`var rg = new ResourceGroupObject(C, "MySubnet");`
`49`	`49`	`var vn = new VirtualNetworkObject(C.CreateNetwork(), "MySubnet", rg, "192.168.0.0/16");`
`50`	`50`	`var subnet = new SubnetObject("MySubnet", vn, "192.168.1.0/24");`
`51`		`- Assert.Equal(2, subnet.Priority);`
	`51`	`+ Assert.Equal(3, subnet.Priority);`
`52`	`52`	`}`
`53`	`53`
`54`		`- //[Fact]`
	`54`	`+ [Fact]`
`55`	`55`	`public void NetworkInterfaceObjectTest()`
`56`	`56`	`{`
`57`	`57`	`var network = C.CreateNetwork();`
`@@ -61,10 +61,10 @@ public void NetworkInterfaceObjectTest()`
`61`	`61`	`var pia = new PublicIpAddressObject(network, "MyNI", rg);`
`62`	`62`	`var nsg = new NetworkSecurityGroupObject(network, "MyNI", rg);`
`63`	`63`	`var ni = new NetworkInterfaceObject(network, "MyNI", rg, subnet, pia, nsg);`
`64`		`- Assert.Equal(3, ni.Priority);`
	`64`	`+ Assert.Equal(4, ni.Priority);`
`65`	`65`	`}`
`66`	`66`
`67`		`- //[Fact]`
	`67`	`+ [Fact]`
`68`	`68`	`public void VmObjectTest()`
`69`	`69`	`{`
`70`	`70`	`var network = C.CreateNetwork();`
`@@ -75,7 +75,7 @@ public void VmObjectTest()`
`75`	`75`	`var nsg = new NetworkSecurityGroupObject(network, "MyVM", rg);`
`76`	`76`	`var ni = new NetworkInterfaceObject(network, "MyVM", rg, subnet, pia, nsg);`
`77`	`77`	`var vm = new VirtualMachineObject(C, "MyVM", rg, ni, "MyVMUser", "@3as54dDd");`
`78`		`- Assert.Equal(4, vm.Priority);`
	`78`	`+ Assert.Equal(5, vm.Priority);`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`	`}`