Playtenders / prozorro-robot_tests · Commits

Commit 237826bbd30fdb1b675e446ce710270739591f70

Authored by kosaniak
Committed by GitHub
2 parents bdcd1c63 023b1b4c

Merge pull request #975 from ivanka12/demo 

change branch for openprocurement_client
Inline Side-by-side
Showing 3 changed files with 335 additions and 83 deletions
... ... @@ -64,7 +64,7 @@ gh_push = git@github.com:
64 64
65 65 [sources]
66 66 barbecue = git ${remotes:gh}openprocurement/barbecue.git
67   -openprocurement_client = git ${remotes:gh}openprocurement/openprocurement.client.python.git branch=use_requests
  67 +openprocurement_client = git ${remotes:gh}openprocurement/openprocurement.client.python.git branch=upstream
68 68 robot_tests.broker.alltenders = git ${remotes:gh}openprocurement/robot_tests.broker.alltenders.git
69 69 robot_tests.broker.aladdin = git ${remotes:gh}openprocurement/robot_tests.broker.aladdin.git
70 70 robot_tests.broker.dzo = git ${remotes:gh}openprocurement/robot_tests.broker.dzo.git
... ...
... ... @@ -72,7 +72,7 @@ Library openprocurement_client.utils
72 72 ${edr_wrapper}= prepare_edr_wrapper ${EDR_HOST_URL} ${EDR_VERSION} ${USERS.users['${username}'].auth_edr[0]} ${USERS.users['${username}'].auth_edr[1]}
73 73 Set To Dictionary ${USERS.users['${username}']} edr_client=${edr_wrapper}
74 74 #Variables for contracting_management module
75   - ${contract_api_wrapper}= prepare_contract_api_wrapper ${USERS.users['${username}'].api_key} ${api_host_url} ${api_version} ${ds_api_wraper}
  75 + ${contract_api_wrapper}= prepare_contract_api_wrapper ${USERS.users['${username}'].api_key} CONTRACTS ${api_host_url} ${api_version} ${ds_api_wraper}
76 76 Set To Dictionary ${USERS.users['${username}']} contracting_client=${contract_api_wrapper}
77 77 Set To Dictionary ${USERS.users['${username}']} contract_access_token=${EMPTY}
78 78 ${contracts_id_map}= Create Dictionary
... ... @@ -87,7 +87,10 @@ Library openprocurement_client.utils
87 87 Log ${filepath}
88 88 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
89 89 ${tender}= set_access_key ${tender} ${USERS.users['${username}'].access_token}
90   - ${reply}= Call Method ${USERS.users['${username}'].client} upload_document ${filepath} ${tender}
  90 + ${reply}= Call Method ${USERS.users['${username}'].client} upload_document
  91 + ... ${filepath}
  92 + ... ${tender.data.id}
  93 + ... access_token=${tender.access.token}
91 94 Log object data ${reply} reply
92 95 #return here is needed to have uploaded doc data in `Завантажити документ в лот` keyword
93 96 [return] ${reply}
... ... @@ -166,7 +169,10 @@ Library openprocurement_client.utils
166 169 ${status}= Set Variable If 'below' in '${MODE}' active.enquiries ${status}
167 170 ${status}= Set Variable If '${status}'=='${EMPTY}' active ${status}
168 171 Set To Dictionary ${tender['data']} status=${status}
169   - ${tender}= Call Method ${USERS.users['${username}'].client} patch_tender ${tender}
  172 + ${tender}= Call Method ${USERS.users['${username}'].client} patch_tender
  173 + ... ${tender.data.id}
  174 + ... ${tender}
  175 + ... access_token=${tender.access.token}
170 176 Log ${tender}
171 177 Log ${\n}${API_HOST_URL}/api/${API_VERSION}/tenders/${tender.data.id}${\n} WARN
172 178 Set To Dictionary ${USERS.users['${username}']} access_token=${access_token}
... ... @@ -207,7 +213,10 @@ Library openprocurement_client.utils
207 213 ${tender}= Call Method ${USERS.users['${username}'].client} create_plan ${tender_data}
208 214 Log ${tender}
209 215 ${access_token}= Get Variable Value ${tender.access.token}
210   - ${tender}= Call Method ${USERS.users['${username}'].client} patch_plan ${tender}
  216 + ${tender}= Call Method ${USERS.users['${username}'].client} patch_plan
  217 + ... ${tender.data.id}
  218 + ... ${tender}
  219 + ... access_token=${tender.access.token}
211 220 Log ${tender}
212 221 Log ${\n}${API_HOST_URL}/api/${API_VERSION}/plans/${tender.data.id}${\n} WARN
213 222 Set To Dictionary ${USERS.users['${username}']} access_token=${access_token}
... ... @@ -441,7 +450,10 @@ Library openprocurement_client.utils
441 450 Run Keyword If '${procurementMethodType}' == 'aboveThresholdUA' or '${procurementMethodType}' == 'aboveThresholdEU'
442 451 ... Remove From Dictionary ${tender.data} enquiryPeriod
443 452 ${tender}= set_access_key ${tender} ${USERS.users['${username}'].access_token}
444   - ${tender}= Call Method ${USERS.users['${username}'].client} patch_tender ${tender}
  453 + ${tender}= Call Method ${USERS.users['${username}'].client} patch_tender
  454 + ... ${tender.data.id}
  455 + ... ${tender}
  456 + ... access_token=${tender.access.token}
445 457 Run Keyword And Expect Error * Порівняти об'єкти ${prev_value} ${tender.data.${fieldname}}
446 458 Set_To_Object ${USERS.users['${username}'].tender_data} ${fieldname} ${fieldvalue}
447 459
... ... @@ -451,7 +463,10 @@ Library openprocurement_client.utils
451 463 ${tender}= openprocurement_client.Пошук плану по ідентифікатору ${username} ${tender_uaid}
452 464 Set_To_Object ${tender.data} ${fieldname} ${fieldvalue}
453 465 ${tender}= set_access_key ${tender} ${USERS.users['${username}'].access_token}
454   - ${tender}= Call Method ${USERS.users['${username}'].client} patch_plan ${tender}
  466 + ${tender}= Call Method ${USERS.users['${username}'].client} patch_plan
  467 + ... ${tender.data.id}
  468 + ... ${tender}
  469 + ... access_token=${tender.access.token}
455 470 Set_To_Object ${USERS.users['${username}'].tender_data} ${fieldname} ${fieldvalue}
456 471
457 472 ##############################################################################
... ... @@ -462,15 +477,20 @@ Library openprocurement_client.utils
462 477 [Arguments] ${username} ${tender_uaid} ${item}
463 478 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
464 479 Append To List ${tender.data['items']} ${item}
465   - Call Method ${USERS.users['${username}'].client} patch_tender ${tender}
  480 + Call Method ${USERS.users['${username}'].client} patch_tender
  481 + ... ${tender.data.id}
  482 + ... ${tender}
  483 + ... access_token=${tender.access.token}
