NetworkInterface

huangpf · Oct 17, 2017 · 5782a9b · 5782a9b
1 parent a522a35
commit 5782a9b
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 11 deletions.
diff --git a/experiments/Azure.Experiments/Azure.Experiments.Tests/ComputeTest.cs b/experiments/Azure.Experiments/Azure.Experiments.Tests/ComputeTest.cs
@@ -54,6 +54,19 @@ public async Task SubnetTest()
             var info = await subnet.GetOrCreateAsync(c);
         }
 
+        [Fact]
+        public async Task NetworkInterfaceObject()
+        {
+            var c = Credentials.Get();
+            var rg = new ResourceGroupObject("MyNI");
+            var vn = new VirtualNetworkObject("MyNI", rg, "192.168.0.0/16");
+            var subnet = new SubnetObject("MyNI", vn, "192.168.1.0/24");
+            var pia = new PublicIpAddressObject("MyNI", rg);
+            var nsg = new NetworkSecurityGroupObject("MyNI", rg);
+            var ni = new NetworkInterfaceObject("MyNI", rg, subnet, pia, nsg);
+            var info = await ni.GetOrCreateAsync(c);
+        }
+
         [Fact]
         public async Task Test1()
         {

diff --git a/experiments/Azure.Experiments/Azure.Experiments/AzureObject.cs b/experiments/Azure.Experiments/Azure.Experiments/AzureObject.cs
@@ -28,6 +28,8 @@ protected AzureObject(string name, IEnumerable<AzureObject> dependencies)
     public abstract class AzureObject<T, C> : AzureObject
         where T: class
     {
+        public T Info { get; private set; }
+
         public async Task<T> GetOrNullAsync(C c)
         {
             if (!IsGetCalled)
@@ -84,8 +86,6 @@ protected AzureObject(string name, IEnumerable<AzureObject> dependencies)
 
         protected abstract Task DeleteAsync(C c);
 
-        private bool IsGetCalled;
-
-        private T Info;
+        private bool IsGetCalled;       
     }
 }
diff --git a/experiments/Azure.Experiments/Azure.Experiments/NetworkInterfaceObject.cs b/experiments/Azure.Experiments/Azure.Experiments/NetworkInterfaceObject.cs
@@ -4,23 +4,39 @@
 
 namespace Azure.Experiments
 {
-    class NetworkInterfaceObject
+    public sealed class NetworkInterfaceObject
         : ResourceObject<NetworkInterface, INetworkInterfacesOperations>
     {
-        protected NetworkInterfaceObject(
+        public NetworkInterfaceObject(
             string name,
             ResourceGroupObject rg, 
-            VirtualNetworkObject vn,
+            SubnetObject subnet,
             PublicIpAddressObject pia,
             NetworkSecurityGroupObject nsg) 
-            : base(name, rg, new AzureObject[] { vn, pia, nsg })
+            : base(name, rg, new AzureObject[] { subnet, pia, nsg })
         {
+            Pia = pia;
+            Subnet = subnet;
         }
 
-        protected override Task<NetworkInterface> CreateAsync(
+        protected override async Task<NetworkInterface> CreateAsync(
             INetworkInterfacesOperations c)
-            => c.CreateOrUpdateAsync(
-                ResourceGroupName, Name, new NetworkInterface());
+            => await c.CreateOrUpdateAsync(
+                ResourceGroupName,
+                Name, 
+                new NetworkInterface
+                {
+                    Location = "eastus",                    
+                    IpConfigurations = new[] 
+                    {
+                        new NetworkInterfaceIPConfiguration
+                        {
+                            Name = Name,
+                            Subnet = Subnet.Info,
+                            PublicIPAddress = Pia.Info,
+                        }
+                    }                    
+                });
 
         protected override INetworkInterfacesOperations CreateClient(Context c)
             => c.CreateNetwork().NetworkInterfaces;
@@ -31,5 +47,8 @@ protected override Task DeleteAsync(INetworkInterfacesOperations c)
         protected override Task<NetworkInterface> GetOrThrowAsync(
             INetworkInterfacesOperations c)
             => c.GetAsync(ResourceGroupName, Name);
+
+        private PublicIpAddressObject Pia { get; }
+        private SubnetObject Subnet { get; }
     }
 }
diff --git a/experiments/Compute.Experiments/AzureRM.Compute.Experiments.psm1 b/experiments/Compute.Experiments/AzureRM.Compute.Experiments.psm1
@@ -514,7 +514,7 @@ class NetworkInterface: Resource1 {
         $subnetInfo = $this.Subnet.Info
         $securityGroupInfo = $this.SecurityGroup.Info
         return New-AzureRmNetworkInterface `
-            -ResourceGroupName $this.GetResourceGroupName() `
+            -ResourceGroupName $this.ResourceGroup.Name `
             -Location $p.Location `
             -Name $this.Name `
             -PublicIpAddressId $publicIpAddressInfo.Id `