Commit 7ea010c5 authored by Mohamad Rahhal's avatar Mohamad Rahhal
Browse files

-Added logical resources and some fixes in the dockerfile+ allocator

parent 7b8d9ebe

src/spine_leaf/Dockerfile

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ RUN pip-compile --quiet --output-file=requirements.txt requirements.in /var/tera 
RUN python3 -m pip install -r requirements.txt



WORKDIR /var/teraflow

COPY src/logical_resources/__init__.py logical_resources/__init__.py

COPY src/logical_resources/client/. logical_resources/client/

COPY src/device/__init__.py device/__init__.py

COPY src/device/client/. device/client/

COPY src/spine_leaf/. spine_leaf/

src/spine_leaf/database.py

+1 −1
Original line number Diff line number Diff line 
from src.spine_leaf.state_store import SpineLeafStateStore

from .state_store import SpineLeafStateStore



SpineLeafDatabase = SpineLeafStateStore

src/spine_leaf/requirements.in

0 → 100644
+13 −0
Original line number Diff line number Diff line 
# Copyright 2022-2025 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.
 
 No newline at end of file

src/spine_leaf/scripts/resource_allocator.py

+1 −7
Original line number Diff line number Diff line
@@ -13,12 +13,8 @@ 
# limitations under the License.





#a basic one supposing that i have the client not final 

import logging

from typing import Dict, List, Optional, Tuple as TypingTuple



from networkx import config



from common.proto.logical_resources_pb2 import (

    FabricId,

    ResourceReservation,
@@ -26,7 +22,7 @@ from common.proto.logical_resources_pb2 import ( 
    Tuple as LRTuple,

)

from common.proto.spineleaf_pb2 import ConfigSetting

from logical_resources_client.client.logicalresources import LogicalResourceClient

from logical_resources.client.Logicalresourceclient import LogicalResourceClient



LOGGER = logging.getLogger(__name__)
@@ -120,5 +116,3 @@ class ResourceAllocator: 
            self._rollback_reservations(reserved, fabric_id)

            LOGGER.exception('Allocation failed for device=%s role=%s fabric=%s', device_uuid, role, fabric_id)

            return None, None