vCPUsAvailable capability reflect actual vcpu in the guest

This commit is contained in:
Lili Deng 2022-04-09 16:21:10 +08:00 коммит произвёл Chi Song
Родитель 285590e9d6
Коммит 57e29bad6f
2 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -1496,7 +1496,7 @@ class AzurePlatform(Platform):
](is_allow_set=True, items=[]) ](is_allow_set=True, items=[])
for sku_capability in resource_sku.capabilities: for sku_capability in resource_sku.capabilities:
name = sku_capability.name name = sku_capability.name
if name == "vCPUs": if name == "vCPUsAvailable":
node_space.core_count = int(sku_capability.value) node_space.core_count = int(sku_capability.value)
if resource_sku.family in ["standardLSv2Family"]: if resource_sku.family in ["standardLSv2Family"]:
# refer https://docs.microsoft.com/en-us/azure/virtual-machines/lsv2-series # noqa: E501 # refer https://docs.microsoft.com/en-us/azure/virtual-machines/lsv2-series # noqa: E501

Просмотреть файл

@ -51,7 +51,7 @@ class AzurePrepareTestCase(TestCase):
"capabilities": [ "capabilities": [
{"name": "MaxResourceVolumeMB", "value": "1376256"}, {"name": "MaxResourceVolumeMB", "value": "1376256"},
{"name": "OSVhdSizeMB", "value": "1047552"}, {"name": "OSVhdSizeMB", "value": "1047552"},
{"name": "vCPUs", "value": "48"}, {"name": "vCPUsAvailable", "value": "48"},
{"name": "MemoryGB", "value": "448"}, {"name": "MemoryGB", "value": "448"},
{"name": "vCPUsAvailable", "value": "48"}, {"name": "vCPUsAvailable", "value": "48"},
{"name": "GPUs", "value": "4"}, {"name": "GPUs", "value": "4"},