Merge pull request #3 from sergey-shandar/sergey-compute-class

sergey-shandar · web-flow · commit 199077b6ba3d · 2017-09-14T18:17:14.000-07:00
Sergey compute class
diff --git a/experiments/Compute.Experiments/AzureRM.Compute.Experiments.Tests.ps1 b/experiments/Compute.Experiments/AzureRM.Compute.Experiments.Tests.ps1
@@ -15,6 +15,8 @@ $vmComputerUser = $credentials.vmUser;
 $password = ConvertTo-SecureString $vmComputerPassword -AsPlainText -Force;
 $vmCredential = New-Object System.Management.Automation.PSCredential ($vmComputerUser, $password);
 
+New-AzVm -Name MyVM -Credential $vmCredential -WhatIf
+
 # $vm = New-AzVm
 # $vm = New-AzVm -Credential $vmCredential
 $vm = New-AzVm -Name MyVM -Credential $vmCredential
diff --git a/experiments/Compute.Experiments/AzureRM.Compute.Experiments.psd1 b/experiments/Compute.Experiments/AzureRM.Compute.Experiments.psd1
@@ -12,7 +12,7 @@
 RootModule = ".\AzureRM.Compute.Experiments.psm1"
 
 # Version number of this module.
-ModuleVersion = '1.0.4'
+ModuleVersion = '1.0.6'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/experiments/Compute.Experiments/AzureRM.Compute.Experiments.psm1 b/experiments/Compute.Experiments/AzureRM.Compute.Experiments.psm1
@@ -2,31 +2,36 @@
 .ExternalHelp AzureRM.Compute.Experiments-help.xml
 #>
 function New-AzVm {
-    [CmdletBinding()]
+    [CmdletBinding(SupportsShouldProcess = $true)]
     param (
-        [Parameter(Mandatory=$true)][string] $Name = "VM",
+        [Parameter(Mandatory=$true, Position=0)][string] $Name = "VM",
         [Parameter()][PSCredential] $Credential,
         [Parameter()][string] $ImageName = "Win2012R2Datacenter",
         [Parameter()][string] $ResourceGroupName,
         [Parameter()][string] $Location,
         [Parameter()][string] $VirtualNetworkName,
         [Parameter()][string] $PublicIpAddressName,
         [Parameter()][string] $SecurityGroupName
-        # [Parameter()][string] $NetworkInterfaceName
     )
 
     PROCESS {
         $rgi = [ResourceGroup]::new($ResourceGroupName);
+
         $vni = [VirtualNetwork]::new($VirtualNetworkName);
         $piai = [PublicIpAddress]::new($PublicIpAddressName);
         $sgi = [SecurityGroup]::new($SecurityGroupName);
+
+        # we don't allow to reuse NetworkInterface so $name is $null.
         $nii = [NetworkInterface]::new(
-            $null, # $NetworkInterfaceName,
+            $null,
             $vni,
             $piai,
             $sgi);
+
+        # the purpouse of the New-AzVm cmdlet is to create (not get) a VM so $name is $null.
         $vmi = [VirtualMachine]::new($null, $nii, $rgi, $Credential, $ImageName, $images);
 
+        # infer a location
         $locationi = [Location]::new();
         if (-not $Location) {
             $vmi.UpdateLocation($locationi);
@@ -37,12 +42,16 @@ function New-AzVm {
             $locationi.Value = $Location;
         }
 
-        $resourceGroup = $rgi.GetOrCreate($Name + "ResourceGroup", $locationi.Value, $null);
-        $vmResponse = $vmi.Create($Name, $locationi.Value, $resourceGroup.ResourceGroupName);
+        $createParams = [CreateParams]::new($Name, $locationi.Value, $Name);
 
-        New-PsObject @{
-            ResourceId = $resourceGroup.ResourceId;
-            Response = $vmResponse;
+        if ($PSCmdlet.ShouldProcess($Name, "Creating a virtual machine")) {
+            $resourceGroup = $rgi.GetOrCreate($createParams);
+            $vmResponse = $vmi.Create($createParams);
+
+            New-PsObject @{
+                ResourceId = $resourceGroup.ResourceId;
+                Response = $vmResponse;
+            }
         }
     }
 }
@@ -57,6 +66,18 @@ class Location {
     }
 }
 
+class CreateParams {
+    [string] $Name;
+    [string] $Location;
+    [string] $ResourceGroupName;
+
+    CreateParams([string] $name, [string] $location, [string] $resourceGroupName) {
+        $this.Name = $name;
+        $this.Location = $location;
+        $this.ResourceGroupName = $resourceGroupName;
+    }
+}
+
 class AzureObject {
     [string] $Name;
     [AzureObject[]] $Children;
@@ -79,7 +100,7 @@ class AzureObject {
         return $null;
     }
 
-    [object] Create([string] $name, [string] $location, [string] $resourceGroupName) {
+    [object] Create([CreateParams] $p) {
         return $null;
     }
 
@@ -96,12 +117,12 @@ class AzureObject {
         }
     }
 
-    [object] GetOrCreate([string] $name, [string] $location, [string] $resourceGroupName) {
+    [object] GetOrCreate([CreateParams] $p) {
         if ($this.Name) {
             return $this.GetInfo();
         } else {
-            $result = $this.Create($name, $location, $resourceGroupName);
-            $this.Name = $name;
+            $result = $this.Create($p);
+            $this.Name = $p.Name;
             return $result;
         }
     }
@@ -115,8 +136,11 @@ class ResourceGroup: AzureObject {
         return Get-AzureRmResourceGroup -Name $this.Name;
     }
 
-    [object] Create([string] $name, [string] $location, [string] $resourceGroupName) {
-        return New-AzureRmResourceGroup -Name $name -Location $location;
+    [object] Create([CreateParams] $p) {
+        return New-AzureRmResourceGroup `
+            -Name $p.Name `
+            -Location $p.Location `
+            -WarningAction SilentlyContinue;
     }
 }
 
@@ -133,16 +157,17 @@ class VirtualNetwork: Resource1 {
         return Get-AzureRmVirtualNetwork -Name $this.Name;
     }
 
-    [object] Create([string] $name, [string] $location, [string] $resourceGroupName) {
+    [object] Create([CreateParams] $p) {
         $subnetConfig = New-AzureRmVirtualNetworkSubnetConfig `
             -Name "Subnet" `
             -AddressPrefix "192.168.1.0/24"
         return New-AzureRmVirtualNetwork `
-            -ResourceGroupName $resourceGroupName `
-            -Location $location `
-            -Name $name `
+            -ResourceGroupName $p.ResourceGroupName `
+            -Location $p.Location `
+            -Name $p.Name `
             -AddressPrefix "192.168.0.0/16" `
-            -Subnet $subnetConfig
+            -Subnet $subnetConfig `
+            -WarningAction SilentlyContinue
     }
 }
 
@@ -154,12 +179,13 @@ class PublicIpAddress: Resource1 {
         return Get-AzureRMPublicIpAddress -Name $this.Name;
     }
 
-    [object] Create([string] $name, [string] $location, [string] $resourceGroupName) {
+    [object] Create([CreateParams] $p) {
         return New-AzureRmPublicIpAddress `
-            -ResourceGroupName $resourceGroupName `
-            -Location $location `
+            -ResourceGroupName $p.ResourceGroupName `
+            -Location $p.Location `
+            -Name $p.Name `
             -AllocationMethod Static `
-            -Name $name
+            -WarningAction SilentlyContinue
     }
 }
 
@@ -171,9 +197,9 @@ class SecurityGroup: Resource1 {
         return Get-AzureRMSecurityGroup -Name $this.Name;
     }
 
-    [object] Create([string] $name, [string] $location, [string] $resourceGroupName) {
+    [object] Create([CreateParams] $p) {
         $securityRuleConfig = New-AzureRmNetworkSecurityRuleConfig `
-            -Name $name `
+            -Name $p.Name `
             -Protocol "Tcp" `
             -Priority 1000 `
             -Access "Allow" `
@@ -184,10 +210,11 @@ class SecurityGroup: Resource1 {
             -DestinationAddressPrefix "*"
 
         return New-AzureRmNetworkSecurityGroup `
-            -ResourceGroupName $resourceGroupName `
-            -Location $location `
-            -Name $name `
-            -SecurityRules $securityRuleConfig
+            -ResourceGroupName $p.ResourceGroupName `
+            -Location $p.Location `
+            -Name $p.Name `
+            -SecurityRules $securityRuleConfig `
+            -WarningAction SilentlyContinue
     }
 }
 
@@ -211,17 +238,18 @@ class NetworkInterface: AzureObject {
         return Get-AzureRMNetworkInterface -Name $this.Name;
     }
 
-    [object] Create([string] $name, [string] $location, [string] $resourceGroupName) {
-        $xpublicIpAddress = $this.PublicIpAddress.GetOrCreate($name, $location, $resourceGroupName);
-        $xvirtualNetwork = $this.VirtualNetwork.GetOrCreate($name, $location, $resourceGroupName);
-        $xsecurityGroup = $this.SecurityGroup.GetOrCreate($name, $location, $resourceGroupName);
+    [object] Create([CreateParams] $p) {
+        $xpublicIpAddress = $this.PublicIpAddress.GetOrCreate($p);
+        $xvirtualNetwork = $this.VirtualNetwork.GetOrCreate($p);
+        $xsecurityGroup = $this.SecurityGroup.GetOrCreate($p);
         return New-AzureRmNetworkInterface `
-            -ResourceGroupName $resourceGroupName `
-            -Location $location `
-            -Name $name `
+            -ResourceGroupName $p.ResourceGroupName `
+            -Location $p.Location `
+            -Name $p.Name `
             -PublicIpAddressId $xpublicIpAddress.Id `
             -SubnetId $xvirtualNetwork.Subnets[0].Id `
-            -NetworkSecurityGroupId $xsecurityGroup.Id
+            -NetworkSecurityGroupId $xsecurityGroup.Id `
+            -WarningAction SilentlyContinue
     }
 }
 
@@ -250,9 +278,8 @@ class VirtualMachine: AzureObject {
         return Get-AzureRMVirtualMachine -Name $this.Name;
     }
 
-    [object] Create([string] $name, [string] $location, [string] $resourceGroupName) {
-        $networkInterfaceInstance = $this.NetworkInterface.GetOrCreate( `
-            $name, $location, $resourceGroupName);
+    [object] Create([CreateParams] $p) {
+        $networkInterfaceInstance = $this.NetworkInterface.GetOrCreate($p);
 
         if (-not $this.Credential) {
             $this.Credential = Get-Credential
@@ -264,8 +291,8 @@ class VirtualMachine: AzureObject {
         }
 
         $vmSize = "Standard_DS2"
-        $vmConfig = New-AzureRmVMConfig -VMName $Name -VMSize $vmSize
-        $vmComputerName = $Name + "Computer"
+        $vmConfig = New-AzureRmVMConfig -VMName $p.Name -VMSize $vmSize
+        $vmComputerName = $p.Name + "Computer"
         switch ($vmImage.Type) {
             "Windows" {
                 $vmConfig = $vmConfig | Set-AzureRmVMOperatingSystem `
@@ -291,9 +318,10 @@ class VirtualMachine: AzureObject {
             | Add-AzureRmVMNetworkInterface -Id $networkInterfaceInstance.Id
 
         return New-AzureRmVm `
-            -ResourceGroupName $resourceGroupName `
-            -Location $location `
-            -VM $vmConfig
+            -ResourceGroupName $p.ResourceGroupName `
+            -Location $p.Location `
+            -VM $vmConfig `
+            -WarningAction SilentlyContinue
     }
 }
 
diff --git a/experiments/Compute.Experiments/docs/New-AzVm.md b/experiments/Compute.Experiments/docs/New-AzVm.md
