Merge "Bugfix: fix typo"

[yardstick.git] / tests / unit / benchmark / contexts / test_model.py

diff --git a/tests/unit/benchmark/contexts/test_model.py b/tests/unit/benchmark/contexts/test_model.py
index 48584cf..6ae4e6d 100644 (file)
--- a/tests/unit/benchmark/contexts/test_model.py
+++ b/tests/unit/benchmark/contexts/test_model.py
@@ -11,8 +11,9 @@
 
 # Unittest for yardstick.benchmark.contexts.model
 
-import mock
+from __future__ import absolute_import
 import unittest
+import mock
 
 from yardstick.benchmark.contexts import model
 
@@ -119,7 +120,8 @@ class NetworkTestCase(unittest.TestCase):
 
         attrs = {'external_network': 'ext_net'}
         test_network = model.Network('foo', self.mock_context, attrs)
-        exp_router = model.Router('router', 'foo', self.mock_context, 'ext_net')
+        exp_router = model.Router('router', 'foo', self.mock_context,
+                                  'ext_net')
 
         self.assertEqual(test_network.router.stack_name, exp_router.stack_name)
         self.assertEqual(test_network.router.stack_if_name,
@@ -167,6 +169,7 @@ class ServerTestCase(unittest.TestCase):
         self.mock_context.name = 'bar'
         self.mock_context.keypair_name = 'some-keys'
         self.mock_context.secgroup_name = 'some-secgroup'
+        self.mock_context.user = "some-user"
 
     def test_construct_defaults(self):
 
@@ -177,6 +180,7 @@ class ServerTestCase(unittest.TestCase):
         self.assertEqual(test_server.keypair_name, 'some-keys')
         self.assertEqual(test_server.secgroup_name, 'some-secgroup')
         self.assertEqual(test_server.placement_groups, [])
+        self.assertIsNone(test_server.server_group)
         self.assertEqual(test_server.instances, 1)
         self.assertIsNone(test_server.floating_ip)
         self.assertIsNone(test_server._image)
@@ -192,6 +196,15 @@ class ServerTestCase(unittest.TestCase):
         self.assertRaises(ValueError, model.Server, 'foo',
                           self.mock_context, attrs)
 
+    @mock.patch('yardstick.benchmark.contexts.model.PlacementGroup')
+    def test_construct_get_wrong_server_group(self, mock_sg):
+
+        attrs = {'server_group': 'baz'}
+        mock_sg.get.return_value = None
+
+        self.assertRaises(ValueError, model.Server, 'foo',
+                          self.mock_context, attrs)
+
     @mock.patch('yardstick.benchmark.contexts.heat.HeatTemplate')
     def test__add_instance(self, mock_template):
 
@@ -215,6 +228,6 @@ class ServerTestCase(unittest.TestCase):
         mock_template.add_server.assert_called_with(
             'some-server', 'some-image', 'some-flavor',
             ports=['some-server-some-network-port'],
+            user=self.mock_context.user,
             key_name=self.mock_context.keypair_name,
             scheduler_hints='hints')
-