hcs-cli 0.1.317__py3-none-any.whl → 0.1.319__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (112) hide show
  1. hcs_cli/__init__.py +1 -1
  2. hcs_cli/cmds/advisor/html_utils.py +30 -26
  3. hcs_cli/cmds/advisor/recommendation_engine.py +7 -10
  4. hcs_cli/cmds/api.py +5 -3
  5. hcs_cli/cmds/daas/tenant/plan.py +1 -1
  6. hcs_cli/cmds/debug/start.py +2 -3
  7. hcs_cli/cmds/dev/fs/helper/credential_helper.py +2 -0
  8. hcs_cli/cmds/dev/fs/helper/k8s_util.py +0 -1
  9. hcs_cli/cmds/dev/fs/helper/license_info.py +36 -12
  10. hcs_cli/cmds/dev/fs/init.py +38 -5
  11. hcs_cli/cmds/dev/fs/profiler.py +0 -1
  12. hcs_cli/cmds/dev/fs/provided_files/akka.plan.yml +94 -250
  13. hcs_cli/cmds/dev/fs/provided_files/azsim.plan.yml +27 -34
  14. hcs_cli/cmds/dev/fs/provided_files/azure.plan.yml +294 -322
  15. hcs_cli/cmds/dev/fs/provided_files/mqtt-secret.yaml +188 -93
  16. hcs_cli/cmds/dev/fs/provided_files/mqtt-server-external.yaml +4 -5
  17. hcs_cli/cmds/dev/fs/provided_files/patch-mqtt-hostname.yml +3 -3
  18. hcs_cli/cmds/dev/fs/provided_files/patch-vernemq-ssl-depth.json +1 -1
  19. hcs_cli/cmds/dev/fs/tailor.py +7 -12
  20. hcs_cli/cmds/dev/mqtt.py +1 -2
  21. hcs_cli/cmds/dev/onboard.py +35 -1
  22. hcs_cli/cmds/dev/util/mqtt_helper.py +0 -1
  23. hcs_cli/cmds/hoc/search.py +39 -9
  24. hcs_cli/cmds/hst/clean.py +2 -1
  25. hcs_cli/cmds/inventory/assign.py +72 -28
  26. hcs_cli/cmds/inventory/deassign.py +35 -18
  27. hcs_cli/cmds/inventory/logoff.py +86 -8
  28. hcs_cli/cmds/inventory/session.py +2 -2
  29. hcs_cli/cmds/scm/operator.py +2 -2
  30. hcs_cli/cmds/scm/plan.py +131 -3
  31. hcs_cli/cmds/task.py +2 -4
  32. hcs_cli/cmds/template/expand.py +65 -0
  33. hcs_cli/cmds/template/list_usage.py +2 -2
  34. hcs_cli/cmds/template/usage.py +20 -7
  35. hcs_cli/cmds/vm/list.py +0 -1
  36. hcs_cli/config/hcs-deployments.yaml +52 -52
  37. hcs_cli/main.py +0 -2
  38. hcs_cli/payload/akka.blueprint.yml +95 -243
  39. hcs_cli/payload/app/manual.json +19 -19
  40. hcs_cli/payload/edge/akka.json +6 -6
  41. hcs_cli/payload/edge/vsphere.json +6 -6
  42. hcs_cli/payload/hoc/lcm-capcalc.json.template +43 -0
  43. hcs_cli/payload/hoc/no-spare.json.template +1 -1
  44. hcs_cli/payload/inventory/assign.json +14 -16
  45. hcs_cli/payload/inventory/deassign.json +11 -11
  46. hcs_cli/payload/lcm/akka.json +31 -33
  47. hcs_cli/payload/lcm/azure-dummy-nt.json +64 -66
  48. hcs_cli/payload/lcm/azure-dummy.json +64 -66
  49. hcs_cli/payload/lcm/azure-real.json +13 -11
  50. hcs_cli/payload/lcm/edge-proxy.json +34 -36
  51. hcs_cli/payload/lcm/zero-dedicated.json +34 -36
  52. hcs_cli/payload/lcm/zero-delay-1m-per-vm.json +53 -69
  53. hcs_cli/payload/lcm/zero-fail-delete-template.json +43 -0
  54. hcs_cli/payload/lcm/zero-fail-destroy-onthread.json +38 -40
  55. hcs_cli/payload/lcm/zero-fail-destroy.json +38 -40
  56. hcs_cli/payload/lcm/zero-fail-prepare-onthread.json +38 -40
  57. hcs_cli/payload/lcm/zero-fail-prepare.json +38 -40
  58. hcs_cli/payload/lcm/zero-fail-vm-onthread.json +58 -74
  59. hcs_cli/payload/lcm/zero-fail-vm.json +58 -74
  60. hcs_cli/payload/lcm/zero-floating.json +34 -36
  61. hcs_cli/payload/lcm/zero-manual.json +33 -35
  62. hcs_cli/payload/lcm/zero-multisession.json +34 -36
  63. hcs_cli/payload/lcm/zero-nanw.json +31 -33
  64. hcs_cli/payload/lcm/zero-new-5k-delay.json +69 -78
  65. hcs_cli/payload/lcm/zero-new-5k.json +36 -38
  66. hcs_cli/payload/lcm/zero-new-snapshot.json +37 -39
  67. hcs_cli/payload/lcm/zero-new.json +37 -39
  68. hcs_cli/payload/lcm/zero-reuse-vm-id.json +33 -35
  69. hcs_cli/payload/lcm/zero-with-max-id-offset.json +32 -34
  70. hcs_cli/payload/lcm/zero.json +59 -73
  71. hcs_cli/payload/provider/ad-stes-vsphere.json +26 -26
  72. hcs_cli/payload/provider/akka.json +12 -12
  73. hcs_cli/payload/provider/azure.json +14 -14
  74. hcs_cli/payload/provider/edgeproxy.json +12 -12
  75. hcs_cli/payload/provider/vsphere.json +14 -14
  76. hcs_cli/payload/scm/starter.json +22 -23
  77. hcs_cli/payload/synt/core/p01-dummy-success.json +11 -15
  78. hcs_cli/payload/synt/core/p02-dummy-fail.json +12 -15
  79. hcs_cli/payload/synt/core/p03-dummy-exception.json +12 -15
  80. hcs_cli/payload/synt/core/p04-dummy-success-repeat.json +12 -15
  81. hcs_cli/payload/synt/core/p05-dummy-fail-repeat.json +13 -16
  82. hcs_cli/payload/synt/core/p06-dummy-exception-repeat.json +13 -16
  83. hcs_cli/payload/synt/core/p07-dummy-delay.json +12 -15
  84. hcs_cli/payload/synt/core/p08-dummy-property.json +12 -15
  85. hcs_cli/payload/synt/ext/p20-connect-success.json +12 -15
  86. hcs_cli/payload/synt/ext/p21-connect-fail.json +12 -15
  87. hcs_cli/payload/synt/ext/p30-ssl-success.json +12 -15
  88. hcs_cli/payload/synt/ext/p31-ssl-fail.json +13 -16
  89. hcs_cli/payload/synt/ext/p40-http-success.json +12 -15
  90. hcs_cli/payload/synt/ext/p41-http-fail.json +12 -15
  91. hcs_cli/payload/synt/ext/p42-http-status-code.json +14 -20
  92. hcs_cli/payload/synt/ext1/p10-ping-success.json +13 -16
  93. hcs_cli/payload/synt/ext1/p11-ping-fail.json +12 -15
  94. hcs_cli/payload/synt/ext1/p12-ping-success-repeat.json +14 -17
  95. hcs_cli/provider/hcs/cert.py +0 -1
  96. hcs_cli/provider/hcs/edge.py +1 -1
  97. hcs_cli/provider/hcs/uag.py +6 -1
  98. hcs_cli/service/hoc/diagnostic.py +0 -3
  99. hcs_cli/service/inventory/__init__.py +1 -1
  100. hcs_cli/service/inventory/session.py +23 -7
  101. hcs_cli/service/lcm/vm.py +0 -1
  102. hcs_cli/service/task.py +0 -1
  103. hcs_cli/support/debug_util.py +0 -1
  104. hcs_cli/support/plan_util.py +0 -1
  105. hcs_cli/support/predefined_payload.py +4 -1
  106. hcs_cli/support/template_util.py +0 -1
  107. hcs_cli/support/test_utils.py +2 -2
  108. hcs_cli/support/test_utils2.py +536 -0
  109. {hcs_cli-0.1.317.dist-info → hcs_cli-0.1.319.dist-info}/METADATA +24 -17
  110. {hcs_cli-0.1.317.dist-info → hcs_cli-0.1.319.dist-info}/RECORD +112 -108
  111. {hcs_cli-0.1.317.dist-info → hcs_cli-0.1.319.dist-info}/WHEEL +0 -0
  112. {hcs_cli-0.1.317.dist-info → hcs_cli-0.1.319.dist-info}/entry_points.txt +0 -0
