Skip to content

vmware: Encrypt vmotion if flavor requires it, or don't #508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
grandchild wants to merge 1 commit into
base: stable/xena-m3
Choose a base branch
from
Open

vmware: Encrypt vmotion if flavor requires it, or don't #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions nova/tests/unit/virt/vmwareapi/test_vm_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,7 @@ def test_get_resize_spec(self):
expected.memoryAllocation = memoryAllocation
expected.extraConfig = []
expected.memoryReservationLockedToMax = False
expected.migrateEncryption = None

self.assertEqual(expected, result)

Expand Down Expand Up @@ -459,6 +460,7 @@ def test_get_resize_spec_with_limits(self):
expected.memoryAllocation = memoryAllocation
expected.extraConfig = []
expected.memoryReservationLockedToMax = False
expected.migrateEncryption = None

self.assertEqual(expected, result)

Expand Down Expand Up @@ -883,6 +885,7 @@ def _create_vm_config_spec(self):
spec.name = self._instance.uuid
spec.instanceUuid = self._instance.uuid
spec.deviceChange = []
spec.migrateEncryption = None
spec.numCPUs = 2

spec.version = None
Expand Down Expand Up @@ -963,6 +966,7 @@ def test_get_vm_create_spec_with_allocations(self):
extra_specs)
expected = fake_factory.create('ns0:VirtualMachineConfigSpec')
expected.deviceChange = []
expected.migrateEncryption = None
expected.guestId = constants.DEFAULT_OS_TYPE
expected.instanceUuid = self._instance.uuid
expected.memoryMB = self._instance.memory_mb
Expand Down Expand Up @@ -1018,6 +1022,7 @@ def test_get_vm_create_spec_with_limit(self):
expected.instanceUuid = self._instance.uuid
expected.name = self._instance.uuid
expected.deviceChange = []
expected.migrateEncryption = None
expected.extraConfig = []

extra_config = fake_factory.create("ns0:OptionValue")
Expand Down Expand Up @@ -1072,6 +1077,7 @@ def test_get_vm_create_spec_with_share(self):
expected.instanceUuid = self._instance.uuid
expected.name = self._instance.uuid
expected.deviceChange = []
expected.migrateEncryption = None

expected.extraConfig = []
extra_config = fake_factory.create('ns0:OptionValue')
Expand Down Expand Up @@ -1125,6 +1131,7 @@ def test_get_vm_create_spec_with_share_custom(self):
expected.instanceUuid = self._instance.uuid
expected.name = self._instance.uuid
expected.deviceChange = []
expected.migrateEncryption = None

expected.extraConfig = []
extra_config = fake_factory.create('ns0:OptionValue')
Expand Down Expand Up @@ -1173,6 +1180,7 @@ def test_get_vm_create_spec_with_metadata(self):
expected.name = self._instance.uuid
expected.instanceUuid = self._instance.uuid
expected.deviceChange = []
expected.migrateEncryption = None
expected.numCPUs = 2

expected.version = None
Expand Down Expand Up @@ -1216,6 +1224,7 @@ def test_get_vm_create_spec_with_firmware(self):
expected.name = self._instance.uuid
expected.instanceUuid = self._instance.uuid
expected.deviceChange = []
expected.migrateEncryption = None
expected.numCPUs = 2

expected.version = None
Expand Down Expand Up @@ -2058,6 +2067,7 @@ def test_get_vm_create_spec_with_console_delay(self):
expected.name = self._instance.uuid
expected.instanceUuid = self._instance.uuid
expected.deviceChange = []
expected.migrateEncryption = None
expected.numCPUs = 2

