Commit 008be1ba authored by Pablo Armingol's avatar Pablo Armingol
Browse files

code cleanup

parent 02d28cbc

src/device/service/drivers/openconfig/templates/Inventory.py

+0 −1
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ def parse(xml_data : ET.Element) -> List[Tuple[str, Dict[str, Any]]]: 
            add_value_from_tag(inventory, 'class', component_type)

        

        if inventory['class'] == 'CPU' or inventory['class'] == 'STORAGE': continue

        

        component_empty = xml_component.find('ocp:state/ocp:empty', namespaces=NAMESPACES)

        if not component_empty is None:

            add_value_from_tag(inventory['attributes'], 'empty', component_empty)

src/slice/service/SliceServiceServicerImpl.py

+5 −4
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ from service.client.ServiceClient import ServiceClient 
from .slice_grouper.SliceGrouper import SliceGrouper



LOGGER = logging.getLogger(__name__)



METRICS_POOL = MetricsPool('Slice', 'RPC')



class SliceServiceServicerImpl(SliceServiceServicer):
@@ -43,7 +44,7 @@ class SliceServiceServicerImpl(SliceServiceServicer): 
        # Set slice status to "SERVICESTATUS_PLANNED" to ensure rest of components are aware the slice is

        # being modified.

        context_client = ContextClient()

        slice_ro : Optional[Slice] = get_slice_by_id(context_client, request.slice_id, rw_copy=False) # se obtiene la slice con el sliceId de la req

        slice_ro : Optional[Slice] = get_slice_by_id(context_client, request.slice_id, rw_copy=False)



        slice_rw = Slice()

        slice_rw.CopyFrom(request if slice_ro is None else slice_ro)
@@ -51,7 +52,6 @@ class SliceServiceServicerImpl(SliceServiceServicer): 
        slice_rw.slice_owner.CopyFrom(request.slice_owner)                          # pylint: disable=no-member

        slice_rw.slice_status.slice_status = SliceStatusEnum.SLICESTATUS_PLANNED    # pylint: disable=no-member



#copiamos endpoints, reglas y configuraciones de la req a la slice

        copy_endpoint_ids(request.slice_endpoint_ids,        slice_rw.slice_endpoint_ids       ) # pylint: disable=no-member

        copy_constraints (request.slice_constraints,         slice_rw.slice_constraints        ) # pylint: disable=no-member

        copy_config_rules(request.slice_config.config_rules, slice_rw.slice_config.config_rules) # pylint: disable=no-member
@@ -207,6 +207,7 @@ class SliceServiceServicerImpl(SliceServiceServicer): 
        _slice_rw.CopyFrom(_slice)

        _slice_rw.slice_status.slice_status = SliceStatusEnum.SLICESTATUS_DEINIT # pylint: disable=no-member

        context_client.SetSlice(_slice_rw)



        if is_inter_domain(context_client, _slice.slice_endpoint_ids):

            interdomain_client = InterdomainClient()

            slice_id = interdomain_client.DeleteSlice(request)

src/slice/service/slice_grouper/SliceGrouper.py

+1 −2
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ class SliceGrouper: 


    @property

    def is_enabled(self): return self._is_enabled

    

    def group(self, slice_obj : Slice) -> bool:

        LOGGER.debug('[group] slice_obj={:s}'.format(grpc_message_to_json_string(slice_obj)))

        selected_group = self._select_group(slice_obj)