hcs-cli 0.1.318__py3-none-any.whl → 0.1.320__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.
- hcs_cli/__init__.py +2 -2
- hcs_cli/cmds/advisor/html_utils.py +30 -26
- hcs_cli/cmds/advisor/recommendation_engine.py +7 -10
- hcs_cli/cmds/daas/tenant/plan.py +1 -1
- hcs_cli/cmds/debug/start.py +0 -1
- hcs_cli/cmds/dev/fs/clear.py +8 -0
- hcs_cli/cmds/dev/fs/helper/credential_helper.py +2 -0
- hcs_cli/cmds/dev/fs/helper/k8s_util.py +0 -1
- hcs_cli/cmds/dev/fs/init.py +38 -5
- hcs_cli/cmds/dev/fs/profiler.py +0 -1
- hcs_cli/cmds/dev/fs/provided_files/akka.plan.yml +94 -250
- hcs_cli/cmds/dev/fs/provided_files/azsim.plan.yml +27 -34
- hcs_cli/cmds/dev/fs/provided_files/azure.plan.yml +294 -322
- hcs_cli/cmds/dev/fs/provided_files/mqtt-secret.yaml +188 -93
- hcs_cli/cmds/dev/fs/provided_files/mqtt-server-external.yaml +4 -5
- hcs_cli/cmds/dev/fs/provided_files/patch-mqtt-hostname.yml +3 -3
- hcs_cli/cmds/dev/fs/provided_files/patch-vernemq-ssl-depth.json +1 -1
- hcs_cli/cmds/dev/fs/tailor.py +7 -12
- hcs_cli/cmds/dev/mqtt.py +1 -2
- hcs_cli/cmds/dev/util/mqtt_helper.py +0 -1
- hcs_cli/cmds/hoc/search.py +39 -9
- hcs_cli/cmds/hoc/stats.py +46 -0
- hcs_cli/cmds/hst/clean.py +2 -1
- hcs_cli/cmds/inventory/assign.py +1 -3
- hcs_cli/cmds/inventory/deassign.py +1 -1
- hcs_cli/cmds/inventory/delete.py +48 -0
- hcs_cli/cmds/lcm/provider/create.py +11 -2
- hcs_cli/cmds/lcm/template/expand.py +46 -0
- hcs_cli/cmds/lcm/vm/delete.py +3 -2
- hcs_cli/cmds/scm/plan.py +131 -3
- hcs_cli/cmds/task.py +2 -4
- hcs_cli/cmds/template/expand.py +64 -19
- hcs_cli/cmds/template/list_usage.py +2 -2
- hcs_cli/cmds/template/update.py +2 -2
- hcs_cli/cmds/template/usage.py +20 -7
- hcs_cli/cmds/vm/delete.py +3 -2
- hcs_cli/cmds/vm/list.py +51 -40
- hcs_cli/cmds/vmm/rootca_migrate.py +1 -1
- hcs_cli/config/hcs-deployments.yaml +52 -52
- hcs_cli/main.py +0 -2
- hcs_cli/payload/akka.blueprint.yml +95 -243
- hcs_cli/payload/app/manual.json +19 -19
- hcs_cli/payload/edge/akka.json +6 -6
- hcs_cli/payload/edge/vsphere.json +6 -6
- hcs_cli/payload/hoc/lcm-capcalc.json.template +43 -0
- hcs_cli/payload/hoc/no-spare.json.template +1 -1
- hcs_cli/payload/inventory/assign.json +14 -16
- hcs_cli/payload/inventory/deassign.json +11 -11
- hcs_cli/payload/lcm/akka.json +31 -33
- hcs_cli/payload/lcm/azure-dummy.json +64 -66
- hcs_cli/payload/lcm/azure-real.json +13 -11
- hcs_cli/payload/lcm/edge-proxy.json +34 -36
- hcs_cli/payload/lcm/zero-dedicated.json +34 -36
- hcs_cli/payload/lcm/zero-delay-1m-per-vm.json +53 -69
- hcs_cli/payload/lcm/zero-fail-delete-template.json +43 -0
- hcs_cli/payload/lcm/zero-fail-destroy-onthread.json +38 -40
- hcs_cli/payload/lcm/zero-fail-destroy.json +38 -40
- hcs_cli/payload/lcm/zero-fail-prepare-onthread.json +38 -40
- hcs_cli/payload/lcm/zero-fail-prepare.json +38 -40
- hcs_cli/payload/lcm/zero-fail-vm-onthread.json +58 -74
- hcs_cli/payload/lcm/zero-fail-vm.json +58 -74
- hcs_cli/payload/lcm/zero-floating.json +34 -36
- hcs_cli/payload/lcm/zero-manual.json +33 -35
- hcs_cli/payload/lcm/zero-multisession.json +34 -36
- hcs_cli/payload/lcm/zero-nanw.json +31 -33
- hcs_cli/payload/lcm/zero-new-5k-delay.json +69 -78
- hcs_cli/payload/lcm/zero-new-5k.json +36 -38
- hcs_cli/payload/lcm/zero-new-snapshot.json +37 -39
- hcs_cli/payload/lcm/zero-new.json +37 -39
- hcs_cli/payload/lcm/zero-reuse-vm-id.json +33 -35
- hcs_cli/payload/lcm/zero-with-max-id-offset.json +32 -34
- hcs_cli/payload/lcm/zero.json +59 -73
- hcs_cli/payload/provider/ad-stes-vsphere.json +26 -26
- hcs_cli/payload/provider/akka.json +12 -12
- hcs_cli/payload/provider/azure.json +14 -14
- hcs_cli/payload/provider/edgeproxy.json +12 -12
- hcs_cli/payload/provider/vsphere.json +14 -14
- hcs_cli/payload/scm/starter.json +22 -23
- hcs_cli/payload/synt/core/p01-dummy-success.json +11 -15
- hcs_cli/payload/synt/core/p02-dummy-fail.json +12 -15
- hcs_cli/payload/synt/core/p03-dummy-exception.json +12 -15
- hcs_cli/payload/synt/core/p04-dummy-success-repeat.json +12 -15
- hcs_cli/payload/synt/core/p05-dummy-fail-repeat.json +13 -16
- hcs_cli/payload/synt/core/p06-dummy-exception-repeat.json +13 -16
- hcs_cli/payload/synt/core/p07-dummy-delay.json +12 -15
- hcs_cli/payload/synt/core/p08-dummy-property.json +12 -15
- hcs_cli/payload/synt/ext/p20-connect-success.json +12 -15
- hcs_cli/payload/synt/ext/p21-connect-fail.json +12 -15
- hcs_cli/payload/synt/ext/p30-ssl-success.json +12 -15
- hcs_cli/payload/synt/ext/p31-ssl-fail.json +13 -16
- hcs_cli/payload/synt/ext/p40-http-success.json +12 -15
- hcs_cli/payload/synt/ext/p41-http-fail.json +12 -15
- hcs_cli/payload/synt/ext/p42-http-status-code.json +14 -20
- hcs_cli/payload/synt/ext1/p10-ping-success.json +13 -16
- hcs_cli/payload/synt/ext1/p11-ping-fail.json +12 -15
- hcs_cli/payload/synt/ext1/p12-ping-success-repeat.json +14 -17
- hcs_cli/provider/hcs/cert.py +0 -1
- hcs_cli/provider/hcs/edge.py +1 -1
- hcs_cli/provider/hcs/uag.py +1 -1
- hcs_cli/service/admin/template.py +10 -1
- hcs_cli/service/hoc/diagnostic.py +11 -3
- hcs_cli/service/inventory/__init__.py +15 -2
- hcs_cli/service/inventory/vm.py +12 -0
- hcs_cli/service/lcm/template.py +9 -6
- hcs_cli/service/lcm/vm.py +0 -1
- hcs_cli/service/task.py +0 -1
- hcs_cli/service/template.py +1 -1
- hcs_cli/support/debug_util.py +0 -1
- hcs_cli/support/plan_util.py +0 -1
- hcs_cli/support/predefined_payload.py +4 -1
- hcs_cli/support/template_util.py +0 -1
- hcs_cli/support/test_utils.py +2 -2
- hcs_cli/support/test_utils2.py +536 -0
- hcs_cli/support/vm_table.py +2 -2
- {hcs_cli-0.1.318.dist-info → hcs_cli-0.1.320.dist-info}/METADATA +24 -17
- {hcs_cli-0.1.318.dist-info → hcs_cli-0.1.320.dist-info}/RECORD +118 -113
- hcs_cli/payload/lcm/azure-dummy-nt.json +0 -69
- {hcs_cli-0.1.318.dist-info → hcs_cli-0.1.320.dist-info}/WHEEL +0 -0
- {hcs_cli-0.1.318.dist-info → hcs_cli-0.1.320.dist-info}/entry_points.txt +0 -0
|
@@ -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:
|
|
84
|
-
secondaryDNS:
|
|
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
|
-
|
|
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:
|
|
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
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
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
|
-
|
|
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:
|
|
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
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
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
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
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
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
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
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
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:
|
|
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
|
-
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
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
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
|
|
553
|
-
|
|
554
|
-
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
|
|
564
|
-
|
|
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
|
-
|
|
572
|
-
|
|
573
|
-
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
|
|
580
|
-
|
|
581
|
-
|
|
582
|
-
|
|
583
|
-
|
|
584
|
-
|
|
585
|
-
|
|
586
|
-
|
|
587
|
-
|
|
588
|
-
|
|
589
|
-
|
|
590
|
-
|
|
591
|
-
|
|
592
|
-
|
|
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:
|
|
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
|
-
|
|
629
|
-
|
|
630
|
-
|
|
631
|
-
|
|
632
|
-
|
|
633
|
-
|
|
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
|
-
|
|
642
|
-
|
|
643
|
-
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
|
|
647
|
-
|
|
648
|
-
|
|
649
|
-
|
|
650
|
-
|
|
651
|
-
|
|
652
|
-
|
|
653
|
-
|
|
654
|
-
|
|
655
|
-
|
|
656
|
-
|
|
657
|
-
|
|
658
|
-
|
|
659
|
-
|
|
660
|
-
|
|
661
|
-
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
|
|
676
|
-
|
|
677
|
-
|
|
678
|
-
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
|
|
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
|
-
|
|
693
|
-
|
|
694
|
-
|
|
695
|
-
|
|
696
|
-
|
|
697
|
-
|
|
698
|
-
|
|
699
|
-
|
|
700
|
-
|
|
701
|
-
|
|
702
|
-
|
|
703
|
-
|
|
704
|
-
|
|
705
|
-
|
|
706
|
-
|
|
707
|
-
|
|
708
|
-
|
|
709
|
-
|
|
710
|
-
|
|
711
|
-
|
|
712
|
-
|
|
713
|
-
|
|
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:
|
|
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
|
-
|
|
753
|
-
|
|
733
|
+
- name: BLAST
|
|
734
|
+
defaultProtocol: true
|
|
754
735
|
templates:
|
|
755
|
-
|
|
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
|
-
|
|
770
|
-
|
|
750
|
+
- name: BLAST
|
|
751
|
+
defaultProtocol: true
|
|
771
752
|
templates:
|
|
772
|
-
|
|
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
|
-
|
|
787
|
-
|
|
767
|
+
- name: BLAST
|
|
768
|
+
defaultProtocol: true
|
|
788
769
|
templates:
|
|
789
|
-
|
|
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
|
-
|
|
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
|
-
|
|
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
|
-
|
|
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}"]
|