Name :-(

sergey-shandar · sergey-shandar · commit c844f7bed343 · 2017-10-25T14:27:50.000-07:00
diff --git a/experiments/Azure.Experiments/Azure.Experiments/AzureObject.cs b/experiments/Azure.Experiments/Azure.Experiments/AzureObject.cs
@@ -11,7 +11,7 @@ public abstract class AzureObject
         public static IEnumerable<AzureObject> NoDependencies { get; } 
             = Enumerable.Empty<AzureObject>();
 
-        public string Name { get; }
+        public abstract string Name { get; }
 
         public IEnumerable<AzureObject> Dependencies { get; }
 
@@ -49,9 +49,9 @@ public async Task<DependencyLocation> GetDependencyLocationAsync()
             return DependencyLocation;
         }
 
-        protected AzureObject(string name, IEnumerable<AzureObject> dependencies)
+        protected AzureObject(IEnumerable<AzureObject> dependencies)
         {
-            Name = name;
+            // Name = name;
             Dependencies = dependencies;
             Priority = dependencies.Any() 
                 ? dependencies.Max(d => d.Priority) + 1 
@@ -111,8 +111,8 @@ public async Task<T> GetOrCreateAsync()
             return await GetOrCreateAsync(location);
         }
 
-        protected AzureObject(string name, IEnumerable<AzureObject> dependencies) 
-            : base(name, dependencies)
+        protected AzureObject(IEnumerable<AzureObject> dependencies) 
+            : base(dependencies)
         {
         }
 
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Compute/VirtualMachineObject.cs b/experiments/Azure.Experiments/Azure.Experiments/Compute/VirtualMachineObject.cs
@@ -15,8 +15,9 @@ public VirtualMachineObject(
             NetworkInterfaceObject ni,
             string adminUsername,
             string adminPassword) 
-            : base(name, rg, new[] { ni })
+            : base(rg, new[] { ni })
         {
+            Name = name;
             Client = new ComputeManagementClient(c.Credentials)
                 {
                     SubscriptionId = c.SubscriptionId
@@ -79,5 +80,7 @@ protected override Task<VirtualMachine> GetOrThrowAsync()
         private NetworkInterfaceObject Ni { get; }
 
         private IVirtualMachinesOperations Client { get; }
+
+        public override string Name { get; }
     }
 }
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Network/NetworkInterfaceObject.cs b/experiments/Azure.Experiments/Azure.Experiments/Network/NetworkInterfaceObject.cs
@@ -14,8 +14,9 @@ public NetworkInterfaceObject(
             SubnetObject subnet,
             PublicIpAddressObject pia,
             NetworkSecurityGroupObject nsg) 
-            : base(name, rg, new AzureObject[] { subnet, pia, nsg })
+            : base(rg, new AzureObject[] { subnet, pia, nsg })
         {
+            Name = name;
             Client = client.NetworkInterfaces;
             Pia = pia;
             Subnet = subnet;
@@ -51,5 +52,7 @@ protected override Task<NetworkInterface> GetOrThrowAsync()
         private SubnetObject Subnet { get; }
 
         private INetworkInterfacesOperations Client { get; }
+
+        public override string Name { get; }
     }
 }
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Network/NetworkObject.cs b/experiments/Azure.Experiments/Azure.Experiments/Network/NetworkObject.cs
@@ -6,15 +6,14 @@ 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(ResourceGroupObject rg)
+            : base(rg)
         {
         }
 
         protected NetworkObject(
-            string name,
             ResourceGroupObject rg,
-            IEnumerable<AzureObject> dependencies) : base(name, rg, dependencies)
+            IEnumerable<AzureObject> dependencies) : base(rg, dependencies)
         {
         }
     }
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Network/NetworkSecurityGroup.cs b/experiments/Azure.Experiments/Azure.Experiments/Network/NetworkSecurityGroup.cs
@@ -11,8 +11,9 @@ public NetworkSecurityGroupObject(
             INetworkManagementClient client,
             string name,
             ResourceGroupObject rg)
