Leverage vyos_vrouter on Cloudify

It also stop rebooting the VMs.

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

2 files changed, 2 insertions, 61 deletions

diff --git a/functest/tests/unit/vnf/router/test_cloudify_vrouter.py b/functest/tests/unit/vnf/router/test_cloudify_vrouter.py
index db03d716c..b3f83e946 100644
--- a/functest/tests/unit/vnf/router/test_cloudify_vrouter.py
+++ b/functest/tests/unit/vnf/router/test_cloudify_vrouter.py
@@ -12,61 +12,10 @@
 import logging
 import unittest
 
-import mock
-
-from functest.core import vnf
-from functest.opnfv_tests.vnf.router import cloudify_vrouter
-
 
 class CloudifyVrouterTesting(unittest.TestCase):
 
-    def setUp(self):
-
-        self.tenant = 'cloudify_vrouter'
-        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': 'vrouter',
-                    'descriptor': {'version': '100',
-                                   'file_name': 'function-test-' +
-                                                'openstack-blueprint.yaml',
-                                   'name': 'vrouter-opnfv',
-                                   'url': 'https://foo',
-                                   'requirements': {'flavor':
-                                                    {'name': 'm1.medium',
-                                                     'ram_min': 2048}}}}
-
-        # pylint: disable=bad-continuation
-        with mock.patch(
-                'functest.opnfv_tests.vnf.router.cloudify_vrouter.Utilvnf'), \
-                mock.patch('functest.opnfv_tests.vnf.router.'
-                           'cloudify_vrouter.vrouter_base.Utilvnf'), \
-                mock.patch('os.makedirs'), \
-                mock.patch(
-                    'functest.utils.functest_utils.get_parameter_from_yaml',
-                    return_value={
-                        'tenant_images': 'foo',
-                        'orchestrator': self.orchestrator,
-                        'vnf': self.vnf, 'vnf_test_suite': '',
-                        'version': 'whatever'}):
-
-            self.router_vnf = cloudify_vrouter.CloudifyVrouter()
-
-        self.images = {'image1': 'url1',
-                       'image2': 'url2'}
-        self.details = {'orchestrator': {'status': 'PASS', 'duration': 120},
-                        'vnf': {},
-                        'test_vnf':  {}}
-
-    def test_prepare_missing_param(self):
-        with self.assertRaises(vnf.VnfPreparationException):
-            self.router_vnf.prepare()
+    pass
 
 
 if __name__ == "__main__":
diff --git a/functest/tests/unit/vnf/router/test_vrouter_base.py b/functest/tests/unit/vnf/router/test_vrouter_base.py
index 1851b201a..330093658 100644
--- a/functest/tests/unit/vnf/router/test_vrouter_base.py
+++ b/functest/tests/unit/vnf/router/test_vrouter_base.py
@@ -12,17 +12,9 @@
 import logging
 import unittest
 
-import mock
-
-from functest.opnfv_tests.vnf.router import vrouter_base
-
 
 class VrouterOnBoardingBaseTesting(unittest.TestCase):
-
-    def setUp(self):
-        with mock.patch('functest.opnfv_tests.vnf.router.cloudify_vrouter.'
-                        'os.makedirs'):
-            self.vrouter_vnf = vrouter_base.VrouterOnBoardingBase()
+    pass
 
 
 if __name__ == "__main__":