openstack
/
nova
Code Issues Proposed changes

Merge "Remove redundant call to get/create default security group" into stable/train

This commit is contained in:
Zuul 2019-11-02 17:10:53 +00:00 committed by Gerrit Code Review
parent 0bc14aa427 416290f193
commit 9136e2c7f7
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gate/post_test_hook.sh
View File

@ -166,13 +166,8 @@ $MANAGE db online_data_migrations
# creation of a new deleted marker instance.
set +e
archive_deleted_rows
set -e
# Verify whether online data migrations run after archiving will succeed.
# See for more details: https://bugs.launchpad.net/nova/+bug/1824435
$MANAGE db online_data_migrations
rc=$?
set -e
if [[ $rc -ne 2 ]]; then
echo "Expected return code 2 from online_data_migrations until bug 1824435 is fixed"
exit 2
fi

24
nova/db/sqlalchemy/api.py
View File

@ -1753,7 +1753,7 @@ def instance_create(context, values):
values - dict containing column values.
"""
security_group_ensure_default(context)
default_group = security_group_ensure_default(context)
values = values.copy()
values['metadata'] = _metadata_refs(
@ -1782,21 +1782,19 @@ def instance_create(context, values):
instance_ref['extra'].update(values.pop('extra', {}))
instance_ref.update(values)
def _get_sec_group_models(security_groups):
models = []
default_group = _security_group_ensure_default(context)
if 'default' in security_groups:
models.append(default_group)
# Generate a new list, so we don't modify the original
security_groups = [x for x in security_groups if x != 'default']
if security_groups:
models.extend(_security_group_get_by_names(
context, security_groups))
return models
# Gather the security groups for the instance
sg_models = []
if 'default' in security_groups:
sg_models.append(default_group)
# Generate a new list, so we don't modify the original
security_groups = [x for x in security_groups if x != 'default']
if security_groups:
sg_models.extend(_security_group_get_by_names(
context, security_groups))
if 'hostname' in values:
_validate_unique_server_name(context, values['hostname'])
instance_ref.security_groups = _get_sec_group_models(security_groups)
instance_ref.security_groups = sg_models
context.session.add(instance_ref)
# create the instance uuid to ec2_id mapping entry for instance