-            : base(name, rg)
+            : base(rg)
         {
+            Name = name;
             Client = client.NetworkSecurityGroups;
         }
 
@@ -26,5 +27,7 @@ protected override Task<NetworkSecurityGroup> GetOrThrowAsync()
             => Client.GetAsync(ResourceGroupName, Name);
 
         private INetworkSecurityGroupsOperations Client { get; }
+
+        public override string Name { get; }
     }
 }
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Network/PublicIpAddressObject.cs b/experiments/Azure.Experiments/Azure.Experiments/Network/PublicIpAddressObject.cs
@@ -11,20 +11,23 @@ public PublicIpAddressObject(
             INetworkManagementClient client,
             string name,
             ResourceGroupObject rg)
-            : base(name, rg)
+            : base(rg)
         {
+            Name = name;
             Client = client.PublicIPAddresses;
         }
 
         protected override Task<PublicIPAddress> CreateAsync(string location)
             => Client.CreateOrUpdateAsync(
                 ResourceGroupName,
                 Name,
-                new PublicIPAddress { Location = "eastus" });
+                new PublicIPAddress { Location = location });
 
         protected override Task<PublicIPAddress> GetOrThrowAsync()
             => Client.GetAsync(ResourceGroupName, Name);
 
         private IPublicIPAddressesOperations Client { get; }
+
+        public override string Name { get; }
     }
 }
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Network/SubnetObject.cs b/experiments/Azure.Experiments/Azure.Experiments/Network/SubnetObject.cs
@@ -11,8 +11,9 @@ public sealed class SubnetObject : AzureObject<Subnet, SubnetPolicy>
 
         public SubnetObject(
             string name, VirtualNetworkObject vn, string addressPrefix) 
-            : base(name, new[] { vn })
+            : base(new[] { vn })
         {
+            Name = name;
             Vn = vn;
             AddressPrefix = addressPrefix;
         }
@@ -32,6 +33,8 @@ protected override async Task<Subnet> GetOrThrowAsync()
 
         private VirtualNetworkObject Vn { get; }
 
+        public override string Name { get; }
+
         private Subnet GetSubnet(VirtualNetwork vn)
             => vn?.Subnets.FirstOrDefault(s => s.Name == Name);
     }
diff --git a/experiments/Azure.Experiments/Azure.Experiments/Network/VirtualNetworkObject.cs b/experiments/Azure.Experiments/Azure.Experiments/Network/VirtualNetworkObject.cs
@@ -12,8 +12,9 @@ public VirtualNetworkObject(
             string name,
             ResourceGroupObject rg,
             string addressPrefix) 
-            : base(name, rg, NoDependencies)
+            : base(rg, NoDependencies)
         {
+            Name = name;
             Client = client.VirtualNetworks;
             AddressPrefix = addressPrefix;
         }
@@ -37,5 +38,7 @@ protected override Task<VirtualNetwork> GetOrThrowAsync()
         private string AddressPrefix { get; }
 
         public IVirtualNetworksOperations Client { get; }
+
+        public override string Name { get; }
     }
 }
