Merge "More Unit Tests for tempest and IMS module"

2 files changed, 88 insertions, 1 deletions

diff --git a/functest/tests/unit/opnfv_tests/vnf/ims/test_clearwater.py b/functest/tests/unit/opnfv_tests/vnf/ims/test_clearwater.py
index 527f12e5..18bebfdf 100644
--- a/functest/tests/unit/opnfv_tests/vnf/ims/test_clearwater.py
+++ b/functest/tests/unit/opnfv_tests/vnf/ims/test_clearwater.py
@@ -39,16 +39,48 @@ class ClearwaterTesting(unittest.TestCase):
         with mock.patch.object(self.clearwater.orchestrator,
                                'download_upload_and_deploy_blueprint',
                                return_value=''):
-            self.clearwater.deploy_vnf(self.bp),
+            self.clearwater.deploy_vnf(self.bp)
             self.assertEqual(self.clearwater.deploy, True)
 
     def test_undeploy_vnf_deployment_passed(self):
         with mock.patch.object(self.clearwater.orchestrator,
                                'undeploy_deployment'):
             self.clearwater.deploy = True
+            self.clearwater.undeploy_vnf()
+            self.assertEqual(self.clearwater.deploy, False)
+
+    def test_undeploy_vnf_deployment_with_undeploy(self):
+        with mock.patch.object(self.clearwater.orchestrator,
+                               'undeploy_deployment') as m:
+            self.clearwater.deploy = False
+            self.clearwater.undeploy_vnf(),
+            self.assertEqual(self.clearwater.deploy, False)
+            self.assertFalse(m.called)
+
+            self.clearwater.orchestrator = None
+            self.clearwater.deploy = True
+            self.clearwater.undeploy_vnf(),
+            self.assertEqual(self.clearwater.deploy, True)
+
+            self.clearwater.deploy = False
             self.clearwater.undeploy_vnf(),
             self.assertEqual(self.clearwater.deploy, False)
 
+    def test_set_methods(self):
+        self.clearwater.set_orchestrator(self.orchestrator)
+        self.assertTrue(self.clearwater.orchestrator, self.orchestrator)
+        self.clearwater.set_flavor_id('test_flavor_id')
+        self.assertTrue(self.clearwater.config['flavor_id'], 'test_flavor_id')
+        self.clearwater.set_image_id('test_image_id')
+        self.assertTrue(self.clearwater.config['image_id'], 'test_image_id')
+        self.clearwater.set_agent_user('test_user')
+        self.assertTrue(self.clearwater.config['agent_user'], 'test_user')
+        self.clearwater.set_external_network_name('test_network')
+        self.assertTrue(self.clearwater.config['external_network_name'],
+                        'test_network')
+        self.clearwater.set_public_domain('test_domain')
+        self.assertTrue(self.clearwater.config['public_domain'],
+                        'test_domain')
 
 if __name__ == "__main__":
     unittest.main(verbosity=2)
diff --git a/functest/tests/unit/opnfv_tests/vnf/ims/test_orchestrator_cloudify.py b/functest/tests/unit/opnfv_tests/vnf/ims/test_orchestrator_cloudify.py
index 620b0216..bf6d483f 100644
--- a/functest/tests/unit/opnfv_tests/vnf/ims/test_orchestrator_cloudify.py
+++ b/functest/tests/unit/opnfv_tests/vnf/ims/test_orchestrator_cloudify.py
@@ -6,6 +6,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 
 import logging
+import subprocess32 as subprocess
 import unittest
 
 import mock
@@ -117,6 +118,60 @@ class ImsVnfTesting(unittest.TestCase):
                                                                     'dest'),
                              True)
 
+    def test_execute_command_failed(self):
+        with mock.patch('__builtin__.open',
+                        mock.mock_open(read_data='test_data\n')):
+            subprocess.call = mock.create_autospec(subprocess.call,
+                                                   return_value=0)
+            mock_log = mock.Mock()
+            cmd = 'test_cmd -e test_env bash_script'
+            ret = orchestrator_cloudify.execute_command(cmd, mock_log,
+                                                        timeout=100)
+            self.assertEqual(ret, False)
+
+    def test_execute_command_default(self):
+        with mock.patch('__builtin__.open',
+                        mock.mock_open(read_data='test_data\n')):
+            subprocess.call = mock. \
+                create_autospec(subprocess.call,
+                                return_value=subprocess.TimeoutExpired)
+            mock_log = mock.Mock()
+            cmd = 'test_cmd -e test_env bash_script'
+            ret = orchestrator_cloudify.execute_command(cmd, mock_log,
+                                                        timeout=100)
+            self.assertEqual(ret, ['test_data\n'])
+
+    def test_set_methods(self):
+        self.orchestrator.set_credentials('test_username', 'test_password',
+                                          'test_tenant_name', 'test_auth_url')
+        self.assertTrue(self.orchestrator.config['keystone_username'],
+                        'test_username')
+        self.assertTrue(self.orchestrator.config['keystone_password'],
+                        'test_password')
+        self.assertTrue(self.orchestrator.config['keystone_url'],
+                        'test_auth_url')
+        self.assertTrue(self.orchestrator.config['keystone_tenant_name'],
+                        'test_tenant_name')
+        self.orchestrator.set_flavor_id('test_flavor_id')
+        self.assertTrue(self.orchestrator.config['flavor_id'],
+                        'test_flavor_id')
+        self.orchestrator.set_image_id('test_image_id')
+        self.assertTrue(self.orchestrator.config['image_id'], 'test_image_id')
+        self.orchestrator.set_external_network_name('test_network')
+        self.assertTrue(self.orchestrator.config['external_network_name'],
+                        'test_network')
+        self.orchestrator.set_ssh_user('test_user')
+        self.assertTrue(self.orchestrator.config['ssh_user'],
+                        'test_user')
+        self.orchestrator.set_nova_url('test_nova_url')
+        self.assertTrue(self.orchestrator.config['nova_url'],
+                        'test_nova_url')
+        self.orchestrator.set_neutron_url('test_neutron_url')
+        self.assertTrue(self.orchestrator.config['neutron_url'],
+                        'test_neutron_url')
+        self.orchestrator.set_nameservers(['test_subnet'])
+        self.assertTrue(self.orchestrator.config['dns_subnet_1'],
+                        'test_subnet')
 
 if __name__ == "__main__":
     unittest.main(verbosity=2)