Loading src/spine_leaf/service/SpineLeafServicerImpl.py +7 −15 Changes for src/spine_leaf/service/SpineLeafServicerImpl.py: 7 added lines, 15 removed lines. Original line number Diff line number Diff line Loading @@ -19,23 +19,15 @@ import logging import grpc from common.method_wrappers.Decorator import MetricsPool, safe_and_metered_rpc_method from common.proto.spine_leaf_pb2 import ( ConfigSetting, DeployDeviceConfigRequest, DeployResponse, DeviceConfigQuery, FabricDefinitionResponse, FabricInventory, FabricNode, FabricScope, FabricSettings, OperationStatus, SetDeviceRoleRequest, UnsetDeviceRoleRequest, ConfigSetting, DeployDeviceConfigRequest, DeployResponse, DeviceConfigQuery, FabricDefinitionResponse, FabricInventory, FabricNode, FabricScope, FabricSettings, OperationStatus, SetDeviceRoleRequest, UnsetDeviceRoleRequest, ) from common.proto.spine_leaf_pb2_grpc import SpineLeafServicer from ..state_store import SpineLeafStateStore as InternalDatabase from ..scripts.config_payload import build_deploy_payload from ..scripts.resource_allocator import ResourceAllocator from .configurator.config_payload import build_deploy_payload from .configurator.resource_allocator import ResourceAllocator from .database.Database import SpineLeafDatabase as InternalDatabase LOGGER = logging.getLogger(__name__) METRICS_POOL = MetricsPool('SpineLeaf', 'RPC') Loading src/spine_leaf/scripts/fabric_config_builder.py→src/spine_leaf/service/configurator/FabricConfigBuilder.py +5 −5 Changes for src/spine_leaf/service/configurator/FabricConfigBuilder.py: 5 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -23,8 +23,8 @@ DEFAULT_VXLAN_PORT = 4789 class FabricConfigBuilder: def __init__(self, state_store): self.store = state_store def __init__(self, database): self.database = database @staticmethod def _strip_prefix(address: str) -> str: Loading Loading @@ -272,9 +272,9 @@ class FabricConfigBuilder: def build(self, fabric_id: str, device_id: str) -> List[Tuple[str, str]]: rules: List[Tuple[str, str]] = [] fabric = self.store.get_fabric(fabric_id) or {} inventory = self.store.get_fabric_inventory(fabric_id) device = self.store.get_device_role(fabric_id, device_id) fabric = self.database.get_fabric(fabric_id) or {} inventory = self.database.get_fabric_inventory(fabric_id) device = self.database.get_device_role(fabric_id, device_id) if not device: return rules Loading src/spine_leaf/scripts/config_payload.py→src/spine_leaf/service/configurator/config_payload.py +0 −0 File moved. View file src/spine_leaf/scripts/resource_allocator.py→src/spine_leaf/service/configurator/resource_allocator.py +0 −0 File moved. View file src/spine_leaf/service/database/state_store.py→src/spine_leaf/service/database/Database.py +3 −4 Changes for src/spine_leaf/service/database/Database.py: 3 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -13,10 +13,9 @@ # limitations under the License. from typing import Dict, List, Optional, Tuple from .UuidTools import get_uuid_from_string from service.service.tools.object_uuid import get_uuid_from_string class SpineLeafStateStore: class SpineLeafDatabase: #In-memory state for fabric/device roles and generated configs def __init__(self): Loading Loading @@ -116,7 +115,7 @@ class SpineLeafStateStore: return True, f'Device {device_id} set as {role} in fabric {fabric_id}' def build_driver_config_rules(self, fabric_id: str, device_id: str) -> List[Tuple[str, str]]: from spine_leaf.scripts.fabric_config_builder import FabricConfigBuilder from spine_leaf.service.configurator.fabric_config_builder import FabricConfigBuilder rules = FabricConfigBuilder(self).build(fabric_id, device_id) self.driver_config_rules[(fabric_id, device_id)] = rules Loading Loading
src/spine_leaf/service/SpineLeafServicerImpl.py +7 −15 Changes for src/spine_leaf/service/SpineLeafServicerImpl.py: 7 added lines, 15 removed lines. Original line number Diff line number Diff line Loading @@ -19,23 +19,15 @@ import logging import grpc from common.method_wrappers.Decorator import MetricsPool, safe_and_metered_rpc_method from common.proto.spine_leaf_pb2 import ( ConfigSetting, DeployDeviceConfigRequest, DeployResponse, DeviceConfigQuery, FabricDefinitionResponse, FabricInventory, FabricNode, FabricScope, FabricSettings, OperationStatus, SetDeviceRoleRequest, UnsetDeviceRoleRequest, ConfigSetting, DeployDeviceConfigRequest, DeployResponse, DeviceConfigQuery, FabricDefinitionResponse, FabricInventory, FabricNode, FabricScope, FabricSettings, OperationStatus, SetDeviceRoleRequest, UnsetDeviceRoleRequest, ) from common.proto.spine_leaf_pb2_grpc import SpineLeafServicer from ..state_store import SpineLeafStateStore as InternalDatabase from ..scripts.config_payload import build_deploy_payload from ..scripts.resource_allocator import ResourceAllocator from .configurator.config_payload import build_deploy_payload from .configurator.resource_allocator import ResourceAllocator from .database.Database import SpineLeafDatabase as InternalDatabase LOGGER = logging.getLogger(__name__) METRICS_POOL = MetricsPool('SpineLeaf', 'RPC') Loading
src/spine_leaf/scripts/fabric_config_builder.py→src/spine_leaf/service/configurator/FabricConfigBuilder.py +5 −5 Changes for src/spine_leaf/service/configurator/FabricConfigBuilder.py: 5 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -23,8 +23,8 @@ DEFAULT_VXLAN_PORT = 4789 class FabricConfigBuilder: def __init__(self, state_store): self.store = state_store def __init__(self, database): self.database = database @staticmethod def _strip_prefix(address: str) -> str: Loading Loading @@ -272,9 +272,9 @@ class FabricConfigBuilder: def build(self, fabric_id: str, device_id: str) -> List[Tuple[str, str]]: rules: List[Tuple[str, str]] = [] fabric = self.store.get_fabric(fabric_id) or {} inventory = self.store.get_fabric_inventory(fabric_id) device = self.store.get_device_role(fabric_id, device_id) fabric = self.database.get_fabric(fabric_id) or {} inventory = self.database.get_fabric_inventory(fabric_id) device = self.database.get_device_role(fabric_id, device_id) if not device: return rules Loading
src/spine_leaf/scripts/config_payload.py→src/spine_leaf/service/configurator/config_payload.py +0 −0 File moved. View file
src/spine_leaf/scripts/resource_allocator.py→src/spine_leaf/service/configurator/resource_allocator.py +0 −0 File moved. View file
src/spine_leaf/service/database/state_store.py→src/spine_leaf/service/database/Database.py +3 −4 Changes for src/spine_leaf/service/database/Database.py: 3 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -13,10 +13,9 @@ # limitations under the License. from typing import Dict, List, Optional, Tuple from .UuidTools import get_uuid_from_string from service.service.tools.object_uuid import get_uuid_from_string class SpineLeafStateStore: class SpineLeafDatabase: #In-memory state for fabric/device roles and generated configs def __init__(self): Loading Loading @@ -116,7 +115,7 @@ class SpineLeafStateStore: return True, f'Device {device_id} set as {role} in fabric {fabric_id}' def build_driver_config_rules(self, fabric_id: str, device_id: str) -> List[Tuple[str, str]]: from spine_leaf.scripts.fabric_config_builder import FabricConfigBuilder from spine_leaf.service.configurator.fabric_config_builder import FabricConfigBuilder rules = FabricConfigBuilder(self).build(fabric_id, device_id) self.driver_config_rules[(fabric_id, device_id)] = rules Loading