diff --git a/experiments/Azure.Experiments/Azure.Experiments/ResourceGroupObject.cs b/experiments/Azure.Experiments/Azure.Experiments/ResourceGroupObject.cs
@@ -8,8 +8,9 @@ public sealed class ResourceGroupObject : AzureObject<
         ResourceGroup, ResourceGroupPolicy>
     {
         public ResourceGroupObject(Context client, string name) 
-            : base(name, NoDependencies)
+            : base(NoDependencies)
         {
+            Name = name;
             Client = new ResourceManagementClient(client.Credentials)
                 {
                     SubscriptionId = client.SubscriptionId
@@ -26,5 +27,7 @@ protected override Task<ResourceGroup> GetOrThrowAsync()
             => Client.GetAsync(Name);
 
         private IResourceGroupsOperations Client { get; }
+
+        public override string Name { get; }
     }
 }
diff --git a/experiments/Azure.Experiments/Azure.Experiments/ResourceObject.cs b/experiments/Azure.Experiments/Azure.Experiments/ResourceObject.cs
@@ -10,18 +10,16 @@ public abstract class ResourceObject<T, P> : AzureObject<T, P>
         public string ResourceGroupName { get; }
 
         protected ResourceObject(
-            string name,
             ResourceGroupObject rg,
             IEnumerable<AzureObject> dependencies) 
-            : base(name, dependencies.Concat(new[] { rg }))
+            : base(dependencies.Concat(new[] { rg }))
         {
             ResourceGroupName = rg.Name;
         }
 
         protected ResourceObject(
-            string name,
             ResourceGroupObject rg)
-            : this(name, rg, NoDependencies)
+            : this(rg, NoDependencies)
         {
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public abstract class AzureObject`
`11`	`11`	`public static IEnumerable<AzureObject> NoDependencies { get; }`
`12`	`12`	`= Enumerable.Empty<AzureObject>();`
`13`	`13`
`14`		`- public string Name { get; }`
	`14`	`+ public abstract string Name { get; }`
`15`	`15`
`16`	`16`	`public IEnumerable<AzureObject> Dependencies { get; }`
`17`	`17`
`@@ -49,9 +49,9 @@ public async Task<DependencyLocation> GetDependencyLocationAsync()`
`49`	`49`	`return DependencyLocation;`
`50`	`50`	`}`
`51`	`51`
`52`		`- protected AzureObject(string name, IEnumerable<AzureObject> dependencies)`
	`52`	`+ protected AzureObject(IEnumerable<AzureObject> dependencies)`
`53`	`53`	`{`
`54`		`- Name = name;`
	`54`	`+ // Name = name;`
`55`	`55`	`Dependencies = dependencies;`
`56`	`56`	`Priority = dependencies.Any()`
`57`	`57`	`? dependencies.Max(d => d.Priority) + 1`
`@@ -111,8 +111,8 @@ public async Task<T> GetOrCreateAsync()`
`111`	`111`	`return await GetOrCreateAsync(location);`
`112`	`112`	`}`
`113`	`113`
`114`		`- protected AzureObject(string name, IEnumerable<AzureObject> dependencies)`
`115`		`- : base(name, dependencies)`
	`114`	`+ protected AzureObject(IEnumerable<AzureObject> dependencies)`
	`115`	`+ : base(dependencies)`
`116`	`116`	`{`
`117`	`117`	`}`
`118`	`118`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,9 @@ public VirtualMachineObject(`
`15`	`15`	`NetworkInterfaceObject ni,`
`16`	`16`	`string adminUsername,`
`17`	`17`	`string adminPassword)`
`18`		`- : base(name, rg, new[] { ni })`
	`18`	`+ : base(rg, new[] { ni })`
`19`	`19`	`{`
	`20`	`+ Name = name;`
`20`	`21`	`Client = new ComputeManagementClient(c.Credentials)`
`21`	`22`	`{`
`22`	`23`	`SubscriptionId = c.SubscriptionId`
`@@ -79,5 +80,7 @@ protected override Task<VirtualMachine> GetOrThrowAsync()`
`79`	`80`	`private NetworkInterfaceObject Ni { get; }`
`80`	`81`
`81`	`82`	`private IVirtualMachinesOperations Client { get; }`
	`83`	`+`
	`84`	`+ public override string Name { get; }`
`82`	`85`	`}`
`83`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,9 @@ public NetworkInterfaceObject(`
`14`	`14`	`SubnetObject subnet,`
`15`	`15`	`PublicIpAddressObject pia,`
`16`	`16`	`NetworkSecurityGroupObject nsg)`
`17`		`- : base(name, rg, new AzureObject[] { subnet, pia, nsg })`
	`17`	`+ : base(rg, new AzureObject[] { subnet, pia, nsg })`
`18`	`18`	`{`
	`19`	`+ Name = name;`
`19`	`20`	`Client = client.NetworkInterfaces;`
`20`	`21`	`Pia = pia;`
`21`	`22`	`Subnet = subnet;`
`@@ -51,5 +52,7 @@ protected override Task<NetworkInterface> GetOrThrowAsync()`
`51`	`52`	`private SubnetObject Subnet { get; }`
`52`	`53`
`53`	`54`	`private INetworkInterfacesOperations Client { get; }`
	`55`	`+`
	`56`	`+ public override string Name { get; }`
`54`	`57`	`}`
`55`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,15 +6,14 @@ namespace Azure.Experiments.Network`
`6`	`6`	`public abstract class NetworkObject<T> : ResourceObject<T, NetworkPolicy<T>>`
`7`	`7`	`where T : Resource`
`8`	`8`	`{`
`9`		`- protected NetworkObject(string name, ResourceGroupObject rg)`
`10`		`- : base(name, rg)`
	`9`	`+ protected NetworkObject(ResourceGroupObject rg)`
	`10`	`+ : base(rg)`
`11`	`11`	`{`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`protected NetworkObject(`
`15`		`- string name,`
`16`	`15`	`ResourceGroupObject rg,`
`17`		`- IEnumerable<AzureObject> dependencies) : base(name, rg, dependencies)`
	`16`	`+ IEnumerable<AzureObject> dependencies) : base(rg, dependencies)`
`18`	`17`	`{`
`19`	`18`	`}`
`20`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,9 @@ public NetworkSecurityGroupObject(`
`11`	`11`	`INetworkManagementClient client,`
`12`	`12`	`string name,`
`13`	`13`	`ResourceGroupObject rg)`
`14`		`- : base(name, rg)`
	`14`	`+ : base(rg)`
`15`	`15`	`{`
	`16`	`+ Name = name;`
`16`	`17`	`Client = client.NetworkSecurityGroups;`
`17`	`18`	`}`
`18`	`19`
`@@ -26,5 +27,7 @@ protected override Task<NetworkSecurityGroup> GetOrThrowAsync()`
`26`	`27`	`=> Client.GetAsync(ResourceGroupName, Name);`
`27`	`28`
`28`	`29`	`private INetworkSecurityGroupsOperations Client { get; }`
	`30`	`+`
	`31`	`+ public override string Name { get; }`
`29`	`32`	`}`
`30`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,20 +11,23 @@ public PublicIpAddressObject(`
`11`	`11`	`INetworkManagementClient client,`
`12`	`12`	`string name,`
`13`	`13`	`ResourceGroupObject rg)`
`14`		`- : base(name, rg)`
	`14`	`+ : base(rg)`
`15`	`15`	`{`
	`16`	`+ Name = name;`
`16`	`17`	`Client = client.PublicIPAddresses;`
`17`	`18`	`}`
`18`	`19`
`19`	`20`	`protected override Task<PublicIPAddress> CreateAsync(string location)`
`20`	`21`	`=> Client.CreateOrUpdateAsync(`
`21`	`22`	`ResourceGroupName,`
`22`	`23`	`Name,`
`23`		`- new PublicIPAddress { Location = "eastus" });`
	`24`	`+ new PublicIPAddress { Location = location });`
`24`	`25`
`25`	`26`	`protected override Task<PublicIPAddress> GetOrThrowAsync()`
`26`	`27`	`=> Client.GetAsync(ResourceGroupName, Name);`
`27`	`28`
`28`	`29`	`private IPublicIPAddressesOperations Client { get; }`
	`30`	`+`
	`31`	`+ public override string Name { get; }`
`29`	`32`	`}`
`30`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,9 @@ public sealed class SubnetObject : AzureObject<Subnet, SubnetPolicy>`
`11`	`11`
`12`	`12`	`public SubnetObject(`
`13`	`13`	`string name, VirtualNetworkObject vn, string addressPrefix)`
`14`		`- : base(name, new[] { vn })`
	`14`	`+ : base(new[] { vn })`
`15`	`15`	`{`
	`16`	`+ Name = name;`
`16`	`17`	`Vn = vn;`
`17`	`18`	`AddressPrefix = addressPrefix;`
`18`	`19`	`}`
`@@ -32,6 +33,8 @@ protected override async Task<Subnet> GetOrThrowAsync()`
`32`	`33`
`33`	`34`	`private VirtualNetworkObject Vn { get; }`
`34`	`35`
	`36`	`+ public override string Name { get; }`
	`37`	`+`
`35`	`38`	`private Subnet GetSubnet(VirtualNetwork vn)`
`36`	`39`	`=> vn?.Subnets.FirstOrDefault(s => s.Name == Name);`
`37`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,9 @@ public VirtualNetworkObject(`
`12`	`12`	`string name,`
`13`	`13`	`ResourceGroupObject rg,`
`14`	`14`	`string addressPrefix)`
`15`		`- : base(name, rg, NoDependencies)`
	`15`	`+ : base(rg, NoDependencies)`
`16`	`16`	`{`
	`17`	`+ Name = name;`
`17`	`18`	`Client = client.VirtualNetworks;`
`18`	`19`	`AddressPrefix = addressPrefix;`
`19`	`20`	`}`
`@@ -37,5 +38,7 @@ protected override Task<VirtualNetwork> GetOrThrowAsync()`
`37`	`38`	`private string AddressPrefix { get; }`
`38`	`39`
`39`	`40`	`public IVirtualNetworksOperations Client { get; }`
	`41`	`+`
	`42`	`+ public override string Name { get; }`
`40`	`43`	`}`
`41`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,9 @@ public sealed class ResourceGroupObject : AzureObject<`
`8`	`8`	`ResourceGroup, ResourceGroupPolicy>`
`9`	`9`	`{`
`10`	`10`	`public ResourceGroupObject(Context client, string name)`
`11`		`- : base(name, NoDependencies)`
	`11`	`+ : base(NoDependencies)`
`12`	`12`	`{`
	`13`	`+ Name = name;`
`13`	`14`	`Client = new ResourceManagementClient(client.Credentials)`
`14`	`15`	`{`
`15`	`16`	`SubscriptionId = client.SubscriptionId`
`@@ -26,5 +27,7 @@ protected override Task<ResourceGroup> GetOrThrowAsync()`
`26`	`27`	`=> Client.GetAsync(Name);`
`27`	`28`
`28`	`29`	`private IResourceGroupsOperations Client { get; }`
	`30`	`+`
	`31`	`+ public override string Name { get; }`
`29`	`32`	`}`
`30`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,18 +10,16 @@ public abstract class ResourceObject<T, P> : AzureObject<T, P>`
`10`	`10`	`public string ResourceGroupName { get; }`
`11`	`11`
`12`	`12`	`protected ResourceObject(`
`13`		`- string name,`
`14`	`13`	`ResourceGroupObject rg,`
`15`	`14`	`IEnumerable<AzureObject> dependencies)`
`16`		`- : base(name, dependencies.Concat(new[] { rg }))`
	`15`	`+ : base(dependencies.Concat(new[] { rg }))`
`17`	`16`	`{`
`18`	`17`	`ResourceGroupName = rg.Name;`
`19`	`18`	`}`
`20`	`19`
`21`	`20`	`protected ResourceObject(`
`22`		`- string name,`
`23`	`21`	`ResourceGroupObject rg)`
`24`		`- : this(name, rg, NoDependencies)`
	`22`	`+ : this(rg, NoDependencies)`
`25`	`23`	`{`
`26`	`24`	`}`
`27`	`25`	`}`