Network and Compute, policies.

sergey-shandar · sergey-shandar · commit 94b26c2848e6 · 2017-10-24T15:41:00.000-07:00
diff --git a/experiments/Azure.Experiments/Azure.Experiments/AzureObject.cs b/experiments/Azure.Experiments/Azure.Experiments/AzureObject.cs
@@ -26,8 +26,9 @@ protected AzureObject(string name, IEnumerable<AzureObject> dependencies)
         }
     }
 
-    public abstract class AzureObject<T> : AzureObject
+    public abstract class AzureObject<T, P> : AzureObject
         where T: class
+        where P: struct, IInfoPolicy<T>
     {
         public T Info { get; private set; }
 
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Compute/ComputePolicy.cs b/experiments/Azure.Experiments/Azure.Experiments/Compute/ComputePolicy.cs
@@ -0,0 +1,11 @@
+﻿using Microsoft.Azure.Management.Compute.Models;
+
+namespace Azure.Experiments.Compute
+{
+    public struct ComputePolicy<T> : IInfoPolicy<T>
+        where T : Resource
+    {
+        public string GetLocation(T value) 
+            => value.Location;
+    }
+}
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Compute/VirtualMachineObject.cs b/experiments/Azure.Experiments/Azure.Experiments/Compute/VirtualMachineObject.cs
@@ -1,13 +1,14 @@
-﻿using Microsoft.Azure.Management.Compute;
+﻿using Azure.Experiments.Network;
+using Microsoft.Azure.Management.Compute;
 using Microsoft.Azure.Management.Compute.Models;
 using System.Threading.Tasks;
 
-namespace Azure.Experiments
+namespace Azure.Experiments.Compute
 {
-    public sealed class VmObject 
-        : ResourceObject<VirtualMachine>
+    public sealed class VirtualMachineObject 
+        : ResourceObject<VirtualMachine, ComputePolicy<VirtualMachine>>
     {
-        public VmObject(
+        public VirtualMachineObject(
             Context c,
             string name,
             ResourceGroupObject rg,
diff --git a/experiments/Azure.Experiments/Azure.Experiments/IInfoPolicy.cs b/experiments/Azure.Experiments/Azure.Experiments/IInfoPolicy.cs
@@ -0,0 +1,7 @@
+﻿namespace Azure.Experiments
+{
+    public interface IInfoPolicy<T>
+    {
+        string GetLocation(T value);
+    }
+}
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Network/NetworkInterfaceObject.cs b/experiments/Azure.Experiments/Azure.Experiments/Network/NetworkInterfaceObject.cs
@@ -2,10 +2,10 @@
 using Microsoft.Azure.Management.Network.Models;
 using System.Threading.Tasks;
 
-namespace Azure.Experiments
+namespace Azure.Experiments.Network
 {
     public sealed class NetworkInterfaceObject
-        : ResourceObject<NetworkInterface>
+        : NetworkObject<NetworkInterface>
     {
         public NetworkInterfaceObject(
             INetworkManagementClient client,
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Network/NetworkObject.cs b/experiments/Azure.Experiments/Azure.Experiments/Network/NetworkObject.cs
@@ -0,0 +1,20 @@
+﻿using System.Collections.Generic;
+using Microsoft.Azure.Management.Network.Models;
+
+namespace Azure.Experiments.Network
+{
+    public abstract class NetworkObject<T> : ResourceObject<T, NetworkPolicy<T>>
+        where T : Resource
+    {
+        protected NetworkObject(string name, ResourceGroupObject rg) : base(name, rg)
+        {
+        }
+
+        protected NetworkObject(
+            string name,
+            ResourceGroupObject rg,
+            IEnumerable<AzureObject> dependencies) : base(name, rg, dependencies)
+        {
+        }
+    }
+}
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Network/NetworkPolicy.cs b/experiments/Azure.Experiments/Azure.Experiments/Network/NetworkPolicy.cs
@@ -0,0 +1,11 @@
+﻿using Microsoft.Azure.Management.Network.Models;
+
+namespace Azure.Experiments.Network
+{
+    public struct NetworkPolicy<T> : IInfoPolicy<T>
+        where T : Resource
+    {
+        public string GetLocation(T value)
+            => value.Location;
+    }
+}
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Network/NetworkSecurityGroup.cs b/experiments/Azure.Experiments/Azure.Experiments/Network/NetworkSecurityGroup.cs
@@ -2,10 +2,10 @@
 using Microsoft.Azure.Management.Network.Models;
 using System.Threading.Tasks;
 
-namespace Azure.Experiments
+namespace Azure.Experiments.Network
 {
     public sealed class NetworkSecurityGroupObject
-        : ResourceObject<NetworkSecurityGroup>
+        : NetworkObject<NetworkSecurityGroup>
     {
         public NetworkSecurityGroupObject(
             INetworkManagementClient client,
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Network/PublicIpAddressObject.cs b/experiments/Azure.Experiments/Azure.Experiments/Network/PublicIpAddressObject.cs
@@ -2,10 +2,10 @@
 using Microsoft.Azure.Management.Network.Models;
 using System.Threading.Tasks;
 
-namespace Azure.Experiments
+namespace Azure.Experiments.Network
 {
     public sealed class PublicIpAddressObject :
-        ResourceObject<PublicIPAddress>
+        NetworkObject<PublicIPAddress>
     {
         public PublicIpAddressObject(
             INetworkManagementClient client,
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Network/SubnetObject.cs b/experiments/Azure.Experiments/Azure.Experiments/Network/SubnetObject.cs
@@ -3,9 +3,9 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Azure.Experiments
+namespace Azure.Experiments.Network
 {
-    public sealed class SubnetObject : AzureObject<Subnet>
+    public sealed class SubnetObject : AzureObject<Subnet, SubnetPolicy>
     {
         public string AddressPrefix { get; }
 
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Network/SubnetPolicy.cs b/experiments/Azure.Experiments/Azure.Experiments/Network/SubnetPolicy.cs
@@ -0,0 +1,9 @@
+﻿using Microsoft.Azure.Management.Network.Models;
+
+namespace Azure.Experiments
+{
+    public struct SubnetPolicy : IInfoPolicy<Subnet>
+    {
+        public string GetLocation(Subnet value) => null;
+    }
+}
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Network/VirtualNetworkObject.cs b/experiments/Azure.Experiments/Azure.Experiments/Network/VirtualNetworkObject.cs
@@ -2,10 +2,10 @@
 using Microsoft.Azure.Management.Network.Models;
 using System.Threading.Tasks;
 
-namespace Azure.Experiments
+namespace Azure.Experiments.Network
 {
     public sealed class VirtualNetworkObject : 
-        ResourceObject<VirtualNetwork>
+        NetworkObject<VirtualNetwork>
     {
         public VirtualNetworkObject(
             INetworkManagementClient client,
diff --git a/experiments/Azure.Experiments/Azure.Experiments/ResourceGroupObject.cs b/experiments/Azure.Experiments/Azure.Experiments/ResourceGroupObject.cs
@@ -5,7 +5,7 @@
 namespace Azure.Experiments
 {
     public sealed class ResourceGroupObject : AzureObject<
-        ResourceGroup>
+        ResourceGroup, ResourceGroupPolicy>
     {
         public ResourceGroupObject(Context client, string name) 
             : base(name, NoDependencies)
diff --git a/experiments/Azure.Experiments/Azure.Experiments/ResourceGroupPolicy.cs b/experiments/Azure.Experiments/Azure.Experiments/ResourceGroupPolicy.cs
@@ -0,0 +1,10 @@
+﻿using Microsoft.Azure.Management.ResourceManager.Models;
+
+namespace Azure.Experiments
+{
+    public struct ResourceGroupPolicy : IInfoPolicy<ResourceGroup>
+    {
+        public string GetLocation(ResourceGroup value)
+            => value.Location;
+    }
+}
diff --git a/experiments/Azure.Experiments/Azure.Experiments/ResourceObject.cs b/experiments/Azure.Experiments/Azure.Experiments/ResourceObject.cs
@@ -3,8 +3,9 @@
 
 namespace Azure.Experiments
 {
-    public abstract class ResourceObject<T> : AzureObject<T>
+    public abstract class ResourceObject<T, P> : AzureObject<T, P>
         where T : class
+        where P : struct, IInfoPolicy<T>
     {
         public string ResourceGroupName { get; }
 
diff --git a/experiments/Azure.Experiments/Tests/ComputeTest.cs b/experiments/Azure.Experiments/Tests/ComputeTest.cs
@@ -1,6 +1,8 @@
 using Xunit;
 using Microsoft.Azure.Management.Compute;
 using System.Threading.Tasks;
+using Azure.Experiments.Network;
+using Azure.Experiments.Compute;
 
 namespace Azure.Experiments.Tests
 {
@@ -79,7 +81,7 @@ public async Task VmObject()
             var pia = new PublicIpAddressObject(network, "MyVM", rg);
             var nsg = new NetworkSecurityGroupObject(network, "MyVM", rg);
             var ni = new NetworkInterfaceObject(network, "MyVM", rg, subnet, pia, nsg);
-            var vm = new VmObject(c, "MyVM", rg, ni, "MyVMUser", "@3as54dDd");
+            var vm = new VirtualMachineObject(c, "MyVM", rg, ni, "MyVMUser", "@3as54dDd");
             var info = await vm.GetOrCreateAsync();
         }
 
diff --git a/experiments/Azure.Experiments/Tests/UnitTests.cs b/experiments/Azure.Experiments/Tests/UnitTests.cs
@@ -1,4 +1,6 @@
-﻿using Microsoft.Rest;
+﻿using Azure.Experiments.Compute;
+using Azure.Experiments.Network;
+using Microsoft.Rest;
 using Xunit;
 
 namespace Azure.Experiments.Tests
@@ -8,22 +10,22 @@ public class UnitTests
         private static Context C { get; }
             = new Context(new TokenCredentials("a"), string.Empty);
 
-        //[Fact]
+        [Fact]
         public void ResourceGroupObjectTest()
         {
             var rg = new ResourceGroupObject(C, "My");
             Assert.Equal(0, rg.Priority);
         }
 
-        //[Fact]
+        [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);
         }
 
-        //[Fact]
+        [Fact]
         public void PublicIpAddressObjectTest()
         {
             var rg = new ResourceGroupObject(C, "MyPIA");
@@ -72,7 +74,7 @@ public void VmObjectTest()
             var pia = new PublicIpAddressObject(network, "MyVM", rg);
             var nsg = new NetworkSecurityGroupObject(network, "MyVM", rg);
             var ni = new NetworkInterfaceObject(network, "MyVM", rg, subnet, pia, nsg);
-            var vm = new VmObject(C, "MyVM", rg, ni, "MyVMUser", "@3as54dDd");
+            var vm = new VirtualMachineObject(C, "MyVM", rg, ni, "MyVMUser", "@3as54dDd");
             Assert.Equal(4, vm.Priority);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,9 @@ protected AzureObject(string name, IEnumerable<AzureObject> dependencies)`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`		`- public abstract class AzureObject<T> : AzureObject`
	`29`	`+ public abstract class AzureObject<T, P> : AzureObject`
`30`	`30`	`where T: class`
	`31`	`+ where P: struct, IInfoPolicy<T>`
`31`	`32`	`{`
`32`	`33`	`public T Info { get; private set; }`
`33`	`34`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,10 @@`
`2`	`2`	`using Microsoft.Azure.Management.Network.Models;`
`3`	`3`	`using System.Threading.Tasks;`
`4`	`4`
`5`		`-namespace Azure.Experiments`
	`5`	`+namespace Azure.Experiments.Network`
`6`	`6`	`{`
`7`	`7`	`public sealed class NetworkInterfaceObject`
`8`		`- : ResourceObject<NetworkInterface>`
	`8`	`+ : NetworkObject<NetworkInterface>`
`9`	`9`	`{`
`10`	`10`	`public NetworkInterfaceObject(`
`11`	`11`	`INetworkManagementClient client,`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using System.Threading.Tasks;`
`5`	`5`
`6`		`-namespace Azure.Experiments`
	`6`	`+namespace Azure.Experiments.Network`
`7`	`7`	`{`
`8`		`- public sealed class SubnetObject : AzureObject<Subnet>`
	`8`	`+ public sealed class SubnetObject : AzureObject<Subnet, SubnetPolicy>`
`9`	`9`	`{`
`10`	`10`	`public string AddressPrefix { get; }`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`namespace Azure.Experiments`
`6`	`6`	`{`
`7`	`7`	`public sealed class ResourceGroupObject : AzureObject<`
`8`		`- ResourceGroup>`
	`8`	`+ ResourceGroup, ResourceGroupPolicy>`
`9`	`9`	`{`
`10`	`10`	`public ResourceGroupObject(Context client, string name)`
`11`	`11`	`: base(name, NoDependencies)`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,9 @@`
`3`	`3`
`4`	`4`	`namespace Azure.Experiments`
`5`	`5`	`{`
`6`		`- public abstract class ResourceObject<T> : AzureObject<T>`
	`6`	`+ public abstract class ResourceObject<T, P> : AzureObject<T, P>`
`7`	`7`	`where T : class`
	`8`	`+ where P : struct, IInfoPolicy<T>`
`8`	`9`	`{`
`9`	`10`	`public string ResourceGroupName { get; }`
`10`	`11`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-using Microsoft.Rest;`
	`1`	`+using Azure.Experiments.Compute;`
	`2`	`+using Azure.Experiments.Network;`
	`3`	`+using Microsoft.Rest;`
`2`	`4`	`using Xunit;`
`3`	`5`
`4`	`6`	`namespace Azure.Experiments.Tests`
`@@ -8,22 +10,22 @@ public class UnitTests`
`8`	`10`	`private static Context C { get; }`
`9`	`11`	`= new Context(new TokenCredentials("a"), string.Empty);`
`10`	`12`
`11`		`- //[Fact]`
	`13`	`+ [Fact]`
`12`	`14`	`public void ResourceGroupObjectTest()`
`13`	`15`	`{`
`14`	`16`	`var rg = new ResourceGroupObject(C, "My");`
`15`	`17`	`Assert.Equal(0, rg.Priority);`
`16`	`18`	`}`
`17`	`19`
`18`		`- //[Fact]`
	`20`	`+ [Fact]`
`19`	`21`	`public void VirtualNetworkObjectTest()`
`20`	`22`	`{`
`21`	`23`	`var rg = new ResourceGroupObject(C, "My1");`
`22`	`24`	`var vn = new VirtualNetworkObject(C.CreateNetwork(), "My1", rg, "192.168.0.0/16");`
`23`	`25`	`Assert.Equal(1, vn.Priority);`
`24`	`26`	`}`
`25`	`27`
`26`		`- //[Fact]`
	`28`	`+ [Fact]`
`27`	`29`	`public void PublicIpAddressObjectTest()`
`28`	`30`	`{`
`29`	`31`	`var rg = new ResourceGroupObject(C, "MyPIA");`
`@@ -72,7 +74,7 @@ public void VmObjectTest()`
`72`	`74`	`var pia = new PublicIpAddressObject(network, "MyVM", rg);`
`73`	`75`	`var nsg = new NetworkSecurityGroupObject(network, "MyVM", rg);`
`74`	`76`	`var ni = new NetworkInterfaceObject(network, "MyVM", rg, subnet, pia, nsg);`
`75`		`- var vm = new VmObject(C, "MyVM", rg, ni, "MyVMUser", "@3as54dDd");`
	`77`	`+ var vm = new VirtualMachineObject(C, "MyVM", rg, ni, "MyVMUser", "@3as54dDd");`
`76`	`78`	`Assert.Equal(4, vm.Priority);`
`77`	`79`	`}`
`78`	`80`	`}`