fixed ingest enum names to match query enum names

rax-maas · Dec 10, 2015 · 7a67e49 · 7a67e49
1 parent 00a5e56
commit 7a67e49
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/contrib/grinder/scripts/ingestenum.py b/contrib/grinder/scripts/ingestenum.py
@@ -62,7 +62,7 @@ def generate_enum_suffix(self):
   def generate_enum_metric(self, time, tenant_id, metric_id):
     return {'tenantId': str(tenant_id),
             'timestamp': time,
-            'enums': [{'name': 'enum_grinder_'+str(metric_id),
+            'enums': [{'name': generate_enum_metric_name(metric_id),
                        'value': 'e_g_'+str(metric_id) + self.generate_enum_suffix()}]
             }
 

diff --git a/contrib/grinder/scripts/tests.py b/contrib/grinder/scripts/tests.py
@@ -279,10 +279,10 @@ def test_generate_enum_payload(self):
     payload = json.loads(thread.generate_payload(1, [[2, 1], [2, 2]]))
     valid_payload = [{u'timestamp': 1,
                       u'tenantId': u'2',
-                      u'enums': [{u'value': u'e_g_1_0', u'name': u'enum_grinder_1'}]},
+                      u'enums': [{u'value': u'e_g_1_0', u'name': utils.generate_enum_metric_name(1)}]},
                      {u'timestamp': 1,
                       u'tenantId': u'2',
-                      u'enums': [{u'value': u'e_g_2_0', u'name': u'enum_grinder_2'}]}
+                      u'enums': [{u'value': u'e_g_2_0', u'name': utils.generate_enum_metric_name(2)}]}
                     ]
     self.assertEqual(payload, valid_payload)
 
@@ -351,7 +351,7 @@ def test_ingest_enum_make_request(self):
       thread.slice = [[[2, 0], [2, 1]]]
       thread.position = 0
       thread.finish_time = 10000
-      valid_payload = [{'tenantId': '2', 'timestamp': 1000, 'enums': [{'value': 'e_g_0_0', 'name': 'enum_grinder_0'}]}, {'tenantId': '2', 'timestamp': 1000, 'enums': [{'value': 'e_g_1_0', 'name': 'enum_grinder_1'}]}]
+      valid_payload = [{'tenantId': '2', 'timestamp': 1000, 'enums': [{'value': 'e_g_0_0', 'name': utils.generate_enum_metric_name(0)}]}, {'tenantId': '2', 'timestamp': 1000, 'enums': [{'value': 'e_g_1_0', 'name': utils.generate_enum_metric_name(1)}]}]
 
       url, payload = thread.make_request(pp)
       #confirm request generates proper URL and payload