Update Azure VMs and regions for 2024-07-01 (#5100)

Signed-off-by: Adam Talbot <12817534+adamrtalbot@users.noreply.github.com> Signed-off-by: Paolo Di Tommaso <paolo.ditommaso@gmail.com> Co-authored-by: Paolo Di Tommaso <paolo.ditommaso@gmail.com>
nextflow-io · Jul 2, 2024 · 12b027e · 12b027e
1 parent 7d5e5d2
commit 12b027e
Show file tree

Hide file tree

Showing 46 changed files with 121,003 additions and 76,112 deletions.
diff --git a/plugins/nf-azure/src/main/nextflow/cloud/azure/batch/AzBatchService.groovy b/plugins/nf-azure/src/main/nextflow/cloud/azure/batch/AzBatchService.groovy
@@ -218,7 +218,7 @@ class AzBatchService implements Closeable {
 
  protected Double computeScore(int cpus, MemoryUnit mem, Map entry) {
  def vmCores = entry.numberOfCores as int
- double vmMemGb = (entry.memoryInMb as int) /1024
+ double vmMemGb = (entry.memoryInMB as int) /1024
 
  if( cpus > vmCores ) {
  return null

diff --git a/plugins/nf-azure/src/main/nextflow/cloud/azure/batch/AzVmType.groovy b/plugins/nf-azure/src/main/nextflow/cloud/azure/batch/AzVmType.groovy
@@ -41,9 +41,9 @@ class AzVmType {
  AzVmType(Map map) {
  this.name = map.name
  this.maxDataDiskCount = map.maxDataDiskCount as Integer
- this.memory = map.memoryInMb ? MemoryUnit.of( "$map.memoryInMb MB" ) : null
+ this.memory = map.memoryInMB ? MemoryUnit.of( "$map.memoryInMB MB" ) : null
  this.numberOfCores = map.numberOfCores as Integer
- this.osDiskSize = map.osDiskSizeInMb ? MemoryUnit.of( "$map.osDiskSizeInMb MB" ) : null
- this.resourceDiskSize = map.resourceDiskSizeInMb ? MemoryUnit.of( "$map.resourceDiskSizeInMb MB" ) : null
+ this.osDiskSize = map.osDiskSizeInMB ? MemoryUnit.of( "$map.osDiskSizeInMB MB" ) : null
+ this.resourceDiskSize = map.resourceDiskSizeInMB ? MemoryUnit.of( "$map.resourceDiskSizeInMB MB" ) : null
  }
 }