Commit 5747c5a3 authored by Mohamad Rahhal's avatar Mohamad Rahhal
Browse files

SpineLeaf: 

-Adpting the SpineLeaf Payload from DeployDeviceConfigRequest
parent 446297a7

src/common/tools/descriptor/Loader.py

+8 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ from common.proto.context_pb2 import ( 
    Link, LinkId, Service, ServiceId, Slice, SliceId,

    Topology, TopologyId , OpticalLink

)

from common.proto.spineleaf_pb2 import SetDeviceRoleRequest

from common.proto.spineleaf_pb2 import DeployDeviceConfigRequest, SetDeviceRoleRequest

from common.tools.object_factory.Context import json_context_id

from context.client.ContextClient import ContextClient

from device.client.DeviceClient import DeviceClient
@@ -671,7 +671,13 @@ class DescriptorLoader: 
                    hints = self._build_spine_leaf_hints(fabric_name, device_uuid)

                    if hints:

                        request_kwargs['role'] = json.dumps(hints)

                    method(SetDeviceRoleRequest(**request_kwargs))

                    config = method(SetDeviceRoleRequest(**request_kwargs))

                    if config is not None and getattr(config, 'device_uuid', ''):

                        self.__spl_cli.DeployDeviceConfig(DeployDeviceConfigRequest(

                            device_uuid=device_uuid,

                            fabric_id=fabric_id,

                            config=config,

                        ))

                    num_ok += 1

                except Exception as e:  

                    error_list.append(f'{fabric_id}/{device_identifier}: {str(e)}')

src/spine_leaf/scripts/config_payload.py

+11 −7
Original line number Diff line number Diff line
@@ -12,12 +12,16 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



from common.tools.grpc.Tools import grpc_message_to_json_string

import json



from common.tools.grpc.Tools import grpc_message_to_json



def build_deploy_payload(device_uuid: str, fabric_id: str, config) -> str:

    return '{"device_uuid": "%s", "fabric_id": "%s", "config": %s}' % (

        str(device_uuid),

        str(fabric_id),

        grpc_message_to_json_string(config),

    )
 


def build_deploy_payload(device_uuid: str, fabric_id: str, config, driver_config_rules=None) -> str:

    payload = {

        'device_uuid': str(device_uuid),

        'fabric_id': str(fabric_id),

        'config': grpc_message_to_json(config),

        'driver_config_rules': driver_config_rules or [],

    }

    return json.dumps(payload, sort_keys=True)

src/spine_leaf/service/SpineLeafServicerImpl.py

+15 −2
Original line number Diff line number Diff line
@@ -228,9 +228,22 @@ class SpineLeafServicerImpl(SpineLeafServicer): 


    @safe_and_metered_rpc_method(METRICS_POOL, LOGGER)

    def DeployDeviceConfig(self, request: DeployDeviceConfigRequest, context: grpc.ServicerContext) -> DeployResponse:

        payload_json = build_deploy_payload(request.device_uuid, request.fabric_id, request.config)

        config = self.db.get_config(request.fabric_id, request.device_uuid) or request.config

        driver_config_rules = self.db.get_driver_config_rules(request.fabric_id, request.device_uuid)

        payload_json = build_deploy_payload(

            request.device_uuid,

            request.fabric_id,

            config,

            driver_config_rules=driver_config_rules,

        )

        LOGGER.info('Deploy payload generated for %s: %s', request.device_uuid, payload_json)

        self.db.update_device_status(request.fabric_id, request.device_uuid, 'deployed')

        # Return the generated deploy payload so callers can parse driver_config_rules

        try:

            return DeployResponse(success=True, message=payload_json)

        except Exception:

            # Fallback to a safe status message if serialization fails for any reason

            LOGGER.exception('Failed to attach deploy payload to response for device=%s', request.device_uuid)

            return DeployResponse(success=True, message='Configuration payload generated and ready for device component')



    @safe_and_metered_rpc_method(METRICS_POOL, LOGGER)

src/tests/Spine-Leaf-BGP-test/spine1-underlay-test.py

0 → 100644
+0 −0

Empty file added.