hcs_cli/cmds/dev/fs/provided_files/azure.plan.yml CHANGED
@@ -1,3 +1,4 @@
1
+ ---
1
2
  deploymentId: az1
2
3
  var:
3
4
  orgId: ${env.ORG_ID}
@@ -80,8 +81,8 @@ resource:
80
81
  auxiliary:
81
82
  username: ${env.AUXILIARY_BIND_USER_NAME}
82
83
  password: ${env.AUXILIARY_BIND_PASSWORD}
83
- primaryDNS: null
84
- secondaryDNS: null
84
+ primaryDNS:
85
+ secondaryDNS:
85
86
  myEdge:
86
87
  kind: hcs/edge
87
88
  data:
@@ -101,8 +102,7 @@ resource:
101
102
  cidr: ${var.edge.subnetAddressSpace}
102
103
  resourceTags: ${var.resourceTag}
103
104
  myUAG:
104
- after:
105
- - myEdge
105
+ after: [myEdge]
106
106
  kind: hcs/uag
107
107
  data:
108
108
  orgId: ${var.orgId}
@@ -155,7 +155,7 @@ resource:
155
155
  CpuArchitectureType: x64
156
156
  AcceleratedNetworkingEnabled: false
157
157
  LowPriorityCapable: true
158
- HyperVGenerations: ''
158
+ HyperVGenerations: ""
159
159
  VMDeploymentTypes: PaaS,IaaS
160
160
  UncachedDiskIOPS: 6400
161
161
  EphemeralOSDiskSupported: false
@@ -243,7 +243,7 @@ resource:
243
243
  os: Windows 10 Enterprise multi-session, 20H2
244
244
  osType: WINDOWS
245
245
  markers:
246
- - name: default
246
+ - name: default
247
247
  assetDetails:
248
248
  data:
249
249
  generationType: V1
@@ -266,40 +266,38 @@ resource:
266
266
  providerLabel: AZURE
267
267
  options:
268
268
  horizonAgent:
269
- agentPackageId: null
269
+ agentPackageId:
270
270
  installHorizonAgent: true
271
271
  features:
272
272
  - AvAgentInstall