466 484
467 485
468 486 Додати предмет закупівлі в план
469 487 [Arguments] ${username} ${tender_uaid} ${item}
470 488 ${tender}= openprocurement_client.Пошук плану по ідентифікатору ${username} ${tender_uaid}
471 489 Append To List ${tender.data['items']} ${item}
472   - Call Method ${USERS.users['${username}'].client} patch_plan ${tender}
473   -
  490 + Call Method ${USERS.users['${username}'].client} patch_plan
  491 + ... ${tender.data.id}
  492 + ... ${tender}
  493 + ... access_token=${tender.access.token}
474 494
475 495 Отримати інформацію із предмету
476 496 [Arguments] ${username} ${tender_uaid} ${item_id} ${field_name}
... ... @@ -483,7 +503,10 @@ Library openprocurement_client.utils
483 503 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
484 504 ${item_index}= get_object_index_by_id ${tender.data['items']} ${item_id}
485 505 Remove From List ${tender.data['items']} ${item_index}
486   - Call Method ${USERS.users['${username}'].client} patch_tender ${tender}
  506 + Call Method ${USERS.users['${username}'].client} patch_tender
  507 + ... ${tender.data.id}
  508 + ... ${tender}
  509 + ... access_token=${tender.access.token}
487 510
488 511
489 512 Видалити предмет закупівлі плану
... ... @@ -491,15 +514,20 @@ Library openprocurement_client.utils
491 514 ${tender}= openprocurement_client.Пошук плану по ідентифікатору ${username} ${tender_uaid}
492 515 ${item_index}= get_object_index_by_id ${tender.data['items']} ${item_id}
493 516 Remove From List ${tender.data['items']} ${item_index}
494   - Call Method ${USERS.users['${username}'].client} patch_plan ${tender}
495   -
  517 + Call Method ${USERS.users['${username}'].client} patch_plan
  518 + ... ${tender.data.id}
  519 + ... ${tender}
  520 + ... access_token=${tender.access.token}
496 521
497 522 Видалити поле з донора
498 523 [Arguments] ${username} ${tender_uaid} ${funders_index} ${field_name}
499 524 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
500 525 Delete From Dictionary ${tender.data['funders'][${funders_index}]} ${field_name}
501 526 Log ${tender.data['funders'][${funders_index}]}
502   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_tender ${tender}
  527 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_tender
  528 + ... ${tender.data.id}
  529 + ... ${tender}
  530 + ... access_token=${tender.access.token}
503 531 Dictionary Should Not Contain Path ${reply.data['funders'][${funders_index}]} ${field_name}
504 532
505 533
... ... @@ -508,7 +536,10 @@ Library openprocurement_client.utils
508 536 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
509 537 Remove From List ${tender.data.funders} ${funders_index}
510 538 Log ${tender}
511   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_tender ${tender}
  539 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_tender
  540 + ... ${tender.data.id}
  541 + ... ${tender}
  542 + ... access_token=${tender.access.token}
512 543 Log ${reply}
513 544
514 545
... ... @@ -518,7 +549,10 @@ Library openprocurement_client.utils
518 549 Set To Dictionary ${tender.data} funders=@{EMPTY}
519 550 Append To List ${tender.data.funders} ${funders_data}
520 551 Log ${tender}
521   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_tender ${tender}
  552 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_tender
  553 + ... ${tender.data.id}
  554 + ... ${tender}
  555 + ... access_token=${tender.access.token}
522 556
523 557 ##############################################################################
524 558 # Lot operations
... ... @@ -527,7 +561,10 @@ Library openprocurement_client.utils
527 561 Створити лот
528 562 [Arguments] ${username} ${tender_uaid} ${lot}
529 563 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
530   - ${reply}= Call Method ${USERS.users['${username}'].client} create_lot ${tender} ${lot}
  564 + ${reply}= Call Method ${USERS.users['${username}'].client} create_lot
  565 + ... ${tender.data.id}
  566 + ... ${lot}
  567 + ... access_token=${tender.access.token}
531 568 #return here is needed to have created lot id in `Створити лот з предметом закупівлі` keyword
532 569 [return] ${reply}
533 570
... ... @@ -551,7 +588,11 @@ Library openprocurement_client.utils
551 588 ${lot_index}= get_object_index_by_id ${tender.data.lots} ${lot_id}
552 589 ${lot}= Create Dictionary data=${tender.data.lots[${lot_index}]}
553 590 Set_To_Object ${lot.data} ${fieldname} ${fieldvalue}
554   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_lot ${tender} ${lot}
  591 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_lot
  592 + ... ${tender.data.id}
  593 + ... ${lot}
  594 + ... ${lot.data.id}
  595 + ... access_token=${tender.access.token}
555 596
556 597
557 598 Додати предмет закупівлі в лот
... ... @@ -561,7 +602,10 @@ Library openprocurement_client.utils
561 602 ${lot_id}= Get Variable Value ${tender.data.lots[${lot_index}].id}
562 603 Set_To_Object ${item} relatedLot ${lot_id}
563 604 Append To List ${tender.data['items']} ${item}
564   - Call Method ${USERS.users['${username}'].client} patch_tender ${tender}
  605 + Call Method ${USERS.users['${username}'].client} patch_tender
  606 + ... ${tender.data.id}
  607 + ... ${tender}
  608 + ... access_token=${tender.access.token}
565 609
566 610
567 611 Завантажити документ в лот
... ... @@ -571,7 +615,11 @@ Library openprocurement_client.utils
571 615 ${lot_id}= Get Variable Value ${tender.data.lots[${lot_index}].id}
572 616 ${doc}= openprocurement_client.Завантажити документ ${username} ${filepath} ${tender_uaid}
573 617 ${lot_doc}= test_lot_document_data ${doc} ${lot_id}
574   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_document ${tender} ${lot_doc}
  618 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_document
  619 + ... ${tender.data.id}
  620 + ... ${lot_doc}
  621 + ... ${lot_doc.data.id}
  622 + ... access_token=${tender.access.token}
575 623
576 624
577 625 Видалити лот
... ... @@ -624,7 +672,10 @@ Library openprocurement_client.utils
624 672 [Arguments] ${username} ${tender_uaid} ${feature}
625 673 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
626 674 Append To List ${tender.data['features']} ${feature}
627   - Call Method ${USERS.users['${username}'].client} patch_tender ${tender}
  675 + Call Method ${USERS.users['${username}'].client} patch_tender
  676 + ... ${tender.data.id}
  677 + ... ${tender}
  678 + ... access_token=${tender.access.token}
