xml tests support added, dbf-swt-checker.jar updated to version 1.2, swt-dbf-converter.jar updated to version 0.0.2, clearing-tester.jar updated to version 1.4

.gitlab-ci.yml

@@ -17,7 +17,7 @@ preflight:
   stage: preflight
   script:
     - pwd
-    - git clone "http://gitlab-ci-token:$ACCESS_TOKEN@git.mfd.msk/mfd/clearing_test.git"
+    - git clone -b xml-files "http://gitlab-ci-token:$ACCESS_TOKEN@git.mfd.msk/mfd/clearing_test.git"
     - find /builds/mfd/clearing/clearing_test -name ".gitkeep" -type f -delete
   artifacts:
     name: "$CI_COMMIT_REF_NAME"

clr_test/clearing-all/kill_all.sh

@@ -7,8 +7,10 @@ kill -9 $(ps -ef | grep java | grep company-service.jar  | awk '{print $2}')
 kill -9 $(ps -ef | grep java | grep clearing-service.jar  | awk '{print $2}')
 kill -9 $(ps -ef | grep java | grep dbf-exporter.jar | awk '{print $2}')
 kill -9 $(ps -ef | grep java | grep lim-exporter.jar | awk '{print $2}')
+kill -9 $(ps -ef | grep java | grep xml-exporter.jar | awk '{print $2}')
 kill -9 $(ps -ef | grep java | grep swt-exporter.jar | awk '{print $2}')
 kill -9 $(ps -ef | grep java | grep dbf-importer.jar | awk '{print $2}')
+kill -9 $(ps -ef | grep java | grep xml-importer.jar | awk '{print $2}')
 kill -9 $(ps -ef | grep java | grep trade-importer.jar | awk '{print $2}')
 kill -9 $(ps -ef | grep java | grep imdg.jar | awk '{print $2}')
 kill -9 $(ps -ef | grep java | grep securities-service.jar | awk '{print $2}')

clr_test/clearing-all/launch_all.sh

@@ -15,10 +15,13 @@ java -jar $CLEARING_HOME/bin/account-service.jar --spring.config.location=$CLEAR
 java -jar $CLEARING_HOME/bin/clearing-service.jar --spring.config.location=$CLEARING_HOME/settings/clearing-service/ &
 java -jar $CLEARING_HOME/bin/scheduler-service.jar --spring.config.location=$CLEARING_HOME/settings/scheduler-service/ &
 
-java -jar $CLEARING_HOME/bin/dbf-exporter.jar --spring.config.location=$CLEARING_HOME/settings/dbf-exporter/ &
-java -jar $CLEARING_HOME/bin/dbf-importer.jar --spring.config.location=$CLEARING_HOME/settings/dbf-importer/ &
+#java -jar $CLEARING_HOME/bin/dbf-exporter.jar --spring.config.location=$CLEARING_HOME/settings/dbf-exporter/ &
+#java -jar $CLEARING_HOME/bin/dbf-importer.jar --spring.config.location=$CLEARING_HOME/settings/dbf-importer/ &
 
 java -jar $CLEARING_HOME/bin/swt-exporter.jar --spring.config.location=$CLEARING_HOME/settings/swt-exporter/ &
 java -jar $CLEARING_HOME/bin/swt-importer.jar --spring.config.location=$CLEARING_HOME/settings/swt-importer/ &
 
+java -jar $CLEARING_HOME/bin/xml-exporter.jar --spring.config.location=$CLEARING_HOME/settings/xml-exporter/ &
+java -jar $CLEARING_HOME/bin/xml-importer.jar --spring.config.location=$CLEARING_HOME/settings/xml-importer/ &
+
 echo all services launched starting. $?

clr_test/clearing-all/settings/xml-exporter/application.properties

