Commit 3c598379 authored by Mohamad Rahhal's avatar Mohamad Rahhal
Browse files

CLEANED-BY-MOHAMAD-8/8/24

parent 60e32198

src/device/service/drivers/gnmi_nokia_srlinux/handlers/Interface.py

+34 −34
Original line number Diff line number Diff line
@@ -33,75 +33,75 @@ class InterfaceHandler(_Handler): 
        return '/srl_nokia-interfaces:interface'



    def compose(self, resource_key: str, resource_value: Dict, delete: bool = False) -> Tuple[str, str]:

        if_name = str(resource_value['if_name'])

        sif_index = int(resource_value.get('subif_index'))

        name = str(resource_value['name'])

        index = int(resource_value.get('index'))



        if delete:

            PATH_TMPL = '/interface[name={:s}]/subinterface[index={:d}]'

            str_path = PATH_TMPL.format(if_name, sif_index)

            str_path = PATH_TMPL.format(name, index)

            str_data = json.dumps({})

            return str_path, str_data

        

        str_path = '/interface[name={:s}]'.format(if_name)

        str_path = '/interface[name={:s}]'.format(name)

        json_interface = {}



        if 'if_name' in resource_value:

        if 'name' in resource_value:

            #if_name=str(resource_value['if_name'])

            json_interface['name']=if_name

            json_interface['name'] = name





        if 'if_admin_state' in resource_value:

            bool_admin_state = bool(resource_value['if_admin_state'])

        if 'admin_state' in resource_value:

            bool_admin_state = bool(resource_value['admin_state'])

            str_admin_state = 'enable' if bool_admin_state else 'disable'

            json_interface['admin-state'] = str_admin_state

 

        if 'subif_index' in resource_value:

            subif_index = int(resource_value['subif_index'])

        if 'sub_index' in resource_value:

            sub_index = int(resource_value['sub_index'])

        else:

            subif_index=0

        subif_list= json_interface.setdefault('subinterface', list())

        subif={'index':subif_index}

        subif_list.append(subif)

            sub_index=0

        sub_list = json_interface.setdefault('subinterface', list())

        subif = {'index':sub_index}

        sub_list.append(subif)

            

 

        if 'subif_ipv4_admin_state' in resource_value:

            bool_ipv4_admin_state = bool(resource_value['subif_ipv4_admin_state'])

        if 'sub_ipv4_admin_state' in resource_value:

            bool_ipv4_admin_state = bool(resource_value['sub_ipv4_admin_state'])

            str_ipv4_admin_state = 'enable' if bool_ipv4_admin_state else 'disable'

            ipv4 = subif.setdefault('ipv4', dict())

            ipv4['admin-state'] = str_ipv4_admin_state

            





        if 'subif_ipv4_address'  in resource_value and 'subif_ipv4_prefix'  in resource_value:

            subif_ipv4_address = str(resource_value['subif_ipv4_address'])

            subif_ipv4_prefix  = int(resource_value['subif_ipv4_prefix'])

        if 'sub_ipv4_address'  in resource_value and 'sub_ipv4_prefix'  in resource_value:

            sub_ipv4_address = str(resource_value['sub_ipv4_address'])

            sub_ipv4_prefix  = int(resource_value['sub_ipv4_prefix'])

            ipv4 = subif.setdefault('ipv4', dict())

            address_list = ipv4.setdefault('address', list())

            address_list.append({

                'ip-prefix': '{:s}/{:d}'.format(subif_ipv4_address, subif_ipv4_prefix)

                'ip-prefix': '{:s}/{:d}'.format(sub_ipv4_address, sub_ipv4_prefix)

            })



        if 'if_vlan_tagging' in resource_value:

            bool_if_vlan_tagging = bool(resource_value['if_vlan_tagging'])

            json_interface['vlan-tagging']=bool_if_vlan_tagging

        if 'vlan_tagging' in resource_value:

            bool_vlan_tagging = bool(resource_value['vlan_tagging'])

            json_interface['vlan-tagging'] = bool_vlan_tagging

    

   

        if 'subif_type' in resource_value:

            subif_type = str(resource_value['subif_type'])

            subif['type'] =subif_type

        if 'sub_type' in resource_value:

            sub_type = str(resource_value['sub_type'])

            subif['type'] = sub_type

 



        if 'subif_vlan_admin_state' in resource_value: 

            bool_vlan_admin_state = bool(resource_value['subif_vlan_admin_state'])

        if 'sub_vlan_admin_state' in resource_value: 

            bool_vlan_admin_state = bool(resource_value['sub_vlan_admin_state'])

            str_vlan_admin_state = 'enable' if bool_vlan_admin_state else 'disable'

            subif['admin-state'] = str_vlan_admin_state 





        if 'subif_vlan_encap' in resource_value:

            subif_vlan_encap=str(resource_value['subif_vlan_encap'])

        if 'sub_vlan_encap' in resource_value:

            sub_vlan_encap = str(resource_value['sub_vlan_encap'])

            vlan=subif.setdefault('vlan', dict())

            encap=vlan.setdefault('encap', dict())

            encap[subif_vlan_encap]=dict() 

            encap[sub_vlan_encap] = dict() 



        

        return str_path,json.dumps(json_interface)

