update CFDP source code
All checks were successful
EIVE/-/pipeline/pr-main This commit looks good

This commit is contained in:
Robin Müller 2023-09-13 13:37:10 +02:00
parent 8b45dd8bff
commit 8d28b321d4
Signed by: muellerr
GPG Key ID: FCE0B2BD2195142F

View File

@ -20,10 +20,7 @@ from tmtccmd.tc import (
SendCbParams, SendCbParams,
TcQueueEntryType, TcQueueEntryType,
) )
from tmtccmd.config.cfdp import ( from tmtccmd.config.cfdp import generic_cfdp_params_to_put_request
cfdp_req_to_put_req_proxy_get_req,
cfdp_req_to_put_req_regular,
)
from spacepackets.ecss import PusVerificator from spacepackets.ecss import PusVerificator
from tmtccmd.util import FileSeqCountProvider from tmtccmd.util import FileSeqCountProvider
from spacepackets.cfdp import PduHolder, DirectiveType from spacepackets.cfdp import PduHolder, DirectiveType
@ -117,15 +114,12 @@ class TcHandler(TcHandlerBase):
): ):
put_req_cfg_wrapper = cfdp_procedure.request_wrapper.to_put_request() put_req_cfg_wrapper = cfdp_procedure.request_wrapper.to_put_request()
if put_req_cfg_wrapper.cfg.proxy_op: if put_req_cfg_wrapper.cfg.proxy_op:
put_req = cfdp_req_to_put_req_proxy_get_req(
put_req_cfg_wrapper.cfg,
CFDP_LOCAL_ENTITY_ID,
CFDP_REMOTE_ENTITY_ID,
)
self.proxy_op = True self.proxy_op = True
else: put_req = generic_cfdp_params_to_put_request(
put_req = cfdp_req_to_put_req_regular( params=put_req_cfg_wrapper.cfg,
put_req_cfg_wrapper.cfg, CFDP_REMOTE_ENTITY_ID local_id=CFDP_LOCAL_ENTITY_ID,
remote_id=CFDP_REMOTE_ENTITY_ID,
dest_id_proxy_put_req=CFDP_LOCAL_ENTITY_ID,
) )
_LOGGER.info( _LOGGER.info(
f"CFDP: Starting file put request with parameters:\n{put_req}" f"CFDP: Starting file put request with parameters:\n{put_req}"