@@ -0,0 +1,38 @@
+spring.main.web-application-type=none
+
+export-xml-service.hazelcast.cluster-members=localhost:5701
+export-xml-service.hazelcast.login=dev
+export-xml-service.hazelcast.password=dev-pass
+
+export-xml-service.common.encoding=cp866
+export-xml-service.common.threads-count=10
+
+export-xml-service.store.local-temp-dir=/opt/clearing/files/xml/exporter/
+
+export-xml-service.store.out-pay-val-dir.RUB=/out/prc/
+export-xml-service.store.out-pay-val-dir.EUR=/out/prc/
+export-xml-service.store.out-pay-val-dir.CNY=/out/prc/
+
+export-xml-service.store.user=user
+export-xml-service.store.password=Aa111111
+export-xml-service.store.server-ip=sftp
+export-xml-service.store.server-port=22
+
+export-xml-service.kafka-consumer.bootstrap-servers=kafka:9092
+export-xml-service.kafka-consumer.group-id=dev-group-balance-service
+export-xml-service.kafka-consumer.enable-auto-commit=false
+export-xml-service.kafka-consumer.session-timeout-ms=30000
+export-xml-service.kafka-consumer.auto-offset-reset=latest
+export-xml-service.kafka-consumer.linger-ms=1
+export-xml-service.kafka-consumer.buffer-memory=33554432
+
+export-xml-service.kafka-producer.bootstrap-servers=kafka:9092
+export-xml-service.kafka-producer.acks=all
+export-xml-service.kafka-producer.retries=0
+export-xml-service.kafka-producer.batch-size=16384
+export-xml-service.kafka-producer.linger-ms=1
+export-xml-service.kafka-producer.buffer-memory=33554432
+
+export-xml-service.section=S
+export-xml-service.sender=LCC
+export-xml-service.receiver=\u0422\u0435\u0441\u0442

clr_test/clearing-all/settings/xml-importer/application.properties

@@ -0,0 +1,44 @@
+spring.main.web-application-type=none
+
+import-xml-service.process-files=true
+import-xml-service.process-lks-files=false
+
+import-xml-service.scheduler.check-src-dir-cron=*/3 * * * * *
+
+import-xml-service.store.delete-src-files=false
+import-xml-service.store.src-dir=/opt/clearing/files/xml/importer/in
+import-xml-service.store.out-dir=/opt/clearing/files/xml/importer/out/
+import-xml-service.store.out-dir-error=/opt/clearing/files/xml/importer/error/
+
+import-xml-service.common.encoding-source=cp866
+import-xml-service.common.insert-batch-size=100
+import-xml-service.common.threads-count=10
+
+#sftpSrcDir
+import-xml-service.store.sftp-in.sftp-src-dir=/in/prc/
+import-xml-service.store.sftp-in.sftp-src-pay-val-dir.rub=/in/prc/
+import-xml-service.store.sftp-in.sftp-src-pay-val-dir.eur=/in/prc/
+
+import-xml-service.store.sftp-in.user=user
+import-xml-service.store.sftp-in.password=Aa111111
+import-xml-service.store.sftp-in.server-ip=sftp
+import-xml-service.store.sftp-in.server-port=22
+
+import-xml-service.hazelcast.cluster-members=localhost:5701
+import-xml-service.hazelcast.login=dev
+import-xml-service.hazelcast.password=dev-pass
+
+import-xml-service.kafka-producer.bootstrap-servers=kafka:9092
+import-xml-service.kafka-producer.acks=all
+import-xml-service.kafka-producer.retries=0
+import-xml-service.kafka-producer.batch-size=16384
+import-xml-service.kafka-producer.linger-ms=1
+import-xml-service.kafka-producer.buffer-memory=33554432
+
+import-xml-service.kafka-consumer.bootstrap-servers=kafka:9092
+import-xml-service.kafka-consumer.group-id=dev-group-clearing-service
+import-xml-service.kafka-consumer.enable-auto-commit=false
+import-xml-service.kafka-consumer.session-timeout-ms=30000
+import-xml-service.kafka-consumer.auto-offset-reset=latest
+import-xml-service.kafka-consumer.linger-ms=1
+import-xml-service.kafka-consumer.buffer-memory=33554432

clr_test/run_test_docker_containers.py

@@ -10,7 +10,7 @@ logging.basicConfig(level=logging.INFO, format="%(asctime)s [%(levelname)s] %(me
 DATA_ROOT_DIR = os.environ['CLEARING_TEST_DIR']
 CLR_TEST_DIR = os.environ['CLR_TEST_DIR']
 RESULT_FILES_DIR = os.environ['RESULT_FILES_DIR']
-DDL_VERSION_FROM = (3, 18, 0)
+DDL_VERSION_FROM = (3, 23, 0)
 
 
 def run_docker(folder_name: str) -> int:
@@ -103,7 +103,7 @@ def apply_test_case(folder: str) -> None:
     copy_directory(f"{DATA_ROOT_DIR}/{folder}/data",
                    f"{CLR_TEST_DIR}/db/data")
 
-    remove_files_with_extensions(".xml")
+    # remove_files_with_extensions(".xml")
     # change_date(folder)
     exit_code = run_docker(folder)
     append_to_log_file(folder, exit_code)