273
- # - DEM
274
- # - AvAgentInstall
275
- # - ClientDriveRedirection
276
- # - PerfTracker
277
- # - HelpDesk
278
- # - RTAV
279
- # - PrintRedir
280
- # - GEOREDIR
281
- # - SmartCard
282
- # - USB
283
- # - URLRedirection
284
- # - SerialPortRedirection
285
- # - ScannerRedirection
286
- # - SDOSensor
273
+ # - DEM
274
+ # - AvAgentInstall
275
+ # - ClientDriveRedirection
276
+ # - PerfTracker
277
+ # - HelpDesk
278
+ # - RTAV
279
+ # - PrintRedir
280
+ # - GEOREDIR
281
+ # - SmartCard
282
+ # - USB
283
+ # - URLRedirection
284
+ # - SerialPortRedirection
285
+ # - ScannerRedirection
286
+ # - SDOSensor
287
287
  applicationScan:
288
288
  enableAppScan: false
289
289
  appScanDetails:
290
290
  infrastructureResourceList: []
291
291
  publishWithResiliency: false
292
- osCustomizations:
293
- - DisableWindowsUpdate
294
- - RemoveAppXPackages
292
+ osCustomizations: [DisableWindowsUpdate, RemoveAppXPackages]
295
293
  validateImage: false
296
294
  validationInfraResourceDetails:
297
295
  infrastructureResourceList:
298
- - kind: subnet
299
- id: /subscriptions/${var.provider.subscriptionId}/resourceGroups/${var.desktop.resourceGroup}/providers/Microsoft.Network/virtualNetworks/${var.desktop.vnet}/subnets/${var.desktop.subnet}
300
- data:
301
- parent: /subscriptions/${var.provider.subscriptionId}/resourceGroups/${var.desktop.resourceGroup}/providers/Microsoft.Network/virtualNetworks/${var.desktop.vnet}
302
- cidr: ${var.desktop.subnetAddressSpace}
296
+ - kind: subnet
297
+ id: /subscriptions/${var.provider.subscriptionId}/resourceGroups/${var.desktop.resourceGroup}/providers/Microsoft.Network/virtualNetworks/${var.desktop.vnet}/subnets/${var.desktop.subnet}
298
+ data:
299
+ parent: /subscriptions/${var.provider.subscriptionId}/resourceGroups/${var.desktop.resourceGroup}/providers/Microsoft.Network/virtualNetworks/${var.desktop.vnet}
300
+ cidr: ${var.desktop.subnetAddressSpace}
303
301
  resourceTags: ${var.resourceTag}
304
302
  myImageSingleSession:
305
303
  kind: hcs/image
@@ -317,7 +315,7 @@ resource:
317
315
  os: Windows 10 Enterprise, 22H2
318
316
  osType: WINDOWS
319
317
  markers:
320
- - name: default
318
+ - name: default
321
319
  assetDetails:
322
320
  data:
323
321
  generationType: V1
@@ -340,39 +338,37 @@ resource:
340
338
  providerLabel: AZURE
341
339
  options:
342
340
  horizonAgent:
343
- agentPackageId: null
341
+ agentPackageId:
344
342
  installHorizonAgent: true
345
343
  features:
346
344
  - AvAgentInstall
347
- # - DEM
348
- # - ClientDriveRedirection
349
- # - PerfTracker
350
- # - HelpDesk
351
- # - RTAV
352
- # - PrintRedir
353
- # - GEOREDIR
354
- # - SmartCard
355
- # - USB
356
- # - URLRedirection
357
- # - SerialPortRedirection
358
- # - ScannerRedirection
359
- # - SDOSensor
345
+ # - DEM
346
+ # - ClientDriveRedirection
347
+ # - PerfTracker
348
+ # - HelpDesk
349
+ # - RTAV
350
+ # - PrintRedir
351
+ # - GEOREDIR
352
+ # - SmartCard
353
+ # - USB
354
+ # - URLRedirection
355
+ # - SerialPortRedirection
356
+ # - ScannerRedirection
357
+ # - SDOSensor
360
358
  applicationScan:
361
359
  enableAppScan: false
362
360
  appScanDetails:
363
361
  infrastructureResourceList: []
364
362
  publishWithResiliency: false
365
- osCustomizations:
366
- - DisableWindowsUpdate
367
- - RemoveAppXPackages
363
+ osCustomizations: [DisableWindowsUpdate, RemoveAppXPackages]
368
364
  validateImage: false
369
365
  validationInfraResourceDetails:
370
366
  infrastructureResourceList:
371
- - kind: subnet
372
- id: /subscriptions/${var.provider.subscriptionId}/resourceGroups/${var.desktop.resourceGroup}/providers/Microsoft.Network/virtualNetworks/${var.desktop.vnet}/subnets/${var.desktop.subnet}
373
- data:
374
- parent: /subscriptions/${var.provider.subscriptionId}/resourceGroups/${var.desktop.resourceGroup}/providers/Microsoft.Network/virtualNetworks/${var.desktop.vnet}
375
- cidr: ${var.desktop.subnetAddressSpace}
367
+ - kind: subnet
368
+ id: /subscriptions/${var.provider.subscriptionId}/resourceGroups/${var.desktop.resourceGroup}/providers/Microsoft.Network/virtualNetworks/${var.desktop.vnet}/subnets/${var.desktop.subnet}
369
+ data:
370
+ parent: /subscriptions/${var.provider.subscriptionId}/resourceGroups/${var.desktop.resourceGroup}/providers/Microsoft.Network/virtualNetworks/${var.desktop.vnet}
371
+ cidr: ${var.desktop.subnetAddressSpace}
376
372
  resourceTags: ${var.resourceTag}
377
373
  myTemplateDedicated:
378
374
  kind: hcs/pool-template
@@ -383,12 +379,12 @@ resource:
383
379
  streamId: ${myImageSingleSession.id}
384
380
  markerId: ${myImageSingleSession.markers[0].id}
