X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Ftests%2Funit%2Fodl%2Ftest_odl.py;h=d803d41317ebf15f6580a417b35b8c1f16632d8e;hb=522a8def3bba5423cdc3adc4b66b58bfa92db198;hp=ff25cd7a9a1b09ff41cf9f4ec1d43ef43dad83d0;hpb=12583eeea0b14325328950fc981d704e36198919;p=functest.git diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py index ff25cd7a9..d803d4131 100644 --- a/functest/tests/unit/odl/test_odl.py +++ b/functest/tests/unit/odl/test_odl.py @@ -33,7 +33,7 @@ class ODLTesting(unittest.TestCase): logging.disable(logging.CRITICAL) _keystone_ip = "127.0.0.1" - _neutron_url = "http://127.0.0.2:9696" + _neutron_url = u"https://127.0.0.1:9696" _sdn_controller_ip = "127.0.0.3" _os_auth_url = "http://{}:5000/v3".format(_keystone_ip) _os_projectname = "admin" @@ -153,8 +153,8 @@ class ODLMainTesting(ODLTesting): def _test_run_suites(self, status, *args): kwargs = self._get_run_suites_kwargs() self.assertEqual(self.test.run_suites(**kwargs), status) - if len(args) > 0: - args[0].assert_called_once_with(self.test.res_dir) + if args: + args[0].assert_called_once_with(self.test.odl_variables_file) if len(args) > 1: variable = [ 'KEYSTONEURL:{}://{}'.format( @@ -171,13 +171,11 @@ class ODLMainTesting(ODLTesting): 'PORT:{}'.format(self._odl_webport), 'RESTCONFPORT:{}'.format(self._odl_restconfport)] args[1].assert_called_once_with( - odl.ODLTests.basic_suite_dir, - odl.ODLTests.neutron_suite_dir, + odl.ODLTests.basic_suite_dir, odl.ODLTests.neutron_suite_dir, log='NONE', output=os.path.join(self.test.res_dir, 'output.xml'), - report='NONE', - stdout=mock.ANY, - variable=variable) + report='NONE', stdout=mock.ANY, variable=variable, + variablefile=[]) def _test_no_keyword(self, key): kwargs = self._get_run_suites_kwargs(key) @@ -214,15 +212,17 @@ class ODLMainTesting(ODLTesting): def test_no_odlrestconfport(self): self._test_no_keyword('odlrestconfport') - def test_set_vars_ko(self): + @mock.patch('os.path.isfile', return_value=True) + def test_set_vars_ko(self, *args): with mock.patch.object(self.test, 'set_robotframework_vars', return_value=False) as mock_object: self._test_run_suites(testcase.TestCase.EX_RUN_ERROR) mock_object.assert_called_once_with( self._odl_username, self._odl_password) + args[0].assert_called_once_with(self.test.odl_variables_file) @mock.patch('robot.run', side_effect=RobotError) - @mock.patch('os.makedirs') + @mock.patch('os.path.isfile', return_value=True) def test_run_ko(self, *args): with mock.patch.object(self.test, 'set_robotframework_vars', return_value=True), \ @@ -230,7 +230,7 @@ class ODLMainTesting(ODLTesting): self._test_run_suites(testcase.TestCase.EX_RUN_ERROR, *args) @mock.patch('robot.run') - @mock.patch('os.makedirs') + @mock.patch('os.path.isfile', return_value=True) def test_parse_results_ko(self, *args): with mock.patch.object(self.test, 'set_robotframework_vars', return_value=True), \ @@ -239,15 +239,24 @@ class ODLMainTesting(ODLTesting): self._test_run_suites(testcase.TestCase.EX_RUN_ERROR, *args) @mock.patch('robot.run') - @mock.patch('os.makedirs') + @mock.patch('os.path.isfile', return_value=True) def test_ok(self, *args): with mock.patch.object(self.test, 'set_robotframework_vars', return_value=True), \ mock.patch.object(self.test, 'parse_results'): self._test_run_suites(testcase.TestCase.EX_OK, *args) + @mock.patch('robot.run') + @mock.patch('os.path.isfile', return_value=False) + def test_ok_no_creds(self, *args): + with mock.patch.object(self.test, 'set_robotframework_vars', + return_value=True) as mock_method, \ + mock.patch.object(self.test, 'parse_results'): + self._test_run_suites(testcase.TestCase.EX_OK, *args) + mock_method.assert_not_called() + @mock.patch('robot.run', return_value=1) - @mock.patch('os.makedirs') + @mock.patch('os.path.isfile', return_value=True) def test_testcases_in_failure(self, *args): with mock.patch.object(self.test, 'set_robotframework_vars', return_value=True), \ @@ -260,65 +269,68 @@ class ODLRunTesting(ODLTesting): """The class testing ODLTests.run().""" # pylint: disable=missing-docstring - def _test_no_env_var(self, var): - with mock.patch('functest.utils.openstack_utils.get_endpoint', - return_value=ODLTesting._neutron_url): - del os.environ[var] - self.assertEqual(self.test.run(), - testcase.TestCase.EX_RUN_ERROR) - + @mock.patch('snaps.openstack.utils.keystone_utils.get_endpoint', + return_value=ODLTesting._neutron_url) + @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.' + 'get_credentials') + def _test_no_env_var(self, var, *args): + del os.environ[var] + self.assertEqual(self.test.run(), testcase.TestCase.EX_RUN_ERROR) + args[0].assert_called_once_with() + args[1].assert_called_once_with(mock.ANY, 'network') + + @mock.patch('snaps.openstack.utils.keystone_utils.get_endpoint', + return_value=ODLTesting._neutron_url) + @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.' + 'get_credentials') def _test_run(self, status=testcase.TestCase.EX_OK, - exception=None, **kwargs): + exception=None, *args, **kwargs): odlip = kwargs['odlip'] if 'odlip' in kwargs else '127.0.0.3' odlwebport = kwargs['odlwebport'] if 'odlwebport' in kwargs else '8080' odlrestconfport = (kwargs['odlrestconfport'] if 'odlrestconfport' in kwargs else '8181') - - with mock.patch('functest.utils.openstack_utils.get_endpoint', - return_value=ODLTesting._neutron_url): - if exception: - self.test.run_suites = mock.Mock(side_effect=exception) - else: - self.test.run_suites = mock.Mock(return_value=status) - self.assertEqual(self.test.run(), status) - self.test.run_suites.assert_called_once_with( - odl.ODLTests.default_suites, - neutronurl=self._neutron_url, - odlip=odlip, odlpassword=self._odl_password, - odlrestconfport=odlrestconfport, - odlusername=self._odl_username, odlwebport=odlwebport, - osauthurl=self._os_auth_url, - ospassword=self._os_password, - osprojectname=self._os_projectname, - osusername=self._os_username, - osprojectdomainname=self._os_projectdomainname, - osuserdomainname=self._os_userdomainname) - + if exception: + self.test.run_suites = mock.Mock(side_effect=exception) + else: + self.test.run_suites = mock.Mock(return_value=status) + self.assertEqual(self.test.run(), status) + self.test.run_suites.assert_called_once_with( + odl.ODLTests.default_suites, neutronurl=self._neutron_url, + odlip=odlip, odlpassword=self._odl_password, + odlrestconfport=odlrestconfport, odlusername=self._odl_username, + odlwebport=odlwebport, osauthurl=self._os_auth_url, + ospassword=self._os_password, osprojectname=self._os_projectname, + osusername=self._os_username, + osprojectdomainname=self._os_projectdomainname, + osuserdomainname=self._os_userdomainname) + args[0].assert_called_once_with() + args[1].assert_called_once_with(mock.ANY, 'network') + + @mock.patch('snaps.openstack.utils.keystone_utils.get_endpoint', + return_value=ODLTesting._neutron_url) + @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.' + 'get_credentials') def _test_multiple_suites(self, suites, - status=testcase.TestCase.EX_OK, **kwargs): + status=testcase.TestCase.EX_OK, *args, **kwargs): odlip = kwargs['odlip'] if 'odlip' in kwargs else '127.0.0.3' odlwebport = kwargs['odlwebport'] if 'odlwebport' in kwargs else '8080' odlrestconfport = (kwargs['odlrestconfport'] if 'odlrestconfport' in kwargs else '8181') - with mock.patch('functest.utils.openstack_utils.get_endpoint', - return_value=ODLTesting._neutron_url): - self.test.run_suites = mock.Mock(return_value=status) - self.assertEqual(self.test.run(suites=suites), status) - self.test.run_suites.assert_called_once_with( - suites, - neutronurl=self._neutron_url, - odlip=odlip, odlpassword=self._odl_password, - odlrestconfport=odlrestconfport, - odlusername=self._odl_username, odlwebport=odlwebport, - osauthurl=self._os_auth_url, - ospassword=self._os_password, - osprojectname=self._os_projectname, - osusername=self._os_username, - osprojectdomainname=self._os_projectdomainname, - osuserdomainname=self._os_userdomainname) + self.test.run_suites = mock.Mock(return_value=status) + self.assertEqual(self.test.run(suites=suites), status) + self.test.run_suites.assert_called_once_with( + suites, neutronurl=self._neutron_url, odlip=odlip, + odlpassword=self._odl_password, odlrestconfport=odlrestconfport, + odlusername=self._odl_username, odlwebport=odlwebport, + osauthurl=self._os_auth_url, ospassword=self._os_password, + osprojectname=self._os_projectname, osusername=self._os_username, + osprojectdomainname=self._os_projectdomainname, + osuserdomainname=self._os_userdomainname) + args[0].assert_called_once_with() + args[1].assert_called_once_with(mock.ANY, 'network') def test_exc(self): - with mock.patch('functest.utils.openstack_utils.get_endpoint', + with mock.patch('snaps.openstack.utils.keystone_utils.get_endpoint', side_effect=auth_plugins.MissingAuthPlugin()): self.assertEqual(self.test.run(), testcase.TestCase.EX_RUN_ERROR) @@ -337,27 +349,24 @@ class ODLRunTesting(ODLTesting): def test_run_suites_false(self): os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip - self._test_run(testcase.TestCase.EX_RUN_ERROR, + self._test_run(testcase.TestCase.EX_RUN_ERROR, None, odlip=self._sdn_controller_ip, odlwebport=self._odl_webport) def test_run_suites_exc(self): with self.assertRaises(Exception): os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip - self._test_run(status=testcase.TestCase.EX_RUN_ERROR, - exception=Exception(), + self._test_run(testcase.TestCase.EX_RUN_ERROR, + Exception(), odlip=self._sdn_controller_ip, odlwebport=self._odl_webport) def test_no_sdn_controller_ip(self): - with mock.patch('functest.utils.openstack_utils.get_endpoint', - return_value=ODLTesting._neutron_url): - self.assertEqual(self.test.run(), - testcase.TestCase.EX_RUN_ERROR) + self.assertEqual(self.test.run(), testcase.TestCase.EX_RUN_ERROR) def test_without_installer_type(self): os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip - self._test_run(testcase.TestCase.EX_OK, + self._test_run(testcase.TestCase.EX_OK, None, odlip=self._sdn_controller_ip, odlwebport=self._odl_webport) @@ -371,69 +380,57 @@ class ODLRunTesting(ODLTesting): def test_fuel(self): os.environ["INSTALLER_TYPE"] = "fuel" - self._test_run(testcase.TestCase.EX_OK, + self._test_run(testcase.TestCase.EX_OK, None, odlip=urllib.parse.urlparse(self._neutron_url).hostname, odlwebport='8181', odlrestconfport='8282') def test_apex_no_controller_ip(self): - with mock.patch('functest.utils.openstack_utils.get_endpoint', - return_value=ODLTesting._neutron_url): - os.environ["INSTALLER_TYPE"] = "apex" - self.assertEqual(self.test.run(), - testcase.TestCase.EX_RUN_ERROR) + os.environ["INSTALLER_TYPE"] = "apex" + self.assertEqual(self.test.run(), testcase.TestCase.EX_RUN_ERROR) def test_apex(self): os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip os.environ["INSTALLER_TYPE"] = "apex" - self._test_run(testcase.TestCase.EX_OK, + self._test_run(testcase.TestCase.EX_OK, None, odlip=self._sdn_controller_ip, odlwebport='8081', odlrestconfport='8081') def test_netvirt_no_controller_ip(self): - with mock.patch('functest.utils.openstack_utils.get_endpoint', - return_value=ODLTesting._neutron_url): - os.environ["INSTALLER_TYPE"] = "netvirt" - self.assertEqual(self.test.run(), - testcase.TestCase.EX_RUN_ERROR) + os.environ["INSTALLER_TYPE"] = "netvirt" + self.assertEqual(self.test.run(), testcase.TestCase.EX_RUN_ERROR) def test_netvirt(self): os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip os.environ["INSTALLER_TYPE"] = "netvirt" - self._test_run(testcase.TestCase.EX_OK, + self._test_run(testcase.TestCase.EX_OK, None, odlip=self._sdn_controller_ip, odlwebport='8081', odlrestconfport='8081') def test_joid_no_controller_ip(self): - with mock.patch('functest.utils.openstack_utils.get_endpoint', - return_value=ODLTesting._neutron_url): - os.environ["INSTALLER_TYPE"] = "joid" - self.assertEqual(self.test.run(), - testcase.TestCase.EX_RUN_ERROR) + os.environ["INSTALLER_TYPE"] = "joid" + self.assertEqual(self.test.run(), testcase.TestCase.EX_RUN_ERROR) def test_joid(self): os.environ["SDN_CONTROLLER"] = self._sdn_controller_ip os.environ["INSTALLER_TYPE"] = "joid" - self._test_run(testcase.TestCase.EX_OK, + self._test_run(testcase.TestCase.EX_OK, None, odlip=self._sdn_controller_ip, odlwebport='8080') def test_compass(self): os.environ["INSTALLER_TYPE"] = "compass" - self._test_run(testcase.TestCase.EX_OK, + self._test_run(testcase.TestCase.EX_OK, None, odlip=urllib.parse.urlparse(self._neutron_url).hostname, odlrestconfport='8080') def test_daisy_no_controller_ip(self): - with mock.patch('functest.utils.openstack_utils.get_endpoint', - return_value=ODLTesting._neutron_url): - os.environ["INSTALLER_TYPE"] = "daisy" - self.assertEqual(self.test.run(), - testcase.TestCase.EX_RUN_ERROR) + os.environ["INSTALLER_TYPE"] = "daisy" + self.assertEqual(self.test.run(), testcase.TestCase.EX_RUN_ERROR) def test_daisy(self): os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip os.environ["INSTALLER_TYPE"] = "daisy" - self._test_run(testcase.TestCase.EX_OK, + self._test_run(testcase.TestCase.EX_OK, None, odlip=self._sdn_controller_ip, odlwebport='8181', odlrestconfport='8087')