From 0f91a2666676f3cf4f21e2e69be5340c690e85fc Mon Sep 17 00:00:00 2001 From: Alexander Kislitsky Date: Wed, 1 Apr 2015 17:58:58 +0300 Subject: [PATCH] Fix for flatten data for CSV reports In case of lists or tuples we are joining data into one string. Joining of non-string types fixed. Vmware attributes added to tests for installation structure generation function. Change-Id: I46b21ae33fd4b50f0d2c5722584248beee8c4f17 Closes-Bug: #1439235 --- .../fuel_analytics/api/resources/utils/export_utils.py | 2 +- .../test/api/resources/utils/inst_structure_test.py | 3 +++ .../test/api/resources/utils/test_stats_to_csv.py | 8 ++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/analytics/fuel_analytics/api/resources/utils/export_utils.py b/analytics/fuel_analytics/api/resources/utils/export_utils.py index e2e4f87..7d84b0e 100644 --- a/analytics/fuel_analytics/api/resources/utils/export_utils.py +++ b/analytics/fuel_analytics/api/resources/utils/export_utils.py @@ -53,7 +53,7 @@ def get_flatten_data(keys_paths, data): if d is None: break if isinstance(d, (list, tuple)): - flatten_data.append(' '.join(d)) + flatten_data.append(' '.join(map(six.text_type, d))) else: flatten_data.append(d) return flatten_data diff --git a/analytics/fuel_analytics/test/api/resources/utils/inst_structure_test.py b/analytics/fuel_analytics/test/api/resources/utils/inst_structure_test.py index 8fc32b7..fbb5562 100644 --- a/analytics/fuel_analytics/test/api/resources/utils/inst_structure_test.py +++ b/analytics/fuel_analytics/test/api/resources/utils/inst_structure_test.py @@ -79,6 +79,9 @@ class InstStructureTest(BaseTest): 'attributes': { 'libvirt_type': random.choice(libvirt_names), 'heat': random.choice((True, False)), + }, + 'vmware_attributes': { + 'vmware_az_cinder_enable': [True, False], } } network_configuration = self.generate_network_configuration() diff --git a/analytics/fuel_analytics/test/api/resources/utils/test_stats_to_csv.py b/analytics/fuel_analytics/test/api/resources/utils/test_stats_to_csv.py index aa7313a..9e35dfd 100644 --- a/analytics/fuel_analytics/test/api/resources/utils/test_stats_to_csv.py +++ b/analytics/fuel_analytics/test/api/resources/utils/test_stats_to_csv.py @@ -223,3 +223,11 @@ class StatsToCsvExportTest(InstStructureTest, DbTest): flatten_cluster = list(flatten_clusters)[0] pos = csv_keys_paths.index(['nodes_platform_name_gt3']) self.assertEqual(True, flatten_cluster[pos]) + + def test_vmware_attributes(self): + exporter = StatsToCsv() + inst_structures = self.generate_inst_structures( + clusters_num_range=(1, 1)) + result = exporter.export_clusters(inst_structures, []) + for _ in result: + pass