385
381
  networks:
386
- - kind: subnets
387
- id: /subscriptions/${var.provider.subscriptionId}/resourceGroups/${var.desktop.resourceGroup}/providers/Microsoft.Network/virtualNetworks/${var.desktop.vnet}/subnets/${var.desktop.subnet}
388
- data:
389
- parent: /subscriptions/${var.provider.subscriptionId}/resourceGroups/${var.desktop.resourceGroup}/providers/Microsoft.Network/virtualNetworks/${var.desktop.vnet}
390
- name: ${var.desktop.subnet}
391
- cidr: ${var.desktop.subnetAddressSpace}
382
+ - kind: subnets
383
+ id: /subscriptions/${var.provider.subscriptionId}/resourceGroups/${var.desktop.resourceGroup}/providers/Microsoft.Network/virtualNetworks/${var.desktop.vnet}/subnets/${var.desktop.subnet}
384
+ data:
385
+ parent: /subscriptions/${var.provider.subscriptionId}/resourceGroups/${var.desktop.resourceGroup}/providers/Microsoft.Network/virtualNetworks/${var.desktop.vnet}
386
+ name: ${var.desktop.subnet}
387
+ cidr: ${var.desktop.subnetAddressSpace}
392
388
  diskSizeInGB: 127
393
389
  diskEncryption:
394
390
  enabled: false
@@ -396,85 +392,80 @@ resource:
396
392
  availabilityZoneEnabled: false
397
393
  infrastructure:
398
394
  vmSkus:
399
- - kind: vmSkus
400
- id: Standard_DS2_v2
401
- data:
402
- capabilities:
403
- MemoryPreservingMaintenanceSupported: true
404
- vCPUsAvailable: '2'
405
- OSVhdSizeMB: '1047552'
406
- CombinedTempDiskAndCachedReadBytesPerSecond: '65536000'
407
- CombinedTempDiskAndCachedWriteBytesPerSecond: '65536000'
408
- EncryptionAtHostSupported: true
409
- UncachedDiskBytesPerSecond: '96000000'
410
- CombinedTempDiskAndCachedIOPS: '8000'
411
- RdmaEnabled: false
412
- MemoryGB: 7
413
- PremiumIO: true
414
- CapacityReservationSupported: true
415
- SupportedEphemeralOSDiskPlacements: ResourceDisk,CacheDisk
416
- CpuArchitectureType: x64
417
- AcceleratedNetworkingEnabled: true
418
- LowPriorityCapable: true
419
- HyperVGenerations:
420
- - V1
421
- - V2
422
- VMDeploymentTypes: IaaS
423
- CachedDiskBytes: '92341796864'
424
- UncachedDiskIOPS: '6400'
425
- EphemeralOSDiskSupported: true
426
- MaxDataDiskCount: '8'
427
- MaxResourceVolumeMB: '14336'
428
- vCPUsPerCore: '1'
429
- MaxNetworkInterfaces: '2'
430
- ACUs: '210'
431
- vCPUs: 2
432
- visible: true
433
- deprecated: false
434
- azAllowed: true
435
- uagAllowed: false
436
- tier: Standard
437
- templateRecommended: true
438
- series: DSv2
439
- name: Standard_DS2_v2
440
- templateBlocked: false
441
- edgeAllowed: false
442
- family: standardDSv2Family
443
- gpuType: NONE
444
- supportedZones:
445
- - '1'
446
- - '2'
447
- - '3'
448
- displayName: DS2_v2 (2 CPUs, 7GiB Memory)
395
+ - kind: vmSkus
396
+ id: Standard_DS2_v2
397
+ data:
398
+ capabilities:
399
+ MemoryPreservingMaintenanceSupported: true
400
+ vCPUsAvailable: "2"
401
+ OSVhdSizeMB: "1047552"
402
+ CombinedTempDiskAndCachedReadBytesPerSecond: "65536000"
403
+ CombinedTempDiskAndCachedWriteBytesPerSecond: "65536000"
404
+ EncryptionAtHostSupported: true
405
+ UncachedDiskBytesPerSecond: "96000000"
406
+ CombinedTempDiskAndCachedIOPS: "8000"
407
+ RdmaEnabled: false
408
+ MemoryGB: 7
409
+ PremiumIO: true
410
+ CapacityReservationSupported: true
411
+ SupportedEphemeralOSDiskPlacements: ResourceDisk,CacheDisk
412
+ CpuArchitectureType: x64
413
+ AcceleratedNetworkingEnabled: true
414
+ LowPriorityCapable: true
415
+ HyperVGenerations: [V1, V2]
416
+ VMDeploymentTypes: IaaS
417
+ CachedDiskBytes: "92341796864"
418
+ UncachedDiskIOPS: "6400"
419
+ EphemeralOSDiskSupported: true
420
+ MaxDataDiskCount: "8"
421
+ MaxResourceVolumeMB: "14336"
422
+ vCPUsPerCore: "1"
423
+ MaxNetworkInterfaces: "2"
424
+ ACUs: "210"
425
+ vCPUs: 2
426
+ visible: true
427
+ deprecated: false
428
+ azAllowed: true
429
+ uagAllowed: false
430
+ tier: Standard
431
+ templateRecommended: true
432
+ series: DSv2
433
+ name: Standard_DS2_v2
434
+ templateBlocked: false
435
+ edgeAllowed: false
436
+ family: standardDSv2Family
437
+ gpuType: NONE
438
+ supportedZones: ["1", "2", "3"]
439
+ displayName: DS2_v2 (2 CPUs, 7GiB Memory)
449
440
  diskSkus:
