Commit 5c796f98 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Device OpenCofnig Driver: 

- minor formatting
parent 96134ba8

src/device/service/drivers/openconfig/OpenConfigDriver.py

+5 −3
Original line number Diff line number Diff line
@@ -190,7 +190,8 @@ def do_sampling(samples_cache : SamplesCache, resource_key : str, out_samples : 


def edit_config(

    netconf_handler : NetconfSessionHandler, resources : List[Tuple[str, Any]], delete=False, commit_per_rule= False,

    target='running', default_operation='merge', test_option=None, error_option=None, format='xml' # pylint: disable=redefined-builtin

    target='running', default_operation='merge', test_option=None, error_option=None,

    format='xml' # pylint: disable=redefined-builtin

):

    str_method = 'DeleteConfig' if delete else 'SetConfig'

    LOGGER.info('[{:s}] resources = {:s}'.format(str_method, str(resources)))
@@ -203,7 +204,8 @@ def edit_config( 
            chk_length(str_resource_name, resource, min_length=2, max_length=2)

            resource_key,resource_value = resource

            chk_string(str_resource_name + '.key', resource_key, allow_empty=False)

            str_config_message = compose_config(resource_key, resource_value, delete=delete,vendor=netconf_handler.vendor)

            str_config_message = compose_config(

                resource_key, resource_value, delete=delete, vendor=netconf_handler.vendor)

            if str_config_message is None: raise UnsupportedResourceKeyException(resource_key)

            LOGGER.info('[{:s}] str_config_message[{:d}] = {:s}'.format(

                str_method, len(str_config_message), str(str_config_message)))

src/device/service/drivers/openconfig/templates/__init__.py

+3 −1
Original line number Diff line number Diff line
@@ -77,7 +77,9 @@ def parse(resource_key : str, xml_data : ET.Element): 
    if parser is None: return [(resource_key, xml_data)]

    return parser(xml_data)



def compose_config(resource_key : str, resource_value : str, delete : bool = False,vendor : Optional[str] = None) -> str:

def compose_config(

    resource_key : str, resource_value : str, delete : bool = False, vendor : Optional[str] = None

) -> str:

    template_name = '{:s}/edit_config.xml'.format(RE_REMOVE_FILTERS.sub('', resource_key))

    template = JINJA_ENV.get_template(template_name)

    data : Dict[str, Any] = json.loads(resource_value)