628 679
629 680
630 681 Додати неціновий показник на предмет
... ... @@ -634,7 +685,10 @@ Library openprocurement_client.utils
634 685 ${item_id}= Get Variable Value ${tender.data['items'][${item_index}].id}
635 686 Set To Dictionary ${feature} relatedItem=${item_id}
636 687 Append To List ${tender.data['features']} ${feature}
637   - Call Method ${USERS.users['${username}'].client} patch_tender ${tender}
  688 + Call Method ${USERS.users['${username}'].client} patch_tender
  689 + ... ${tender.data.id}
  690 + ... ${tender}
  691 + ... access_token=${tender.access.token}
638 692
639 693
640 694 Додати неціновий показник на лот
... ... @@ -644,7 +698,10 @@ Library openprocurement_client.utils
644 698 ${lot_id}= Get Variable Value ${tender.data['lots'][${lot_index}].id}
645 699 Set To Dictionary ${feature} relatedItem=${lot_id}
646 700 Append To List ${tender.data['features']} ${feature}
647   - Call Method ${USERS.users['${username}'].client} patch_tender ${tender}
  701 + Call Method ${USERS.users['${username}'].client} patch_tender
  702 + ... ${tender.data.id}
  703 + ... ${tender}
  704 + ... access_token=${tender.access.token}
648 705
649 706
650 707 Отримати інформацію із нецінового показника
... ... @@ -658,7 +715,10 @@ Library openprocurement_client.utils
658 715 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
659 716 ${feature_index}= get_object_index_by_id ${tender.data['features']} ${feature_id}
660 717 Remove From List ${tender.data['features']} ${feature_index}
661   - Call Method ${USERS.users['${username}'].client} patch_tender ${tender}
  718 + Call Method ${USERS.users['${username}'].client} patch_tender
  719 + ... ${tender.data.id}
  720 + ... ${tender}
  721 + ... access_token=${tender.access.token}
662 722
663 723
664 724 ##############################################################################
... ... @@ -671,7 +731,10 @@ Library openprocurement_client.utils
671 731 ${item_index}= get_object_index_by_id ${tender.data['items']} ${item_id}
672 732 ${item_id}= Get Variable Value ${tender.data['items'][${item_index}].id}
673 733 ${question}= test_related_question ${question} item ${item_id}
674   - ${reply}= Call Method ${USERS.users['${username}'].client} create_question ${tender} ${question}
  734 + ${reply}= Call Method ${USERS.users['${username}'].client} create_question
  735 + ... ${tender.data.id}
  736 + ... ${question}
  737 + ... access_token=${tender.access.token}
675 738
676 739
677 740 Задати запитання на лот
... ... @@ -680,13 +743,19 @@ Library openprocurement_client.utils
680 743 ${lot_index}= get_object_index_by_id ${tender.data.lots} ${lot_id}
681 744 ${lot_id}= Get Variable Value ${tender.data.lots[${lot_index}].id}
682 745 ${question}= test_related_question ${question} lot ${lot_id}
683   - ${reply}= Call Method ${USERS.users['${username}'].client} create_question ${tender} ${question}
  746 + ${reply}= Call Method ${USERS.users['${username}'].client} create_question
  747 + ... ${tender.data.id}
  748 + ... ${question}
  749 + ... access_token=${tender.access.token}
684 750
685 751
686 752 Задати запитання на тендер
687 753 [Arguments] ${username} ${tender_uaid} ${question}
688 754 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
689   - ${reply}= Call Method ${USERS.users['${username}'].client} create_question ${tender} ${question}
  755 + ${reply}= Call Method ${USERS.users['${username}'].client} create_question
  756 + ... ${tender.data.id}
  757 + ... ${question}
  758 + ... access_token=${tender.access.token}
690 759
691 760
692 761 Отримати інформацію із запитання
... ... @@ -700,7 +769,11 @@ Library openprocurement_client.utils
700 769 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
701 770 ${tender}= set_access_key ${tender} ${USERS.users['${username}'].access_token}
702 771 ${answer_data.data.id}= openprocurement_client.Отримати інформацію із запитання ${username} ${tender_uaid} ${question_id} id
703   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_question ${tender} ${answer_data}
  772 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_question
  773 + ... ${tender.data.id}
  774 + ... ${answer_data}
  775 + ... ${answer_data.data.id}
  776 + ... access_token=${tender.access.token}
704 777
705 778 ##############################################################################
706 779 # Claims
... ... @@ -723,8 +796,9 @@ Library openprocurement_client.utils
723 796 ${reply}= Call Method
724 797 ... ${USERS.users['${username}'].client}
725 798 ... create_complaint
726   - ... ${tender}
  799 + ... ${tender.data.id}
727 800 ... ${claim}
  801 + ... access_token=${tender.access.token}
728 802 Log ${reply}
729 803 Set To Dictionary ${USERS.users['${username}']} complaint_access_token=${reply.access.token}
730 804 [return] ${reply.data.complaintID}
... ... @@ -756,9 +830,10 @@ Library openprocurement_client.utils
756 830 ${reply}= Call Method
757 831 ... ${USERS.users['${username}'].client}
758 832 ... create_award_complaint
759   - ... ${tender}
  833 + ... ${tender.data.id}
760 834 ... ${claim}
761 835 ... ${tender.data.awards[${award_index}].id}
  836 + ... access_token=${tender.access.token}
762 837 Log ${reply}
763 838 Set To Dictionary ${USERS.users['${username}']} complaint_access_token=${reply.access.token}
764 839 Log ${USERS.users['${username}'].complaint_access_token}
... ... @@ -892,7 +967,11 @@ Library openprocurement_client.utils
892 967 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
893 968 ${tender}= set_access_key ${tender} ${USERS.users['${username}'].complaint_access_token}
894 969 ${complaint_internal_id}= openprocurement_client.Отримати internal id по UAid для скарги ${tender} ${complaintID}
895   - ${reply}= Call Method ${USERS.users['${username}'].client} upload_complaint_document ${document} ${tender} ${complaint_internal_id}
  970 + ${reply}= Call Method ${USERS.users['${username}'].client} upload_complaint_document
  971 + ... ${document}
  972 + ... ${tender.data.id}
  973 + ... ${complaint_internal_id}
  974 + ... access_token=${USERS.users['${username}'].complaint_access_token}
896 975 Log ${tender}
897 976 Log ${reply}
898 977
... ... @@ -905,7 +984,12 @@ Library openprocurement_client.utils
905 984 Log ${USERS.users['${username}'].complaint_access_token}
906 985 ${tender}= set_access_key ${tender} ${USERS.users['${username}'].complaint_access_token}
907 986 ${complaint_internal_id}= openprocurement_client.Отримати internal id по UAid для скарги ${tender} ${complaintID}
908   - ${reply}= Call Method ${USERS.users['${username}'].client} upload_award_complaint_document ${document} ${tender} ${tender.data.awards[${award_index}].id} ${complaint_internal_id}
  987 + ${reply}= Call Method ${USERS.users['${username}'].client} upload_award_complaint_document
  988 + ... ${document}
  989 + ... ${tender.data.id}
  990 + ... ${tender.data.awards[${award_index}].id}
  991 + ... ${complaint_internal_id}
  992 + ... access_token=${USERS.users['${username}'].complaint_access_token}