450
- - kind: diskSkus
451
- id: Premium_LRS
452
- data:
453
- series: UNKNOWN
454
- capabilities:
455
- MaxBurstDurationInMin: '30'
456
- MaxZonalFaultDomainCount: '3'
457
- BurstCreditBucketSizeInIO: '6084000'
458
- MinIOps: '120'
459
- MaxBurstBandwidthMBps: '170'
460
- BurstCreditBucketSizeInGiB: '255'
461
- MaxBandwidthMBps: '25'
462
- MaxIOps: '120'
463
- MinSizeGiB: '0'
464
- MaxSizeGiB: '4'
465
- MaxValueOfMaxShares: '3'
466
- MinBandwidthMBps: '25'
467
- MaxBurstIops: '3500'
468
- tier: Premium
469
- name: Premium_LRS
470
- family: ''
471
- diskSkuAutoScaleEnabled: false
441
+ - kind: diskSkus
442
+ id: Premium_LRS
443
+ data:
444
+ series: UNKNOWN
445
+ capabilities:
446
+ MaxBurstDurationInMin: "30"
447
+ MaxZonalFaultDomainCount: "3"
448
+ BurstCreditBucketSizeInIO: "6084000"
449
+ MinIOps: "120"
450
+ MaxBurstBandwidthMBps: "170"
451
+ BurstCreditBucketSizeInGiB: "255"
452
+ MaxBandwidthMBps: "25"
453
+ MaxIOps: "120"
454
+ MinSizeGiB: "0"
455
+ MaxSizeGiB: "4"
456
+ MaxValueOfMaxShares: "3"
457
+ MinBandwidthMBps: "25"
458
+ MaxBurstIops: "3500"
459
+ tier: Premium
460
+ name: Premium_LRS
461
+ family: ""
462
+ diskSkuAutoScaleEnabled: false
472
463
  reuseVmId: true
473
464
  sessionsPerVm: 1
474
465
  agentCustomization:
475
- demSettingId: ''
466
+ demSettingId: ""
476
467
  sparePolicy:
477
- description: ''
468
+ description: ""
478
469
  limit: 1
479
470
  max: 1
480
471
  min: 1
@@ -485,7 +476,7 @@ resource:
485
476
  activeDirectoryId: ${myAD.id}
486
477
  flags:
487
478
  azureHybridJoinEnabled: false
488
- templateUEMSettings: null
479
+ templateUEMSettings:
489
480
  uagDeploymentId: ${myUAG.id}
490
481
  orgId: ${var.orgId}
491
482
  providerInstanceId: ${myProvider.id}
@@ -504,12 +495,12 @@ resource:
504
495
  streamId: ${myImageSingleSession.id}
505
496
  markerId: ${myImageSingleSession.markers[0].id}
506
497
  networks:
507
- - kind: subnets
508
- id: /subscriptions/${var.provider.subscriptionId}/resourceGroups/${var.desktop.resourceGroup}/providers/Microsoft.Network/virtualNetworks/${var.desktop.vnet}/subnets/${var.desktop.subnet}
509
- data:
510
- parent: /subscriptions/${var.provider.subscriptionId}/resourceGroups/${var.desktop.resourceGroup}/providers/Microsoft.Network/virtualNetworks/${var.desktop.vnet}
511
- name: ${var.desktop.subnet}
512
- cidr: ${var.desktop.subnetAddressSpace}
498
+ - kind: subnets
499
+ id: /subscriptions/${var.provider.subscriptionId}/resourceGroups/${var.desktop.resourceGroup}/providers/Microsoft.Network/virtualNetworks/${var.desktop.vnet}/subnets/${var.desktop.subnet}
500
+ data:
501
+ parent: /subscriptions/${var.provider.subscriptionId}/resourceGroups/${var.desktop.resourceGroup}/providers/Microsoft.Network/virtualNetworks/${var.desktop.vnet}
502
+ name: ${var.desktop.subnet}
503
+ cidr: ${var.desktop.subnetAddressSpace}
513
504
  diskSizeInGB: 127
514
505
  diskEncryption:
515
506
  enabled: false
@@ -517,85 +508,80 @@ resource:
517
508
  availabilityZoneEnabled: false
518
509
  infrastructure:
519
510
  vmSkus:
