Remove service_names dictionary from service.py

This dictionary is not used anywhere and is just sitting there.
Also, it requires a redundant additional argument to register_service
which is plain confusing.

Change-Id: Ic1748a85602de8f8cc7e60d810716041461f04d0
This commit is contained in:
Shachar Snapiri 2018-04-11 11:39:23 +03:00
parent 3945b4eb7f
commit d50f469068
5 changed files with 5 additions and 11 deletions

View File

@ -84,8 +84,7 @@ def main():
nb_api = api_nb.NbApi.get_instance(False, True)
service_instance = metadata_service.DFMetadataProxyHandler(
cfg.CONF, nb_api)
df_service.register_service(
'df-metadata-service', nb_api, service_instance)
df_service.register_service('df-metadata-service', nb_api)
service = wsgi.Server('dragonflow-metadata-service', disable_ssl=True)
service.start(
service_instance,

View File

@ -167,5 +167,5 @@ def main():
df_config.init(sys.argv)
nb_api = api_nb.NbApi.get_instance(False, True)
server = BGPService(nb_api)
df_service.register_service('df-bgp-service', nb_api, server)
df_service.register_service('df-bgp-service', nb_api)
service.launch(cfg.CONF, server).wait()

View File

@ -348,5 +348,5 @@ def main():
init_ryu_config()
nb_api = api_nb.NbApi.get_instance(False)
controller = DfLocalController(chassis_name, nb_api)
service.register_service('df-local-controller', nb_api, controller)
service.register_service('df-local-controller', nb_api)
controller.run()

View File

@ -149,6 +149,6 @@ def main():
df_config.init(sys.argv)
nb_api = api_nb.NbApi.get_instance(False, True)
service = PublisherService(nb_api)
df_service.register_service('df-publisher-service', nb_api, service)
df_service.register_service('df-publisher-service', nb_api)
service.initialize()
service.run()

View File

@ -22,9 +22,6 @@ from dragonflow.db.models import service
LOG = log.getLogger(__name__)
service_names = {}
def run_status_reporter(callback):
def report_status():
try:
@ -37,9 +34,7 @@ def run_status_reporter(callback):
timer.start(interval=cfg.CONF.df.report_interval)
def register_service(service_name, nb_api, instance=None):
if instance:
service_names[id(instance)] = service_name
def register_service(service_name, nb_api):
chassis_id = cfg.CONF.host
nb_api.create(service.Service(chassis=chassis_id, binary=service_name),
skip_send_event=True)