Convert files to Unix format

It fixes "[cloudify_ims] Support Cloudify 4.0" [1]

[1] https://gerrit.opnfv.org/gerrit/#/c/36315/

Change-Id: I70d04e781d7034f37783764ae5e8b399d62bb793
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

1 files changed, 194 insertions, 194 deletions

diff --git a/functest/tests/unit/core/test_vnf.py b/functest/tests/unit/core/test_vnf.py
index 403c452f..2ebbbe37 100644
--- a/functest/tests/unit/core/test_vnf.py
+++ b/functest/tests/unit/core/test_vnf.py
@@ -1,194 +1,194 @@
-#!/usr/bin/env python

-

-# Copyright (c) 2016 Orange and others.

-#

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Apache License, Version 2.0

-# which accompanies this distribution, and is available at

-# http://www.apache.org/licenses/LICENSE-2.0

-

-# pylint: disable=missing-docstring

-

-import logging

-import unittest

-

-import mock

-

-from functest.core import vnf

-from functest.core import testcase

-from functest.utils import constants

-

-

-class VnfBaseTesting(unittest.TestCase):

-    """The class testing VNF."""

-    # pylint: disable=missing-docstring,too-many-public-methods

-

-    tenant_name = 'test_tenant_name'

-    tenant_description = 'description'

-

-    def setUp(self):

-        constants.CONST.__setattr__("vnf_foo_tenant_name", self.tenant_name)

-        constants.CONST.__setattr__(

-            "vnf_foo_tenant_description", self.tenant_description)

-        self.test = vnf.VnfOnBoarding(project='functest', case_name='foo')

-

-    def test_run_deploy_vnf_exc(self):

-        with mock.patch.object(self.test, 'prepare'),\

-            mock.patch.object(self.test, 'deploy_orchestrator',

-                              return_value=None), \

-            mock.patch.object(self.test, 'deploy_vnf',

-                              side_effect=Exception):

-            self.assertEqual(self.test.run(),

-                             testcase.TestCase.EX_TESTCASE_FAILED)

-

-    def test_run_test_vnf_exc(self):

-        with mock.patch.object(self.test, 'prepare'),\

-            mock.patch.object(self.test, 'deploy_orchestrator',

-                              return_value=None), \

-            mock.patch.object(self.test, 'deploy_vnf'), \

-            mock.patch.object(self.test, 'test_vnf',

-                              side_effect=Exception):

-            self.assertEqual(self.test.run(),

-                             testcase.TestCase.EX_TESTCASE_FAILED)

-

-    def test_run_deploy_orch_ko(self):

-        with mock.patch.object(self.test, 'prepare'),\

-                mock.patch.object(self.test, 'deploy_orchestrator',

-                                  return_value=False), \

-                mock.patch.object(self.test, 'deploy_vnf',

-                                  return_value=True), \

-                mock.patch.object(self.test, 'test_vnf',

-                                  return_value=True):

-            self.assertEqual(self.test.run(),

-                             testcase.TestCase.EX_TESTCASE_FAILED)

-

-    def test_run_vnf_deploy_ko(self):

-        with mock.patch.object(self.test, 'prepare'),\

-                mock.patch.object(self.test, 'deploy_orchestrator',

-                                  return_value=True), \

-                mock.patch.object(self.test, 'deploy_vnf',

-                                  return_value=False), \

-                mock.patch.object(self.test, 'test_vnf',

-                                  return_value=True):

-            self.assertEqual(self.test.run(),

-                             testcase.TestCase.EX_TESTCASE_FAILED)

-

-    def test_run_vnf_test_ko(self):

-        with mock.patch.object(self.test, 'prepare'),\

-                mock.patch.object(self.test, 'deploy_orchestrator',

-                                  return_value=True), \

-                mock.patch.object(self.test, 'deploy_vnf',

-                                  return_value=True), \

-                mock.patch.object(self.test, 'test_vnf',

-                                  return_value=False):

-            self.assertEqual(self.test.run(),

-                             testcase.TestCase.EX_TESTCASE_FAILED)

-

-    def test_run_default(self):

-        with mock.patch.object(self.test, 'prepare'),\

-                mock.patch.object(self.test, 'deploy_orchestrator',

-                                  return_value=True), \

-                mock.patch.object(self.test, 'deploy_vnf',

-                                  return_value=True), \

