Merge branch 'dev'

fvanroie · Mar 3, 2018 · fb4fe1a · fb4fe1a
2 parents 21d2338 + 646d268
commit fb4fe1a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/Core/_Connect-OPNsense.Tests.ps1 b/Core/_Connect-OPNsense.Tests.ps1
@@ -1,6 +1,15 @@
 Import-Module PS_OPNsense -force
 
-. ..\..\..\Wiki\PS_OPNsense.wiki\Test-Module.ps1
+# Define connection parameters
+$apiKey = $env:OPNkey
+$apiPwd = $env:OPNpwd | ConvertTo-SecureString -AsPlainText -Force
+$Url = $env:OPNurl
+
+# Convert the connection parameters into a PowerShell Credentials Object
+$apiCred = New-Object System.Management.Automation.PSCredential -ArgumentList $apiKey, $apiPwd
+
+# Connect to OPNsense server
+$conn = Connect-OPNsense -Url $Url -Credential $apiCred -SkipCertificateCheck -Verbose:$beVerbose  #-WebCredential $webCred
 
 Function Compare-Json ($value, $expected) {
     [String]::Compare(($value | ConvertTo-Json -Depth 15), ($expected | ConvertTo-Json -Depth 15), $true)

diff --git a/Examples/Connect.Example.ps1 b/Examples/Connect.Example.ps1
@@ -8,7 +8,7 @@ Import-Module -Name PS_OPNsense -Verbose:$beVerbose
 # Define connection parameters
 $apiKey = '<my OPNsense api key>'
 $apiPwd = '<my OPNsense api secret>' | ConvertTo-SecureString -AsPlainText -Force
-$Url = 'https://opnsense.localdomain:80'
+$Url = 'https://opnsense.localdomain:443'
 
 # Convert the connection parameters into a PowerShell Credentials Object
 $apiCred = New-Object System.Management.Automation.PSCredential -ArgumentList $apiKey, $apiPwd
@@ -31,4 +31,4 @@ Invoke-OPNsenseAudit -Raw -Verbose:$beVerbose | Format-List
 
 
 ## Disconnect from OPNsense server
-Disconnect-OPNsense -Verbose:$beVerbose
+# Disconnect-OPNsense -Verbose:$beVerbose