520
- - kind: vmSkus
521
- id: Standard_DS2_v2
522
- data:
523
- capabilities:
524
- MemoryPreservingMaintenanceSupported: true
525
- vCPUsAvailable: '2'
526
- OSVhdSizeMB: '1047552'
527
- CombinedTempDiskAndCachedReadBytesPerSecond: '65536000'
528
- CombinedTempDiskAndCachedWriteBytesPerSecond: '65536000'
529
- EncryptionAtHostSupported: true
530
- UncachedDiskBytesPerSecond: '96000000'
531
- CombinedTempDiskAndCachedIOPS: '8000'
532
- RdmaEnabled: false
533
- MemoryGB: 7
534
- PremiumIO: true
535
- CapacityReservationSupported: true
536
- SupportedEphemeralOSDiskPlacements: ResourceDisk,CacheDisk
537
- CpuArchitectureType: x64
538
- AcceleratedNetworkingEnabled: true
539
- LowPriorityCapable: true
540
- HyperVGenerations:
541
- - V1
542
- - V2
543
- VMDeploymentTypes: IaaS
544
- CachedDiskBytes: '92341796864'
545
- UncachedDiskIOPS: '6400'
546
- EphemeralOSDiskSupported: true
547
- MaxDataDiskCount: '8'
548
- MaxResourceVolumeMB: '14336'
549
- vCPUsPerCore: '1'
550
- MaxNetworkInterfaces: '2'
551
- ACUs: '210'
552
- vCPUs: 2
553
- visible: true
554
- deprecated: false
555
- azAllowed: true
556
- uagAllowed: false
557
- tier: Standard
558
- templateRecommended: true
559
- series: DSv2
560
- name: Standard_DS2_v2
561
- templateBlocked: false
562
- edgeAllowed: false
563
- family: standardDSv2Family
564
- gpuType: NONE
565
- supportedZones:
566
- - '1'
567
- - '2'
568
- - '3'
569
- displayName: DS2_v2 (2 CPUs, 7GiB Memory)
511
+ - kind: vmSkus
512
+ id: Standard_DS2_v2
513
+ data:
514
+ capabilities:
515
+ MemoryPreservingMaintenanceSupported: true
516
+ vCPUsAvailable: "2"
517
+ OSVhdSizeMB: "1047552"
518
+ CombinedTempDiskAndCachedReadBytesPerSecond: "65536000"
519
+ CombinedTempDiskAndCachedWriteBytesPerSecond: "65536000"
520
+ EncryptionAtHostSupported: true
521
+ UncachedDiskBytesPerSecond: "96000000"
522
+ CombinedTempDiskAndCachedIOPS: "8000"
523
+ RdmaEnabled: false
524
+ MemoryGB: 7
525
+ PremiumIO: true
526
+ CapacityReservationSupported: true
527
+ SupportedEphemeralOSDiskPlacements: ResourceDisk,CacheDisk
528
+ CpuArchitectureType: x64
529
+ AcceleratedNetworkingEnabled: true
530
+ LowPriorityCapable: true
531
+ HyperVGenerations: [V1, V2]
532
+ VMDeploymentTypes: IaaS
533
+ CachedDiskBytes: "92341796864"
534
+ UncachedDiskIOPS: "6400"
535
+ EphemeralOSDiskSupported: true
536
+ MaxDataDiskCount: "8"
537
+ MaxResourceVolumeMB: "14336"
538
+ vCPUsPerCore: "1"
539
+ MaxNetworkInterfaces: "2"
540
+ ACUs: "210"
541
+ vCPUs: 2
542
+ visible: true
543
+ deprecated: false
544
+ azAllowed: true
545
+ uagAllowed: false
546
+ tier: Standard
547
+ templateRecommended: true
548
+ series: DSv2
549
+ name: Standard_DS2_v2
550
+ templateBlocked: false
551
+ edgeAllowed: false
552
+ family: standardDSv2Family
553
+ gpuType: NONE
554
+ supportedZones: ["1", "2", "3"]
555
+ displayName: DS2_v2 (2 CPUs, 7GiB Memory)
570
556
  diskSkus:
571
- - kind: diskSkus
572
- id: Premium_LRS
573
- data:
574
- series: UNKNOWN
575
- capabilities:
576
- MaxBurstDurationInMin: '30'
577
- MaxZonalFaultDomainCount: '3'
578
- BurstCreditBucketSizeInIO: '6084000'
579
- MinIOps: '120'
580
- MaxBurstBandwidthMBps: '170'
581
- BurstCreditBucketSizeInGiB: '255'
582
- MaxBandwidthMBps: '25'
583
- MaxIOps: '120'
584
- MinSizeGiB: '0'
585
- MaxSizeGiB: '4'
586
- MaxValueOfMaxShares: '3'
587
- MinBandwidthMBps: '25'
588
- MaxBurstIops: '3500'
589
- tier: Premium
590
- name: Premium_LRS
591
- family: ''
592
- diskSkuAutoScaleEnabled: false
557
+ - kind: diskSkus
558
+ id: Premium_LRS
559
+ data:
560
+ series: UNKNOWN
561
+ capabilities:
562
+ MaxBurstDurationInMin: "30"
563
+ MaxZonalFaultDomainCount: "3"
564
+ BurstCreditBucketSizeInIO: "6084000"
565
+ MinIOps: "120"
566
+ MaxBurstBandwidthMBps: "170"
567
+ BurstCreditBucketSizeInGiB: "255"
568
+ MaxBandwidthMBps: "25"
569
+ MaxIOps: "120"
570
+ MinSizeGiB: "0"
571
+ MaxSizeGiB: "4"
572
+ MaxValueOfMaxShares: "3"
573
+ MinBandwidthMBps: "25"
574
+ MaxBurstIops: "3500"
575
+ tier: Premium
576
+ name: Premium_LRS
577
+ family: ""
578
+ diskSkuAutoScaleEnabled: false
593
579
  reuseVmId: true
594
580
  sessionsPerVm: 1
595
581
  agentCustomization:
596
- demSettingId: ''
582
+ demSettingId: ""
597
583
  sparePolicy:
598
- description: ''
584
+ description: ""
599
585
  limit: 1
600
586
  max: 1
601
587
  min: 1
@@ -606,7 +592,7 @@ resource:
606
592
  activeDirectoryId: ${myAD.id}
607
593
  flags:
608
594
  azureHybridJoinEnabled: false
609
- templateUEMSettings: null
595
+ templateUEMSettings:
610
596
  uagDeploymentId: ${myUAG.id}
611
597
  orgId: ${var.orgId}
612
598
  providerInstanceId: ${myProvider.id}
@@ -625,12 +611,12 @@ resource:
625
611
  streamId: ${myImageMultiSession.id}
626
612
  markerId: ${myImageMultiSession.markers[0].id}
627
613
  networks:
