diff options
| author | Graham Hayes <graham.hayes@hp.com> | 2014-12-15 18:58:18 +0000 |
|---|---|---|
| committer | Graham Hayes <graham.hayes@hp.com> | 2014-12-15 19:03:43 +0000 |
| commit | 8b1dccd81765aced68faa766bb821376c36fd907 (patch) | |
| tree | 110e776cd0f41f828a1455fa553865b895054d82 | |
| parent | b1f6f7c6e637c3df1370f8de5c1a5567e94f129b (diff) | |
| download | designate-8b1dccd81765aced68faa766bb821376c36fd907.tar.gz | |
Fixed the syntax of obj_reset_changes in SQLA
Change-Id: Ieb5b4dc241d8cc50931ca40e5158e0d931108228
Closes-Bug: 1402788
| -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): |