Merge "NSX|P: silent octavia get status and statistics" into stable/ussuri
This commit is contained in:
commit
e790cbb2de
|
@ -351,7 +351,7 @@ def stats_getter(context, core_plugin, ignore_list=None):
|
||||||
try:
|
try:
|
||||||
# get the NSX statistics for this LB service
|
# get the NSX statistics for this LB service
|
||||||
stats_results = lb_service_client.get_statistics(
|
stats_results = lb_service_client.get_statistics(
|
||||||
lb_service_id).get('results', [])
|
lb_service_id, silent=True).get('results', [])
|
||||||
if stats_results:
|
if stats_results:
|
||||||
rsp = stats_results[0]
|
rsp = stats_results[0]
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -244,7 +244,7 @@ class EdgeLoadBalancerManagerFromDict(base_mgr.NsxpLoadbalancerBaseManager):
|
||||||
service_client = self.core_plugin.nsxpolicy.load_balancer.lb_service
|
service_client = self.core_plugin.nsxpolicy.load_balancer.lb_service
|
||||||
vs_list = self._get_lb_virtual_servers(context, lb)
|
vs_list = self._get_lb_virtual_servers(context, lb)
|
||||||
try:
|
try:
|
||||||
rsp = service_client.get_statistics(lb['id'])
|
rsp = service_client.get_statistics(lb['id'], silent=True)
|
||||||
for result in rsp.get('results', []):
|
for result in rsp.get('results', []):
|
||||||
for vs in result.get('virtual_servers', []):
|
for vs in result.get('virtual_servers', []):
|
||||||
# Skip the virtual server that doesn't belong
|
# Skip the virtual server that doesn't belong
|
||||||
|
@ -264,6 +264,7 @@ class EdgeLoadBalancerManagerFromDict(base_mgr.NsxpLoadbalancerBaseManager):
|
||||||
return stats
|
return stats
|
||||||
|
|
||||||
def get_operating_status(self, context, id, with_members=False):
|
def get_operating_status(self, context, id, with_members=False):
|
||||||
|
|
||||||
service_client = self.core_plugin.nsxpolicy.load_balancer.lb_service
|
service_client = self.core_plugin.nsxpolicy.load_balancer.lb_service
|
||||||
try:
|
try:
|
||||||
service_status = service_client.get_status(id)
|
service_status = service_client.get_status(id)
|
||||||
|
@ -329,14 +330,14 @@ def _get_octavia_lb_status(result):
|
||||||
def status_getter(context, core_plugin):
|
def status_getter(context, core_plugin):
|
||||||
nsxlib_lb = core_plugin.nsxpolicy.load_balancer
|
nsxlib_lb = core_plugin.nsxpolicy.load_balancer
|
||||||
lb_client = nsxlib_lb.lb_service
|
lb_client = nsxlib_lb.lb_service
|
||||||
lbs = lb_client.list()
|
lbs = lb_client.list(silent=True)
|
||||||
lb_statuses = []
|
lb_statuses = []
|
||||||
lsn_statuses = []
|
lsn_statuses = []
|
||||||
pool_statuses = []
|
pool_statuses = []
|
||||||
member_statuses = []
|
member_statuses = []
|
||||||
for lb in lbs:
|
for lb in lbs:
|
||||||
try:
|
try:
|
||||||
service_status = lb_client.get_status(lb['id'])
|
service_status = lb_client.get_status(lb['id'], silent=True)
|
||||||
if not isinstance(service_status, dict):
|
if not isinstance(service_status, dict):
|
||||||
service_status = {}
|
service_status = {}
|
||||||
except nsxlib_exc.ManagerError:
|
except nsxlib_exc.ManagerError:
|
||||||
|
|
Loading…
Reference in New Issue