Skip to content

Commit e91d187

Browse files
allmightyspiffGitHub Enterprise
allmightyspiff
authored and
GitHub Enterprise
committed
Merge pull request #806 from SoftLayer/issues803
updated volume-modify help messages
2 parents 500d53b + 94e8dd0 commit e91d187

15 files changed

Lines changed: 100 additions & 86 deletions

‎bin/buildAndDeploy.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import platform
1111
import hashlib
1212
import glob
13+
import sys
1314
from rich import print
1415
from rich.markup import escape
1516

@@ -75,7 +76,11 @@ def runTests() -> None:
7576
subprocess.run(go_vet, check=True)
7677
go_test = ['go', 'test'] + clean_mods
7778
print(f'[turquoise2]Running: go test $(go list ./... | grep -v "fixtures" | grep -v "vendor")')
78-
subprocess.run(go_test, check=True)
79+
try:
80+
subprocess.run(go_test, check=True)
81+
except subprocess.CalledProcessError as e:
82+
print(f"[red]Unit tests failed")
83+
sys.exit(e.returncode)
7984
go_sec = ['gosec', '-exclude-dir=fixture', '-exclude-dir=plugin/resources', '-quiet', './...']
8085
# Not using the 'real' command because this is more copy/pasteable.
8186
print('[turquoise2]Running: ' + " ".join(go_sec))

‎bin/go-bindata_mac‎

100644100755
File mode changed.

‎plugin/commands/block/volume_modify.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ func NewVolumeModifyCommand(sl *metadata.SoftlayerStorageCommand) *VolumeModifyC
4444
},
4545
}
4646
cobraCmd.Flags().IntVarP(&thisCmd.NewSize, "new-size", "c", 0, T("New Size of block volume in GB. ***If no size is given, the original size of volume is used.***\n Potential Sizes: [20, 40, 80, 100, 250, 500, 1000, 2000, 4000, 8000, 12000]\n Minimum: [the original size of the volume]"))
47-
cobraCmd.Flags().IntVarP(&thisCmd.NewIops, "new-iops", "i", 0, T("Performance Storage IOPS, between 100 and 6000 in multiples of 100 [only for performance volumes] ***If no IOPS value is specified, the original IOPS value of the volume will be used.***\n Requirements: [If original IOPS/GB for the volume is less than 0.3, new IOPS/GB must also be less than 0.3. If original IOPS/GB for the volume is greater than or equal to 0.3, new IOPS/GB for the volume must also be greater than or equal to 0.3.]"))
48-
cobraCmd.Flags().Float64VarP(&thisCmd.NewTier, "new-tier", "t", 0, T("Endurance Storage Tier (IOPS per GB) [only for endurance volumes] ***If no tier is specified, the original tier of the volume will be used.***\n Requirements: [If original IOPS/GB for the volume is 0.25, new IOPS/GB for the volume must also be 0.25. If original IOPS/GB for the volume is greater than 0.25, new IOPS/GB for the volume must also be greater than 0.25.]"))
47+
cobraCmd.Flags().IntVarP(&thisCmd.NewIops, "new-iops", "i", 0, T("Performance Storage IOPS, between 100 and 6000 in multiples of 100 [only for performance volumes] ***If no IOPS value is specified, the original IOPS value of the volume will be used.***"))
48+
cobraCmd.Flags().Float64VarP(&thisCmd.NewTier, "new-tier", "t", 0, T("Endurance Storage Tier (IOPS per GB) [only for endurance volumes] ***If no tier is specified, the original tier of the volume will be used.***"))
4949
cobraCmd.Flags().BoolVarP(&thisCmd.Force, "force", "f", false, T("Force operation without confirmation"))
5050
thisCmd.Command = cobraCmd
5151
return thisCmd

