Skip to content

Commit 4dab632

Browse files
Log the entity at driver entry
(cherry picked from commit f112a6c)
1 parent a48bdfd commit 4dab632

2 files changed

Lines changed: 59 additions & 0 deletions

File tree

f5lbaasdriver/v2/bigip/driver_v2.py

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,9 @@ def __init__(self, driver):
152152
self.driver = driver
153153
self.api_dict = None
154154

155+
def _log_entity(self, entity):
156+
LOG.debug("Log the entity: %s", entity.to_api_dict())
157+
155158
def _call_rpc(self, context, loadbalancer, entity, rpc_method, **kwargs):
156159
'''Perform operations common to create and delete for managers.'''
157160

@@ -298,6 +301,9 @@ class LoadBalancerManager(EntityManager):
298301
@log_helpers.log_method_call
299302
def create(self, context, loadbalancer):
300303
"""Create a loadbalancer."""
304+
305+
self._log_entity(loadbalancer)
306+
301307
driver = self.driver
302308
try:
303309
agent, service = self._schedule_agent_create_service(
@@ -356,6 +362,10 @@ def create(self, context, loadbalancer):
356362
@log_helpers.log_method_call
357363
def update(self, context, old_loadbalancer, loadbalancer):
358364
"""Update a loadbalancer."""
365+
366+
self._log_entity(old_loadbalancer)
367+
self._log_entity(loadbalancer)
368+
359369
driver = self.driver
360370
try:
361371
agent, service = self._schedule_agent_create_service(
@@ -383,6 +393,9 @@ def update(self, context, old_loadbalancer, loadbalancer):
383393
@log_helpers.log_method_call
384394
def delete(self, context, loadbalancer):
385395
"""Delete a loadbalancer."""
396+
397+
self._log_entity(loadbalancer)
398+
386399
driver = self.driver
387400
try:
388401
agent, service = self._schedule_agent_create_service(
@@ -443,6 +456,8 @@ class ListenerManager(EntityManager):
443456
def create(self, context, listener):
444457
"""Create a listener."""
445458

459+
self._log_entity(listener)
460+
446461
lb = listener.loadbalancer
447462
self.api_dict = listener.to_dict(
448463
loadbalancer=False, default_pool=False)
@@ -466,6 +481,9 @@ def append_listeners(context, loadbalancer, service):
466481
def update(self, context, old_listener, listener):
467482
"""Update a listener."""
468483

484+
self._log_entity(old_listener)
485+
self._log_entity(listener)
486+
469487
driver = self.driver
470488
lb = listener.loadbalancer
471489
try:
@@ -486,6 +504,8 @@ def update(self, context, old_listener, listener):
486504
def delete(self, context, listener):
487505
"""Delete a listener."""
488506

507+
self._log_entity(listener)
508+
489509
lb = listener.loadbalancer
490510
self.api_dict = listener.to_dict(
491511
loadbalancer=False, default_pool=False)
@@ -527,6 +547,8 @@ def _get_pool_dict(self, pool):
527547
def create(self, context, pool):
528548
"""Create a pool."""
529549

550+
self._log_entity(pool)
551+
530552
lb = pool.loadbalancer
531553
self.api_dict = self._get_pool_dict(pool)
532554

@@ -559,6 +581,9 @@ def append_pools_monitors(context, loadbalancer, service):
559581
def update(self, context, old_pool, pool):
560582
"""Update a pool."""
561583

584+
self._log_entity(old_pool)
585+
self._log_entity(pool)
586+
562587
driver = self.driver
563588
lb = pool.loadbalancer
564589
try:
@@ -578,6 +603,8 @@ def update(self, context, old_pool, pool):
578603
def delete(self, context, pool):
579604
"""Delete a pool."""
580605

606+
self._log_entity(pool)
607+
581608
lb = pool.loadbalancer
582609
self.api_dict = self._get_pool_dict(pool)
583610

@@ -611,6 +638,8 @@ class MemberManager(EntityManager):
611638
def create(self, context, member):
612639
"""Create a member."""
613640

641+
self._log_entity(member)
642+
614643
lb = member.pool.loadbalancer
615644

616645
if self.driver.unlegacy_setting_placeholder_driver_side:
@@ -719,6 +748,9 @@ def create_bulk(self, context, members):
719748
def update(self, context, old_member, member):
720749
"""Update a member."""
721750

751+
self._log_entity(old_member)
752+
self._log_entity(member)
753+
722754
driver = self.driver
723755
lb = member.pool.loadbalancer
724756
try:
@@ -737,6 +769,9 @@ def update(self, context, old_member, member):
737769
@log_helpers.log_method_call
738770
def delete(self, context, member):
739771
"""Delete a member."""
772+
773+
self._log_entity(member)
774+
740775
lb = member.pool.loadbalancer
741776
driver = self.driver
742777
try:
@@ -794,6 +829,8 @@ class HealthMonitorManager(EntityManager):
794829
def create(self, context, health_monitor):
795830
"""Create a health monitor."""
796831

832+
self._log_entity(health_monitor)
833+
797834
lb = health_monitor.pool.loadbalancer
798835
self.api_dict = health_monitor.to_dict(pool=False)
799836

@@ -816,6 +853,9 @@ def append_pools_monitors(context, loadbalancer, service):
816853
def update(self, context, old_health_monitor, health_monitor):
817854
"""Update a health monitor."""
818855

856+
self._log_entity(old_health_monitor)
857+
self._log_entity(health_monitor)
858+
819859
driver = self.driver
820860
lb = health_monitor.pool.loadbalancer
821861
try:
@@ -835,6 +875,8 @@ def update(self, context, old_health_monitor, health_monitor):
835875
def delete(self, context, health_monitor):
836876
"""Delete a health monitor."""
837877

878+
self._log_entity(health_monitor)
879+
838880
lb = health_monitor.pool.loadbalancer
839881
self.api_dict = health_monitor.to_dict(pool=False)
840882

@@ -861,6 +903,8 @@ class L7PolicyManager(EntityManager):
861903
def create(self, context, policy):
862904
"""Create an L7 policy."""
863905

906+
self._log_entity(policy)
907+
864908
lb = policy.listener.loadbalancer
865909
self.api_dict = policy.to_dict(listener=False, rules=False)
866910

@@ -887,6 +931,9 @@ def append_pools_monitors(context, loadbalancer, service):
887931
def update(self, context, old_policy, policy):
888932
"""Update a policy."""
889933

934+
self._log_entity(old_policy)
935+
self._log_entity(policy)
936+
890937
driver = self.driver
891938
lb = policy.listener.loadbalancer
892939
try:
@@ -906,6 +953,8 @@ def update(self, context, old_policy, policy):
906953
def delete(self, context, policy):
907954
"""Delete a policy."""
908955

956+
self._log_entity(policy)
957+
909958
lb = policy.listener.loadbalancer
910959
self.api_dict = policy.to_dict(listener=False, rules=False)
911960

@@ -936,6 +985,8 @@ class L7RuleManager(EntityManager):
936985
def create(self, context, rule):
937986
"""Create an L7 rule."""
938987

988+
self._log_entity(rule)
989+
939990
lb = rule.policy.listener.loadbalancer
940991
self.api_dict = rule.to_dict(policy=False)
941992

@@ -962,6 +1013,9 @@ def append_pools_monitors(context, loadbalancer, service):
9621013
def update(self, context, old_rule, rule):
9631014
"""Update a rule."""
9641015

1016+
self._log_entity(old_rule)
1017+
self._log_entity(rule)
1018+
9651019
driver = self.driver
9661020
lb = rule.policy.listener.loadbalancer
9671021
try:
@@ -981,6 +1035,8 @@ def update(self, context, old_rule, rule):
9811035
def delete(self, context, rule):
9821036
"""Delete a rule."""
9831037

1038+
self._log_entity(rule)
1039+
9841040
lb = rule.policy.listener.loadbalancer
9851041
self.api_dict = rule.to_dict(policy=False)
9861042

f5lbaasdriver/v2/bigip/test/test_driver_v2.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ def attached_to_loadbalancer(self):
4646
def to_dict(self, **kwargs):
4747
return self.__dict__
4848

49+
def to_api_dict(self):
50+
return self.to_dict()
51+
4952

5053
class FakeListener(FakeBaseObj):
5154
def __init__(self, id='test_obj_id', attached_to_lb=True):

0 commit comments

Comments
 (0)