P4 UPF service handler based on SD-Fabric

Georgios P. Katsikasrequested to merge
pr-upf into develop

Closes issue #229 (closed)

Edited by Georgios P. Katsikas

Merge request reports

proto/context.proto

+1 −0
Changes for proto/context.proto: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ enum ServiceTypeEnum { 
  SERVICETYPE_IP_LINK = 11;

  SERVICETYPE_TAPI_LSP = 12;

  SERVICETYPE_IPOWDM = 13;

  SERVICETYPE_UPF = 14;

}



enum ServiceStatusEnum {

src/common/DeviceTypes.py

+3 −0
Changes for src/common/DeviceTypes.py: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ class DeviceTypeEnum(Enum): 
    EMULATED_PACKET_ROUTER          = 'emu-packet-router'

    EMULATED_PACKET_SWITCH          = 'emu-packet-switch'

    EMULATED_XR_CONSTELLATION       = 'emu-xr-constellation'

    EMULATED_ORAN_DU                = 'oran-du'

    EMULATED_ORAN_CU                = 'oran-cu'

    EMULATED_ORAN_CN                = 'oran-cn'



    # Real device types

    CLIENT                          = 'client'

src/context/service/database/models/enums/ServiceType.py

+1 −0
Changes for src/context/service/database/models/enums/ServiceType.py: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ class ORM_ServiceTypeEnum(enum.Enum): 
    IP_LINK                   = ServiceTypeEnum.SERVICETYPE_IP_LINK

    IPOWDM                    = ServiceTypeEnum.SERVICETYPE_IPOWDM

    TAPI_LSP                  = ServiceTypeEnum.SERVICETYPE_TAPI_LSP

    UPF                       = ServiceTypeEnum.SERVICETYPE_UPF



grpc_to_enum__service_type = functools.partial(

    grpc_to_enum, ServiceTypeEnum, ORM_ServiceTypeEnum)

src/service/service/service_handler_api/FilterFields.py

+44 −2
Changes for src/service/service/service_handler_api/FilterFields.py: 44 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -20,8 +20,50 @@ class FilterFieldEnum(Enum): 
    SERVICE_TYPE  = 'service_type'

    DEVICE_DRIVER = 'device_driver'



# Map allowed filter fields to allowed values per Filter field.

# If no restriction (free text) None is specified

SERVICE_TYPE_VALUES = {

    ServiceTypeEnum.SERVICETYPE_UNKNOWN,

    ServiceTypeEnum.SERVICETYPE_L3NM,

    ServiceTypeEnum.SERVICETYPE_L2NM,

    ServiceTypeEnum.SERVICETYPE_L1NM,

    ServiceTypeEnum.SERVICETYPE_TAPI_CONNECTIVITY_SERVICE,

    ServiceTypeEnum.SERVICETYPE_TE,

    ServiceTypeEnum.SERVICETYPE_E2E,

    ServiceTypeEnum.SERVICETYPE_OPTICAL_CONNECTIVITY,

    ServiceTypeEnum.SERVICETYPE_QKD,

    ServiceTypeEnum.SERVICETYPE_INT,

    ServiceTypeEnum.SERVICETYPE_ACL,

    ServiceTypeEnum.SERVICETYPE_IP_LINK,

    ServiceTypeEnum.SERVICETYPE_IPOWDM,

    ServiceTypeEnum.SERVICETYPE_TAPI_LSP,

    ServiceTypeEnum.SERVICETYPE_UPF,

}



DEVICE_DRIVER_VALUES = {

    DeviceDriverEnum.DEVICEDRIVER_UNDEFINED,

    DeviceDriverEnum.DEVICEDRIVER_OPENCONFIG,

    DeviceDriverEnum.DEVICEDRIVER_TRANSPORT_API,

    DeviceDriverEnum.DEVICEDRIVER_P4,

    DeviceDriverEnum.DEVICEDRIVER_IETF_NETWORK_TOPOLOGY,

    DeviceDriverEnum.DEVICEDRIVER_ONF_TR_532,

    DeviceDriverEnum.DEVICEDRIVER_XR,

    DeviceDriverEnum.DEVICEDRIVER_IETF_L2VPN,

    DeviceDriverEnum.DEVICEDRIVER_GNMI_OPENCONFIG,

    DeviceDriverEnum.DEVICEDRIVER_OPTICAL_TFS,

    DeviceDriverEnum.DEVICEDRIVER_IETF_ACTN,

    DeviceDriverEnum.DEVICEDRIVER_OC,

    DeviceDriverEnum.DEVICEDRIVER_QKD,

    DeviceDriverEnum.DEVICEDRIVER_IETF_L3VPN,

    DeviceDriverEnum.DEVICEDRIVER_IETF_SLICE,

    DeviceDriverEnum.DEVICEDRIVER_NCE,

    DeviceDriverEnum.DEVICEDRIVER_SMARTNIC,

    DeviceDriverEnum.DEVICEDRIVER_MORPHEUS,

    DeviceDriverEnum.DEVICEDRIVER_RYU,

    DeviceDriverEnum.DEVICEDRIVER_GNMI_NOKIA_SRLINUX,

    DeviceDriverEnum.DEVICEDRIVER_OPENROADM,

    DeviceDriverEnum.DEVICEDRIVER_RESTCONF_OPENCONFIG,

}



# Map allowed filter fields to allowed values per Filter field. If no restriction (free text) None is specified

FILTER_FIELD_ALLOWED_VALUES = {

    FilterFieldEnum.SERVICE_TYPE.value  : set(ServiceTypeEnum.values()),

    FilterFieldEnum.DEVICE_DRIVER.value : set(DeviceDriverEnum.values()),

src/service/service/service_handlers/p4_fabric_tna_acl/p4_fabric_tna_acl_service_handler.py

+4 −4
Changes for src/service/service/service_handlers/p4_fabric_tna_acl/p4_fabric_tna_acl_service_handler.py: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ class P4FabricACLServiceHandler(_ServiceHandler): 
            if IPV4_SRC in acl_entry:

                try:

                    rules += rules_set_up_acl_filter_host(

                        ingress_port=port_id,

                        port_id=port_id,

                        ip_address=acl_entry[IPV4_SRC],

                        prefix_len=acl_entry[IPV4_PREFIX_LEN],

                        ip_direction="src",
@@ -461,7 +461,7 @@ class P4FabricACLServiceHandler(_ServiceHandler): 
            if IPV4_DST in acl_entry:

                try:

                    rules += rules_set_up_acl_filter_host(

                        ingress_port=port_id,

                        port_id=port_id,

                        ip_address=acl_entry[IPV4_DST],

                        prefix_len=acl_entry[IPV4_PREFIX_LEN],

                        ip_direction="dst",
@@ -474,7 +474,7 @@ class P4FabricACLServiceHandler(_ServiceHandler): 
            if TRN_PORT_SRC in acl_entry:

                try:

                    rules += rules_set_up_acl_filter_port(

                        ingress_port=port_id,

                        port_id=port_id,

                        transport_port=acl_entry[TRN_PORT_SRC],

                        transport_direction="src",

                        action=action
@@ -486,7 +486,7 @@ class P4FabricACLServiceHandler(_ServiceHandler): 
            if TRN_PORT_DST in acl_entry:

                try:

                    rules += rules_set_up_acl_filter_port(

                        ingress_port=port_id,

                        port_id=port_id,

                        transport_port=acl_entry[TRN_PORT_DST],

                        transport_direction="dst",

                        action=action