909 993 Log ${tender}
910 994 Log ${reply}
911 995
... ... @@ -917,7 +1001,11 @@ Library openprocurement_client.utils
917 1001 ${tender}= set_access_key ${tender} ${USERS.users['${username}'].complaint_access_token}
918 1002 ${complaint_internal_id}= openprocurement_client.Отримати internal id по UAid для скарги ${tender} ${complaintID}
919 1003 Set To Dictionary ${confirmation_data.data} id=${complaint_internal_id}
920   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_complaint ${tender} ${confirmation_data}
  1004 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_complaint
  1005 + ... ${tender.data.id}
  1006 + ... ${confirmation_data}
  1007 + ... ${complaint_internal_id}
  1008 + ... access_token=${USERS.users['${username}'].complaint_access_token}
921 1009 Log ${tender}
922 1010 Log ${reply}
923 1011
... ... @@ -931,7 +1019,12 @@ Library openprocurement_client.utils
931 1019 ${tender}= set_access_key ${tender} ${USERS.users['${username}'].complaint_access_token}
932 1020 ${complaint_internal_id}= openprocurement_client.Отримати internal id по UAid для скарги ${tender} ${complaintID}
933 1021 Set To Dictionary ${confirmation_data.data} id=${complaint_internal_id}
934   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_award_complaint ${tender} ${confirmation_data} ${tender.data.awards[${award_index}].id}
  1022 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_award_complaint
  1023 + ... ${tender.data.id}
  1024 + ... ${confirmation_data}
  1025 + ... ${tender.data.awards[${award_index}].id}
  1026 + ... ${complaint_internal_id}
  1027 + ... access_token=${tender.access.token}
935 1028 Log ${tender}
936 1029 Log ${reply}
937 1030
... ... @@ -952,7 +1045,11 @@ Library openprocurement_client.utils
952 1045 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
953 1046 ${complaint_internal_id}= openprocurement_client.Отримати internal id по UAid для скарги ${tender} ${complaintID}
954 1047 Set To Dictionary ${answer_data.data} id=${complaint_internal_id}
955   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_complaint ${tender} ${answer_data}
  1048 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_complaint
  1049 + ... ${tender.data.id}
  1050 + ... ${answer_data}
  1051 + ... ${complaint_internal_id}
  1052 + ... access_token=${tender.access.token}
956 1053 log ${tender}
957 1054 Log ${reply}
958 1055
... ... @@ -963,7 +1060,12 @@ Library openprocurement_client.utils
963 1060 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
964 1061 ${complaint_internal_id}= openprocurement_client.Отримати internal id по UAid для скарги ${tender} ${complaintID}
965 1062 Set To Dictionary ${answer_data.data} id=${complaint_internal_id}
966   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_award_complaint ${tender} ${answer_data} ${tender.data.awards[${award_index}].id}
  1063 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_award_complaint
  1064 + ... ${tender.data.id}
  1065 + ... ${answer_data}
  1066 + ... ${tender.data.awards[${award_index}].id}
  1067 + ... ${complaint_internal_id}
  1068 + ... access_token=${tender.access.token}
967 1069 log ${tender}
968 1070 Log ${reply}
969 1071
... ... @@ -981,7 +1083,11 @@ Library openprocurement_client.utils
981 1083 ${tender}= set_access_key ${tender} ${USERS.users['${username}'].complaint_access_token}
982 1084 ${complaint_internal_id}= openprocurement_client.Отримати internal id по UAid для скарги ${tender} ${complaintID}
983 1085 Set To Dictionary ${confirmation_data.data} id=${complaint_internal_id}
984   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_complaint ${tender} ${confirmation_data}
  1086 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_complaint
  1087 + ... ${tender.data.id}
  1088 + ... ${confirmation_data}
  1089 + ... ${complaint_internal_id}
  1090 + ... access_token=${tender.access.token}
985 1091 Log ${reply}
986 1092
987 1093
... ... @@ -992,7 +1098,12 @@ Library openprocurement_client.utils
992 1098 ${tender}= set_access_key ${tender} ${USERS.users['${username}'].complaint_access_token}
993 1099 ${complaint_internal_id}= openprocurement_client.Отримати internal id по UAid для скарги ${tender} ${complaintID}
994 1100 Set To Dictionary ${confirmation_data.data} id=${complaint_internal_id}
995   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_award_complaint ${tender} ${confirmation_data} ${tender.data.awards[${award_index}].id}
  1101 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_award_complaint
  1102 + ... ${tender.data.id}
  1103 + ... ${confirmation_data}
  1104 + ... ${tender.data.awards[${award_index}].id}
  1105 + ... ${complaint_internal_id}
  1106 + ... access_token=${USERS.users['${username}'].complaint_access_token}
996 1107 Log ${reply}
997 1108
998 1109
... ... @@ -1009,7 +1120,11 @@ Library openprocurement_client.utils
1009 1120 ${tender}= set_access_key ${tender} ${USERS.users['${username}'].complaint_access_token}
1010 1121 ${complaint_internal_id}= openprocurement_client.Отримати internal id по UAid для скарги ${tender} ${complaintID}
1011 1122 Set To Dictionary ${cancellation_data.data} id=${complaint_internal_id}
1012   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_complaint ${tender} ${cancellation_data}
  1123 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_complaint
  1124 + ... ${tender.data.id}
  1125 + ... ${cancellation_data}
  1126 + ... ${complaint_internal_id}
  1127 + ... access_token=${USERS.users['${username}'].complaint_access_token}
1013 1128 Log ${reply}
1014 1129
1015 1130
... ... @@ -1020,7 +1135,12 @@ Library openprocurement_client.utils
1020 1135 ${tender}= set_access_key ${tender} ${USERS.users['${username}'].complaint_access_token}
1021 1136 ${complaint_internal_id}= openprocurement_client.Отримати internal id по UAid для скарги ${tender} ${complaintID}
1022 1137 Set To Dictionary ${cancellation_data.data} id=${complaint_internal_id}
1023   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_award_complaint ${tender} ${cancellation_data} ${tender.data.awards[${award_index}].id}
  1138 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_award_complaint
  1139 + ... ${tender.data.id}
  1140 + ... ${cancellation_data}
  1141 + ... ${tender.data.awards[${award_index}].id}
  1142 + ... ${complaint_internal_id}
  1143 + ... access_token=${USERS.users['${username}'].complaint_access_token}
