Merge "Add IOMMU to grub to support OVS/SRIOV SA contexts"

[yardstick.git] / yardstick / tests / unit / orchestrator / test_kubernetes.py

diff --git a/yardstick/tests/unit/orchestrator/test_kubernetes.py b/yardstick/tests/unit/orchestrator/test_kubernetes.py
index be9c2ae..2d5c4a2 100644 (file)
--- a/yardstick/tests/unit/orchestrator/test_kubernetes.py
+++ b/yardstick/tests/unit/orchestrator/test_kubernetes.py
@@ -405,6 +405,19 @@ class ContainerObjectTestCase(base.BaseUnitTestCase):
                     'imagePullPolicy':'Always'}
         self.assertEqual(expected, container_obj.get_container_item())
 
+    def test_get_container_item_with_tty_stdin(self):
+        args = ['arg1', 'arg2']
+        container_obj = kubernetes.ContainerObject(
+            'cname', 'fake_sshkey', args=args, tty=False, stdin=True)
+        expected = {'args': args,
+                    'command': kubernetes.ContainerObject.COMMAND_DEFAULT,
+                    'image': kubernetes.ContainerObject.IMAGE_DEFAULT,
+                    'name': 'cname-container',
+                    'volumeMounts': container_obj._create_volume_mounts(),
+                    'tty': False,
+                    'stdin': True}
+        self.assertEqual(expected, container_obj.get_container_item())
+
     def test__parse_commands_string(self):
         container_obj = kubernetes.ContainerObject('cname', 'fake_sshkey')
         self.assertEqual(['fake command'],
@@ -516,9 +529,10 @@ class NetworkObjectTestCase(base.BaseUnitTestCase):
         net_obj._version = 'version'
         net_obj._plural = 'plural'
         net_obj._template = 'template'
+        net_obj._name = 'fake_name'
         net_obj.create()
         mock_create_network.assert_called_once_with(
-            'scope', 'group', 'version', 'plural', 'template')
+            'scope', 'group', 'version', 'plural', 'template', 'fake_name')
 
     @mock.patch.object(kubernetes_utils, 'delete_network')
     def test_delete(self, mock_delete_network):
@@ -530,7 +544,7 @@ class NetworkObjectTestCase(base.BaseUnitTestCase):
         net_obj._name = 'name'
         net_obj.delete()
         mock_delete_network.assert_called_once_with(
-            'scope', 'group', 'version', 'plural', 'name')
+            'scope', 'group', 'version', 'plural', 'name', skip_codes=[404])
 
 
 class ServiceNodePortObjectTestCase(base.BaseUnitTestCase):
@@ -598,7 +612,8 @@ class ServiceNodePortObjectTestCase(base.BaseUnitTestCase):
     def test_delete(self, mock_delete_service):
         nodeport_object = kubernetes.ServiceNodePortObject('fake_name')
         nodeport_object.delete()
-        mock_delete_service.assert_called_once_with('fake_name-service')
+        mock_delete_service.assert_called_once_with('fake_name-service',
+                                                    skip_codes=[404])
 
 
 class KubernetesTemplate(base.BaseUnitTestCase):