src/device/service/drivers/gnmi_nokia_srlinux/handlers/NetworkInstance.py

+211 −211

File changed.

Preview size limit exceeded, changes collapsed.

src/device/service/drivers/gnmi_nokia_srlinux/handlers/NetworkInstanceInterface.py

+4 −4
Original line number Diff line number Diff line
@@ -24,16 +24,16 @@ class NetworkInstanceInterfaceHandler(_Handler): 


    def compose(self, resource_key : str, resource_value : Dict, delete : bool = False) -> Tuple[str, str]:

        ni_name = str(resource_value['name'     ])    # default

        if_name   = str(resource_value['if_name'  ])    # ethernet-1/49.0

        name = str(resource_value['name'  ])    # ethernet-1/49.0





        if delete:

            PATH_TMPL = '/network-instances/network-instance[name={:s}]/interface[if_name={:s}]'

            str_path = PATH_TMPL.format(ni_name,if_name)

            str_path = PATH_TMPL.format(ni_name,name)

            str_data = json.dumps({})

            return str_path, str_data



        str_path = 'network-instance[name={:s}]/interface'.format(ni_name, if_name)

        str_path = 'network-instance[name={:s}]/interface'.format(ni_name, name)

        str_data = json.dumps({})



    def parse(self, json_data : Dict) -> List[Tuple[str, Dict[str, Any]]]:

src/device/service/drivers/gnmi_nokia_srlinux/handlers/NetworkInstanceVxlanInterface.py

+3 −3
Original line number Diff line number Diff line
@@ -24,16 +24,16 @@ class NetworkInstanceVxlanInterfacehandler(_Handler): 


    def compose(self, resource_key : str, resource_value : Dict, delete : bool = False) -> Tuple[str, str]:

        ni_name   = str(resource_value['name'     ])    # vrf-1

        if_name   = str(resource_value['if_name'  ])    # vxlan1.1

        name   = str(resource_value['name'  ])    # vxlan1.1





        if delete:

            PATH_TMPL = '/network-instances/network-instance[name={:s}]/interface[if_name={:s}]'

            str_path = PATH_TMPL.format(ni_name,if_name)

            str_path = PATH_TMPL.format(ni_name,name)

            str_data = json.dumps({})

            return str_path, str_data



        str_path = 'network-instance[name={:s}]/vxlan-interface'.format(ni_name, if_name)

        str_path = 'network-instance[name={:s}]/vxlan-interface'.format(ni_name, name)

        str_data = json.dumps({})



    def parse(self, json_data : Dict) -> List[Tuple[str, Dict[str, Any]]]:

src/device/service/drivers/gnmi_nokia_srlinux/handlers/TunnelInterface.py

+15 −17
Original line number Diff line number Diff line
@@ -27,35 +27,33 @@ class TunnelInterfaceHandler(_Handler): 
        #return '/tunnel-interface'



    def compose(self, resource_key: str, resource_value: Dict, delete: bool = False) -> Tuple[str, str]:

        if_name = str(resource_value['if_name'])

        name = str(resource_value['name'])



        if delete:

            PATH_TMPL = '/tunnel-interface[name={:s}]'

            str_path = PATH_TMPL.format(if_name)

            str_path = PATH_TMPL.format(name)

            str_data = json.dumps({})

            return str_path, str_data

        

       

        str_path = '/tunnel-interface[name={:s}]'.format(if_name)

        str_path = '/tunnel-interface[name={:s}]'.format(name)

 



        if 'if_index' in resource_value:

            if_index = str(resource_value['if_index'])

        if 'index' in resource_value:

            index = str(resource_value['index'])

            json_tunnel = {}

            subif_vxlaninterface = json_tunnel.setdefault('vxlan-interface', list())

            subif = {'index': if_index}

            subif = {'index': index}



        if 'if_type_tunnel' in resource_value:

            if_type_tunnel = str(resource_value['if_type_tunnel'])

            subif['type'] = if_type_tunnel

        if 'type_tunnel' in resource_value:

            type_tunnel = str(resource_value['type_tunnel'])

            subif['type'] = type_tunnel



        if 'if_vni_tunnel' in resource_value:

            if_vni_tunnel = int(resource_value['if_vni_tunnel'])

        if 'vni_tunnel' in resource_value:

            vni_tunnel = int(resource_value['vni_tunnel'])

            subif['ingress'] = {}

            subif['ingress']['vni'] = if_vni_tunnel

            subif['ingress']['vni'] = vni_tunnel

            subif_vxlaninterface.append(subif)

          



        return str_path, json.dumps(json_tunnel)



    def parse(self, json_data: Dict) -> List[Tuple[str, Dict[str, Any]]]: