100b9dc62c
Merge these, removing an unnecessary layer of abstraction, and place them in the new 'nova.db.main' directory. The resulting change is huge, but it's mainly the result of 's/sqlalchemy import api/main import api/' and 's/nova.db.api/nova.db.main.api/' with some necessary cleanup. We also need to rework how we do the blocking of API calls since we no longer have a 'DBAPI' object that we can monkey patch as we were doing before. This is now done via a global variable that is set by the 'main' function of 'nova.cmd.compute'. The main impact of this change is that it's no longer possible to set '[database] use_db_reconnect' and have all APIs automatically wrapped in a DB retry. Seeing as this behavior is experimental, isn't applied to any of the API DB methods (which don't use oslo.db's 'DBAPI' helper), and is used explicitly in what would appear to be the critical cases (via the explicit 'oslo_db.api.wrap_db_retry' decorator), this doesn't seem like a huge loss. Change-Id: Iad2e4da4546b80a016e477577d23accb2606a6e4 Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
182 lines
6.9 KiB
Python
182 lines
6.9 KiB
Python
# Copyright 2013 IBM Corp.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
# TODO(stephenfin): This is all nova-network related and can be deleted as soon
|
|
# as we remove the 'security_group' field from the 'Instance' object
|
|
|
|
from oslo_utils import uuidutils
|
|
from oslo_utils import versionutils
|
|
|
|
from nova.db.main import api as db
|
|
from nova.db.main import models
|
|
from nova import objects
|
|
from nova.objects import base
|
|
from nova.objects import fields
|
|
|
|
|
|
@base.NovaObjectRegistry.register
|
|
class SecurityGroup(base.NovaPersistentObject, base.NovaObject):
|
|
# Version 1.0: Initial version
|
|
# Version 1.1: String attributes updated to support unicode
|
|
# Version 1.2: Added uuid field for Neutron security groups.
|
|
VERSION = '1.2'
|
|
|
|
fields = {
|
|
'id': fields.IntegerField(),
|
|
'name': fields.StringField(),
|
|
'description': fields.StringField(),
|
|
'user_id': fields.StringField(),
|
|
'project_id': fields.StringField(),
|
|
# The uuid field is only used for Neutron security groups and is not
|
|
# persisted to the Nova database.
|
|
'uuid': fields.UUIDField()
|
|
}
|
|
|
|
def obj_make_compatible(self, primitive, target_version):
|
|
target_version = versionutils.convert_version_to_tuple(target_version)
|
|
if target_version < (1, 2) and 'uuid' in primitive:
|
|
del primitive['uuid']
|
|
|
|
@staticmethod
|
|
def _from_db_object(context, secgroup, db_secgroup):
|
|
for field in secgroup.fields:
|
|
if field != 'uuid':
|
|
setattr(secgroup, field, db_secgroup[field])
|
|
secgroup._context = context
|
|
secgroup.obj_reset_changes()
|
|
return secgroup
|
|
|
|
@base.remotable_classmethod
|
|
def get(cls, context, secgroup_id):
|
|
db_secgroup = db.security_group_get(context, secgroup_id)
|
|
return cls._from_db_object(context, cls(), db_secgroup)
|
|
|
|
@base.remotable_classmethod
|
|
def get_by_name(cls, context, project_id, group_name):
|
|
db_secgroup = db.security_group_get_by_name(context,
|
|
project_id,
|
|
group_name)
|
|
return cls._from_db_object(context, cls(), db_secgroup)
|
|
|
|
@base.remotable
|
|
def in_use(self):
|
|
return db.security_group_in_use(self._context, self.id)
|
|
|
|
@base.remotable
|
|
def save(self):
|
|
updates = self.obj_get_changes()
|
|
# We don't store uuid in the Nova database so remove it if someone
|
|
# mistakenly tried to save a neutron security group object. We only
|
|
# need the uuid in the object for obj_to_primitive() calls where this
|
|
# object is serialized and stored in the RequestSpec object.
|
|
updates.pop('uuid', None)
|
|
if updates:
|
|
db_secgroup = db.security_group_update(self._context, self.id,
|
|
updates)
|
|
self._from_db_object(self._context, self, db_secgroup)
|
|
self.obj_reset_changes()
|
|
|
|
@base.remotable
|
|
def refresh(self):
|
|
self._from_db_object(self._context, self,
|
|
db.security_group_get(self._context, self.id))
|
|
|
|
@property
|
|
def identifier(self):
|
|
return self.uuid if 'uuid' in self else self.name
|
|
|
|
|
|
@base.NovaObjectRegistry.register
|
|
class SecurityGroupList(base.ObjectListBase, base.NovaObject):
|
|
# Version 1.0: Initial version
|
|
# SecurityGroup <= version 1.1
|
|
# Version 1.1: Added get_counts() for quotas
|
|
VERSION = '1.1'
|
|
|
|
fields = {
|
|
'objects': fields.ListOfObjectsField('SecurityGroup'),
|
|
}
|
|
|
|
def __init__(self, *args, **kwargs):
|
|
super(SecurityGroupList, self).__init__(*args, **kwargs)
|
|
self.objects = []
|
|
self.obj_reset_changes()
|
|
|
|
@staticmethod
|
|
@db.pick_context_manager_reader
|
|
def _get_counts_from_db(context, project_id, user_id=None):
|
|
query = context.session.query(models.SecurityGroup.id).\
|
|
filter_by(deleted=0).\
|
|
filter_by(project_id=project_id)
|
|
counts = {}
|
|
counts['project'] = {'security_groups': query.count()}
|
|
if user_id:
|
|
query = query.filter_by(user_id=user_id)
|
|
counts['user'] = {'security_groups': query.count()}
|
|
return counts
|
|
|
|
@base.remotable_classmethod
|
|
def get_all(cls, context):
|
|
groups = db.security_group_get_all(context)
|
|
return base.obj_make_list(context, cls(context),
|
|
objects.SecurityGroup, groups)
|
|
|
|
@base.remotable_classmethod
|
|
def get_by_project(cls, context, project_id):
|
|
groups = db.security_group_get_by_project(context, project_id)
|
|
return base.obj_make_list(context, cls(context),
|
|
objects.SecurityGroup, groups)
|
|
|
|
@base.remotable_classmethod
|
|
def get_by_instance(cls, context, instance):
|
|
groups = db.security_group_get_by_instance(context, instance.uuid)
|
|
return base.obj_make_list(context, cls(context),
|
|
objects.SecurityGroup, groups)
|
|
|
|
@base.remotable_classmethod
|
|
def get_counts(cls, context, project_id, user_id=None):
|
|
"""Get the counts of SecurityGroup objects in the database.
|
|
|
|
:param context: The request context for database access
|
|
:param project_id: The project_id to count across
|
|
:param user_id: The user_id to count across
|
|
:returns: A dict containing the project-scoped counts and user-scoped
|
|
counts if user_id is specified. For example:
|
|
|
|
{'project': {'security_groups': <count across project>},
|
|
'user': {'security_groups': <count across user>}}
|
|
"""
|
|
return cls._get_counts_from_db(context, project_id, user_id=user_id)
|
|
|
|
|
|
def make_secgroup_list(security_groups):
|
|
"""A helper to make security group objects from a list of names or uuids.
|
|
|
|
Note that this does not make them save-able or have the rest of the
|
|
attributes they would normally have, but provides a quick way to fill,
|
|
for example, an instance object during create.
|
|
"""
|
|
secgroups = objects.SecurityGroupList()
|
|
secgroups.objects = []
|
|
for sg in security_groups:
|
|
secgroup = objects.SecurityGroup()
|
|
if uuidutils.is_uuid_like(sg):
|
|
# This is a neutron security group uuid so store in the uuid field.
|
|
secgroup.uuid = sg
|
|
else:
|
|
# This is neutron's special 'default' security group
|
|
secgroup.name = sg
|
|
secgroups.objects.append(secgroup)
|
|
return secgroups
|