From 8a6e619f7246a5eb55d96613f536ce50fcf5c0fd Mon Sep 17 00:00:00 2001 From: David C Kennedy Date: Fri, 11 Nov 2016 14:32:56 +0000 Subject: [PATCH] Populate the project id for kafka publish This needs to be the admin project id so for devstack this needs to be written to the configuration file once the users/projects etc are created and identifiable. Add a similar process to the refresh script. Correct the configuration property name to 'project' rather than using the old nomencature 'tenant'. Change-Id: Ib9970ffacf5ee0f7f006722038a1db8024c1385e --- .../monasca-transform/monasca-transform.conf | 2 +- devstack/plugin.sh | 13 ++++ etc/monasca-transform.conf | 2 +- .../component/insert/__init__.py | 2 +- .../config/config_initializer.py | 2 +- .../driver/first_attempt_at_spark_test.py | 64 +++++++++---------- .../test_pre_hourly_processor_agg.py | 2 +- tests/unit/usage/test_fetch_quantity_agg.py | 12 ++-- .../test_fetch_quantity_instance_usage_agg.py | 16 ++--- .../usage/test_fetch_quantity_util_agg.py | 6 +- ...st_fetch_quantity_util_agg_second_stage.py | 4 +- .../usage/test_host_cpu_usage_component.py | 12 ++-- ...est_host_cpu_usage_component_second_agg.py | 24 +++---- tests/unit/usage/test_vm_cpu_allocated_agg.py | 6 +- .../test_vm_cpu_allocated_agg_second_stage.py | 12 ++-- tools/vagrant/refresh_monasca_transform.sh | 8 +++ 16 files changed, 104 insertions(+), 83 deletions(-) diff --git a/devstack/files/monasca-transform/monasca-transform.conf b/devstack/files/monasca-transform/monasca-transform.conf index c17e613..792c140 100644 --- a/devstack/files/monasca-transform/monasca-transform.conf +++ b/devstack/files/monasca-transform/monasca-transform.conf @@ -16,7 +16,7 @@ password = password adapter = monasca_transform.messaging.adapter:KafkaMessageAdapter topic = metrics brokers=192.168.15.6:9092 -publish_kafka_tenant_id = d2cb21079930415a9f2a33588b9f2bb6 +publish_kafka_project_id=d2cb21079930415a9f2a33588b9f2bb6 adapter_pre_hourly = monasca_transform.messaging.adapter:KafkaMessageAdapterPreHourly topic_pre_hourly = metrics_pre_hourly diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 96200c6..cdbbb17 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -290,6 +290,17 @@ function create_monasca_transform_directories { } +function get_id () { + echo `"$@" | grep ' id ' | awk '{print $4}'` +} + +function ascertain_admin_project_id { + + source ~/devstack/openrc admin admin + export ADMIN_PROJECT_ID=$(get_id openstack project show admin) + +} + function copy_monasca_transform_files { sudo cp -f "${MONASCA_TRANSFORM_BASE}"/monasca-transform/devstack/files/monasca-transform/service_runner.py /opt/monasca/transform/lib/. @@ -385,6 +396,8 @@ function post_config_monasca_transform { function extra_monasca_transform { + ascertain_admin_project_id + sudo sed -i "s/publish_kafka_project_id=d2cb21079930415a9f2a33588b9f2bb6/publish_kafka_project_id=${ADMIN_PROJECT_ID}/g" /etc/monasca-transform.conf sudo service monasca-transform start } diff --git a/etc/monasca-transform.conf b/etc/monasca-transform.conf index de13e3e..53c1e0f 100644 --- a/etc/monasca-transform.conf +++ b/etc/monasca-transform.conf @@ -16,7 +16,7 @@ password = password adapter = monasca_transform.messaging.adapter:KafkaMessageAdapter topic = metrics brokers = localhost:9092 -publish_kafka_tenant_id = d2cb21079930415a9f2a33588b9f2bb6 +publish_kafka_project_id = d2cb21079930415a9f2a33588b9f2bb6 adapter_pre_hourly = monasca_transform.messaging.adapter:KafkaMessageAdapterPreHourly topic_pre_hourly = metrics_pre_hourly diff --git a/monasca_transform/component/insert/__init__.py b/monasca_transform/component/insert/__init__.py index 407dc7d..34788d9 100644 --- a/monasca_transform/component/insert/__init__.py +++ b/monasca_transform/component/insert/__init__.py @@ -95,7 +95,7 @@ class InsertComponent(Component): # a usable tenant ID to us in a configurable way. BTW, without a # proper/valid tenant ID, aggregated metrics don't get persisted # to the Monasca DB. - meta_part["tenantId"] = cfg.CONF.messaging.publish_kafka_tenant_id + meta_part["tenantId"] = cfg.CONF.messaging.publish_kafka_project_id meta_part["region"] = "useast" value_meta_part = {"record_count": instance_usage_dict.get( diff --git a/monasca_transform/config/config_initializer.py b/monasca_transform/config/config_initializer.py index b181bd9..e1f76f4 100644 --- a/monasca_transform/config/config_initializer.py +++ b/monasca_transform/config/config_initializer.py @@ -80,7 +80,7 @@ class ConfigInitializer(object): cfg.StrOpt('brokers', default='192.168.10.4:9092', help='Messaging brokers'), - cfg.StrOpt('publish_kafka_tenant_id', + cfg.StrOpt('publish_kafka_project_id', default='111111', help='publish aggregated metrics tenant'), cfg.StrOpt('adapter_pre_hourly', diff --git a/tests/unit/driver/first_attempt_at_spark_test.py b/tests/unit/driver/first_attempt_at_spark_test.py index 9a59673..512b48f 100644 --- a/tests/unit/driver/first_attempt_at_spark_test.py +++ b/tests/unit/driver/first_attempt_at_spark_test.py @@ -132,7 +132,7 @@ class SparkTest(SparkContextTest): total_mb_agg_metric.get('metric').get('value')) self.assertEqual('useast', total_mb_agg_metric.get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, total_mb_agg_metric.get('meta').get('tenantId')) self.assertEqual('all', total_mb_agg_metric.get('metric').get('dimensions') @@ -163,7 +163,7 @@ class SparkTest(SparkContextTest): self.assertEqual('useast', usable_mb_agg_metric.get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, usable_mb_agg_metric.get('meta').get('tenantId')) self.assertEqual('all', usable_mb_agg_metric.get('metric').get('dimensions') @@ -202,7 +202,7 @@ class SparkTest(SparkContextTest): vcpus_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, vcpus_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -243,7 +243,7 @@ class SparkTest(SparkContextTest): vcpus_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, vcpus_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -284,7 +284,7 @@ class SparkTest(SparkContextTest): vcpus_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, vcpus_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -324,7 +324,7 @@ class SparkTest(SparkContextTest): vm_mem_total_mb_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, vm_mem_total_mb_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -363,7 +363,7 @@ class SparkTest(SparkContextTest): vm_mem_total_mb_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, vm_mem_total_mb_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -402,7 +402,7 @@ class SparkTest(SparkContextTest): vm_mem_total_mb_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, vm_mem_total_mb_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -437,7 +437,7 @@ class SparkTest(SparkContextTest): self.assertEqual('useast', total_allocated_disk_agg_metric.get('meta') .get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, total_allocated_disk_agg_metric.get('meta') .get('tenantId')) self.assertEqual('all', @@ -478,7 +478,7 @@ class SparkTest(SparkContextTest): vm_disk_allocation_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, vm_disk_allocation_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -519,7 +519,7 @@ class SparkTest(SparkContextTest): vm_disk_allocation_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, vm_disk_allocation_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -560,7 +560,7 @@ class SparkTest(SparkContextTest): vm_disk_allocation_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, vm_disk_allocation_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -598,7 +598,7 @@ class SparkTest(SparkContextTest): self.assertEqual('useast', vm_cpu_util_perc_agg_metric.get('meta') .get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, vm_cpu_util_perc_agg_metric.get('meta') .get('tenantId')) self.assertEqual('all', @@ -637,7 +637,7 @@ class SparkTest(SparkContextTest): self.assertEqual('useast', vm_cpu_util_perc_agg_metric.get('meta') .get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, vm_cpu_util_perc_agg_metric.get('meta') .get('tenantId')) self.assertEqual('all', @@ -676,7 +676,7 @@ class SparkTest(SparkContextTest): disk_total_space_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, disk_total_space_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -714,7 +714,7 @@ class SparkTest(SparkContextTest): disk_total_used_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, disk_total_used_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -754,7 +754,7 @@ class SparkTest(SparkContextTest): cpu_util_cores_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, cpu_util_cores_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -796,7 +796,7 @@ class SparkTest(SparkContextTest): cpu_util_cores_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, cpu_util_cores_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -838,7 +838,7 @@ class SparkTest(SparkContextTest): cpu_util_cores_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, cpu_util_cores_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -879,7 +879,7 @@ class SparkTest(SparkContextTest): vm_mem_used_mb_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, vm_mem_used_mb_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -918,7 +918,7 @@ class SparkTest(SparkContextTest): vm_mem_used_mb_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, vm_mem_used_mb_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -957,7 +957,7 @@ class SparkTest(SparkContextTest): vm_mem_used_mb_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, vm_mem_used_mb_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -991,7 +991,7 @@ class SparkTest(SparkContextTest): used_swift_agg_metric.get('metric').get('value')) self.assertEqual('useast', used_swift_agg_metric.get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, used_swift_agg_metric.get('meta').get('tenantId')) self.assertEqual('all', used_swift_agg_metric.get('metric').get('dimensions') @@ -1020,7 +1020,7 @@ class SparkTest(SparkContextTest): used_swift_agg_metric.get('metric').get('value')) self.assertEqual('useast', used_swift_agg_metric.get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, used_swift_agg_metric.get('meta').get('tenantId')) self.assertEqual('all', used_swift_agg_metric.get('metric').get('dimensions') @@ -1049,7 +1049,7 @@ class SparkTest(SparkContextTest): used_swift_agg_metric.get('metric').get('value')) self.assertEqual('useast', used_swift_agg_metric.get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, used_swift_agg_metric.get('meta').get('tenantId')) self.assertEqual('all', used_swift_agg_metric.get('metric').get('dimensions') @@ -1078,7 +1078,7 @@ class SparkTest(SparkContextTest): avail_swift_agg_metric.get('metric').get('value')) self.assertEqual('useast', avail_swift_agg_metric.get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, avail_swift_agg_metric.get('meta').get('tenantId')) self.assertEqual('all', avail_swift_agg_metric.get('metric').get('dimensions') @@ -1107,7 +1107,7 @@ class SparkTest(SparkContextTest): avail_swift_agg_metric.get('metric').get('value')) self.assertEqual('useast', avail_swift_agg_metric.get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, avail_swift_agg_metric.get('meta').get('tenantId')) self.assertEqual('all', avail_swift_agg_metric.get('metric').get('dimensions') @@ -1136,7 +1136,7 @@ class SparkTest(SparkContextTest): avail_swift_agg_metric.get('metric').get('value')) self.assertEqual('useast', avail_swift_agg_metric.get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, avail_swift_agg_metric.get('meta').get('tenantId')) self.assertEqual('all', avail_swift_agg_metric.get('metric').get('dimensions') @@ -1164,7 +1164,7 @@ class SparkTest(SparkContextTest): diskusage_rate_agg_metric.get('metric').get('value')) self.assertEqual('useast', diskusage_rate_agg_metric.get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, diskusage_rate_agg_metric.get('meta').get('tenantId')) self.assertEqual('all', diskusage_rate_agg_metric.get('metric') @@ -1202,7 +1202,7 @@ class SparkTest(SparkContextTest): nova_vm_cpu_total_alloc_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, nova_vm_cpu_total_alloc_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -1243,7 +1243,7 @@ class SparkTest(SparkContextTest): nova_vm_mem_total_alloc_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, nova_vm_mem_total_alloc_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -1284,7 +1284,7 @@ class SparkTest(SparkContextTest): storage_objects_size_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, storage_objects_size_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', diff --git a/tests/unit/processor/test_pre_hourly_processor_agg.py b/tests/unit/processor/test_pre_hourly_processor_agg.py index d816c0a..a2f864b 100644 --- a/tests/unit/processor/test_pre_hourly_processor_agg.py +++ b/tests/unit/processor/test_pre_hourly_processor_agg.py @@ -187,7 +187,7 @@ class TestPreHourlyProcessorAgg(SparkContextTest): .get('value_meta').get('record_count')) self.assertEqual('useast', swift_disk_rate_agg_metric.get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, swift_disk_rate_agg_metric.get('meta') .get('tenantId')) self.assertEqual('all', diff --git a/tests/unit/usage/test_fetch_quantity_agg.py b/tests/unit/usage/test_fetch_quantity_agg.py index 1eb3150..dc3fb3d 100644 --- a/tests/unit/usage/test_fetch_quantity_agg.py +++ b/tests/unit/usage/test_fetch_quantity_agg.py @@ -233,7 +233,7 @@ class TestFetchQuantityAgg(SparkContextTest): mem_total_mb_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, mem_total_mb_agg_metric .get('meta').get('tenantId')) self.assertEqual('mini-mon', @@ -341,7 +341,7 @@ class TestFetchQuantityAgg(SparkContextTest): mem_total_mb_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, mem_total_mb_agg_metric .get('meta').get('tenantId')) self.assertEqual('mini-mon', @@ -447,7 +447,7 @@ class TestFetchQuantityAgg(SparkContextTest): mem_total_mb_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, mem_total_mb_agg_metric .get('meta').get('tenantId')) self.assertEqual('mini-mon', @@ -554,7 +554,7 @@ class TestFetchQuantityAgg(SparkContextTest): mem_total_mb_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, mem_total_mb_agg_metric .get('meta').get('tenantId')) self.assertEqual('mini-mon', @@ -661,7 +661,7 @@ class TestFetchQuantityAgg(SparkContextTest): mem_total_mb_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, mem_total_mb_agg_metric .get('meta').get('tenantId')) self.assertEqual('mini-mon', @@ -768,7 +768,7 @@ class TestFetchQuantityAgg(SparkContextTest): mem_total_mb_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, mem_total_mb_agg_metric .get('meta').get('tenantId')) self.assertEqual('mini-mon', diff --git a/tests/unit/usage/test_fetch_quantity_instance_usage_agg.py b/tests/unit/usage/test_fetch_quantity_instance_usage_agg.py index 954b7ab..1ae0be5 100644 --- a/tests/unit/usage/test_fetch_quantity_instance_usage_agg.py +++ b/tests/unit/usage/test_fetch_quantity_instance_usage_agg.py @@ -189,7 +189,7 @@ class TestFetchQuantityInstanceUsageAgg(SparkContextTest): mem_total_mb_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, mem_total_mb_agg_metric .get('meta').get('tenantId')) self.assertEqual('mini-mon', @@ -307,7 +307,7 @@ class TestFetchQuantityInstanceUsageAgg(SparkContextTest): mem_total_mb_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, mem_total_mb_agg_metric .get('meta').get('tenantId')) self.assertEqual('mini-mon', @@ -425,7 +425,7 @@ class TestFetchQuantityInstanceUsageAgg(SparkContextTest): mem_total_mb_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, mem_total_mb_agg_metric .get('meta').get('tenantId')) self.assertEqual('mini-mon', @@ -543,7 +543,7 @@ class TestFetchQuantityInstanceUsageAgg(SparkContextTest): mem_total_mb_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, mem_total_mb_agg_metric .get('meta').get('tenantId')) self.assertEqual('mini-mon', @@ -645,7 +645,7 @@ class TestFetchQuantityInstanceUsageAgg(SparkContextTest): mem_total_mb_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, mem_total_mb_agg_metric .get('meta').get('tenantId')) self.assertEqual('mini-mon', @@ -746,7 +746,7 @@ class TestFetchQuantityInstanceUsageAgg(SparkContextTest): mem_total_mb_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, mem_total_mb_agg_metric .get('meta').get('tenantId')) self.assertEqual('mini-mon', @@ -848,7 +848,7 @@ class TestFetchQuantityInstanceUsageAgg(SparkContextTest): mem_total_mb_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, mem_total_mb_agg_metric .get('meta').get('tenantId')) self.assertEqual('mini-mon', @@ -950,7 +950,7 @@ class TestFetchQuantityInstanceUsageAgg(SparkContextTest): mem_total_mb_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, mem_total_mb_agg_metric .get('meta').get('tenantId')) self.assertEqual('mini-mon', diff --git a/tests/unit/usage/test_fetch_quantity_util_agg.py b/tests/unit/usage/test_fetch_quantity_util_agg.py index 26d182c..34e7b42 100644 --- a/tests/unit/usage/test_fetch_quantity_util_agg.py +++ b/tests/unit/usage/test_fetch_quantity_util_agg.py @@ -188,7 +188,7 @@ class TestFetchQuantityUtilAgg(SparkContextTest): utilized_cpu_logical_agg_metric.get( 'meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, utilized_cpu_logical_agg_metric.get( 'meta').get('tenantId')) self.assertEqual('all', @@ -291,7 +291,7 @@ class TestFetchQuantityUtilAgg(SparkContextTest): utilized_cpu_logical_agg_metric.get( 'meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, utilized_cpu_logical_agg_metric.get( 'meta').get('tenantId')) self.assertEqual('all', @@ -394,7 +394,7 @@ class TestFetchQuantityUtilAgg(SparkContextTest): utilized_cpu_logical_agg_metric.get( 'meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, utilized_cpu_logical_agg_metric.get( 'meta').get('tenantId')) self.assertEqual('all', diff --git a/tests/unit/usage/test_fetch_quantity_util_agg_second_stage.py b/tests/unit/usage/test_fetch_quantity_util_agg_second_stage.py index 35e1aaf..09841f6 100644 --- a/tests/unit/usage/test_fetch_quantity_util_agg_second_stage.py +++ b/tests/unit/usage/test_fetch_quantity_util_agg_second_stage.py @@ -203,7 +203,7 @@ class TestFetchQuantityUtilAgg(SparkContextTest): utilized_cpu_logical_agg_metric.get( 'meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, utilized_cpu_logical_agg_metric.get( 'meta').get('tenantId')) self.assertEqual('all', @@ -292,7 +292,7 @@ class TestFetchQuantityUtilAgg(SparkContextTest): utilized_cpu_logical_agg_metric.get( 'meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, utilized_cpu_logical_agg_metric.get( 'meta').get('tenantId')) self.assertEqual('all', diff --git a/tests/unit/usage/test_host_cpu_usage_component.py b/tests/unit/usage/test_host_cpu_usage_component.py index d704130..0b15e71 100644 --- a/tests/unit/usage/test_host_cpu_usage_component.py +++ b/tests/unit/usage/test_host_cpu_usage_component.py @@ -106,7 +106,7 @@ class SparkTest(SparkContextTest): self.assertEqual('useast', total_cpu_logical_agg_metric.get( 'meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, total_cpu_logical_agg_metric.get( 'meta').get('tenantId')) self.assertEqual('all', @@ -145,7 +145,7 @@ class SparkTest(SparkContextTest): self.assertEqual('useast', total_cpu_logical_agg_metric.get( 'meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, total_cpu_logical_agg_metric.get( 'meta').get('tenantId')) self.assertEqual('all', @@ -184,7 +184,7 @@ class SparkTest(SparkContextTest): self.assertEqual('useast', total_cpu_logical_agg_metric.get( 'meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, total_cpu_logical_agg_metric.get( 'meta').get('tenantId')) self.assertEqual('all', @@ -224,7 +224,7 @@ class SparkTest(SparkContextTest): utilized_cpu_logical_agg_metric.get( 'meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, utilized_cpu_logical_agg_metric.get( 'meta').get('tenantId')) self.assertEqual('all', @@ -265,7 +265,7 @@ class SparkTest(SparkContextTest): utilized_cpu_logical_agg_metric.get( 'meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, utilized_cpu_logical_agg_metric.get( 'meta').get('tenantId')) self.assertEqual('all', @@ -306,7 +306,7 @@ class SparkTest(SparkContextTest): utilized_cpu_logical_agg_metric.get( 'meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, utilized_cpu_logical_agg_metric.get( 'meta').get('tenantId')) self.assertEqual('all', diff --git a/tests/unit/usage/test_host_cpu_usage_component_second_agg.py b/tests/unit/usage/test_host_cpu_usage_component_second_agg.py index 37e3664..a576e49 100644 --- a/tests/unit/usage/test_host_cpu_usage_component_second_agg.py +++ b/tests/unit/usage/test_host_cpu_usage_component_second_agg.py @@ -120,7 +120,7 @@ class SparkTest(SparkContextTest): self.assertEqual('useast', total_cpu_logical_agg_metric.get( 'meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, total_cpu_logical_agg_metric.get( 'meta').get('tenantId')) self.assertEqual('all', @@ -159,7 +159,7 @@ class SparkTest(SparkContextTest): self.assertEqual('useast', total_cpu_logical_agg_metric.get( 'meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, total_cpu_logical_agg_metric.get( 'meta').get('tenantId')) self.assertEqual('all', @@ -198,7 +198,7 @@ class SparkTest(SparkContextTest): self.assertEqual('useast', total_cpu_logical_agg_metric.get( 'meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, total_cpu_logical_agg_metric.get( 'meta').get('tenantId')) self.assertEqual('all', @@ -238,7 +238,7 @@ class SparkTest(SparkContextTest): utilized_cpu_logical_agg_metric.get( 'meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, utilized_cpu_logical_agg_metric.get( 'meta').get('tenantId')) self.assertEqual('all', @@ -278,7 +278,7 @@ class SparkTest(SparkContextTest): utilized_cpu_logical_agg_metric.get( 'meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, utilized_cpu_logical_agg_metric.get( 'meta').get('tenantId')) self.assertEqual('all', @@ -318,7 +318,7 @@ class SparkTest(SparkContextTest): utilized_cpu_logical_agg_metric.get( 'meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, utilized_cpu_logical_agg_metric.get( 'meta').get('tenantId')) self.assertEqual('all', @@ -393,7 +393,7 @@ class SparkTest(SparkContextTest): self.assertEqual('useast', total_cpu_logical_agg_metric.get( 'meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, total_cpu_logical_agg_metric.get( 'meta').get('tenantId')) self.assertEqual('all', @@ -432,7 +432,7 @@ class SparkTest(SparkContextTest): self.assertEqual('useast', total_cpu_logical_agg_metric.get( 'meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, total_cpu_logical_agg_metric.get( 'meta').get('tenantId')) self.assertEqual('all', @@ -471,7 +471,7 @@ class SparkTest(SparkContextTest): self.assertEqual('useast', total_cpu_logical_agg_metric.get( 'meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, total_cpu_logical_agg_metric.get( 'meta').get('tenantId')) self.assertEqual('all', @@ -511,7 +511,7 @@ class SparkTest(SparkContextTest): utilized_cpu_logical_agg_metric.get( 'meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, utilized_cpu_logical_agg_metric.get( 'meta').get('tenantId')) self.assertEqual('all', @@ -551,7 +551,7 @@ class SparkTest(SparkContextTest): utilized_cpu_logical_agg_metric.get( 'meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, utilized_cpu_logical_agg_metric.get( 'meta').get('tenantId')) self.assertEqual('all', @@ -591,7 +591,7 @@ class SparkTest(SparkContextTest): utilized_cpu_logical_agg_metric.get( 'meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, utilized_cpu_logical_agg_metric.get( 'meta').get('tenantId')) self.assertEqual('all', diff --git a/tests/unit/usage/test_vm_cpu_allocated_agg.py b/tests/unit/usage/test_vm_cpu_allocated_agg.py index 2db4d84..520cef4 100644 --- a/tests/unit/usage/test_vm_cpu_allocated_agg.py +++ b/tests/unit/usage/test_vm_cpu_allocated_agg.py @@ -161,7 +161,7 @@ class TestVmCpuAllocatedAgg(SparkContextTest): vcpus_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, vcpus_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -200,7 +200,7 @@ class TestVmCpuAllocatedAgg(SparkContextTest): vcpus_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, vcpus_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -336,7 +336,7 @@ class TestVmCpuAllocatedAgg(SparkContextTest): vcpus_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, vcpus_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', diff --git a/tests/unit/usage/test_vm_cpu_allocated_agg_second_stage.py b/tests/unit/usage/test_vm_cpu_allocated_agg_second_stage.py index f4a268e..923d9dc 100644 --- a/tests/unit/usage/test_vm_cpu_allocated_agg_second_stage.py +++ b/tests/unit/usage/test_vm_cpu_allocated_agg_second_stage.py @@ -177,7 +177,7 @@ class TestVmCpuAllocatedAgg(SparkContextTest): vcpus_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, vcpus_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -216,7 +216,7 @@ class TestVmCpuAllocatedAgg(SparkContextTest): vcpus_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, vcpus_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -300,7 +300,7 @@ class TestVmCpuAllocatedAgg(SparkContextTest): vcpus_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, vcpus_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -339,7 +339,7 @@ class TestVmCpuAllocatedAgg(SparkContextTest): vcpus_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, vcpus_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -484,7 +484,7 @@ class TestVmCpuAllocatedAgg(SparkContextTest): vcpus_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, vcpus_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', @@ -566,7 +566,7 @@ class TestVmCpuAllocatedAgg(SparkContextTest): vcpus_agg_metric .get('meta').get('region')) - self.assertEqual(cfg.CONF.messaging.publish_kafka_tenant_id, + self.assertEqual(cfg.CONF.messaging.publish_kafka_project_id, vcpus_agg_metric .get('meta').get('tenantId')) self.assertEqual('all', diff --git a/tools/vagrant/refresh_monasca_transform.sh b/tools/vagrant/refresh_monasca_transform.sh index 1f080b2..beff33a 100755 --- a/tools/vagrant/refresh_monasca_transform.sh +++ b/tools/vagrant/refresh_monasca_transform.sh @@ -56,6 +56,14 @@ sudo su - monasca-transform -c " deactivate" popd +function get_id () { + echo `"$@" | grep ' id ' | awk '{print $4}'` +} + +source ~/devstack/openrc admin admin +export ADMIN_PROJECT_ID=$(get_id openstack project show admin) +sudo sed -i "s/publish_kafka_project_id=d2cb21079930415a9f2a33588b9f2bb6/publish_kafka_project_id=${ADMIN_PROJECT_ID}/g" /etc/monasca-transform.conf + sudo service monasca-transform start popd \ No newline at end of file