x
/
vmware-nsx
Code Issues Proposed changes

MP2P migration: avoid creating duplicate resources for policy-id 

In case multiple resources of the same type have the same policy id,
stop the migration with a warning and rollback.

Change-Id: I64eca1234414982c52e4d0f19e2c3b8a4594c269
This commit is contained in:
asarfaty 2020-08-12 07:49:41 +02:00
parent 36025eb8c0
commit 754c960b5b
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vmware_nsx/shell/admin/plugins/nsxv3/resources/migration.py
View File

@ -241,8 +241,9 @@ def get_resource_migration_data(nsxlib_resource, neutron_id_tags,
else:
resources = nsxlib_resource.list()
if not isinstance(resources, list):
# the nsxlib resources list return inconsistent type of result
# The nsxlib resources list return inconsistent type of result
resources = resources.get('results', [])
policy_ids = []
entries = []
for resource in resources:
name_and_id = printable_resource_name(resource)
@ -285,6 +286,18 @@ def get_resource_migration_data(nsxlib_resource, neutron_id_tags,
LOG.debug("Skipping %s %s as it already exists on the "
"policy backend", printable_name, name_and_id)
continue
# Make sure not to migrate multiple resources to the same policy-id
if policy_id:
if policy_id in policy_ids:
msg = (_("Cannot migrate %s %s to policy-id %s: Another %s "
"has the same designated policy-id. One of those is "
"probably a neutron orphaned. Please delete it and "
"try migration again.") % (printable_name,
name_and_id, policy_id, printable_name))
raise Exception(msg)
policy_ids.append(policy_id)
LOG.debug("Adding data for %s %s, policy-id %s",
printable_name, name_and_id, policy_id)
entry = {'manager_id': resource['id']}