Merge "server group unit testing a bit wrong"

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:

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):

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')