collector: remove deprecated RPC code

Change-Id: I995398ee239754a4d333460112700caeec516eb5

1 files changed, 2 insertions, 25 deletions

diff --git a/tools/send_test_data.py b/tools/send_test_data.py
index ed9b9f59..a1d37a3a 100755
--- a/tools/send_test_data.py
+++ b/tools/send_test_data.py
@@ -30,7 +30,6 @@ import uuid
 
 import make_test_data
 from oslo_config import cfg
-from oslo_context import context
 import oslo_messaging
 from six import moves
 
@@ -39,11 +38,6 @@ from ceilometer.publisher import utils
 from ceilometer import service
 
 
-def send_batch_rpc(rpc_client, topic, batch):
-    rpc_client.prepare(topic=topic).cast(context.RequestContext(),
-                                         'record_metering_data', data=batch)
-
-
 def send_batch_notifier(notifier, topic, batch):
     notifier.sample({}, event_type=topic, payload=batch)
 
@@ -58,13 +52,6 @@ def get_notifier(config_file):
     )
 
 
-def get_rpc_client(config_file):
-    service.prepare_service(argv=['/', '--config-file', config_file])
-    transport = messaging.get_transport()
-    rpc_client = messaging.get_rpc_client(transport, version='1.0')
-    return rpc_client
-
-
 def generate_data(send_batch, make_data_args, samples_count,
                   batch_size, resources_count, topic):
     make_data_args.interval = 1
@@ -104,12 +91,6 @@ def generate_data(send_batch, make_data_args, samples_count,
 
 def get_parser():
     parser = argparse.ArgumentParser()
-    parser.add_argument(
-        '--notify',
-        dest='notify',
-        type=bool,
-        default=True
-    )
 
     parser.add_argument(
         '--batch-size',
@@ -148,12 +129,8 @@ def get_parser():
 def main():
     args = get_parser().parse_known_args()[0]
     make_data_args = make_test_data.get_parser().parse_known_args()[0]
-    if args.notify:
-        notifier = get_notifier(args.config_file)
-        send_batch = functools.partial(send_batch_notifier, notifier)
-    else:
-        rpc_client = get_rpc_client(args.config_file)
-        send_batch = functools.partial(send_batch_rpc, rpc_client)
+    notifier = get_notifier(args.config_file)
+    send_batch = functools.partial(send_batch_notifier, notifier)
     result_dir = args.result_dir
     del args.notify
     del args.config_file