diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-12-17 23:11:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-12-17 23:11:56 +0000 |
| commit | 1e3e8f466882cd21d33b21bedd6635f225d6f0c8 (patch) | |
| tree | 1307e0902c4915dbe88ffb0c93d8ff35b457354c /designate/storage | |
| parent | 2dacbb6649970d5f3b8a75c49248ca6291f03a2f (diff) | |
| parent | 8b1dccd81765aced68faa766bb821376c36fd907 (diff) | |
| download | designate-1e3e8f466882cd21d33b21bedd6635f225d6f0c8.tar.gz | |
Merge "Fixed the syntax of obj_reset_changes in SQLA"
Diffstat (limited to 'designate/storage')
| -rw-r--r-- | designate/storage/impl_sqlalchemy/__init__.py | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/designate/storage/impl_sqlalchemy/__init__.py b/designate/storage/impl_sqlalchemy/__init__.py index 1c2dfa6e..8ba337ef 100644 --- a/designate/storage/impl_sqlalchemy/__init__.py +++ b/designate/storage/impl_sqlalchemy/__init__.py @@ -389,7 +389,7 @@ class SQLAlchemyStorage(sqlalchemy_base.SQLAlchemy, storage_base.Storage): else: recordset.records = objects.RecordList() - recordset.obj_reset_changes('records') + recordset.obj_reset_changes(['records']) return recordset @@ -400,7 +400,7 @@ class SQLAlchemyStorage(sqlalchemy_base.SQLAlchemy, storage_base.Storage): recordset.records = self._find_records( context, {'recordset_id': recordset.id}) - recordset.obj_reset_changes('records') + recordset.obj_reset_changes(['records']) return recordset @@ -414,7 +414,7 @@ class SQLAlchemyStorage(sqlalchemy_base.SQLAlchemy, storage_base.Storage): recordset.records = self._find_records( context, {'recordset_id': recordset.id}) - recordset.obj_reset_changes('records') + recordset.obj_reset_changes(['records']) return recordsets @@ -424,7 +424,7 @@ class SQLAlchemyStorage(sqlalchemy_base.SQLAlchemy, storage_base.Storage): recordset.records = self._find_records( context, {'recordset_id': recordset.id}) - recordset.obj_reset_changes('records') + recordset.obj_reset_changes(['records']) return recordset @@ -620,14 +620,14 @@ class SQLAlchemyStorage(sqlalchemy_base.SQLAlchemy, storage_base.Storage): self.create_pool_attribute(context, pool.id, pool_attribute) else: pool.attributes = objects.PoolAttributeList() - pool.obj_reset_changes('attributes') + pool.obj_reset_changes(['attributes']) if pool.obj_attr_is_set('nameservers'): for nameserver in pool.nameservers: self.create_pool_attribute(context, pool.id, nameserver) else: pool.nameservers = objects.NameServerList() - pool.obj_reset_changes('nameservers') + pool.obj_reset_changes(['nameservers']) return pool @@ -637,8 +637,7 @@ class SQLAlchemyStorage(sqlalchemy_base.SQLAlchemy, storage_base.Storage): context, {'pool_id': pool_id, 'key': '!nameserver'}) pool.nameservers = self._find_pool_attributes( context, {'pool_id': pool_id, 'key': 'nameserver'}) - pool.obj_reset_changes('attributes') - pool.obj_reset_changes('nameservers') + pool.obj_reset_changes(['attributes', 'nameservers']) return pool def find_pools(self, context, criterion=None, marker=None, @@ -651,8 +650,7 @@ class SQLAlchemyStorage(sqlalchemy_base.SQLAlchemy, storage_base.Storage): context, {'pool_id': pool.id, 'key': '!nameserver'}) pool.nameservers = self._find_pool_attributes( context, {'pool_id': pool.id, 'key': 'nameserver'}) - pool.obj_reset_changes('attributes') - pool.obj_reset_changes('nameservers') + pool.obj_reset_changes(['attributes', 'nameservers']) return pools @@ -662,8 +660,7 @@ class SQLAlchemyStorage(sqlalchemy_base.SQLAlchemy, storage_base.Storage): context, {'pool_id': pool.id, 'key': '!nameserver'}) pool.nameservers = self._find_pool_attributes( context, {'pool_id': pool.id, 'key': 'nameserver'}) - pool.obj_reset_changes('attributes') - pool.obj_reset_changes('nameservers') + pool.obj_reset_changes(['attributes', 'nameservers']) return pool def update_pool(self, context, pool): |