Skip to content

Commit fd073cc

Browse files
committed
v119 fix
Fixed other tag related queries for 119
1 parent 1e411d3 commit fd073cc

File tree

4 files changed

+25
-10
lines changed

4 files changed

+25
-10
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
desktop.ini

PureStorage.FlashArray.VMware.VVol/PureStorage.FlashArray.VMware.VVol.psd1

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Created by: Cody Hosterman
55
Organization: Pure Storage, Inc.
66
Filename: PureStorage.FlashArray.VMware.Vvol.psd1
7-
Version: 2.0.1.0
7+
Version: 2.0.1.1
88
Copyright: 2022 Pure Storage, Inc.
99
-------------------------------------------------------------------------
1010
Module Name: PureStorageFlashArrayVMwarevVolPowerShell
@@ -29,7 +29,7 @@
2929
RootModule = 'PureStorage.FlashArray.VMware.Vvol.psm1'
3030

3131
# Version number of this module; major.minor[.build[.revision]]
32-
ModuleVersion = '2.0.1.0'
32+
ModuleVersion = '2.0.1.1'
3333

3434
# ID used to uniquely identify this module
3535
GUID = '105e97db-98b4-41be-be35-17ba25a1ede5'

PureStorage.FlashArray.VMware.VVol/PureStorage.FlashArray.VMware.VVol.psm1

+19-5
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ function Update-PfaVvolVmVolumeGroup {
1111
.OUTPUTS
1212
Returns the FlashArray volume names of the input VM.
1313
.NOTES
14-
Version: 2.0
14+
Version: 2.1
1515
Author: Cody Hosterman https://codyhosterman.com
16-
Creation Date: 08/26/2020
17-
Purpose/Change: Core support
16+
Creation Date: 03/17/2022
17+
Purpose/Change: 1.19 support
1818
.EXAMPLE
1919
PS C:\ New-PfaConnection -endpoint flasharray-m20-2 -credentials (get-credential) -defaultArray
2020
PS C:\ Update-PfaVvolVmVolumeGroup -vm (get-vm myVM)
@@ -155,7 +155,14 @@ function Update-PfaVvolVmVolumeGroup {
155155
New-PfaRestOperation -resourceType "volume/$($vVolInfo.Volume)" -restOperationType PUT -flasharray $fa -SkipCertificateCheck -jsonBody "{`"container`":`"$($volumeGroupName)`"}" |Out-Null
156156
}
157157
}
158-
$volumesAfterMove = (New-PfaRestOperation -resourceType "volume" -restOperationType GET -queryFilter "?tags=true&filter=value=`'$($vmId)`'" -flasharray $fa -SkipCertificateCheck).Name |Select-Object -Unique
158+
if ($flasharray.apiversion.split(".")[1] -gt 18)
159+
{
160+
$volumesAfterMove = (New-PfaRestOperation -resourceType "volume" -restOperationType GET -queryFilter "?tags=true&namespace=vasa-integration.purestorage.com&filter=value=`'$($vmId)`'" -flasharray $fa -SkipCertificateCheck).Name |Select-Object -Unique
161+
}
162+
else
163+
{
164+
$volumesAfterMove = (New-PfaRestOperation -resourceType "volume" -restOperationType GET -queryFilter "?tags=true&filter=value=`'$($vmId)`'" -flasharray $fa -SkipCertificateCheck).Name |Select-Object -Unique
165+
}
159166
foreach ($volumeAfterMove in $volumesAfterMove) {
160167
$volumeFinalNames += $volumeAfterMove
161168
}
@@ -345,7 +352,14 @@ function Get-PfaVolumeNameFromVvolUuid{
345352
}
346353
foreach ($fa in $flasharray)
347354
{
348-
$volumeTags = New-PfaRestOperation -resourceType "volume" -restOperationType GET -queryFilter "?tags=true&filter=value=`'$($vvolUUID)`'" -flasharray $fa -SkipCertificateCheck
355+
if ($flasharray.apiversion.split(".")[1] -gt 18)
356+
{
357+
$volumeTags = New-PfaRestOperation -resourceType "volume" -restOperationType GET -queryFilter "?tags=true&namespace=vasa-integration.purestorage.com&filter=value=`'$($vvolUUID)`'" -flasharray $fa -SkipCertificateCheck
358+
}
359+
else
360+
{
361+
$volumeTags = New-PfaRestOperation -resourceType "volume" -restOperationType GET -queryFilter "?tags=true&filter=value=`'$($vvolUUID)`'" -flasharray $fa -SkipCertificateCheck
362+
}
349363
$volumeName = $volumeTags |where-object {$_.key -eq "PURE_VVOL_ID"}
350364
if ($null -eq $volumeName)
351365
{

PureStorage.FlashArray.VMware/PureStorage.FlashArray.VMware.psd1

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
Created by: Cody Hosterman
55
Organization: Pure Storage, Inc.
66
Filename: PureStorage.FlashArray.VMware.psd1
7-
Version: 2.2.1.1
8-
Copyright: 2021 Pure Storage, Inc.
7+
Version: 2.2.1.2
8+
Copyright: 2022 Pure Storage, Inc.
99
-------------------------------------------------------------------------
1010
Module Name: PureStorageFlashArrayVMwarePowerShell
1111
Disclaimer
@@ -29,7 +29,7 @@
2929
RootModule = ''
3030

3131
# Version number of this module; major.minor[.build[.revision]]
32-
ModuleVersion = '2.2.1.1'
32+
ModuleVersion = '2.2.1.2'
3333

3434
# ID used to uniquely identify this module
3535
GUID = 'a38571e9-918e-4542-bebc-b5294ad4ffbb'

0 commit comments

Comments
 (0)