diff --git a/openstack/config/cloud_region.py b/openstack/config/cloud_region.py index 7c5a42f4f..877867dd5 100644 --- a/openstack/config/cloud_region.py +++ b/openstack/config/cloud_region.py @@ -395,6 +395,7 @@ class CloudRegion(object): verify=verify, cert=cert, timeout=self.config.get('api_timeout'), + collect_timing=self.config.get('timing'), discovery_cache=self._discovery_cache) self.insert_user_agent() # Using old keystoneauth with new os-client-config fails if diff --git a/openstack/tests/unit/config/test_cloud_config.py b/openstack/tests/unit/config/test_cloud_config.py index df21ef2e5..5a8b9df2e 100644 --- a/openstack/tests/unit/config/test_cloud_config.py +++ b/openstack/tests/unit/config/test_cloud_config.py @@ -218,7 +218,8 @@ class TestCloudRegion(base.TestCase): cc.get_session() mock_session.assert_called_with( auth=mock.ANY, - verify=True, cert=None, timeout=None, discovery_cache=None) + verify=True, cert=None, timeout=None, collect_timing=None, + discovery_cache=None) self.assertEqual( fake_session.additional_user_agent, [('openstacksdk', openstack_version.__version__)]) @@ -238,7 +239,8 @@ class TestCloudRegion(base.TestCase): cc.get_session() mock_session.assert_called_with( auth=mock.ANY, - verify=True, cert=None, timeout=None, discovery_cache=None) + verify=True, cert=None, timeout=None, collect_timing=None, + discovery_cache=None) self.assertEqual(fake_session.app_name, "test_app") self.assertEqual(fake_session.app_version, "test_version") self.assertEqual( @@ -258,7 +260,27 @@ class TestCloudRegion(base.TestCase): cc.get_session() mock_session.assert_called_with( auth=mock.ANY, - verify=True, cert=None, timeout=9, discovery_cache=None) + verify=True, cert=None, timeout=9, + collect_timing=None, discovery_cache=None) + self.assertEqual( + fake_session.additional_user_agent, + [('openstacksdk', openstack_version.__version__)]) + + @mock.patch.object(ksa_session, 'Session') + def test_get_session_with_timing(self, mock_session): + fake_session = mock.Mock() + fake_session.additional_user_agent = [] + mock_session.return_value = fake_session + config_dict = defaults.get_defaults() + config_dict.update(fake_services_dict) + config_dict['timing'] = True + cc = cloud_region.CloudRegion( + "test1", "region-al", config_dict, auth_plugin=mock.Mock()) + cc.get_session() + mock_session.assert_called_with( + auth=mock.ANY, + verify=True, cert=None, timeout=None, + collect_timing=True, discovery_cache=None) self.assertEqual( fake_session.additional_user_agent, [('openstacksdk', openstack_version.__version__)])