Commit 7a6a6bad authored by kesnar's avatar kesnar
Browse files

refactor: passing localCLIENT as parameter

parent da4252b8

hackfest/p4/tests/Objects.py

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ DEVICE_SW1 = json_device_p4_disabled(DEVICE_SW1_UUID) 


DEVICE_SW1_DPID             = 1

DEVICE_SW1_NAME             = DEVICE_SW1_UUID

DEVICE_SW1_IP_ADDR          = '10.0.2.10'

DEVICE_SW1_IP_ADDR          = 'localhost'

DEVICE_SW1_PORT             = '50001'

DEVICE_SW1_VENDOR           = 'Open Networking Foundation'

DEVICE_SW1_HW_VER           = 'BMv2 simple_switch'
@@ -88,7 +88,7 @@ DEVICE_SW2 = json_device_p4_disabled(DEVICE_SW2_UUID) 


DEVICE_SW2_DPID             = 1

DEVICE_SW2_NAME             = DEVICE_SW2_UUID

DEVICE_SW2_IP_ADDR          = '10.0.2.10'

DEVICE_SW2_IP_ADDR          = 'localhost'

DEVICE_SW2_PORT             = '50002'

DEVICE_SW2_VENDOR           = 'Open Networking Foundation'

DEVICE_SW2_HW_VER           = 'BMv2 simple_switch'

src/device/service/drivers/p4/p4_driver.py

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ from .p4_common import matches_ipv4, matches_ipv6, valid_port,\ 
    P4_VAL_DEF_TIMEOUT

from .p4_manager import P4Manager, KEY_TABLE,\

    KEY_ACTION_PROFILE, KEY_COUNTER, KEY_DIR_COUNTER, KEY_METER, KEY_DIR_METER,\

    KEY_CTL_PKT_METADATA#, get_api_version

    KEY_CTL_PKT_METADATA

from .p4_client import WriteOperation



try:
@@ -127,7 +127,7 @@ class P4Driver(_Driver): 
            except Exception as ex:  # pylint: disable=broad-except

                raise Exception(ex) from ex



            LOGGER.info("\tConnected via P4Runtime version ")#,get_api_version())

            LOGGER.info("\tConnected via P4Runtime")

            self.__started.set()



            return True

src/device/service/drivers/p4/p4_drv.py

deleted100644 → 0
+0 −599

File deleted.

Preview size limit exceeded, changes collapsed.

src/device/service/drivers/p4/p4_main.py

deleted100644 → 0
+0 −851

File deleted.

Preview size limit exceeded, changes collapsed.

src/device/service/drivers/p4/p4_manager.py

+93 −112

File changed.

Preview size limit exceeded, changes collapsed.