Commit 68dc92c532b502badae9489df8de59a6b4fd3a07
1 parent
825d126a
add api_version to prepare_edr_wrapper, add auth_edr block to users.yaml, add ED…
…R_HOST_URL, EDR_VERSION
Showing
4 changed files
with
11 additions
and
8 deletions
| ... | ... | @@ -27,11 +27,9 @@ Library openprocurement_client_helper.py |
| 27 | 27 | ${id_map}= Create Dictionary |
| 28 | 28 | Set To Dictionary ${USERS.users['${username}']} id_map=${id_map} |
| 29 | 29 | Log ${EDR_HOST_URL} |
| 30 | - Log ${EDR_USERNAME} | |
| 31 | - Log ${EDR_PASSWORD} | |
| 32 | - ${edr_wrapper}= prepare edr wrapper ${EDR_HOST_URL} ${EDR_USERNAME} ${EDR_PASSWORD} | |
| 30 | + Log ${EDR_VERSION} | |
| 31 | + ${edr_wrapper}= prepare_edr_wrapper ${EDR_HOST_URL} ${EDR_VERSION} ${USERS.users['${username}'].auth_edr[0]} ${USERS.users['${username}'].auth_edr[1]} | |
| 33 | 32 | Set To Dictionary ${USERS.users['${username}']} edr_client=${edr_wrapper} |
| 34 | - Log Variables | |
| 35 | 33 | |
| 36 | 34 | |
| 37 | 35 | Завантажити документ |
| ... | ... | @@ -700,7 +698,7 @@ Library openprocurement_client_helper.py |
| 700 | 698 | # Bid operations |
| 701 | 699 | ############################################################################## |
| 702 | 700 | |
| 703 | -Перевірити учасника за ЕДРПОУ | |
| 701 | +Перевірити учасника за ЄДРПОУ | |
| 704 | 702 | [Arguments] ${username} ${edrpou} |
| 705 | 703 | ${reply}= Call Method ${USERS.users['${username}'].edr_client} verify_member ${edrpou} |
| 706 | 704 | Log ${reply} |
| ... | ... | @@ -708,7 +706,7 @@ Library openprocurement_client_helper.py |
| 708 | 706 | |
| 709 | 707 | Подати цінову пропозицію |
| 710 | 708 | [Arguments] ${username} ${tender_uaid} ${bid} ${lots_ids}=${None} ${features_ids}=${None} |
| 711 | - ${verify_response}= Run As ${username} Перевірити учасника за ЕДРПОУ ${bid.data.tenderers[0].identifier.id} | |
| 709 | + ${verify_response}= Run As ${username} Перевірити учасника за ЄДРПОУ ${bid.data.tenderers[0].identifier.id} | |
| 712 | 710 | Log ${verify_response} |
| 713 | 711 | ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} |
| 714 | 712 | ${lots_ids}= Run Keyword IF ${lots_ids} Set Variable ${lots_ids} | ... | ... |
| ... | ... | @@ -35,8 +35,8 @@ class StableEDRClient(EDRClient): |
| 35 | 35 | return super(StableEDRClient, self).request(*args, **kwargs) |
| 36 | 36 | |
| 37 | 37 | |
| 38 | -def prepare_edr_wrapper(host_url, username, password=''): | |
| 39 | - return StableEDRClient(host_url, username, password) | |
| 38 | +def prepare_edr_wrapper(host_url, api_version, username, password): | |
| 39 | + return StableEDRClient(host_url, api_version, username, password) | |
| 40 | 40 | |
| 41 | 41 | |
| 42 | 42 | def get_complaint_internal_id(tender, complaintID): | ... | ... |
| ... | ... | @@ -2,12 +2,15 @@ users: |
| 2 | 2 | Tender_Owner: |
| 3 | 3 | api_key: e9c3ccb8e8124f26941d5f9639a4ebc3 |
| 4 | 4 | broker: Quinta |
| 5 | + auth_edr: [test.quintagroup.com, f5111c99a97a45348d8165ba8fcf0d62] | |
| 5 | 6 | Tender_User: |
| 6 | 7 | api_key: e9c3ccb8e8124f26941d5f9639a4ebc3 |
| 7 | 8 | broker: Quinta |
| 9 | + auth_edr: [test.quintagroup.com, f5111c99a97a45348d8165ba8fcf0d62] | |
| 8 | 10 | Tender_User1: |
| 9 | 11 | api_key: e9c3ccb8e8124f26941d5f9639a4ebc3 |
| 10 | 12 | broker: Quinta |
| 13 | + auth_edr: [test.quintagroup.com, f5111c99a97a45348d8165ba8fcf0d62] | |
| 11 | 14 | Tender_User2: |
| 12 | 15 | api_key: e9c3ccb8e8124f26941d5f9639a4ebc3 |
| 13 | 16 | broker: Quinta | ... | ... |
Please
register
or
login
to post a comment