diff --git a/src/sonic-config-engine/redis_bcc.py b/src/sonic-config-engine/redis_bcc.py deleted file mode 100644 index c9d3ebca239f..000000000000 --- a/src/sonic-config-engine/redis_bcc.py +++ /dev/null @@ -1,29 +0,0 @@ -import jinja2 - -from base64 import b64encode, b64decode - -class RedisBytecodeCache(jinja2.BytecodeCache): - """ A bytecode cache for jinja2 template that stores bytecode in Redis """ - - REDIS_HASH = 'JINJA2_CACHE' - - def __init__(self, client): - self._client = client - try: - self._client.connect(self._client.LOGLEVEL_DB, retry_on=False) - except Exception: - self._client = None - - def load_bytecode(self, bucket): - if self._client is None: - return - code = self._client.get(self._client.LOGLEVEL_DB, self.REDIS_HASH, bucket.key) - if code is not None: - bucket.bytecode_from_string(b64decode(code.encode())) - - def dump_bytecode(self, bucket): - if self._client is None: - return - self._client.set(self._client.LOGLEVEL_DB, self.REDIS_HASH, - bucket.key, b64encode(bucket.bytecode_to_string()).decode()) - diff --git a/src/sonic-config-engine/setup.py b/src/sonic-config-engine/setup.py index aa340995b60b..3f2b2a240a95 100644 --- a/src/sonic-config-engine/setup.py +++ b/src/sonic-config-engine/setup.py @@ -43,7 +43,6 @@ 'minigraph', 'openconfig_acl', 'portconfig', - 'redis_bcc', ] if sys.version_info.major == 3: # Python 3-only modules diff --git a/src/sonic-config-engine/sonic-cfggen b/src/sonic-config-engine/sonic-cfggen index ed7c3b616f3c..d5358f633dbf 100755 --- a/src/sonic-config-engine/sonic-cfggen +++ b/src/sonic-config-engine/sonic-cfggen @@ -31,10 +31,9 @@ from config_samples import generate_sample_config, get_available_config from functools import partial from minigraph import minigraph_encoder, parse_xml, parse_device_desc_xml, parse_asic_sub_role, parse_asic_switch_type from portconfig import get_port_config, get_breakout_mode -from redis_bcc import RedisBytecodeCache from sonic_py_common.multi_asic import get_asic_id_from_name, get_asic_device_id, is_multi_asic from sonic_py_common import device_info -from swsscommon.swsscommon import SonicV2Connector, ConfigDBConnector, SonicDBConfig, ConfigDBPipeConnector +from swsscommon.swsscommon import ConfigDBConnector, SonicDBConfig, ConfigDBPipeConnector PY3x = sys.version_info >= (3, 0) @@ -241,8 +240,7 @@ def _get_jinja2_env(paths): Retreive Jinj2 env used to render configuration templates """ loader = jinja2.FileSystemLoader(paths) - redis_bcc = RedisBytecodeCache(SonicV2Connector(host='127.0.0.1')) - env = jinja2.Environment(loader=loader, trim_blocks=True, bytecode_cache=redis_bcc) + env = jinja2.Environment(loader=loader, trim_blocks=True) env.filters['sort_by_port_index'] = sort_by_port_index env.filters['ipv4'] = is_ipv4 env.filters['ipv6'] = is_ipv6