Merge branch 'master' into Install_Vra

This commit is contained in:
Wes Carroll
2019-02-20 08:29:34 -05:00
10 changed files with 36 additions and 32 deletions
@@ -9,6 +9,7 @@ function Connect-ZertoServer {
)] )]
[ValidateNotNullOrEmpty()] [ValidateNotNullOrEmpty()]
[string]$zertoServer, [string]$zertoServer,
[Parameter( HelpMessage = "Zerto Virtual Manager management port. Default value is 9669." )]
[string]$zertoPort = "9669", [string]$zertoPort = "9669",
[Parameter( [Parameter(
Mandatory = $true, Mandatory = $true,
@@ -18,11 +19,13 @@ function Connect-ZertoServer {
$credential $credential
) )
$zertoConnectionInformation = @{"zertoServer" = $zertoServer; "zertoPort" = $zertoPort; "LastAction" = $(get-date).Ticks} $zertoConnectionInformation = @{"zertoServer" = $zertoServer; "zertoPort" = $zertoPort; "LastAction" = $(get-date).Ticks}
Set-Item Env:zertoConnectionInformation -Value ($zertoConnectionInformation | convertto-json -Compress) Set-Item Env:zertoConnectionInformation -Value ($zertoConnectionInformation | ConvertTo-Json -Compress)
$body = '{"AuthenticationMethod": "1"}' $body = '{"AuthenticationMethod": "1"}'
$uri = "session/add" $uri = "session/add"
$results = Invoke-ZertoRestRequest -uri $uri -credential $credential -returnHeaders -body $body -method POST $results = Invoke-ZertoRestRequest -uri $uri -credential $credential -returnHeaders -body $body -method POST
$zertoAuthorizationHeaders = @{"x-zerto-session" = $results.Headers['x-zerto-session'][0].ToString(); "Accept" = "application/json"} $zertoAuthorizationHeaders = @{"x-zerto-session" = $results.Headers['x-zerto-session'][0].ToString(); "Accept" = "application/json"}
Set-Item Env:zertoAuthorizationHeaders -Value ($zertoAuthorizationHeaders | convertto-json -Compress) Set-Item Env:zertoAuthorizationHeaders -Value ($zertoAuthorizationHeaders | ConvertTo-Json -Compress)
$zertoLocalSiteInfo = Get-ZertoLocalSite
Set-Item Env:zertoLocalSiteInfo -Value ($zertoLocalSiteInfo | ConvertTo-Json -Compress)
return $zertoAuthorizationHeaders return $zertoAuthorizationHeaders
} }
@@ -3,5 +3,6 @@ function Disconnect-ZertoServer {
$uri = "session" $uri = "session"
Invoke-ZertoRestRequest -uri $uri -method DELETE Invoke-ZertoRestRequest -uri $uri -method DELETE
Remove-Item Env:zertoAuthorizationHeaders Remove-Item Env:zertoAuthorizationHeaders
Remove-Item Env:zertoConnectionInformation Remove-Item Env:zertoConnectionInformation
Remove-Item Env:zertoLocalSiteInfo
} }
@@ -41,7 +41,7 @@ function Get-ZertoProtectedVm {
foreach ( $id in $vmIdentifier ) { foreach ( $id in $vmIdentifier ) {
$uri = "{0}/{1}" -f $baseUri, $id $uri = "{0}/{1}" -f $baseUri, $id
$results = Invoke-ZertoRestRequest -uri $uri $results = Invoke-ZertoRestRequest -uri $uri
$returnObject.Add($results) $returnObject.Add($results) | Out-Null
} }
} }
@@ -24,7 +24,7 @@ function Get-ZertoServiceProfile {
foreach ( $id in $serviceProfileId ) { foreach ( $id in $serviceProfileId ) {
$uri = "{0}/{1}" -f $baseUri, $id $uri = "{0}/{1}" -f $baseUri, $id
$results = Invoke-ZertoRestRequest -uri $uri $results = Invoke-ZertoRestRequest -uri $uri
$returnObject.Add($results) $returnObject.Add($results) | Out-Null
} }
} }
+1 -1
View File
@@ -42,7 +42,7 @@ function Get-ZertoTask {
foreach ( $id in $taskIdentifier ) { foreach ( $id in $taskIdentifier ) {
$uri = "{0}/{1}" -f $baseUri, $id $uri = "{0}/{1}" -f $baseUri, $id
$results = Invoke-ZertoRestRequest -uri $uri $results = Invoke-ZertoRestRequest -uri $uri
$returnObject.Add($results) $returnObject.Add($results) | Out-Null
} }
} }
@@ -9,7 +9,7 @@ function Get-ZertoVirtualizationSite {
[Parameter( ParameterSetName = "networks", Mandatory = $true )] [Parameter( ParameterSetName = "networks", Mandatory = $true )]
[Parameter( ParameterSetName = "resourcePools", Mandatory = $true )] [Parameter( ParameterSetName = "resourcePools", Mandatory = $true )]
[Parameter( ParameterSetName = "vms", Mandatory = $true )] [Parameter( ParameterSetName = "vms", Mandatory = $true )]
[string[]]$siteIdentifiers, # [string[]]$siteIdentifiers,
[Parameter( ParameterSetName = "devices", Mandatory = $true )] [Parameter( ParameterSetName = "devices", Mandatory = $true )]
[Parameter( ParameterSetName = "folders", Mandatory = $true )] [Parameter( ParameterSetName = "folders", Mandatory = $true )]
[string]$siteIdentifier, [string]$siteIdentifier,
@@ -50,40 +50,40 @@ function Get-ZertoVirtualizationSite {
"devices" { "devices" {
foreach ( $id in $siteIdentifier ) { foreach ( $id in $siteIdentifier ) {
if ( $PSBoundParameters.Contains( "hostIdentifier" ) ) { if ( $PSBoundParameters.ContainsKey( "hostIdentifier" ) ) {
$uri = "{0}/{1}/devices?hostIdentifier={2}" -f $baseUri, $siteIdentifier, $hostIdentifier $uri = "{0}/{1}/devices?hostIdentifier={2}" -f $baseUri, $siteIdentifier, $hostIdentifier
} else { } else {
$uri = "{0}/{1}/devices" -f $baseUri, $siteIdentifier $uri = "{0}/{1}/devices" -f $baseUri, $siteIdentifier
} }
$results = Invoke-ZertoRestRequest -uri $uri $results = Invoke-ZertoRestRequest -uri $uri
$returnObject.Add($results) $returnObject.Add($results) | Out-Null
} }
} }
"hosts" { "hosts" {
if ( $PSBoundParameters.Contains( "hostIdentifier" ) ) { if ( $PSBoundParameters.ContainsKey( "hostIdentifier" ) ) {
$uri = "{0}/{1}/hosts/{2}" -f $baseUri, $siteIdentifier, $hostIdentifier $uri = "{0}/{1}/hosts/{2}" -f $baseUri, $siteIdentifier, $hostIdentifier
} else { } else {
$uri = "{0}/{1}/hosts" -f $baseUri, $siteIdentifier $uri = "{0}/{1}/hosts" -f $baseUri, $siteIdentifier
} }
$results = Invoke-ZertoRestRequest -uri $uri $results = Invoke-ZertoRestRequest -uri $uri
$returnObject.Add($results) $returnObject.Add($results) | Out-Null
} }
"siteIdentifier" { "siteIdentifier" {
foreach ( $id in $siteIdentifiers ) { # foreach ( $id in $siteIdentifier ) {
$uri = "{0}/{1}" -f $baseUri, $id $uri = "{0}/{1}" -f $baseUri, $id
$results = Invoke-ZertoRestRequest -uri $uri $results = Invoke-ZertoRestRequest -uri $uri
$returnObject.Add($results) $returnObject.Add($results) | Out-Null
} # }
} }
default { default {
foreach ( $id in $siteIdentifiers ) { # foreach ( $id in $siteIdentifier ) {
$uri = "{0}/{1}/{2}" -f $baseUri, $siteIdentifier, $PSCmdlet.ParameterSetName.ToLower() $uri = "{0}/{1}/{2}" -f $baseUri, $siteIdentifier, $PSCmdlet.ParameterSetName.ToLower()
$results = Invoke-ZertoRestRequest -uri $uri $results = Invoke-ZertoRestRequest -uri $uri
$returnObject.Add($results) $returnObject.Add($results) | Out-Null
} # }
} }
} }
} }
+6 -6
View File
@@ -68,13 +68,13 @@ function Get-ZertoVpg {
foreach ( $vpgId in $protectionGroupIdentifier ) { foreach ( $vpgId in $protectionGroupIdentifier ) {
$uri = "{0}/{1}" -f $baseUri, $vpgId $uri = "{0}/{1}" -f $baseUri, $vpgId
$results = Invoke-ZertoRestRequest -uri $uri $results = Invoke-ZertoRestRequest -uri $uri
$returnObject.Add($results) $returnObject.Add($results) | Out-Null
} }
} }
"checkpoints" { "checkpoints" {
$filter = $false $filter = $false
if ( $PSBoundParameters.Contains("startDate") -or $PSBoundParameters.Contains("endDate") ) { if ( $PSBoundParameters.ContainsKey("startDate") -or $PSBoundParameters.ContainsKey("endDate") ) {
$filter = $true $filter = $true
$filterTable = @{} $filterTable = @{}
foreach ( $key in $PSBoundParameters.Keys ) { foreach ( $key in $PSBoundParameters.Keys ) {
@@ -91,7 +91,7 @@ function Get-ZertoVpg {
$uri = "{0}/{1}/checkpoints" -f $baseUri, $id $uri = "{0}/{1}/checkpoints" -f $baseUri, $id
} }
$results = Invoke-ZertoRestRequest -uri $uri $results = Invoke-ZertoRestRequest -uri $uri
$returnObject.Add($results) $returnObject.Add($results) | Out-Null
} }
} }
@@ -99,7 +99,7 @@ function Get-ZertoVpg {
foreach ( $id in $protectionGroupIdentifier ) { foreach ( $id in $protectionGroupIdentifier ) {
$uri = "{0}/{1}/checkpoints/stats" -f $baseUri, $id $uri = "{0}/{1}/checkpoints/stats" -f $baseUri, $id
$results = Invoke-ZertoRestRequest -uri $uri $results = Invoke-ZertoRestRequest -uri $uri
$returnObject.Add($results) $returnObject.Add($results) | Out-Null
} }
} }
@@ -107,13 +107,13 @@ function Get-ZertoVpg {
$filter = Get-ZertoApiFilter -filterTable $PSBoundParameters $filter = Get-ZertoApiFilter -filterTable $PSBoundParameters
$uri = "{0}{1}" -f $baseUri, $filter $uri = "{0}{1}" -f $baseUri, $filter
$results = Invoke-ZertoRestRequest -uri $uri $results = Invoke-ZertoRestRequest -uri $uri
$returnObject.Add($results) $returnObject.Add($results) | Out-Null
} }
default { default {
$uri = "{0}/{1}" -f $baseUri, $PSCmdlet.ParameterSetName.ToLower() $uri = "{0}/{1}" -f $baseUri, $PSCmdlet.ParameterSetName.ToLower()
$results = Invoke-ZertoRestRequest -uri $uri $results = Invoke-ZertoRestRequest -uri $uri
$returnObject.Add($results) $returnObject.Add($results) | Out-Null
} }
} }
} }
+1 -1
View File
@@ -29,7 +29,7 @@ function Get-ZertoVra {
foreach ( $vraId in $vraIdentifier ) { foreach ( $vraId in $vraIdentifier ) {
$uri = "{0}/{1}" -f $baseUri, $vraId $uri = "{0}/{1}" -f $baseUri, $vraId
$results = Invoke-ZertoRestRequest -uri $uri $results = Invoke-ZertoRestRequest -uri $uri
$returnObject.Add($results) $returnObject.Add($results) | Out-Null
} }
} else { } else {
$uri = $baseUri $uri = $baseUri
+2 -2
View File
@@ -13,12 +13,12 @@ function Get-ZertoZorg {
process { process {
if ( $PSCmdlet.ParameterSetName -eq "default" ) { if ( $PSCmdlet.ParameterSetName -eq "default" ) {
$results = Invoke-ZertoRestRequest -uri $baseUri $results = Invoke-ZertoRestRequest -uri $baseUri
$returnObject.Add($results) $returnObject.Add($results) | Out-Null
} elseif ( $PSCmdlet.ParameterSetName -eq "zorgIdentifier" ) { } elseif ( $PSCmdlet.ParameterSetName -eq "zorgIdentifier" ) {
foreach ( $id in $zorgIdentifier ) { foreach ( $id in $zorgIdentifier ) {
$uri = "{0}/{1}" -f $baseUri, $id $uri = "{0}/{1}" -f $baseUri, $id
$results = Invoke-ZertoRestRequest -uri $uri $results = Invoke-ZertoRestRequest -uri $uri
$returnObject.Add($results) $returnObject.Add($results) | Out-Null
} }
} }
} }
+2 -2
View File
@@ -13,12 +13,12 @@ function Get-ZertoZsspSession {
process { process {
if ( $PSCmdlet.ParameterSetName -eq "default" ) { if ( $PSCmdlet.ParameterSetName -eq "default" ) {
$results = Invoke-ZertoRestRequest -uri $baseUri $results = Invoke-ZertoRestRequest -uri $baseUri
$returnObject.Add($results) $returnObject.Add($results) | Out-Null
} elseif ( $PSCmdlet.ParameterSetName -eq "zsspSessionIdentifier" ) { } elseif ( $PSCmdlet.ParameterSetName -eq "zsspSessionIdentifier" ) {
foreach ( $id in $zsspSessionIdentifier ) { foreach ( $id in $zsspSessionIdentifier ) {
$uri = "{0}/{1}" -f $baseUri, $id $uri = "{0}/{1}" -f $baseUri, $id
$results = Invoke-ZertoRestRequest -uri $uri $results = Invoke-ZertoRestRequest -uri $uri
$returnObject.Add($results) $returnObject.Add($results) | Out-Null
} }
} }
} }