Commit 08533d97 authored by Georgios P. Katsikas's avatar Georgios P. Katsikas
Browse files

fix: service types order in proto

parent 1296e935

proto/context.proto

+6 −6
Original line number Diff line number Diff line
@@ -321,12 +321,12 @@ enum ServiceTypeEnum { 
  SERVICETYPE_UNKNOWN = 0;

  SERVICETYPE_L3NM = 1;

  SERVICETYPE_L2NM = 2;

  SERVICETYPE_L1NM = 3;

  SERVICETYPE_TAPI_CONNECTIVITY_SERVICE = 4;

  SERVICETYPE_TE = 5;

  SERVICETYPE_E2E = 6;

  SERVICETYPE_OPTICAL_CONNECTIVITY = 7;

  SERVICETYPE_QKD = 8;

  SERVICETYPE_TAPI_CONNECTIVITY_SERVICE = 3;

  SERVICETYPE_TE = 4;

  SERVICETYPE_E2E = 5;

  SERVICETYPE_OPTICAL_CONNECTIVITY = 6;

  SERVICETYPE_QKD = 7;

  SERVICETYPE_L1NM = 8;

  SERVICETYPE_INT = 9;

  SERVICETYPE_ACL = 10;

}

src/common/tools/object_factory/Service.py

+1 −1
Original line number Diff line number Diff line
@@ -90,6 +90,6 @@ def json_service_p4_planned( 
    ):



    return json_service(

        service_uuid, ServiceTypeEnum.SERVICETYPE_L2NM, context_id=json_context_id(context_uuid),

        service_uuid, ServiceTypeEnum.SERVICETYPE_L1NM, context_id=json_context_id(context_uuid),

        status=ServiceStatusEnum.SERVICESTATUS_PLANNED, endpoint_ids=endpoint_ids, constraints=constraints,

        config_rules=config_rules)
 
 No newline at end of file

src/tests/p4-fwd-l1/tests/topologies/6switchObjects.py

+2 −12
Original line number Diff line number Diff line
@@ -312,12 +312,6 @@ LINK_SW5_SW6 = json_link(LINK_SW5_SW6_UUID, [ENDPOINT_ID_SW5_2, E 


# ----- Service ----------------------------------------------------------------------------------------------------------



#SERVICE_SW1_UUID        = get_service_uuid(ENDPOINT_ID_SW1_1, ENDPOINT_ID_SW1_2)

#SERVICE_SW1             = json_service_p4_planned(SERVICE_SW1_UUID)



#SERVICE_SW2_UUID        = get_service_uuid(ENDPOINT_ID_SW2_1, ENDPOINT_ID_SW2_2)

#SERVICE_SW2             = json_service_p4_planned(SERVICE_SW2_UUID)



SERVICE_SW1_SW6_UUID            = get_service_uuid(ENDPOINT_ID_SW1_3, ENDPOINT_ID_SW6_3)

SERVICE_SW1_SW6                 = json_service_p4_planned(SERVICE_SW1_SW6_UUID)

SERVICE_SW1_SW6_ENDPOINT_IDS    = [DEVICE_SW1_ENDPOINT_IDS[2], DEVICE_SW6_ENDPOINT_IDS[2]]
@@ -347,8 +341,4 @@ LINKS = [ 
    LINK_SW5_SW6

    ]



#SERVICES = [(SERVICE_SW1, DEVICE_SW1_ENDPOINT_IDS), (SERVICE_SW2, DEVICE_SW2_ENDPOINT_IDS)]



#SERVICE_SW1_SW2_ENDPOINT_IDS = DEVICE_SW1_ENDPOINT_IDS + DEVICE_SW2_ENDPOINT_IDS



SERVICES = [(SERVICE_SW1_SW6, SERVICE_SW1_SW6_ENDPOINT_IDS)]