‎plugin/commands/file/volume_modify.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ func NewVolumeModifyCommand(sl *metadata.SoftlayerStorageCommand) *VolumeModifyC
4444
},
4545
}
4646
cobraCmd.Flags().IntVarP(&thisCmd.NewSize, "new-size", "c", 0, T("New Size of file volume in GB. ***If no size is given, the original size of volume is used.***\n Potential Sizes: [20, 40, 80, 100, 250, 500, 1000, 2000, 4000, 8000, 12000]\n Minimum: [the original size of the volume]"))
47-
cobraCmd.Flags().IntVarP(&thisCmd.NewIops, "new-iops", "i", 0, T("Performance Storage IOPS, between 100 and 6000 in multiples of 100 [only for performance volumes] ***If no IOPS value is specified, the original IOPS value of the volume will be used.***\n Requirements: [If original IOPS/GB for the volume is less than 0.3, new IOPS/GB must also be less than 0.3. If original IOPS/GB for the volume is greater than or equal to 0.3, new IOPS/GB for the volume must also be greater than or equal to 0.3.]"))
48-
cobraCmd.Flags().Float64VarP(&thisCmd.NewTier, "new-tier", "t", 0, T("Endurance Storage Tier (IOPS per GB) [only for endurance volumes] ***If no tier is specified, the original tier of the volume will be used.***\n Requirements: [If original IOPS/GB for the volume is 0.25, new IOPS/GB for the volume must also be 0.25. If original IOPS/GB for the volume is greater than 0.25, new IOPS/GB for the volume must also be greater than 0.25.]"))
47+
cobraCmd.Flags().IntVarP(&thisCmd.NewIops, "new-iops", "i", 0, T("Performance Storage IOPS, between 100 and 6000 in multiples of 100 [only for performance volumes] ***If no IOPS value is specified, the original IOPS value of the volume will be used.***"))
48+
cobraCmd.Flags().Float64VarP(&thisCmd.NewTier, "new-tier", "t", 0, T("Endurance Storage Tier (IOPS per GB) [only for endurance volumes] ***If no tier is specified, the original tier of the volume will be used.***"))
4949
cobraCmd.Flags().BoolVarP(&thisCmd.Force, "force", "f", false, T("Force operation without confirmation"))
5050
thisCmd.Command = cobraCmd
5151
return thisCmd

