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, 166 insertions, 166 deletions

diff --git a/functest/tests/unit/vnf/ims/test_cloudify_ims.py b/functest/tests/unit/vnf/ims/test_cloudify_ims.py
index 3a135d18e..537c5146b 100644
--- a/functest/tests/unit/vnf/ims/test_cloudify_ims.py
+++ b/functest/tests/unit/vnf/ims/test_cloudify_ims.py
@@ -1,166 +1,166 @@
-#!/usr/bin/env python

-

-# 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

-

-import logging

-import unittest

-

-import mock

-

-from functest.core import vnf

-from functest.opnfv_tests.vnf.ims import cloudify_ims

-

-

-class CloudifyImsTesting(unittest.TestCase):

-

-    def setUp(self):

-

-        self.tenant = 'cloudify_ims'

-        self.creds = {'username': 'user',

-                      'password': 'pwd'}

-        self.orchestrator = {'name': 'cloudify',

-                             'version': '4.0',

-                             'object': 'foo',

-                             'requirements': {'flavor': {'name': 'm1.medium',

-                                                         'ram_min': 4096},

-                                              'os_image': 'manager_4.0'}}

-

-        self.vnf = {'name': 'clearwater',

-                    'descriptor': {'version': '108',

-                                   'file_name': 'openstack-blueprint.yaml',

-                                   'name': 'clearwater-opnfv',

-                                   'url': 'https://foo',

-                                   'requirements': {'flavor':

-                                                    {'name': 'm1.medium',

-                                                     'ram_min': 2048}}}}

-

-        with mock.patch('functest.opnfv_tests.vnf.ims.cloudify_ims.'

-                        'os.makedirs'), \

-            mock.patch('functest.opnfv_tests.vnf.ims.cloudify_ims.'

-                       'get_config', return_value={

-                           'tenant_images': 'foo',

-                           'orchestrator': self.orchestrator,

-                           'vnf': self.vnf,

-                           'vnf_test_suite': '',

-                           'version': 'whatever'}):

-

-            self.ims_vnf = cloudify_ims.CloudifyIms()

-

-        self.images = {'image1': 'url1',

-                       'image2': 'url2'}

-        self.details = {'orchestrator': {'status': 'PASS', 'duration': 120},

-                        'vnf': {},

-                        'test_vnf':  {}}

-

-    @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/v1'})

-    @mock.patch('snaps.openstack.create_image.OpenStackImage.create')

-    def test_prepare_default(self, *args):

-        self.assertIsNone(self.ims_vnf.prepare())

-        args[4].assert_called_once_with()

-

-    @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/no_v'})

-    @mock.patch('snaps.openstack.create_image.OpenStackImage.create')

-    def test_prepare_bad_auth_url(self, *args):

-        with self.assertRaises(Exception):

-            self.ims_vnf.prepare()

-        args[0].assert_not_called()

-

-    def test_prepare_missing_param(self):

-        with self.assertRaises(vnf.VnfPreparationException):

-            self.ims_vnf.prepare()

-

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

-                side_effect=Exception)

-    def test_prepare_keystone_exception(self, *args):

-        with self.assertRaises(vnf.VnfPreparationException):

-            self.ims_vnf.prepare()

-        args[0].assert_called_once_with()

-

-    @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',

-                side_effect=Exception)

-    def test_prepare_tenant_exception(self, *args):

-        with self.assertRaises(vnf.VnfPreparationException):

-            self.ims_vnf.prepare()

-        args[1].assert_called_once_with()

-

-    @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',

-                side_effect=Exception)

-    def test_prepare_user_exception(self, *args):

-        with self.assertRaises(vnf.VnfPreparationException):

-            self.ims_vnf.prepare()

-        args[2].assert_called_once_with()

-

-    @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',

-                side_effect=Exception)

-    def test_prepare_credentials_exception(self, *args):

-        with self.assertRaises(vnf.VnfPreparationException):

-            self.ims_vnf.prepare()

-        args[0].assert_called_once_with()

-

-    # @mock.patch('snaps.openstack.create_keypairs.OpenStackKeypair',

-    #             side_effect=Exception)

-    # def test_deploy_orchestrator_keypair_exception(self, *args):

-    #    with self.assertRaises(vnf.OrchestratorDeploymentException):

-    #        self.ims_vnf.deploy_orchestrator()

-

-    #   def test_deploy_orchestrator_network_creation_fail(self):

-    #   def test_deploy_orchestrator_floatting_ip_creation_fail(self):

-    #   def test_deploy_orchestrator_flavor_fail(self):

-    #   def test_deploy_orchestrator_get_image_id_fail(self):

-    #   def test_deploy_orchestrator_create_instance_fail(self):

-    #   def test_deploy_orchestrator_secgroup_fail(self):

-    #   def test_deploy_orchestrator_add_floating_ip_fail(self):

-    #   def test_deploy_orchestrator_get_endpoint_fail(self):

-    #   def test_deploy_orchestrator_initiate CloudifyClient_fail(self):

-    #   def test_deploy_orchestrator_get_status_fail(self):

-    #

-

-    #   def test_deploy_vnf(self):

-    #   def test_deploy_vnf_publish_fail(self):

-    #   def test_deploy_vnf_get_flavor_fail(self):

-    #   def test_deploy_vnf_get_external_net_fail(self):

-    #   def test_deploy_vnf_deployment_create_fail(self):

-    #   def test_deploy_vnf_start_fail(self):

-    #

-    #   def test_test_vnf(self):

-    #   def test_test_vnf_deployment_get_fail(self):

-    #   def test_test_vnf_run_live_test_fail(self):

-    #

-    #   def test_clean(self):

-    #   def test_clean_execution_start_fail(self):

-    #   def test_clean_deployment_delete_fail(self):

