From 1b2490bdf0d74ab29cfadfe5100fe4d173427f5b Mon Sep 17 00:00:00 2001 From: liuluyang <1120773382@qq.com> Date: Mon, 4 Dec 2017 23:23:44 -0800 Subject: [PATCH] server group unit testing a bit wrong the function of create_test_server_group should be used instead create_test_aggregate Change-Id: I383bc563d369144a5f918064309b73e7984b61ab Closes-Bug: #1736331 --- mogan/db/sqlalchemy/api.py | 2 +- mogan/tests/unit/db/test_server_group.py | 2 +- mogan/tests/unit/db/utils.py | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mogan/db/sqlalchemy/api.py b/mogan/db/sqlalchemy/api.py index 3b2edc30..fcc67a34 100644 --- a/mogan/db/sqlalchemy/api.py +++ b/mogan/db/sqlalchemy/api.py @@ -1006,7 +1006,7 @@ class Connection(api.Connection): try: server_group_ref = models.ServerGroup() server_group_ref.update(values) - server_group_ref.save(session) + server_group_ref.save(session=session) except db_exc.DBDuplicateEntry: raise exception.ServerGroupExists(group_uuid=values['uuid']) if policies: diff --git a/mogan/tests/unit/db/test_server_group.py b/mogan/tests/unit/db/test_server_group.py index 7195ab93..ecb00d26 100644 --- a/mogan/tests/unit/db/test_server_group.py +++ b/mogan/tests/unit/db/test_server_group.py @@ -32,7 +32,7 @@ class DbServerGroupTestCase(base.DbTestCase): members=['server1', 'server2']) def test_server_group_create(self): - sg = utils.create_test_aggregate(name='testing') + sg = utils.create_test_server_group(name='testing') self.assertEqual('testing', sg.name) def test_server_group_get(self): diff --git a/mogan/tests/unit/db/utils.py b/mogan/tests/unit/db/utils.py index a592ae69..c50158c2 100644 --- a/mogan/tests/unit/db/utils.py +++ b/mogan/tests/unit/db/utils.py @@ -237,6 +237,9 @@ def create_test_server_group(context={}, **kw): """ server_fault = get_test_server_group(**kw) + # Let DB generate ID if it isn't specified explicitly + if 'id' not in kw: + del server_fault['id'] dbapi = db_api.get_instance() members = server_fault.pop('members') policies = server_fault.pop('policies')