-                mock.patch.object(self.test, 'test_vnf',

-                                  return_value=True):

-            self.assertEqual(self.test.run(), testcase.TestCase.EX_OK)

-

-    def test_deploy_vnf_unimplemented(self):

-        with self.assertRaises(vnf.VnfDeploymentException):

-            self.test.deploy_vnf()

-

-    def test_test_vnf_unimplemented(self):

-        with self.assertRaises(vnf.VnfTestException):

-            self.test.test_vnf()

-

-    @mock.patch('functest.core.vnf.os_utils.get_keystone_client')

-    @mock.patch('functest.core.vnf.os_utils.delete_user',

-                return_value=True)

-    def test_clean_user_already_exist(self, *args):

-        self.test.exist_obj['user'] = True

-        self.test.clean()

-        args[0].assert_not_called()

-        args[1].assert_called_once_with()

-

-    @mock.patch('functest.core.vnf.os_utils.get_keystone_client')

-    @mock.patch('functest.core.vnf.os_utils.delete_user',

-                return_value=True)

-    def test_clean_user_created(self, *args):

-        self.test.exist_obj['user'] = False

-        self.test.clean()

-        args[0].assert_called_once_with(mock.ANY, self.tenant_name)

-        args[1].assert_called_once_with()

-

-    @mock.patch('functest.core.vnf.os_utils.get_keystone_client')

-    @mock.patch('functest.core.vnf.os_utils.delete_tenant',

-                return_value=True)

-    def test_clean_tenant_already_exist(self, *args):

-        self.test.exist_obj['tenant'] = True

-        self.test.clean()

-        args[0].assert_not_called()

-        args[1].assert_called_once_with()

-

-    @mock.patch('functest.core.vnf.os_utils.get_keystone_client')

-    @mock.patch('functest.core.vnf.os_utils.delete_tenant',

-                return_value=True)

-    def test_clean_tenant_created(self, *args):

-        self.test.exist_obj['tenant'] = False

-        self.test.clean()

-        args[0].assert_called_once_with(mock.ANY, self.tenant_name)

-        args[1].assert_called_once_with()

-

-    def test_deploy_orch_unimplemented(self):

-        self.assertTrue(self.test.deploy_orchestrator())

-

-    @mock.patch('functest.core.vnf.os_utils.get_keystone_client',

-                return_value='test')

-    @mock.patch('functest.core.vnf.os_utils.get_or_create_tenant_for_vnf',

-                return_value=True)

-    @mock.patch('functest.core.vnf.os_utils.get_or_create_user_for_vnf',

-                return_value=True)

-    @mock.patch('functest.core.vnf.os_utils.get_credentials',

-                return_value={'auth_url': 'test'})

-    def test_prepare(self, *args):

-        self.assertEqual(self.test.prepare(),

-                         testcase.TestCase.EX_OK)

-        args[0].assert_called_once_with()

-        args[1].assert_called_once_with('test', self.tenant_name)

-        args[2].assert_called_once_with(

-            'test', self.tenant_name, self.tenant_description)

-        args[3].assert_called_once_with()

-

-    @mock.patch('functest.core.vnf.os_utils.get_keystone_client',

-                side_effect=Exception)

-    def test_prepare_keystone_client_ko(self, *args):

-        with self.assertRaises(vnf.VnfPreparationException):

-            self.test.prepare()

-        args[0].assert_called_once_with()

-

-    @mock.patch('functest.core.vnf.os_utils.get_keystone_client')

-    @mock.patch('functest.core.vnf.os_utils.get_or_create_tenant_for_vnf',

-                side_effect=Exception)

-    def test_prepare_tenant_creation_ko(self, *args):

-        with self.assertRaises(vnf.VnfPreparationException):

-            self.test.prepare()

-        args[0].assert_called_once_with(

-            mock.ANY, self.tenant_name, self.tenant_description)

-        args[1].assert_called_once_with()

-

-    @mock.patch('functest.core.vnf.os_utils.get_keystone_client')

-    @mock.patch('functest.core.vnf.os_utils.get_or_create_tenant_for_vnf',

-                return_value=0)

-    @mock.patch('functest.core.vnf.os_utils.get_or_create_user_for_vnf',

-                side_effect=Exception)

-    def test_prepare_user_creation_ko(self, *args):

-        with self.assertRaises(vnf.VnfPreparationException):