‎plugin/i18n/resources/de_DE.all.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2708,8 +2708,8 @@
27082708
"translation": "Endurance-Speichertier (E/A-Operationen pro Sekunde/GB) [erforderlich für Endurance-Speichertyp], Optionen: 0.25,2,4,10"
27092709
},
27102710
{
2711-
"id": "Endurance Storage Tier (IOPS per GB) [only for endurance volumes] ***If no tier is specified, the original tier of the volume will be used.***\n Requirements: [If original IOPS/GB for the volume is 0.25, new IOPS/GB for the volume must also be 0.25. If original IOPS/GB for the volume is greater than 0.25, new IOPS/GB for the volume must also be greater than 0.25.]",
2712-
"translation": "Endurance-Speichertier (E/A-Operationen pro Sekunde/GB) [nur für Endurance-Datenträger] ***Ist kein Tier angegeben, wird das ursprüngliche Tier des Datenträgers verwendet.***\nAnforderungen: [Beträgt der ursprüngliche IOPS/GB-Wert für den Datenträger 0,25, muss der neue IOPS/GB-Wert für den Datenträger ebenfalls 0,25 betragen. Liegt der ursprüngliche IOPS/GB-Wert für den Datenträger über 0,25, muss der neue IOPS/GB-Wert für den Datenträger ebenfalls über 0,25 liegen.]"
2711+
"id": "Endurance Storage Tier (IOPS per GB) [only for endurance volumes] ***If no tier is specified, the original tier of the volume will be used.***",
2712+
"translation": "Endurance-Speichertier (E/A-Operationen pro Sekunde/GB) [nur für Endurance-Datenträger] ***Ist kein Tier angegeben, wird das ursprüngliche Tier des Datenträgers verwendet.***"
27132713
},
27142714
{
27152715
"id": "Endurance Storage Tier (IOPS per GB) of the block volume for which space is ordered [optional], options are: 0.25,2,4,10",
@@ -6672,8 +6672,8 @@
66726672
"translation": "Leistungskonfiguration"
66736673
},
66746674
{
6675-
"id": "Performance Storage IOPS, between 100 and 6000 in multiples of 100 [only for performance volumes] ***If no IOPS value is specified, the original IOPS value of the volume will be used.***\n Requirements: [If original IOPS/GB for the volume is less than 0.3, new IOPS/GB must also be less than 0.3. If original IOPS/GB for the volume is greater than or equal to 0.3, new IOPS/GB for the volume must also be greater than or equal to 0.3.]",
6676-
"translation": "E/A-Operationen pro Sekunde (IOPS) für Performance-Speicher, zwischen 100 und 6000 als Vielfaches von 100 [nur für Performance-Datenträger] ***Ist kein IOPS-Wert angegeben, wird der ursprüngliche IOPS-Wert des Datenträgers verwendet.*** \nAnforderungen: [Liegt der ursprüngliche Wert für IOPS/GB für den Datenträger unter 0,3, muss der neue Wert für IOPS/GB ebenfalls unter 0,3 liegen. Ist der ursprüngliche Wert für IOPS/GB für den Datenträger größer-gleich 0,3, muss der neue Wert für IOPS/GB ebenfalls größer-gleich 0,3 sein.]"
6675+
"id": "Performance Storage IOPS, between 100 and 6000 in multiples of 100 [only for performance volumes] ***If no IOPS value is specified, the original IOPS value of the volume will be used.***",
6676+
"translation": "E/A-Operationen pro Sekunde (IOPS) für Performance-Speicher, zwischen 100 und 6000 als Vielfaches von 100 [nur für Performance-Datenträger] ***Ist kein IOPS-Wert angegeben, wird der ursprüngliche IOPS-Wert des Datenträgers verwendet.***"
66776677
},
66786678
{
66796679
"id": "Performance Storage IOPS, between 100 and 6000 in multiples of 100, if no IOPS value is specified, the IOPS value of the original volume will be used",

‎plugin/i18n/resources/en_US.all.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2744,8 +2744,8 @@
27442744
"translation": "Endurance Storage Tier (IOP per GB) [required for storage-type endurance], options are: 0.25,2,4,10"
27452745
},
27462746
{
2747-
"id": "Endurance Storage Tier (IOPS per GB) [only for endurance volumes] ***If no tier is specified, the original tier of the volume will be used.***\n Requirements: [If original IOPS/GB for the volume is 0.25, new IOPS/GB for the volume must also be 0.25. If original IOPS/GB for the volume is greater than 0.25, new IOPS/GB for the volume must also be greater than 0.25.]",
2748-
"translation": "Endurance Storage Tier (IOPS per GB) [only for endurance volumes] ***If no tier is specified, the original tier of the volume will be used.***\n Requirements: [If original IOPS/GB for the volume is 0.25, new IOPS/GB for the volume must also be 0.25. If original IOPS/GB for the volume is greater than 0.25, new IOPS/GB for the volume must also be greater than 0.25.]"
2747+
"id": "Endurance Storage Tier (IOPS per GB) [only for endurance volumes] ***If no tier is specified, the original tier of the volume will be used.***",
2748+
"translation": "Endurance Storage Tier (IOPS per GB) [only for endurance volumes] ***If no tier is specified, the original tier of the volume will be used.***"
27492749
},
27502750
{
27512751
"id": "Endurance Storage Tier (IOPS per GB) of the block volume for which space is ordered [optional], options are: 0.25,2,4,10",
@@ -6732,8 +6732,8 @@
67326732
"translation": "Performance Configuration"
67336733
},
67346734
{
6735-
"id": "Performance Storage IOPS, between 100 and 6000 in multiples of 100 [only for performance volumes] ***If no IOPS value is specified, the original IOPS value of the volume will be used.***\n Requirements: [If original IOPS/GB for the volume is less than 0.3, new IOPS/GB must also be less than 0.3. If original IOPS/GB for the volume is greater than or equal to 0.3, new IOPS/GB for the volume must also be greater than or equal to 0.3.]",
6736-
"translation": "Performance Storage IOPS, between 100 and 6000 in multiples of 100 [only for performance volumes] ***If no IOPS value is specified, the original IOPS value of the volume will be used.***\n Requirements: [If original IOPS/GB for the volume is less than 0.3, new IOPS/GB must also be less than 0.3. If original IOPS/GB for the volume is greater than or equal to 0.3, new IOPS/GB for the volume must also be greater than or equal to 0.3.]"
6735+
"id": "Performance Storage IOPS, between 100 and 6000 in multiples of 100 [only for performance volumes] ***If no IOPS value is specified, the original IOPS value of the volume will be used.***",
6736+
"translation": "Performance Storage IOPS, between 100 and 6000 in multiples of 100 [only for performance volumes] ***If no IOPS value is specified, the original IOPS value of the volume will be used.***"
67376737
},
67386738
{
67396739
"id": "Performance Storage IOPS, between 100 and 6000 in multiples of 100, if no IOPS value is specified, the IOPS value of the original volume will be used",

‎plugin/i18n/resources/es_ES.all.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2708,8 +2708,8 @@
27082708
"translation": "Nivel de almacenamiento resistente (IOP por GB) [obligatorio para el tipo de almacenamiento resistente], las opciones son: 0,25, 2, 4, 10"
27092709
},
27102710
{
2711-
"id": "Endurance Storage Tier (IOPS per GB) [only for endurance volumes] ***If no tier is specified, the original tier of the volume will be used.***\n Requirements: [If original IOPS/GB for the volume is 0.25, new IOPS/GB for the volume must also be 0.25. If original IOPS/GB for the volume is greater than 0.25, new IOPS/GB for the volume must also be greater than 0.25.]",
2712-
"translation": "Nivel de almacenamiento resistente (IOPS por GB) [solo para volúmenes de resistencia] ***Si no se especifica el nivel, se utilizará el nivel original del volumen.***\nRequisitos: [Si el valor de IOPS/GB original del volumen es 0,25, el nuevo valor de IOPS/GB del volumen también debe ser 0,25. Si el valor de IOPS/GB original del volumen es mayor que 0,25, el nuevo valor de IOPS/GB del volumen también debe ser mayor que 0,25]."
2711+
"id": "Endurance Storage Tier (IOPS per GB) [only for endurance volumes] ***If no tier is specified, the original tier of the volume will be used.***",
2712+
"translation": "Nivel de almacenamiento resistente (IOPS por GB) [solo para volúmenes de resistencia] ***Si no se especifica el nivel, se utilizará el nivel original del volumen.***"
27132713
},
27142714
{
27152715
"id": "Endurance Storage Tier (IOPS per GB) of the block volume for which space is ordered [optional], options are: 0.25,2,4,10",
@@ -6672,8 +6672,8 @@
66726672
"translation": "Configuración de rendimiento"
66736673
},
66746674
{
6675-
"id": "Performance Storage IOPS, between 100 and 6000 in multiples of 100 [only for performance volumes] ***If no IOPS value is specified, the original IOPS value of the volume will be used.***\n Requirements: [If original IOPS/GB for the volume is less than 0.3, new IOPS/GB must also be less than 0.3. If original IOPS/GB for the volume is greater than or equal to 0.3, new IOPS/GB for the volume must also be greater than or equal to 0.3.]",
6676-
"translation": "IOPS de almacenamiento de rendimiento, entre 100 y 6000 en múltiplos de 100 [solo para volúmenes de rendimiento] ***Si no se especifica el valor de IOPS, se utilizará el valor de IOPS original del volumen.***\nRequisitos: [Si el valor de IOPS/GB original del volumen es menor que 0,3, el nuevo valor de IOPS/GB también debe ser menor que 0,3. Si el valor de IOPS/GB original del volumen es mayor o igual que 0,3, el nuevo valor de IOPS/GB del volumen también debe ser mayor o igual que 0,3]."
6675+
"id": "Performance Storage IOPS, between 100 and 6000 in multiples of 100 [only for performance volumes] ***If no IOPS value is specified, the original IOPS value of the volume will be used.***",
6676+
"translation": "IOPS de almacenamiento de rendimiento, entre 100 y 6000 en múltiplos de 100 [solo para volúmenes de rendimiento] ***Si no se especifica el valor de IOPS, se utilizará el valor de IOPS original del volumen.***"
66776677
},
66786678
{
66796679
"id": "Performance Storage IOPS, between 100 and 6000 in multiples of 100, if no IOPS value is specified, the IOPS value of the original volume will be used",

‎plugin/i18n/resources/fr_FR.all.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2708,8 +2708,8 @@
27082708
"translation": "Niveau de stockage Endurance (E-S par Go) [requis pour le type de stockage endurance], options : 0.25,2,4,10"
27092709
},
27102710
{
2711-
"id": "Endurance Storage Tier (IOPS per GB) [only for endurance volumes] ***If no tier is specified, the original tier of the volume will be used.***\n Requirements: [If original IOPS/GB for the volume is 0.25, new IOPS/GB for the volume must also be 0.25. If original IOPS/GB for the volume is greater than 0.25, new IOPS/GB for the volume must also be greater than 0.25.]",
2712-
"translation": "Niveau de stockage Endurance (IOPS par Go) [uniquement pour les volumes d'endurance] ***Si aucun niveau n'est indiqué, le niveau d'origine du volume sera utilisé.***\nConditions requises : [Si les IOPS/Go d'origine pour le volume sont égales à 0,25, les nouvelles IOPS/Go pour le volume doivent également être égales à 0,25. Si les IOPS/Go d'origine pour le volume sont supérieures à 0,25, les nouvelles IOPS/Go pour le volume doivent également être supérieures à 0,25.]"
2711+
"id": "Endurance Storage Tier (IOPS per GB) [only for endurance volumes] ***If no tier is specified, the original tier of the volume will be used.***",
2712+
"translation": "Niveau de stockage Endurance (IOPS par Go) [uniquement pour les volumes d'endurance] ***Si aucun niveau n'est indiqué, le niveau d'origine du volume sera utilisé.***"
27132713
},
27142714
{
27152715
"id": "Endurance Storage Tier (IOPS per GB) of the block volume for which space is ordered [optional], options are: 0.25,2,4,10",
@@ -6672,8 +6672,8 @@
66726672
"translation": "Configuration des performances"
66736673
},
66746674
{
6675-
"id": "Performance Storage IOPS, between 100 and 6000 in multiples of 100 [only for performance volumes] ***If no IOPS value is specified, the original IOPS value of the volume will be used.***\n Requirements: [If original IOPS/GB for the volume is less than 0.3, new IOPS/GB must also be less than 0.3. If original IOPS/GB for the volume is greater than or equal to 0.3, new IOPS/GB for the volume must also be greater than or equal to 0.3.]",
6676-
"translation": "IOPS du stockage de type performance, comprises entre 100 et 6000 en multiples de 100 [uniquement pour les volumes d'endurance] ***Si aucune valeur d'IOPS n'est spécifiée, celle du volume d'origine est utilisée.***\nConditions requises : [Si les IOPS/Go d'origine pour le volume sont inférieures à 0,3, les nouvelles IOPS/Go doivent l'être également. Si les IOPS/Go d'origine pour le volume sont supérieures ou égales à 0,3, les nouvelles IOPS/Go pour le volume doivent également être supérieures ou égales à 0,3.]"
6675+
"id": "Performance Storage IOPS, between 100 and 6000 in multiples of 100 [only for performance volumes] ***If no IOPS value is specified, the original IOPS value of the volume will be used.***",
6676+
"translation": "IOPS du stockage de type performance, comprises entre 100 et 6000 en multiples de 100 [uniquement pour les volumes d'endurance] ***Si aucune valeur d'IOPS n'est spécifiée, celle du volume d'origine est utilisée.***"
66776677
},
66786678
{
66796679
"id": "Performance Storage IOPS, between 100 and 6000 in multiples of 100, if no IOPS value is specified, the IOPS value of the original volume will be used",

0 commit comments

Comments
 (0)