1024 1144 Log ${reply}
1025 1145
1026 1146
... ... @@ -1037,7 +1157,11 @@ Library openprocurement_client.utils
1037 1157 ${tender}= set_access_key ${tender} ${USERS.users['${username}'].complaint_access_token}
1038 1158 ${complaint_internal_id}= openprocurement_client.Отримати internal id по UAid для скарги ${tender} ${complaintID}
1039 1159 Set To Dictionary ${escalating_data.data} id=${complaint_internal_id}
1040   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_complaint ${tender} ${escalating_data}
  1160 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_complaint
  1161 + ... ${tender.data.id}
  1162 + ... ${escalating_data}
  1163 + ... ${complaint_internal_id}
  1164 + ... access_token=${USERS.users['${username}'].complaint_access_token}
1041 1165 Log ${reply}
1042 1166
1043 1167
... ... @@ -1048,7 +1172,12 @@ Library openprocurement_client.utils
1048 1172 ${tender}= set_access_key ${tender} ${USERS.users['${username}'].complaint_access_token}
1049 1173 ${complaint_internal_id}= openprocurement_client.Отримати internal id по UAid для скарги ${tender} ${complaintID}
1050 1174 Set To Dictionary ${escalating_data.data} id=${complaint_internal_id}
1051   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_award_complaint ${tender} ${escalating_data} ${tender.data.awards[${award_index}].id}
  1175 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_award_complaint
  1176 + ... ${tender.data.id}
  1177 + ... ${escalating_data}
  1178 + ... ${tender.data.awards[${award_index}].id}
  1179 + ... ${complaint_internal_id}
  1180 + ... access_token=${USERS.users['${username}'].complaint_access_token}
1052 1181 Log ${reply}
1053 1182
1054 1183
... ... @@ -1103,7 +1232,7 @@ Library openprocurement_client.utils
1103 1232 \ ${feature_index}= get_object_index_by_id ${tender.data.features} ${feature_id}
1104 1233 \ ${code}= Get Variable Value ${tender.data.features[${feature_index}].code}
1105 1234 \ Set To Dictionary ${bid.data.parameters[${index}]} code=${code}
1106   - ${reply}= Call Method ${USERS.users['${username}'].client} create_bid ${tender} ${bid}
  1235 + ${reply}= Call Method ${USERS.users['${username}'].client} create_bid ${tender.data.id} ${bid}
1107 1236 Log ${reply}
1108 1237 Set To Dictionary ${USERS.users['${username}']} bid_access_token=${reply.access.token}
1109 1238 ${tender}= set_access_key ${tender} ${USERS.users['${username}'].bid_access_token}
... ... @@ -1111,7 +1240,11 @@ Library openprocurement_client.utils
1111 1240 ${methods}= Create List competitiveDialogueUA competitiveDialogueEU aboveThresholdEU closeFrameworkAgreementUA
1112 1241 ${status}= Set Variable If '${procurementMethodType}' in ${methods} pending active
1113 1242 Set To Dictionary ${reply['data']} status=${status}
1114   - ${reply_active}= Call Method ${USERS.users['${username}'].client} patch_bid ${tender} ${reply}
  1243 + ${reply_active}= Call Method ${USERS.users['${username}'].client} patch_bid
  1244 + ... ${tender.data.id}
  1245 + ... ${reply}
  1246 + ... ${reply.data.id}
  1247 + ... access_token=${tender.access.token}
1115 1248 Set To Dictionary ${USERS.users['${username}']} access_token=${reply['access']['token']}
1116 1249 Set To Dictionary ${USERS.users['${username}'].bidresponses['bid'].data} id=${reply['data']['id']}
1117 1250 Log ${reply_active}
... ... @@ -1125,7 +1258,11 @@ Library openprocurement_client.utils
1125 1258 ${bid}= openprocurement_client.Отримати пропозицію ${username} ${tender_uaid}
1126 1259 Set_To_Object ${bid.data} ${fieldname} ${fieldvalue}
1127 1260 ${tender}= set_access_key ${tender} ${USERS.users['${username}']['access_token']}
1128   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_bid ${tender} ${bid}
  1261 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_bid
  1262 + ... ${tender.data.id}
  1263 + ... ${bid}
  1264 + ... ${bid.data.id}
  1265 + ... access_token=${tender.access.token}
1129 1266 Log ${reply}
1130 1267
1131 1268
... ... @@ -1133,7 +1270,10 @@ Library openprocurement_client.utils
1133 1270 [Arguments] ${username} ${tender_uaid}
1134 1271 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
1135 1272 ${bid_id}= openprocurement_client.Отримати інформацію із пропозиції ${username} ${tender_uaid} id
1136   - ${reply}= Call Method ${USERS.users['${username}'].client} delete_bid ${tender} ${bid_id} ${USERS.users['${username}']['access_token']}
  1273 + ${reply}= Call Method ${USERS.users['${username}'].client} delete_bid
  1274 + ... ${tender.data.id}
  1275 + ... ${bid_id}
  1276 + ... access_token=${USERS.users['${username}']['access_token']}
1137 1277 Log ${reply}
1138 1278
1139 1279
... ... @@ -1142,7 +1282,11 @@ Library openprocurement_client.utils
1142 1282 ${bid_id}= Get Variable Value ${USERS.users['${username}'].bidresponses['bid'].data.id}
1143 1283 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
1144 1284 ${tender}= set_access_key ${tender} ${USERS.users['${username}']['access_token']}
1145   - ${response}= Call Method ${USERS.users['${username}'].client} upload_bid_document ${path} ${tender} ${bid_id} ${doc_type}
  1285 + ${response}= Call Method ${USERS.users['${username}'].client} upload_bid_document
  1286 + ... ${path}
  1287 + ... ${tender.data.id}
  1288 + ... ${bid_id}
  1289 + ... access_token=${tender.access.token}
1146 1290 ${uploaded_file} = Create Dictionary
1147 1291 ... filepath=${path}
1148 1292 ... upload_response=${response}
... ... @@ -1157,7 +1301,12 @@ Library openprocurement_client.utils
1157 1301 ${tender}= set_access_key ${tender} ${USERS.users['${username}']['access_token']}
1158 1302 ${bid}= openprocurement_client.Отримати пропозицію ${username} ${tender_uaid}
1159 1303 ${bid_doc}= get_document_by_id ${bid.data} ${doc_id}
1160   - ${response}= Call Method ${USERS.users['${username}'].client} update_bid_document ${path} ${tender} ${bid_id} ${bid_doc['id']} ${doc_type}
  1304 + ${response}= Call Method ${USERS.users['${username}'].client} update_bid_document
  1305 + ... ${path}
  1306 + ... ${tender.data.id}
  1307 + ... ${bid_id}
  1308 + ... ${bid_doc['id']}
  1309 + ... access_token=${tender.access.token}