628
- - kind: subnets
629
- id: /subscriptions/${var.provider.subscriptionId}/resourceGroups/${var.desktop.resourceGroup}/providers/Microsoft.Network/virtualNetworks/${var.desktop.vnet}/subnets/${var.desktop.subnet}
630
- data:
631
- parent: /subscriptions/${var.provider.subscriptionId}/resourceGroups/${var.desktop.resourceGroup}/providers/Microsoft.Network/virtualNetworks/${var.desktop.vnet}
632
- name: ${var.desktop.subnet}
633
- cidr: ${var.desktop.subnetAddressSpace}
614
+ - kind: subnets
615
+ id: /subscriptions/${var.provider.subscriptionId}/resourceGroups/${var.desktop.resourceGroup}/providers/Microsoft.Network/virtualNetworks/${var.desktop.vnet}/subnets/${var.desktop.subnet}
616
+ data:
617
+ parent: /subscriptions/${var.provider.subscriptionId}/resourceGroups/${var.desktop.resourceGroup}/providers/Microsoft.Network/virtualNetworks/${var.desktop.vnet}
618
+ name: ${var.desktop.subnet}
619
+ cidr: ${var.desktop.subnetAddressSpace}
634
620
  diskSizeInGB: 127
635
621
  diskEncryption:
636
622
  enabled: false
@@ -638,85 +624,80 @@ resource:
638
624
  availabilityZoneEnabled: false
639
625
  infrastructure:
640
626
  vmSkus:
641
- - kind: vmSkus
642
- id: Standard_DS2_v2
643
- data:
644
- capabilities:
645
- MemoryPreservingMaintenanceSupported: true
646
- vCPUsAvailable: '2'
647
- OSVhdSizeMB: '1047552'
648
- CombinedTempDiskAndCachedReadBytesPerSecond: '65536000'
649
- CombinedTempDiskAndCachedWriteBytesPerSecond: '65536000'
650
- EncryptionAtHostSupported: true
651
- UncachedDiskBytesPerSecond: '96000000'
652
- CombinedTempDiskAndCachedIOPS: '8000'
653
- RdmaEnabled: false
654
- MemoryGB: 7
655
- PremiumIO: true
656
- CapacityReservationSupported: true
657
- SupportedEphemeralOSDiskPlacements: ResourceDisk,CacheDisk
658
- CpuArchitectureType: x64
659
- AcceleratedNetworkingEnabled: true
660
- LowPriorityCapable: true
661
- HyperVGenerations:
662
- - V1
663
- - V2
664
- VMDeploymentTypes: IaaS
665
- CachedDiskBytes: '92341796864'
666
- UncachedDiskIOPS: '6400'
667
- EphemeralOSDiskSupported: true
668
- MaxDataDiskCount: '8'
669
- MaxResourceVolumeMB: '14336'
670
- vCPUsPerCore: '1'
671
- MaxNetworkInterfaces: '2'
672
- ACUs: '210'
673
- vCPUs: 2
674
- visible: true
675
- deprecated: false
676
- azAllowed: true
677
- uagAllowed: false
678
- tier: Standard
679
- templateRecommended: true
680
- series: DSv2
681
- name: Standard_DS2_v2
682
- templateBlocked: false
683
- edgeAllowed: false
684
- family: standardDSv2Family
685
- gpuType: NONE
686
- supportedZones:
687
- - '1'
688
- - '2'
689
- - '3'
690
- displayName: DS2_v2 (2 CPUs, 7GiB Memory)
627
+ - kind: vmSkus
628
+ id: Standard_DS2_v2
629
+ data:
630
+ capabilities:
631
+ MemoryPreservingMaintenanceSupported: true
632
+ vCPUsAvailable: "2"
633
+ OSVhdSizeMB: "1047552"
634
+ CombinedTempDiskAndCachedReadBytesPerSecond: "65536000"
635
+ CombinedTempDiskAndCachedWriteBytesPerSecond: "65536000"
636
+ EncryptionAtHostSupported: true
637
+ UncachedDiskBytesPerSecond: "96000000"
638
+ CombinedTempDiskAndCachedIOPS: "8000"
639
+ RdmaEnabled: false
640
+ MemoryGB: 7
641
+ PremiumIO: true
642
+ CapacityReservationSupported: true
643
+ SupportedEphemeralOSDiskPlacements: ResourceDisk,CacheDisk
644
+ CpuArchitectureType: x64
645
+ AcceleratedNetworkingEnabled: true
646
+ LowPriorityCapable: true
647
+ HyperVGenerations: [V1, V2]
648
+ VMDeploymentTypes: IaaS
649
+ CachedDiskBytes: "92341796864"
650
+ UncachedDiskIOPS: "6400"
651
+ EphemeralOSDiskSupported: true
652
+ MaxDataDiskCount: "8"
653
+ MaxResourceVolumeMB: "14336"
654
+ vCPUsPerCore: "1"
655
+ MaxNetworkInterfaces: "2"
656
+ ACUs: "210"
657
+ vCPUs: 2
658
+ visible: true
659
+ deprecated: false
660
+ azAllowed: true
661
+ uagAllowed: false
662
+ tier: Standard
663
+ templateRecommended: true
664
+ series: DSv2
665
+ name: Standard_DS2_v2
666
+ templateBlocked: false
667
+ edgeAllowed: false
668
+ family: standardDSv2Family
669
+ gpuType: NONE
670
+ supportedZones: ["1", "2", "3"]
671
+ displayName: DS2_v2 (2 CPUs, 7GiB Memory)
691
672
  diskSkus:
