Skip to content

Commit 78af00d

Browse files
committed
Fixed issues with $swisconnection in several modules
1 parent 55c61ee commit 78af00d

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed
0 Bytes
Binary file not shown.

Samples/PowerShell/PowerOrion/PowerOrion.psm1

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ function New-OrionNode
223223
write-verbose "Adding $IPAddress to Orion Database"
224224
If ($PSCmdlet.ShouldProcess("$IPAddress","Add Node")) {
225225
$newNode = New-SwisObject $SwisConnection -EntityType "Orion.Nodes" -Properties $newNodeProps
226-
$nodeProps = Get-SwisObject $swis -Uri $newNode
226+
$nodeProps = Get-SwisObject $SwisConnection -Uri $newNode
227227

228228
#Add credentials for WMI nodes
229229
if($ObjectSubType = "WMI"){
@@ -238,7 +238,7 @@ function New-OrionNode
238238
Write-Verbose "Adding WMI Credentials"
239239

240240
#Creating node settings
241-
$newNodeSettings = New-SwisObject $swis -EntityType "Orion.NodeSettings" -Properties $nodeSettings
241+
$newNodeSettings = New-SwisObject $SwisConnection -EntityType "Orion.NodeSettings" -Properties $nodeSettings
242242
Write-Debug "New Node Settings : $newNodeSettings"
243243
} #end of WMI nodes
244244

@@ -247,7 +247,7 @@ function New-OrionNode
247247
write-verbose "Node added with URI = $newNode"
248248

249249
write-verbose "Now Adding pollers for the node..."
250-
$nodeProps = Get-SwisObject $swis -Uri $newNode
250+
$nodeProps = Get-SwisObject $SwisConnection -Uri $newNode
251251
#Loop through all the pollers
252252
foreach ($PollerType in $PollerTypes){
253253
If ($PSCmdlet.ShouldProcess("$PollerTypes","Add Poller")) {
@@ -304,7 +304,7 @@ function Add-OrionDiscoveredInterfaces
304304
Process
305305
{
306306
# Discover interfaces on the node
307-
$Interfaces = Invoke-SwisVerb $swis Orion.NPM.Interfaces DiscoverInterfacesOnNode $nodeId
307+
$Interfaces = Invoke-SwisVerb $SwisConnection Orion.NPM.Interfaces DiscoverInterfacesOnNode $nodeId
308308
if ($Interfaces.Result -notlike "Succeed") {
309309
Write-Warning " Interface discovery failed on Node ID : $NodeId."
310310
}
@@ -316,7 +316,7 @@ function Add-OrionDiscoveredInterfaces
316316
}
317317
}
318318
# Add the remaining interfaces
319-
$result = Invoke-SwisVerb $swis Orion.NPM.Interfaces AddInterfacesOnNode @($nodeId, $Interfaces.DiscoveredInterfaces, "AddDefaultPollers")
319+
$result = Invoke-SwisVerb $SwisConnection Orion.NPM.Interfaces AddInterfacesOnNode @($nodeId, $Interfaces.DiscoveredInterfaces, "AddDefaultPollers")
320320
if ($result.Result -notlike "Succeed") {
321321
Write-Warning " Adding discovered interfaces failed on Node ID : $NodeId."
322322
}
@@ -400,8 +400,8 @@ function New-OrionInterface
400400
}
401401
Process
402402
{
403-
$newIfaceUri = New-SwisObject $swis -EntityType "Orion.NPM.Interfaces" -Properties $newIfaceProps
404-
$ifaceProps = Get-SwisObject $swis -Uri $newIfaceUri
403+
$newIfaceUri = New-SwisObject $SwisConnection -EntityType "Orion.NPM.Interfaces" -Properties $newIfaceProps
404+
$ifaceProps = Get-SwisObject $SwisConnection -Uri $newIfaceUri
405405

406406
# register specific pollers for the node
407407
$poller = @{
@@ -411,7 +411,7 @@ function New-OrionInterface
411411
}
412412

413413
write-verbose "Now Adding pollers for the interface..."
414-
$nodeProps = Get-SwisObject $swis -Uri $newNode
414+
$nodeProps = Get-SwisObject $SwisConnection -Uri $newNode
415415
#Loop through all the pollers
416416
foreach ($PollerType in $PollerTypes){
417417
New-OrionPollerType -PollerType $PollerType -NodeProperties $nodeProps -SwisConnection $SwisConnection
@@ -561,7 +561,7 @@ function Get-OrionNode
561561
Process
562562
{
563563
Write-Verbose " Getting properties at $uri"
564-
$nodeProps = Get-SwisObject $swis -Uri $uri
564+
$nodeProps = Get-SwisObject $SwisConnection -Uri $uri
565565
$properties = New-Object -TypeName psobject -Property $nodeProps
566566
write-debug " The value of nodeprops is $nodeProps"
567567
write-debug " The value of properties is $($properties.gettype())"
@@ -1315,7 +1315,7 @@ function Get-OrionApplicationCredential
13151315
}
13161316
Process
13171317
{
1318-
$credentialSetId = Get-SwisData $swis "SELECT ID FROM Orion.Credential WHERE CredentialOwner='APM' AND Name=@credential" @{ credential = $credential }
1318+
$credentialSetId = Get-SwisData $SwisConnection "SELECT ID FROM Orion.Credential WHERE CredentialOwner='APM' AND Name=@credential" @{ credential = $credential }
13191319
if (!$credentialSetId) {
13201320
Write-error "Can't find credential with name '$credential'."
13211321

0 commit comments

Comments
 (0)