From 2c7d43658b3955a098cdc291f3bab9ff7fe18881 Mon Sep 17 00:00:00 2001
From: Amit Malik <contact2amitmalik@gmail.com>
Date: Fri, 11 Aug 2017 00:06:04 +0530
Subject: [PATCH 1/4] Add files via upload

---
 scripts/InstallNetAppPS.ps1 | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 scripts/InstallNetAppPS.ps1

diff --git a/scripts/InstallNetAppPS.ps1 b/scripts/InstallNetAppPS.ps1
new file mode 100644
index 0000000..7e11878
--- /dev/null
+++ b/scripts/InstallNetAppPS.ps1
@@ -0,0 +1,5 @@
+New-Item C:\NetApp -Type Directory
+$WebClient = New-Object System.Net.WebClient
+$WebClient.DownloadFile("https://raw.githubusercontent.com/SpektraSystems/NetAppAzureQuickstart/master/scripts/NetApp_PowerShell_Toolkit_4.3.0.msi","C:\NetApp\NetApp_PowerShell_Toolkit_4.3.0.msi")
+# Start-Process msiexec.exe -Wait -ArgumentList '/I C:\NetApp\NetApp_PowerShell_Toolkit_4.3.0.msi /quiet'
+Invoke-Command -ScriptBlock { & cmd /c "msiexec.exe /i C:\NetApp\NetApp_PowerShell_Toolkit_4.3.0.msi" /qn ADDLOCAL=F.PSTKDOT}

From 43ee8d471b84760d8e10532060cfba31d3be4350 Mon Sep 17 00:00:00 2001
From: Amit Malik <contact2amitmalik@gmail.com>
Date: Thu, 10 Aug 2017 11:40:30 -0700
Subject: [PATCH 2/4] Update sql-vm.json

---
 nested/sql-vm.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nested/sql-vm.json b/nested/sql-vm.json
index adde041..84418c3 100644
--- a/nested/sql-vm.json
+++ b/nested/sql-vm.json
@@ -48,7 +48,7 @@
     "variables": {
         "vmStorageAccountContainerName": "vhds",
         "OSDiskName": "sql-vm-osdisk",
-        "psToolkitFileName": "NetApp_PowerShell_Toolkit_4.3.0.msi"
+        "psToolkitScriptName": "InstallNetAppPS.ps1"
     },
     "resources": [{
             "type": "Microsoft.Storage/storageAccounts",
@@ -153,9 +153,9 @@
                     "autoUpgradeMinorVersion": true,
                     "settings": {
                         "fileUris": [
-                            "[concat(parameters('_artifactsLocation'),'/scripts/',variables('psToolkitFileName'),parameters('_artifactsLocationSasToken'))]"
+                            "[concat(parameters('_artifactsLocation'),'/scripts/',variables('psToolkitScriptName'),parameters('_artifactsLocationSasToken'))]"
                         ],
-                        "commandToExecute": "start /wait msiexec.exe /i NetApp_PowerShell_Toolkit_4.3.0.msi /qn ADDLOCAL=F.PSTKDOT"
+                           "commandToExecute": "[concat('powershell -ExecutionPolicy Unrestricted -File',' ', variables('psToolkitScriptName'))]"      
                     }
                 }
             }]

From 28828d0692fff4d9f043900bef5e202408aa427e Mon Sep 17 00:00:00 2001
From: Amit Malik <contact2amitmalik@gmail.com>
Date: Thu, 10 Aug 2017 11:59:59 -0700
Subject: [PATCH 3/4] Update netapp_connect_ontap_win.ps1

---
 scripts/netapp_connect_ontap_win.ps1 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/netapp_connect_ontap_win.ps1 b/scripts/netapp_connect_ontap_win.ps1
index 05e1004..23bde0b 100644
--- a/scripts/netapp_connect_ontap_win.ps1
+++ b/scripts/netapp_connect_ontap_win.ps1
@@ -290,6 +290,11 @@ $scriptlogfilepath = 'C:\WindowsAzure\Logs\SQLNetApp_Connect_Storage.ps1.txt'
 ## Starting functions execution
 
 $SVMPwd = $OTCpassword
+New-Item C:\NetApp -Type Directory
+$WebClient = New-Object System.Net.WebClient
+$WebClient.DownloadFile("https://raw.githubusercontent.com/SpektraSystems/NetAppAzureQuickstart/master/scripts/NetApp_PowerShell_Toolkit_4.3.0.msi","C:\NetApp\NetApp_PowerShell_Toolkit_4.3.0.msi")
+# Start-Process msiexec.exe -Wait -ArgumentList '/I C:\NetApp\NetApp_PowerShell_Toolkit_4.3.0.msi /quiet'
+Invoke-Command -ScriptBlock { & cmd /c "msiexec.exe /i C:\NetApp\NetApp_PowerShell_Toolkit_4.3.0.msi" /qn ADDLOCAL=F.PSTKDOT}
 Get-ONTAPClusterDetails $email $password $ocmip
 Connect-ONTAP $AdminLIF $iScSILIF $SVMName $SVMPwd $Capacity
 Load-SampleDatabase

From c2d4ccc64b4b03f88ce6d324ee9f5197d0b395d9 Mon Sep 17 00:00:00 2001
From: Amit Malik <contact2amitmalik@gmail.com>
Date: Thu, 10 Aug 2017 12:58:05 -0700
Subject: [PATCH 4/4] Update netapp_connect_ontap_win.ps1

---
 scripts/netapp_connect_ontap_win.ps1 | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/scripts/netapp_connect_ontap_win.ps1 b/scripts/netapp_connect_ontap_win.ps1
index 23bde0b..38a37d2 100644
--- a/scripts/netapp_connect_ontap_win.ps1
+++ b/scripts/netapp_connect_ontap_win.ps1
@@ -285,16 +285,18 @@ $scriptlogfilepath = 'C:\WindowsAzure\Logs\SQLNetApp_Connect_Storage.ps1.txt'
 (get-content $azurelogfilepath) | % { $_ -replace $password, 'passwordremoved' } | set-content $azurelogfilepath
 (get-content $scriptlogfilepath) | % { $_ -replace $password, 'passwordremoved' } | set-content $scriptlogfilepath
 }
-
-
-## Starting functions execution
-
-$SVMPwd = $OTCpassword
+function Install-NetAppPSToolkit([String]$password)
+{
 New-Item C:\NetApp -Type Directory
 $WebClient = New-Object System.Net.WebClient
 $WebClient.DownloadFile("https://raw.githubusercontent.com/SpektraSystems/NetAppAzureQuickstart/master/scripts/NetApp_PowerShell_Toolkit_4.3.0.msi","C:\NetApp\NetApp_PowerShell_Toolkit_4.3.0.msi")
-# Start-Process msiexec.exe -Wait -ArgumentList '/I C:\NetApp\NetApp_PowerShell_Toolkit_4.3.0.msi /quiet'
 Invoke-Command -ScriptBlock { & cmd /c "msiexec.exe /i C:\NetApp\NetApp_PowerShell_Toolkit_4.3.0.msi" /qn ADDLOCAL=F.PSTKDOT}
+}
+
+## Starting functions execution
+
+$SVMPwd = $OTCpassword
+Install-NetAppPSToolkit
 Get-ONTAPClusterDetails $email $password $ocmip
 Connect-ONTAP $AdminLIF $iScSILIF $SVMName $SVMPwd $Capacity
 Load-SampleDatabase