Context.

Author: sergey-shandar

experiments/Azure.Experiments/Azure.Experiments/Compute/VirtualMachineParameters.cs

@@ -18,9 +18,8 @@ public VirtualMachineParameters(
             Ni = ni;
         }
 
-        protected override Task<VirtualMachine> GetAsync(GetContext context)
+        protected override Task<VirtualMachine> GetAsync(Context context, GetMap map)
             => context
-                .Context
                 .CreateCompute()
                 .VirtualMachines
                 .GetAsync(ResourceGroup.Name, Name);

experiments/Azure.Experiments/Azure.Experiments/GetContext.cs renamed to experiments/Azure.Experiments/Azure.Experiments/GetMap.cs

@@ -4,15 +4,8 @@
 
 namespace Microsoft.Azure.Experiments
 {
-    public sealed class GetContext
+    public sealed class GetMap
     {
-        public Context Context { get; }
-
-        public GetContext(Context context)
-        {
-            Context = context;
-        }
-
         public async Task<T> GetOrAdd<T>(Parameters<T> parameters, Func<Task<T>> get)
             where T : class
         {

experiments/Azure.Experiments/Azure.Experiments/Network/NetworkInterfaceParameters.cs

@@ -27,9 +27,8 @@ public NetworkInterfaceParameters(
             Pia = pia;
         }
 
-        protected override Task<NetworkInterface> GetAsync(GetContext context)
+        protected override Task<NetworkInterface> GetAsync(Context context, GetMap map)
             => context
-                .Context
                 .CreateNetwork()
                 .NetworkInterfaces
                 .GetAsync(ResourceGroup.Name, Name);

experiments/Azure.Experiments/Azure.Experiments/Network/NetworkSecurityGroupParameters.cs

@@ -13,9 +13,8 @@ public NetworkSecurityGroupParameters(
         {
         }
 
-        protected override Task<NetworkSecurityGroup> GetAsync(GetContext context)
+        protected override Task<NetworkSecurityGroup> GetAsync(Context context, GetMap map)
             => context
-                .Context
                 .CreateNetwork()
                 .NetworkSecurityGroups
                 .GetAsync(ResourceGroup.Name, Name);

experiments/Azure.Experiments/Azure.Experiments/Network/PublicIpAddressParameters.cs

@@ -14,9 +14,8 @@ public PublicIpAddressParameters(
         {
         }
 
-        protected override Task<PublicIPAddress> GetAsync(GetContext context)
+        protected override Task<PublicIPAddress> GetAsync(Context context, GetMap map)
             => context
-                .Context
                 .CreateNetwork()
                 .PublicIPAddresses
                 .GetAsync(ResourceGroup.Name, Name);

experiments/Azure.Experiments/Azure.Experiments/Network/SubnetParameters.cs

@@ -15,9 +15,9 @@ public SubnetParameters(
             VirtualNetwork = virtualNetwork;
         }
 
-        protected override async Task<Subnet> GetAsync(GetContext context)
+        protected override async Task<Subnet> GetAsync(Context context, GetMap map)
         {
-            var virtualNetwork = await VirtualNetwork.GetOrNullAsync(context);
+            var virtualNetwork = await VirtualNetwork.GetOrNullAsync(context, map);
             return virtualNetwork?.Subnets.FirstOrDefault(s => s.Name == Name);
         }
     }

experiments/Azure.Experiments/Azure.Experiments/Network/VirtualNetworkParameters.cs

@@ -13,9 +13,8 @@ public VirtualNetworkParameters(
         {
         }
 
-        protected override Task<VirtualNetwork> GetAsync(GetContext context)
+        protected override Task<VirtualNetwork> GetAsync(Context context, GetMap map)
             => context
-                .Context
                 .CreateNetwork()
                 .VirtualNetworks
                 .GetAsync(ResourceGroup.Name, Name);

experiments/Azure.Experiments/Azure.Experiments/Parameters.cs

@@ -30,14 +30,14 @@ protected Parameters(string name, IEnumerable<Parameters> parameters)
         {
         }
 
-        public async Task<T> GetOrNullAsync(GetContext context)
-            => await context.GetOrAdd(
+        public async Task<T> GetOrNullAsync(Context context, GetMap map)
+            => await map.GetOrAdd(
                 this, 
                 async () => 
                 {
                     try
                     {
-                        return await GetAsync(context);
+                        return await GetAsync(context, map);
                     }
                     catch (CloudException e)
                         when (e.Response.StatusCode == HttpStatusCode.NotFound)
@@ -46,6 +46,6 @@ public async Task<T> GetOrNullAsync(GetContext context)
                     }
                 });
 
-        protected abstract Task<T> GetAsync(GetContext context);
+        protected abstract Task<T> GetAsync(Context context, GetMap map);
     }
 }