1161 1310 ${uploaded_file} = Create Dictionary
1162 1311 ... filepath=${path}
1163 1312 ... upload_response=${response}
... ... @@ -1172,7 +1321,12 @@ Library openprocurement_client.utils
1172 1321 ${tender}= set_access_key ${tender} ${USERS.users['${username}']['access_token']}
1173 1322 ${bid}= openprocurement_client.Отримати пропозицію ${username} ${tender_uaid}
1174 1323 ${bid_doc}= get_document_by_id ${bid.data} ${doc_id}
1175   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_bid_document ${tender} ${doc_data} ${bid_id} ${bid_doc['id']}
  1324 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_bid_document
  1325 + ... ${tender.data.id}
  1326 + ... ${doc_data}
  1327 + ... ${bid_id}
  1328 + ... ${bid_doc['id']}
  1329 + ... access_token=${tender.access.token}
1176 1330
1177 1331
1178 1332 Отримати пропозицію
... ... @@ -1180,7 +1334,10 @@ Library openprocurement_client.utils
1180 1334 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
1181 1335 ${bid_id}= Get Variable Value ${USERS.users['${username}'].bid_id}
1182 1336 ${token}= Get Variable Value ${USERS.users['${username}'].access_token}
1183   - ${reply}= Call Method ${USERS.users['${username}'].client} get_bid ${tender} ${bid_id} ${token}
  1337 + ${reply}= Call Method ${USERS.users['${username}'].client} get_bid
  1338 + ... ${tender.data.id}
  1339 + ... ${bid_id}
  1340 + ... access_token=${token}
1184 1341 ${reply}= munch_dict arg=${reply}
1185 1342 [return] ${reply}
1186 1343
... ... @@ -1203,7 +1360,10 @@ Library openprocurement_client.utils
1203 1360 ... [Return] Reply from API
1204 1361 [Arguments] ${username} ${tender_uaid} ${qualification_id}
1205 1362 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
1206   - ${doc_list}= Call Method ${USERS.users['${username}'].client} get_qualification_documents ${tender} ${qualification_id}
  1363 + ${doc_list}= Call Method ${USERS.users['${username}'].client} get_qualification_documents
  1364 + ... ${tender.data.id}
  1365 + ... ${qualification_id}
  1366 + ... access_token=${tender.access.token}
1207 1367 Log ${doc_list}
1208 1368 [Return] ${doc_list}
1209 1369
... ... @@ -1215,7 +1375,10 @@ Library openprocurement_client.utils
1215 1375 ... [Return] Reply from API
1216 1376 [Arguments] ${username} ${tender_uaid} ${award_id}
1217 1377 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
1218   - ${doc_list}= Call Method ${USERS.users['${username}'].client} get_awards_documents ${tender} ${award_id}
  1378 + ${doc_list}= Call Method ${USERS.users['${username}'].client} get_awards_documents
  1379 + ... ${tender.data.id}
  1380 + ... ${award_id}
  1381 + ... access_token=${tender.access.token}
1219 1382 Log ${doc_list}
1220 1383 [Return] ${doc_list}
1221 1384
... ... @@ -1255,7 +1418,11 @@ Library openprocurement_client.utils
1255 1418 ... [Return] Reply of API
1256 1419 [Arguments] ${username} ${document} ${tender_uaid} ${award_num}
1257 1420 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
1258   - ${doc}= Call Method ${USERS.users['${username}'].client} upload_award_document ${document} ${tender} ${tender.data.awards[${award_num}].id}
  1421 + ${doc}= Call Method ${USERS.users['${username}'].client} upload_award_document
  1422 + ... ${document}
  1423 + ... ${tender.data.id}
  1424 + ... ${tender.data.awards[${award_num}].id}
  1425 + ... access_token=${tender.access.token}
1259 1426 Log ${doc}
1260 1427
1261 1428
... ... @@ -1272,7 +1439,11 @@ Library openprocurement_client.utils
1272 1439 ... Set To Dictionary ${award.data}
1273 1440 ... qualified=${True}
1274 1441 ... eligible=${True}
1275   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_award ${tender} ${award}
  1442 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_award
  1443 + ... ${tender.data.id}
  1444 + ... ${award}
  1445 + ... ${award.data.id}
  1446 + ... access_token=${tender.access.token}
1276 1447 Log ${reply}
1277 1448
1278 1449
... ... @@ -1285,7 +1456,11 @@ Library openprocurement_client.utils
1285 1456 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
1286 1457 ${award}= create_data_dict data.status unsuccessful
1287 1458 Set To Dictionary ${award.data} id=${tender.data.awards[${award_num}].id}
1288   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_award ${tender} ${award}
  1459 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_award
  1460 + ... ${tender.data.id}
  1461 + ... ${award}
  1462 + ... ${award.data.id}
  1463 + ... access_token=${tender.access.token}
1289 1464 Log ${reply}
1290 1465 [Return] ${reply}
1291 1466
... ... @@ -1299,7 +1474,11 @@ Library openprocurement_client.utils
1299 1474 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
1300 1475 ${award}= create_data_dict data.status cancelled
1301 1476 Set To Dictionary ${award.data} id=${tender.data.awards[${award_num}].id}
1302   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_award ${tender} ${award}
  1477 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_award
  1478 + ... ${tender.data.id}
  1479 + ... ${award}
  1480 + ... ${award.data.id}
  1481 + ... access_token=${tender.access.token}
1303 1482 Log ${reply}
1304 1483
1305 1484 ##############################################################################
... ... @@ -1333,7 +1512,10 @@ Library openprocurement_client.utils
1333 1512 ${data}= Create dictionary reason=${cancellation_reason}
1334 1513 ${cancellation_data}= Create dictionary data=${data}
1335 1514 ${cancellation_data}= munch_dict arg=${cancellation_data}
1336   - ${cancel_reply}= Call Method ${USERS.users['${username}'].client} create_cancellation ${tender} ${cancellation_data}
  1515 + ${cancel_reply}= Call Method ${USERS.users['${username}'].client} create_cancellation
  1516 + ... ${tender.data.id}
  1517 + ... ${cancellation_data}
  1518 + ... access_token=${tender.access.token}
1337 1519 ${cancellation_id}= Set variable ${cancel_reply.data.id}
1338 1520
1339 1521 ${document_id}= openprocurement_client.Завантажити документацію до запиту на скасування ${username} ${tender_uaid} ${cancellation_id} ${document}
... ... @@ -1350,7 +1532,11 @@ Library openprocurement_client.utils
1350 1532 ... [Return] ID of added document
1351 1533 [Arguments] ${username} ${tender_uaid} ${cancellation_id} ${document}
1352 1534 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
1353   - ${doc_reply}= Call Method ${USERS.users['${username}'].client} upload_cancellation_document ${document} ${tender} ${cancellation_id}
  1535 + ${doc_reply}= Call Method ${USERS.users['${username}'].client} upload_cancellation_document
  1536 + ... ${document}
  1537 + ... ${tender.data.id}
  1538 + ... ${cancellation_id}
  1539 + ... access_token=${tender.access.token}