-    #   def test_clean_blueprint_delete_fail(self):

-

-

-if __name__ == "__main__":

-    logging.disable(logging.CRITICAL)

-    unittest.main(verbosity=2)

+#!/usr/bin/env python
+
+# 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
+
+import logging
+import unittest
+
+import mock
+
+from functest.core import vnf
+from functest.opnfv_tests.vnf.ims import cloudify_ims
+
+
+class CloudifyImsTesting(unittest.TestCase):
+
+    def setUp(self):
+
+        self.tenant = 'cloudify_ims'
+        self.creds = {'username': 'user',
+                      'password': 'pwd'}
+        self.orchestrator = {'name': 'cloudify',
+                             'version': '4.0',
+                             'object': 'foo',
+                             'requirements': {'flavor': {'name': 'm1.medium',
+                                                         'ram_min': 4096},
+                                              'os_image': 'manager_4.0'}}
+
+        self.vnf = {'name': 'clearwater',
+                    'descriptor': {'version': '108',
+                                   'file_name': 'openstack-blueprint.yaml',
+                                   'name': 'clearwater-opnfv',
+                                   'url': 'https://foo',
+                                   'requirements': {'flavor':
+                                                    {'name': 'm1.medium',
+                                                     'ram_min': 2048}}}}
+
+        with mock.patch('functest.opnfv_tests.vnf.ims.cloudify_ims.'
+                        'os.makedirs'), \
+            mock.patch('functest.opnfv_tests.vnf.ims.cloudify_ims.'
+                       'get_config', return_value={
+                           'tenant_images': 'foo',
+                           'orchestrator': self.orchestrator,
+                           'vnf': self.vnf,
+                           'vnf_test_suite': '',
+                           'version': 'whatever'}):
+
+            self.ims_vnf = cloudify_ims.CloudifyIms()
+
+        self.images = {'image1': 'url1',
+                       'image2': 'url2'}
+        self.details = {'orchestrator': {'status': 'PASS', 'duration': 120},
+                        'vnf': {},
+                        'test_vnf':  {}}
+
+    @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/v1'})
+    @mock.patch('snaps.openstack.create_image.OpenStackImage.create')
+    def test_prepare_default(self, *args):
+        self.assertIsNone(self.ims_vnf.prepare())
+        args[4].assert_called_once_with()
+
+    @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/no_v'})
+    @mock.patch('snaps.openstack.create_image.OpenStackImage.create')
+    def test_prepare_bad_auth_url(self, *args):
+        with self.assertRaises(Exception):
+            self.ims_vnf.prepare()
+        args[0].assert_not_called()
+
+    def test_prepare_missing_param(self):
+        with self.assertRaises(vnf.VnfPreparationException):
+            self.ims_vnf.prepare()
+
+    @mock.patch('functest.core.vnf.os_utils.get_keystone_client',
+                side_effect=Exception)
+    def test_prepare_keystone_exception(self, *args):
+        with self.assertRaises(vnf.VnfPreparationException):
+            self.ims_vnf.prepare()
+        args[0].assert_called_once_with()
+
+    @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',
+                side_effect=Exception)
+    def test_prepare_tenant_exception(self, *args):
+        with self.assertRaises(vnf.VnfPreparationException):
+            self.ims_vnf.prepare()
+        args[1].assert_called_once_with()
+
+    @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',
+                side_effect=Exception)
+    def test_prepare_user_exception(self, *args):
+        with self.assertRaises(vnf.VnfPreparationException):
+            self.ims_vnf.prepare()
+        args[2].assert_called_once_with()
+
+    @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',
+                side_effect=Exception)
+    def test_prepare_credentials_exception(self, *args):
+        with self.assertRaises(vnf.VnfPreparationException):
+            self.ims_vnf.prepare()
+        args[0].assert_called_once_with()
+
+    # @mock.patch('snaps.openstack.create_keypairs.OpenStackKeypair',
+    #             side_effect=Exception)
+    # def test_deploy_orchestrator_keypair_exception(self, *args):
+    #    with self.assertRaises(vnf.OrchestratorDeploymentException):
+    #        self.ims_vnf.deploy_orchestrator()
+
+    #   def test_deploy_orchestrator_network_creation_fail(self):
+    #   def test_deploy_orchestrator_floatting_ip_creation_fail(self):
+    #   def test_deploy_orchestrator_flavor_fail(self):
+    #   def test_deploy_orchestrator_get_image_id_fail(self):
+    #   def test_deploy_orchestrator_create_instance_fail(self):
+    #   def test_deploy_orchestrator_secgroup_fail(self):
+    #   def test_deploy_orchestrator_add_floating_ip_fail(self):
+    #   def test_deploy_orchestrator_get_endpoint_fail(self):
+    #   def test_deploy_orchestrator_initiate CloudifyClient_fail(self):
+    #   def test_deploy_orchestrator_get_status_fail(self):
+    #
+
+    #   def test_deploy_vnf(self):
+    #   def test_deploy_vnf_publish_fail(self):
+    #   def test_deploy_vnf_get_flavor_fail(self):
+    #   def test_deploy_vnf_get_external_net_fail(self):
+    #   def test_deploy_vnf_deployment_create_fail(self):
+    #   def test_deploy_vnf_start_fail(self):
+    #
+    #   def test_test_vnf(self):
+    #   def test_test_vnf_deployment_get_fail(self):
+    #   def test_test_vnf_run_live_test_fail(self):
+    #
+    #   def test_clean(self):
+    #   def test_clean_execution_start_fail(self):
+    #   def test_clean_deployment_delete_fail(self):
+    #   def test_clean_blueprint_delete_fail(self):
+
+
+if __name__ == "__main__":
+    logging.disable(logging.CRITICAL)
+    unittest.main(verbosity=2)