keep one ConfigDBConnector instance

Author: Ubuntu

config/main.py

@@ -1894,7 +1894,7 @@ def portchannel(db, ctx, namespace):
 def add_portchannel(ctx, portchannel_name, min_links, fallback):
     """Add port channel"""
 
-    db = ValidatedConfigDBConnector(ctx.obj['db'])
+    db = validate(ctx.obj['db'])
 
     if is_portchannel_present_in_db(db, portchannel_name):
         ctx.fail("{} already exists!".format(portchannel_name))
@@ -1914,7 +1914,7 @@ def add_portchannel(ctx, portchannel_name, min_links, fallback):
 def remove_portchannel(ctx, portchannel_name):
     """Remove port channel"""
 
-    db = ValidatedConfigDBConnector(ctx.obj['db'])
+    db = validate(ctx.obj['db'])
 
     if len([(k, v) for k, v in db.get_table('PORTCHANNEL_MEMBER') if k == portchannel_name]) != 0:
         click.echo("Error: Portchannel {} contains members. Remove members before deleting Portchannel!".format(portchannel_name))

config/validated_config_db_connector.py

@@ -3,12 +3,9 @@
 from swsscommon.swsscommon import ConfigDBConnector
 from generic_config_updater.generic_updater import GenericUpdater, ConfigFormat
 
-class ValidatedConfigDBConnector(ConfigDBConnector):
+def validate(config_db_connector):
 
-    def __init__(self, db):
-        super().__init__()
-
-    def set_entry(self, table, key, value):
+    def validated_set_entry(table, key, value):
         if value:
             op = "add"
         else:
@@ -25,3 +22,6 @@ def set_entry(self, table, key, value):
         format = ConfigFormat.CONFIGDB.name
         config_format = ConfigFormat[format.upper()]
         GenericUpdater().apply_patch(patch=gcu_patch, config_format=config_format, verbose=False, dry_run=False, ignore_non_yang_tables=False, ignore_paths=None)
+
+    config_db_connector.set_entry = validated_set_entry
+    return config_db_connector