1354 1540 Log ${doc_reply}
1355 1541 [Return] ${doc_reply.data.id}
1356 1542
... ... @@ -1366,7 +1552,12 @@ Library openprocurement_client.utils
1366 1552 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
1367 1553 ${temp}= Create Dictionary ${field}=${new_description}
1368 1554 ${data}= Create Dictionary data=${temp}
1369   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_cancellation_document ${tender} ${data} ${cancellation_id} ${document_id}
  1555 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_cancellation_document
  1556 + ... ${tender.data.id}
  1557 + ... ${data}
  1558 + ... ${cancellation_id}
  1559 + ... ${document_id}
  1560 + ... access_token=${tender.access.token}
1370 1561 Log ${reply}
1371 1562
1372 1563
... ... @@ -1379,7 +1570,11 @@ Library openprocurement_client.utils
1379 1570 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
1380 1571 ${data}= test_confirm_data ${cancel_id}
1381 1572 Log ${data}
1382   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_cancellation ${tender} ${data}
  1573 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_cancellation
  1574 + ... ${tender.data.id}
  1575 + ... ${data}
  1576 + ... ${data.data.id}
  1577 + ... access_token=${tender.access.token}
1383 1578 Log ${reply}
1384 1579
1385 1580
... ... @@ -1411,7 +1606,11 @@ Library openprocurement_client.utils
1411 1606 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
1412 1607 ${qualification}= create_data_dict data.status active
1413 1608 Set To Dictionary ${qualification.data} id=${tender.data.qualifications[${qualification_num}].id} eligible=${True} qualified=${True}
1414   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_qualification ${tender} ${qualification}
  1609 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_qualification
  1610 + ... ${tender.data.id}
  1611 + ... ${qualification}
  1612 + ... ${qualification.data.id}
  1613 + ... access_token=${tender.access.token}
1415 1614 Log ${reply}
1416 1615
1417 1616
... ... @@ -1424,7 +1623,11 @@ Library openprocurement_client.utils
1424 1623 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
1425 1624 ${qualification}= create_data_dict data.status unsuccessful
1426 1625 Set To Dictionary ${qualification.data} id=${tender.data.qualifications[${qualification_num}].id}
1427   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_qualification ${tender} ${qualification}
  1626 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_qualification
  1627 + ... ${tender.data.id}
  1628 + ... ${qualification}
  1629 + ... ${qualification.data.id}
  1630 + ... access_token=${tender.access.token}
1428 1631 Log ${reply}
1429 1632
1430 1633
... ... @@ -1435,7 +1638,11 @@ Library openprocurement_client.utils
1435 1638 ... [Return] Reply of API
1436 1639 [Arguments] ${username} ${document} ${tender_uaid} ${qualification_num}
1437 1640 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
1438   - ${doc_reply}= Call Method ${USERS.users['${username}'].client} upload_qualification_document ${document} ${tender} ${tender.data.qualifications[${qualification_num}].id}
  1641 + ${doc_reply}= Call Method ${USERS.users['${username}'].client} upload_qualification_document
  1642 + ... ${document}
  1643 + ... ${tender.data.id}
  1644 + ... ${tender.data.qualifications[${qualification_num}].id}
  1645 + ... access_token=${tender.access.token}
1439 1646 Log ${doc_reply}
1440 1647
1441 1648
... ... @@ -1448,7 +1655,11 @@ Library openprocurement_client.utils
1448 1655 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
1449 1656 ${qualification}= create_data_dict data.status cancelled
1450 1657 Set To Dictionary ${qualification.data} id=${tender.data.qualifications[${qualification_num}].id}
1451   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_qualification ${tender} ${qualification}
  1658 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_qualification
  1659 + ... ${tender.data.id}
  1660 + ... ${qualification}
  1661 + ... ${qualification.data.id}
  1662 + ... access_token=${tender.access.token}
1452 1663 Log ${reply}
1453 1664
1454 1665
... ... @@ -1464,7 +1675,10 @@ Library openprocurement_client.utils
1464 1675 ${tender}= create_data_dict data.id ${internal_id}
1465 1676 ${tender}= set_access_key ${tender} ${USERS.users['${username}'].access_token}
1466 1677 set_to_object ${tender} data.status active.pre-qualification.stand-still
1467   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_tender ${tender}
  1678 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_tender
  1679 + ... ${tender.data.id}
  1680 + ... ${tender}
  1681 + ... access_token=${tender.access.token}
1468 1682 Log ${reply}
1469 1683
1470 1684
... ... @@ -1474,7 +1688,10 @@ Library openprocurement_client.utils
1474 1688 ${tender}= create_data_dict data.id ${internal_id}
1475 1689 ${tender}= set_access_key ${tender} ${USERS.users['${username}'].access_token}
1476 1690 set_to_object ${tender} data.status active.qualification.stand-still
1477   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_tender ${tender}
  1691 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_tender
  1692 + ... ${tender.data.id}
  1693 + ... ${tender}
  1694 + ... access_token=${tender.access.token}
1478 1695 Log ${reply}
1479 1696
1480 1697
... ... @@ -1490,7 +1707,10 @@ Library openprocurement_client.utils
1490 1707 ${tender}= create_data_dict data.id ${internal_id}
1491 1708 ${tender}= set_access_key ${tender} ${USERS.users['${username}'].access_token}
1492 1709 set_to_object ${tender} data.status active.stage2.waiting
1493   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_tender ${tender}
  1710 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_tender
  1711 + ... ${tender.data.id}
  1712 + ... ${tender}
  1713 + ... access_token=${tender.access.token}
1494 1714 Log ${reply}
1495 1715
1496 1716
... ... @@ -1506,7 +1726,10 @@ Library openprocurement_client.utils
1506 1726 ${tender}= create_data_dict data.id ${internal_id}
1507 1727 ${tender}= set_access_key ${tender} ${USERS.users['${username}'].access_token}
1508 1728 set_to_object ${tender} data.status active.tendering
1509   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_tender ${tender}
  1729 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_tender
  1730 + ... ${tender.data.id}
  1731 + ... ${tender}
  1732 + ... access_token=${tender.access.token}
