From b873ca0f6e0850c0a0258d64fc46aa5d67af64a1 Mon Sep 17 00:00:00 2001 From: varun_lodaya Date: Thu, 31 Mar 2016 13:19:15 -0700 Subject: [PATCH] Revert back changes for #1560741 Commit id #e8c22f5ce100c3d63c40338c614465b68e22c5e4 caused errors in starting neutron process. Reverting it back till it's fixed correctly. Change-Id: I3c9e482753ecf24be06c250060ac2a34bedc9eb2 Closes-Bug: #1564572 --- .../loadbalancer/loadbalancer_member.py | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/loadbalancer_member.py b/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/loadbalancer_member.py index 22353d1..10b5271 100644 --- a/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/loadbalancer_member.py +++ b/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/loadbalancer_member.py @@ -54,29 +54,6 @@ def _get_member_pool_id(self, member): pool_uuid = member.parent_uuid return pool_uuid - def _get_object_status(self, member): - endpoint = "http://%s:%s" % (cfg.CONF.COLLECTOR.analytics_api_ip, - cfg.CONF.COLLECTOR.analytics_api_port) - analytics = analytics_client.Client(endpoint) - path = "/analytics/uves/service-instance/" - fqdn_uuid = "%s?cfilt=UveLoadbalancer" % member.parent_uuid - try: - lb_stats = analytics.request(path, fqdn_uuid) - member_stats = lb_stats['UveLoadbalancer']['member_stats'] - except Exception: - member_stats = [] - - # In case of missing analytics, return ACTIVE - if not member_stats: - return constants.ACTIVE - - for member_stat in member_stats: - if member_stat['uuid'] == member.uuid and \ - member_stat['status'] == 'ACTIVE': - return member_stat['status'] - - return constants.DOWN - def make_dict(self, member, fields=None): res = {'id': member.uuid, 'pool_id': member.parent_uuid,