Pre-merge code cleanup

src/common/DeviceTypes.py

@@ -38,6 +38,7 @@ class DeviceTypeEnum(Enum):
     CLIENT                          = 'client'
     DATACENTER                      = 'datacenter'
     IP_SDN_CONTROLLER               = 'ip-sdn-controller'
+    NCE                             = 'nce'
     MICROWAVE_RADIO_SYSTEM          = 'microwave-radio-system'
     OPEN_LINE_SYSTEM                = 'open-line-system'
     OPTICAL_ROADM                   = 'optical-roadm'
@@ -52,6 +53,4 @@ class DeviceTypeEnum(Enum):
 
     # ETSI TeraFlowSDN controller
     TERAFLOWSDN_CONTROLLER          = 'teraflowsdn'
-    IETF_SLICE = 'ietf-slice'
-
-    NCE = 'nce'
\ No newline at end of file
+    IETF_SLICE                      = 'ietf-slice'

src/common/tools/context_queries/Slice.py

@@ -13,17 +13,9 @@
 # limitations under the License.
 
 import logging
-from typing import Optional, Tuple, Union
-from uuid import UUID, uuid5
-
 import grpc
-
-import logging
 from typing import Optional, Tuple, Union
 from uuid import UUID, uuid5
-
-import grpc
-
 from common.Constants import DEFAULT_CONTEXT_NAME
 from common.method_wrappers.ServiceExceptions import InvalidArgumentsException
 from common.proto.context_pb2 import ContextId, Slice, SliceFilter, SliceId
@@ -32,9 +24,6 @@ from common.proto.context_pb2 import ContextId, Slice, SliceFilter, SliceId
 from context.client.ContextClient import ContextClient
 
 
-NAMESPACE_TFS = UUID("200e3a1f-2223-534f-a100-758e29c37f40")
-
-
 NAMESPACE_TFS = UUID("200e3a1f-2223-534f-a100-758e29c37f40")
 
 LOGGER = logging.getLogger(__name__)
@@ -170,4 +159,4 @@ def get_slice_by_defualt_name(
     return get_slice_by_id(
         context_client, slice_id, rw_copy=rw_copy, include_endpoint_ids=include_endpoint_ids,
         include_constraints=include_constraints, include_service_ids=include_service_ids,
-        include_subslice_ids=include_subslice_ids, include_config_rules=include_config_rules)
\ No newline at end of file
+        include_subslice_ids=include_subslice_ids, include_config_rules=include_config_rules)

src/service/service/service_handlers/__init__.py

@@ -69,6 +69,12 @@ SERVICE_HANDLERS = [
             FilterFieldEnum.DEVICE_DRIVER : DeviceDriverEnum.DEVICEDRIVER_IETF_ACTN,
         }
     ]),
+    (L3NM_IETFL3VPN_ServiceHandler, [
+        {
+            FilterFieldEnum.SERVICE_TYPE  : ServiceTypeEnum.SERVICETYPE_L3NM,
+            FilterFieldEnum.DEVICE_DRIVER : [DeviceDriverEnum.DEVICEDRIVER_IETF_L3VPN],
+        }
+    ]),
     (L3NMNCEServiceHandler, [
         {
             FilterFieldEnum.SERVICE_TYPE  : ServiceTypeEnum.SERVICETYPE_L3NM,