1510 1733 Log ${reply}
1511 1734
1512 1735 ##############################################################################
... ... @@ -1518,7 +1741,11 @@ Library openprocurement_client.utils
1518 1741 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
1519 1742 ${contract}= Create Dictionary data=${tender.data.contracts[${contract_index}]}
1520 1743 Set_to_object ${contract.data} ${fieldname} ${fieldvalue}
1521   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_contract ${tender} ${contract}
  1744 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_contract
  1745 + ... ${tender.data.id}
  1746 + ... ${contract}
  1747 + ... ${contract.data.id}
  1748 + ... access_token=${tender.access.token}
1522 1749 Log ${reply}
1523 1750
1524 1751
... ... @@ -1562,7 +1789,11 @@ Library openprocurement_client.utils
1562 1789 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
1563 1790 ${contract}= Create Dictionary data=${tender.data.contracts[${contract_index}]}
1564 1791 Set To Dictionary ${contract.data} dateSigned=${fieldvalue}
1565   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_contract ${tender} ${contract}
  1792 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_contract
  1793 + ... ${tender.data.id}
  1794 + ... ${contract}
  1795 + ... ${contract.data.id}
  1796 + ... access_token=${tender.access.token}
1566 1797 Log ${reply}
1567 1798
1568 1799
... ... @@ -1574,7 +1805,11 @@ Library openprocurement_client.utils
1574 1805 ${contract}= Create Dictionary data=${tender.data.contracts[${contract_index}]}
1575 1806 Set To Dictionary ${contract.data} period=${period}
1576 1807 Log ${contract}
1577   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_contract ${tender} ${contract}
  1808 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_contract
  1809 + ... ${tender.data.id}
  1810 + ... ${contract}
  1811 + ... ${contract.data.id}
  1812 + ... access_token=${tender.access.token}
1578 1813 Log ${reply}
1579 1814
1580 1815
... ... @@ -1583,7 +1818,11 @@ Library openprocurement_client.utils
1583 1818 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
1584 1819 ${contract_id}= Get Variable Value ${tender.data.contracts[${contract_index}].id}
1585 1820 ${tender}= set_access_key ${tender} ${USERS.users['${username}']['access_token']}
1586   - ${response}= Call Method ${USERS.users['${username}'].client} upload_contract_document ${path} ${tender} ${contract_id} ${doc_type}
  1821 + ${response}= Call Method ${USERS.users['${username}'].client} upload_contract_document
  1822 + ... ${path}
  1823 + ... ${tender.data.id}
  1824 + ... ${contract_id}
  1825 + ... access_token=${tender.access.token}
1587 1826 ${uploaded_file} = Create Dictionary
1588 1827 ... filepath=${path}
1589 1828 ... upload_response=${response}
... ... @@ -1599,7 +1838,11 @@ Library openprocurement_client.utils
1599 1838 ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid}
1600 1839 ${data}= test_confirm_data ${tender['data']['contracts'][${contract_num}]['id']}
1601 1840 Log ${data}
1602   - ${reply}= Call Method ${USERS.users['${username}'].client} patch_contract ${tender} ${data}
  1841 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_contract
  1842 + ... ${tender.data.id}
  1843 + ... ${data}
  1844 + ... ${data.data.id}
  1845 + ... access_token=${tender.access.token}
1603 1846 Log ${reply}
1604 1847 [Return] ${reply}
1605 1848
... ... @@ -1662,9 +1905,15 @@ Library openprocurement_client.utils
1662 1905 [Arguments] ${username} ${contract_uaid} ${document}
1663 1906 ${contract}= openprocurement_client.Пошук договору по ідентифікатору ${username} ${contract_uaid}
1664 1907 ${contract}= set_access_key ${contract} ${USERS.users['${username}'].contract_access_token}
1665   - ${reply_doc_create}= Call Method ${USERS.users['${username}'].contracting_client} upload_document ${document} ${contract}
  1908 + ${reply_doc_create}= Call Method ${USERS.users['${username}'].contracting_client} upload_document
  1909 + ... ${document}
  1910 + ... ${contract.data.id}
  1911 + ... access_token=${contract.access.token}
1666 1912 ${change_document}= test_change_document_data ${reply_doc_create} ${USERS.users['${username}'].changes[0].data.id}
1667   - ${reply_doc_patch}= Call Method ${USERS.users['${username}'].contracting_client} patch_document ${contract} ${change_document}
  1913 + ${reply_doc_patch}= Call Method ${USERS.users['${username}'].contracting_client} patch_document
  1914 + ... ${contract.data.id}
  1915 + ... ${change_document}
  1916 + ... access_token=${contract.access.token}
1668 1917 Log ${reply_doc_create}
1669 1918 Log ${reply_doc_patch}
1670 1919
... ... @@ -1709,7 +1958,10 @@ Library openprocurement_client.utils
1709 1958 [Arguments] ${username} ${contract_uaid} ${document}
1710 1959 ${contract}= openprocurement_client.Пошук договору по ідентифікатору ${username} ${contract_uaid}
1711 1960 ${contract}= set_access_key ${contract} ${USERS.users['${username}'].contract_access_token}
1712   - ${reply}= Call Method ${USERS.users['${username}'].contracting_client} upload_document ${document} ${contract}
  1961 + ${reply}= Call Method ${USERS.users['${username}'].contracting_client} upload_document
  1962 + ... ${document}
  1963 + ... ${contract.data.id}
  1964 + ... access_token=${contract.access.token}
1713 1965 Log ${reply}
1714 1966
1715 1967
... ...
1   -from openprocurement_client.client import Client, EDRClient
  1 +from openprocurement_client.resources.tenders import Client
  2 +from openprocurement_client.resources.edr import EDRClient
2 3 from openprocurement_client.dasu_client import DasuClient
3   -from openprocurement_client.document_service_client \
4   - import DocumentServiceClient
5   -from openprocurement_client.plan import PlansClient
6   -from openprocurement_client.contract import ContractingClient
  4 +from openprocurement_client.resources.document_service import DocumentServiceClient
  5 +from openprocurement_client.resources.plans import PlansClient
  6 +from openprocurement_client.resources.contracts import ContractingClient
7 7 from openprocurement_client.exceptions import IdNotFound
8 8 from restkit.errors import RequestFailed, BadStatusLine, ResourceError
9 9 from retrying import retry
... ... @@ -49,8 +49,8 @@ class ContractingStableClient(ContractingClient):
49 49 return super(ContractingStableClient, self).request(*args, **kwargs)
50 50
51 51
52   -def prepare_contract_api_wrapper(key, host_url, api_version, ds_client=None):
53   - return ContractingStableClient(key, host_url, api_version, ds_client=ds_client)
  52 +def prepare_contract_api_wrapper(key, resource, host_url, api_version, ds_client=None):
  53 + return ContractingStableClient(key, resource, host_url, api_version, ds_client=ds_client)
54 54
55 55
56 56 class StableEDRClient(EDRClient):
... ...
Please register or login to post a comment