692
- - kind: diskSkus
693
- id: Premium_LRS
694
- data:
695
- series: UNKNOWN
696
- capabilities:
697
- MaxBurstDurationInMin: '30'
698
- MaxZonalFaultDomainCount: '3'
699
- BurstCreditBucketSizeInIO: '6084000'
700
- MinIOps: '120'
701
- MaxBurstBandwidthMBps: '170'
702
- BurstCreditBucketSizeInGiB: '255'
703
- MaxBandwidthMBps: '25'
704
- MaxIOps: '120'
705
- MinSizeGiB: '0'
706
- MaxSizeGiB: '4'
707
- MaxValueOfMaxShares: '3'
708
- MinBandwidthMBps: '25'
709
- MaxBurstIops: '3500'
710
- tier: Premium
711
- name: Premium_LRS
712
- family: ''
713
- diskSkuAutoScaleEnabled: false
673
+ - kind: diskSkus
674
+ id: Premium_LRS
675
+ data:
676
+ series: UNKNOWN
677
+ capabilities:
678
+ MaxBurstDurationInMin: "30"
679
+ MaxZonalFaultDomainCount: "3"
680
+ BurstCreditBucketSizeInIO: "6084000"
681
+ MinIOps: "120"
682
+ MaxBurstBandwidthMBps: "170"
683
+ BurstCreditBucketSizeInGiB: "255"
684
+ MaxBandwidthMBps: "25"
685
+ MaxIOps: "120"
686
+ MinSizeGiB: "0"
687
+ MaxSizeGiB: "4"
688
+ MaxValueOfMaxShares: "3"
689
+ MinBandwidthMBps: "25"
690
+ MaxBurstIops: "3500"
691
+ tier: Premium
692
+ name: Premium_LRS
693
+ family: ""
694
+ diskSkuAutoScaleEnabled: false
714
695
  reuseVmId: true
715
696
  sessionsPerVm: 1
716
697
  agentCustomization:
717
- demSettingId: ''
698
+ demSettingId: ""
718
699
  sparePolicy:
719
- description: ''
700
+ description: ""
720
701
  limit: 1
721
702
  max: 1
722
703
  min: 1
@@ -727,7 +708,7 @@ resource:
727
708
  activeDirectoryId: ${myAD.id}
728
709
  flags:
729
710
  azureHybridJoinEnabled: false
730
- templateUEMSettings: null
711
+ templateUEMSettings:
731
712
  uagDeploymentId: ${myUAG.id}
732
713
  orgId: ${var.orgId}
733
714
  providerInstanceId: ${myProvider.id}
@@ -749,10 +730,10 @@ resource:
749
730
  enableSSO: false
750
731
  preferredClientType: HORIZON_CLIENT
751
732
  protocols:
752
- - name: BLAST
753
- defaultProtocol: true
733
+ - name: BLAST
734
+ defaultProtocol: true
754
735
  templates:
755
- - id: ${myTemplateDedicated.id}
736
+ - id: ${myTemplateDedicated.id}
756
737
  resourceTags: ${var.resourceTag}
757
738
  myPoolFloating:
758
739
  kind: hcs/pool-group
@@ -766,10 +747,10 @@ resource:
766
747
  enableSSO: false
767
748
  preferredClientType: HORIZON_CLIENT
768
749
  protocols:
769
- - name: BLAST
770
- defaultProtocol: true
750
+ - name: BLAST
751
+ defaultProtocol: true
771
752
  templates:
772
- - id: ${myTemplateFloating.id}
753
+ - id: ${myTemplateFloating.id}
773
754
  resourceTags: ${var.resourceTag}
774
755
  myPoolMulti:
775
756
  kind: hcs/pool-group
@@ -783,41 +764,32 @@ resource:
783
764
  enableSSO: false
784
765
  preferredClientType: HORIZON_CLIENT
785
766
  protocols:
786
- - name: BLAST
787
- defaultProtocol: true
767
+ - name: BLAST
768
+ defaultProtocol: true
788
769
  templates:
789
- - id: ${myTemplateMulti.id}
770
+ - id: ${myTemplateMulti.id}
790
771
  resourceTags: ${var.resourceTag}
791
772
  myEntitlementDedicated:
792
773
  kind: hcs/entitlement
793
774
  data:
794
775
  orgId: ${var.orgId}
795
- poolIds:
796
- - ${myPoolDedicated.id}
776
+ poolIds: ["${myPoolDedicated.id}"]
797
777
  resourceDetails:
798
- - poolId: ${myPoolDedicated.id}
799
- userIds:
800
- - ${env.ENTITLEMENT_USER_1}
801
- - ${env.ENTITLEMENT_USER_2}
778
+ - poolId: ${myPoolDedicated.id}
779
+ userIds: ["${env.ENTITLEMENT_USER_1}", "${env.ENTITLEMENT_USER_2}"]
802
780
  myEntitlementFloating:
803
781
  kind: hcs/entitlement
804
782
  data:
805
783
  orgId: ${var.orgId}
806
- poolIds:
807
- - ${myPoolFloating.id}
784
+ poolIds: ["${myPoolFloating.id}"]
808
785
  resourceDetails:
809
- - poolId: ${myPoolFloating.id}
810
- userIds:
811
- - ${env.ENTITLEMENT_USER_1}
812
- - ${env.ENTITLEMENT_USER_2}
786
+ - poolId: ${myPoolFloating.id}
787
+ userIds: ["${env.ENTITLEMENT_USER_1}", "${env.ENTITLEMENT_USER_2}"]
813
788
  myEntitlementMulti:
814
789
  kind: hcs/entitlement
815
790
  data:
816
791
  orgId: ${var.orgId}
817
- poolIds:
818
- - ${myPoolMulti.id}
792
+ poolIds: ["${myPoolMulti.id}"]
819
793
  resourceDetails:
820
- - poolId: ${myPoolMulti.id}
821
- userIds:
822
- - ${env.ENTITLEMENT_USER_1}
823
- - ${env.ENTITLEMENT_USER_2}
794
+ - poolId: ${myPoolMulti.id}
795
+ userIds: ["${env.ENTITLEMENT_USER_1}", "${env.ENTITLEMENT_USER_2}"]