-            self.test.prepare()

-        args[0].assert_called_once_with(mock.ANY, self.tenant_name)

-        args[1].assert_called_once_with(

-            mock.ANY, self.tenant_name, self.tenant_description)

-        args[2].assert_called_once_with()

-

-

-if __name__ == "__main__":

-    logging.disable(logging.CRITICAL)

-    unittest.main(verbosity=2)

+#!/usr/bin/env python
+
+# Copyright (c) 2016 Orange and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# pylint: disable=missing-docstring
+
+import logging
+import unittest
+
+import mock
+
+from functest.core import vnf
+from functest.core import testcase
+from functest.utils import constants
+
+
+class VnfBaseTesting(unittest.TestCase):
+    """The class testing VNF."""
+    # pylint: disable=missing-docstring,too-many-public-methods
+
+    tenant_name = 'test_tenant_name'
+    tenant_description = 'description'
+
+    def setUp(self):
+        constants.CONST.__setattr__("vnf_foo_tenant_name", self.tenant_name)
+        constants.CONST.__setattr__(
+            "vnf_foo_tenant_description", self.tenant_description)
+        self.test = vnf.VnfOnBoarding(project='functest', case_name='foo')
+
+    def test_run_deploy_vnf_exc(self):
+        with mock.patch.object(self.test, 'prepare'),\
+            mock.patch.object(self.test, 'deploy_orchestrator',
+                              return_value=None), \
+            mock.patch.object(self.test, 'deploy_vnf',
+                              side_effect=Exception):
+            self.assertEqual(self.test.run(),
+                             testcase.TestCase.EX_TESTCASE_FAILED)
+
+    def test_run_test_vnf_exc(self):
+        with mock.patch.object(self.test, 'prepare'),\
+            mock.patch.object(self.test, 'deploy_orchestrator',
+                              return_value=None), \
+            mock.patch.object(self.test, 'deploy_vnf'), \
+            mock.patch.object(self.test, 'test_vnf',
+                              side_effect=Exception):
+            self.assertEqual(self.test.run(),
+                             testcase.TestCase.EX_TESTCASE_FAILED)
+
+    def test_run_deploy_orch_ko(self):
+        with mock.patch.object(self.test, 'prepare'),\
+                mock.patch.object(self.test, 'deploy_orchestrator',
+                                  return_value=False), \
+                mock.patch.object(self.test, 'deploy_vnf',
+                                  return_value=True), \
+                mock.patch.object(self.test, 'test_vnf',
+                                  return_value=True):
+            self.assertEqual(self.test.run(),
+                             testcase.TestCase.EX_TESTCASE_FAILED)
+
+    def test_run_vnf_deploy_ko(self):
+        with mock.patch.object(self.test, 'prepare'),\
+                mock.patch.object(self.test, 'deploy_orchestrator',
+                                  return_value=True), \
+                mock.patch.object(self.test, 'deploy_vnf',
+                                  return_value=False), \
+                mock.patch.object(self.test, 'test_vnf',
+                                  return_value=True):
+            self.assertEqual(self.test.run(),
+                             testcase.TestCase.EX_TESTCASE_FAILED)
+
+    def test_run_vnf_test_ko(self):
+        with mock.patch.object(self.test, 'prepare'),\
+                mock.patch.object(self.test, 'deploy_orchestrator',
+                                  return_value=True), \
+                mock.patch.object(self.test, 'deploy_vnf',
+                                  return_value=True), \
+                mock.patch.object(self.test, 'test_vnf',
+                                  return_value=False):
+            self.assertEqual(self.test.run(),
+                             testcase.TestCase.EX_TESTCASE_FAILED)
+
+    def test_run_default(self):
+        with mock.patch.object(self.test, 'prepare'),\
+                mock.patch.object(self.test, 'deploy_orchestrator',
+                                  return_value=True), \
+                mock.patch.object(self.test, 'deploy_vnf',
+                                  return_value=True), \
+                mock.patch.object(self.test, 'test_vnf',
+                                  return_value=True):
+            self.assertEqual(self.test.run(), testcase.TestCase.EX_OK)
+
+    def test_deploy_vnf_unimplemented(self):
+        with self.assertRaises(vnf.VnfDeploymentException):
+            self.test.deploy_vnf()
+
+    def test_test_vnf_unimplemented(self):
+        with self.assertRaises(vnf.VnfTestException):
+            self.test.test_vnf()
+
+    @mock.patch('functest.core.vnf.os_utils.get_keystone_client')
+    @mock.patch('functest.core.vnf.os_utils.delete_user',
+                return_value=True)
+    def test_clean_user_already_exist(self, *args):
+        self.test.exist_obj['user'] = True
+        self.test.clean()
+        args[0].assert_not_called()
+        args[1].assert_called_once_with()
+
+    @mock.patch('functest.core.vnf.os_utils.get_keystone_client')
+    @mock.patch('functest.core.vnf.os_utils.delete_user',
+                return_value=True)
+    def test_clean_user_created(self, *args):
+        self.test.exist_obj['user'] = False
+        self.test.clean()
+        args[0].assert_called_once_with(mock.ANY, self.tenant_name)
+        args[1].assert_called_once_with()
+
+    @mock.patch('functest.core.vnf.os_utils.get_keystone_client')
+    @mock.patch('functest.core.vnf.os_utils.delete_tenant',
+                return_value=True)
+    def test_clean_tenant_already_exist(self, *args):
+        self.test.exist_obj['tenant'] = True
+        self.test.clean()
+        args[0].assert_not_called()
+        args[1].assert_called_once_with()
+
+    @mock.patch('functest.core.vnf.os_utils.get_keystone_client')
+    @mock.patch('functest.core.vnf.os_utils.delete_tenant',
+                return_value=True)
+    def test_clean_tenant_created(self, *args):
+        self.test.exist_obj['tenant'] = False
+        self.test.clean()
+        args[0].assert_called_once_with(mock.ANY, self.tenant_name)
+        args[1].assert_called_once_with()
+
+    def test_deploy_orch_unimplemented(self):
+        self.assertTrue(self.test.deploy_orchestrator())
+
+    @mock.patch('functest.core.vnf.os_utils.get_keystone_client',
+                return_value='test')
+    @mock.patch('functest.core.vnf.os_utils.get_or_create_tenant_for_vnf',
+                return_value=True)
+    @mock.patch('functest.core.vnf.os_utils.get_or_create_user_for_vnf',
+                return_value=True)
+    @mock.patch('functest.core.vnf.os_utils.get_credentials',
+                return_value={'auth_url': 'test'})
+    def test_prepare(self, *args):
+        self.assertEqual(self.test.prepare(),
+                         testcase.TestCase.EX_OK)
+        args[0].assert_called_once_with()
+        args[1].assert_called_once_with('test', self.tenant_name)
+        args[2].assert_called_once_with(
+            'test', self.tenant_name, self.tenant_description)
+        args[3].assert_called_once_with()
+
+    @mock.patch('functest.core.vnf.os_utils.get_keystone_client',
+                side_effect=Exception)
+    def test_prepare_keystone_client_ko(self, *args):
+        with self.assertRaises(vnf.VnfPreparationException):
+            self.test.prepare()
+        args[0].assert_called_once_with()
+
+    @mock.patch('functest.core.vnf.os_utils.get_keystone_client')
+    @mock.patch('functest.core.vnf.os_utils.get_or_create_tenant_for_vnf',
+                side_effect=Exception)
+    def test_prepare_tenant_creation_ko(self, *args):
+        with self.assertRaises(vnf.VnfPreparationException):
+            self.test.prepare()
+        args[0].assert_called_once_with(
+            mock.ANY, self.tenant_name, self.tenant_description)
+        args[1].assert_called_once_with()
+
+    @mock.patch('functest.core.vnf.os_utils.get_keystone_client')
+    @mock.patch('functest.core.vnf.os_utils.get_or_create_tenant_for_vnf',
+                return_value=0)
+    @mock.patch('functest.core.vnf.os_utils.get_or_create_user_for_vnf',
+                side_effect=Exception)
+    def test_prepare_user_creation_ko(self, *args):
+        with self.assertRaises(vnf.VnfPreparationException):
+            self.test.prepare()
+        args[0].assert_called_once_with(mock.ANY, self.tenant_name)
+        args[1].assert_called_once_with(
+            mock.ANY, self.tenant_name, self.tenant_description)
+        args[2].assert_called_once_with()
+
+
+if __name__ == "__main__":
+    logging.disable(logging.CRITICAL)
+    unittest.main(verbosity=2)