expected.version = None
Expand Down Expand Up @@ -2102,6 +2112,7 @@ def test_get_vm_create_spec_with_cores_per_socket(self):
extra_specs)
expected = fake_factory.create('ns0:VirtualMachineConfigSpec')
expected.deviceChange = []
expected.migrateEncryption = None
expected.guestId = 'otherGuest'
expected.instanceUuid = self._instance.uuid
expected.memoryMB = self._instance.memory_mb
Expand Down Expand Up @@ -2147,6 +2158,7 @@ def test_get_vm_create_spec_with_memory_allocations(self):
extra_specs)
expected = fake_factory.create('ns0:VirtualMachineConfigSpec')
expected.deviceChange = []
expected.migrateEncryption = None
expected.guestId = 'otherGuest'
expected.instanceUuid = self._instance.uuid
expected.memoryMB = self._instance.memory_mb
Expand Down
16 changes: 16 additions & 0 deletions nova/tests/unit/virt/vmwareapi/test_vmops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1420,6 +1420,22 @@ def test_reserve_max_flavor_memory_for_memory_reserved_flavor(self):
self.assertEqual(specs.memory_limits.reservation,
self._instance.flavor.memory_mb)

def _test_vmotion_encryption(self, encryption, expected=None):
if encryption is not None:
self._instance.flavor.extra_specs.update({
"vmware:vmotion_encryption": encryption})
specs = self._vmops._get_extra_specs(self._instance.flavor,
self._image_meta)
self.assertEqual(specs.vmotion_encryption, expected)

def test_vmotion_encryption_values(self):
self._test_vmotion_encryption("required", "required")
self._test_vmotion_encryption("opportunistic", "opportunistic")
self._test_vmotion_encryption("disabled", "disabled")
self._test_vmotion_encryption("INVALID", "required")
# no extra_specs entry at all:
self._test_vmotion_encryption(None, "required")

@mock.patch.object(vmops.VMwareVMOps, '_extend_virtual_disk')
@mock.patch.object(vmops.VMwareVMOps, '_get_extra_specs')
@mock.patch.object(ds_util, 'disk_move')
Expand Down
8 changes: 7 additions & 1 deletion nova/virt/vmwareapi/vm_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ def __init__(self, cpu_limits=None, hw_version=None,
vif_limits=None, hv_enabled=None, firmware=None,
hw_video_ram=None, numa_prefer_ht=None,
numa_vcpu_max_per_virtual_node=None,
migration_data_timeout=None, evc_mode_key=None):
migration_data_timeout=None, evc_mode_key=None,
vmotion_encryption=None):
"""ExtraSpecs object holds extra_specs for the instance."""
self.cpu_limits = cpu_limits or Limits()
self.memory_limits = memory_limits or Limits()
Expand All @@ -130,6 +131,7 @@ def __init__(self, cpu_limits=None, hw_version=None,
self.numa_vcpu_max_per_virtual_node = numa_vcpu_max_per_virtual_node
self.migration_data_timeout = migration_data_timeout
self.evc_mode_key = evc_mode_key
self.vmotion_encryption = vmotion_encryption

def get_capped_evc_mode(self, evc_modes, evc_mode_sort_keys,
max_evc_mode_key):
Expand Down Expand Up @@ -439,6 +441,8 @@ def get_vm_create_spec(client_factory, instance, data_store_name,

config_spec.deviceChange = devices

config_spec.migrateEncryption = extra_specs.vmotion_encryption

# add vm-uuid and iface-id.x values for Neutron
extra_config = []
opt = client_factory.create('ns0:OptionValue')
Expand Down Expand Up @@ -632,6 +636,8 @@ def get_vm_resize_spec(client_factory, vcpus, memory_mb, extra_specs,

resize_spec.extraConfig = extra_config

resize_spec.migrateEncryption = extra_specs.vmotion_encryption

if metadata:
resize_spec.annotation = metadata
return resize_spec
Expand Down
9 changes: 9 additions & 0 deletions nova/virt/vmwareapi/vmops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,15 @@ def _get_extra_specs(self, flavor, image_meta=None):
raise error_util.EvcModeDoesNotExist(evc_mode=evc_mode_key)
extra_specs.evc_mode_key = evc_mode_key

vmotion_encryption = flavor.extra_specs.get(
"vmware:vmotion_encryption", "required")
if vmotion_encryption in ["disabled", "opportunistic", "required"]:
extra_specs.vmotion_encryption = vmotion_encryption
else:
LOG.warning("Invalid vmware:vmotion_encryption value: %s. "
"Using default value: required", vmotion_encryption)
extra_specs.vmotion_encryption = "required"

return extra_specs

def _get_storage_policy(self, flavor):
Expand Down