add api_version to prepare_edr_wrapper, add auth_edr block to users.yaml, add ED…

…R_HOST_URL, EDR_VERSION

@@ -27,11 +27,9 @@ Library  openprocurement_client_helper.py
   ${id_map}=  Create Dictionary
   ${id_map}=  Create Dictionary
   Set To Dictionary  ${USERS.users['${username}']}  id_map=${id_map}
   Set To Dictionary  ${USERS.users['${username}']}  id_map=${id_map}
   Log  ${EDR_HOST_URL}
   Log  ${EDR_HOST_URL}
-  Log  ${EDR_USERNAME}
-  Log  ${EDR_PASSWORD}
-  ${edr_wrapper}=  prepare edr wrapper  ${EDR_HOST_URL}  ${EDR_USERNAME}  ${EDR_PASSWORD}
+  Log  ${EDR_VERSION}
+  ${edr_wrapper}=  prepare_edr_wrapper  ${EDR_HOST_URL}  ${EDR_VERSION}  ${USERS.users['${username}'].auth_edr[0]}  ${USERS.users['${username}'].auth_edr[1]}
   Set To Dictionary  ${USERS.users['${username}']}  edr_client=${edr_wrapper}
   Set To Dictionary  ${USERS.users['${username}']}  edr_client=${edr_wrapper}
-  Log Variables
 
 
 
 
 Завантажити документ
 Завантажити документ
@@ -700,7 +698,7 @@ Library  openprocurement_client_helper.py
 #             Bid operations
 #             Bid operations
 ##############################################################################
 ##############################################################################
 
 
-Перевірити учасника за ЕДРПОУ
+Перевірити учасника за ЄДРПОУ
   [Arguments]  ${username}  ${edrpou}
   [Arguments]  ${username}  ${edrpou}
   ${reply}=  Call Method  ${USERS.users['${username}'].edr_client}  verify_member  ${edrpou}
   ${reply}=  Call Method  ${USERS.users['${username}'].edr_client}  verify_member  ${edrpou}
   Log  ${reply}
   Log  ${reply}
@@ -708,7 +706,7 @@ Library  openprocurement_client_helper.py
 
 
 Подати цінову пропозицію
 Подати цінову пропозицію
   [Arguments]  ${username}  ${tender_uaid}  ${bid}  ${lots_ids}=${None}  ${features_ids}=${None}
   [Arguments]  ${username}  ${tender_uaid}  ${bid}  ${lots_ids}=${None}  ${features_ids}=${None}
-  ${verify_response}=  Run As  ${username}  Перевірити учасника за ЕДРПОУ  ${bid.data.tenderers[0].identifier.id}
+  ${verify_response}=  Run As  ${username}  Перевірити учасника за ЄДРПОУ  ${bid.data.tenderers[0].identifier.id}
   Log  ${verify_response}
   Log  ${verify_response}
   ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uaid}
   ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uaid}
   ${lots_ids}=  Run Keyword IF  ${lots_ids}  Set Variable  ${lots_ids}
   ${lots_ids}=  Run Keyword IF  ${lots_ids}  Set Variable  ${lots_ids}

@@ -35,8 +35,8 @@ class StableEDRClient(EDRClient):
         return super(StableEDRClient, self).request(*args, **kwargs)
         return super(StableEDRClient, self).request(*args, **kwargs)
 
 
 
 
-def prepare_edr_wrapper(host_url, username, password=''):
-    return StableEDRClient(host_url, username, password)
+def prepare_edr_wrapper(host_url, api_version, username, password):
+    return StableEDRClient(host_url, api_version, username, password)
 
 
 
 
 def get_complaint_internal_id(tender, complaintID):
 def get_complaint_internal_id(tender, complaintID):

@@ -2,12 +2,15 @@ users:
     Tender_Owner:
     Tender_Owner:
         api_key:  e9c3ccb8e8124f26941d5f9639a4ebc3
         api_key:  e9c3ccb8e8124f26941d5f9639a4ebc3
         broker:   Quinta
         broker:   Quinta
+        auth_edr: [test.quintagroup.com, f5111c99a97a45348d8165ba8fcf0d62]
     Tender_User:
     Tender_User:
         api_key:  e9c3ccb8e8124f26941d5f9639a4ebc3
         api_key:  e9c3ccb8e8124f26941d5f9639a4ebc3
         broker:   Quinta
         broker:   Quinta
+        auth_edr: [test.quintagroup.com, f5111c99a97a45348d8165ba8fcf0d62]
     Tender_User1:
     Tender_User1:
         api_key:  e9c3ccb8e8124f26941d5f9639a4ebc3
         api_key:  e9c3ccb8e8124f26941d5f9639a4ebc3
         broker:   Quinta
         broker:   Quinta
+        auth_edr: [test.quintagroup.com, f5111c99a97a45348d8165ba8fcf0d62]
     Tender_User2:
     Tender_User2:
         api_key:  e9c3ccb8e8124f26941d5f9639a4ebc3
         api_key:  e9c3ccb8e8124f26941d5f9639a4ebc3
         broker:   Quinta
         broker:   Quinta

@@ -3,3 +3,5 @@ ${API_HOST_URL}  https://lb.api-sandbox.openprocurement.org
 ${API_VERSION}   2.3
 ${API_VERSION}   2.3
 ${BROKER}        Quinta
 ${BROKER}        Quinta
 ${ROLE}          viewer
 ${ROLE}          viewer
+${EDR_HOST_URL}  #TODO: set url
+${EDR_VERSION}   1.0