Commit e34e7b97d97685e9ec07a3e54d55a49452ecdb1d

Authored by qa-user-1
1 parent a707a1bf

first_version

... ... @@ -72,7 +72,13 @@ Library openprocurement_client.utils
72 72 ${api_wrapper}= Run Keyword If '${RESOURCE}' == 'plans'
73 73 ... prepare_plan_api_wrapper ${USERS.users['${username}'].api_key} PLANS ${API_HOST_URL} ${API_VERSION}
74 74 ... ELSE prepare_api_wrapper ${USERS.users['${username}'].api_key} ${RESOURCE} ${API_HOST_URL} ${API_VERSION} ${ds_config}
75   - ${dasu_api_wraper}= prepare_dasu_api_wrapper ${USERS.users['${username}'].dasu_api_key} ${DASU_RESOURCE} ${DASU_API_HOST_URL} ${DASU_API_VERSION} ${ds_config}
  75 + ${dasu_api_wraper}= prepare_dasu_api_wrapper
  76 + ... ${DASU_RESOURCE}
  77 + ... ${DASU_API_HOST_URL}
  78 + ... ${DASU_API_VERSION}
  79 + ... ${USERS.users['${username}'].auth_dasu[0]}
  80 + ... ${USERS.users['${username}'].auth_dasu[1]}
  81 + ... ${ds_config}
76 82 ${agreement_wrapper}= prepare_agreement_api_wrapper ${USERS.users['${username}'].api_key} AGREEMENTS ${API_HOST_URL} ${API_VERSION} ${ds_config}
77 83 Set To Dictionary ${USERS.users['${username}']} client=${api_wrapper}
78 84 Set To Dictionary ${USERS.users['${username}']} agreement_client=${agreement_wrapper}
... ...
... ... @@ -179,6 +179,5 @@ class StableClient_dasu(DasuClient):
179 179 return super(StableClient_dasu, self).request(*args, **kwargs)
180 180
181 181
182   -def prepare_dasu_api_wrapper(key, resource, host_url, api_version, ds_config=None):
183   - return StableClient_dasu(key, resource, host_url, api_version,
184   - ds_config=ds_config)
\ No newline at end of file
  182 +def prepare_dasu_api_wrapper(resource, host_url, api_version, username, password, ds_config=None):
  183 + return StableClient_dasu(resource, host_url, api_version, username, password, ds_config=ds_config)
\ No newline at end of file
... ...
... ... @@ -5,7 +5,7 @@ users:
5 5 plans: [test.quintagroup.com, test.quintagroup.com]
6 6 auctions: [test.quintagroup.com, bc698baa8b814908bc75405ed3d63548]
7 7 api_key: e9c3ccb8e8124f26941d5f9639a4ebc3
8   - dasu_api_key: e9c3ccb8e8124f26941d5f9639a4ebc3
  8 + auth_dasu: [dGVzdF9zYXM6dGVzdF9zYXNfdG9rZW4, dGVzdF9zYXM6dGVzdF9zYXNfdG9rZW4]
9 9 broker: Quinta
10 10 auth_edr: [test.quintagroup.com, f5111c99a97a45348d8165ba8fcf0d62]
11 11 browser: phantomjs
... ... @@ -17,7 +17,7 @@ users:
17 17 plans: [test.quintagroup.com, test.quintagroup.com]
18 18 auctions: [test.quintagroup.com, bc698baa8b814908bc75405ed3d63548]
19 19 api_key: e9c3ccb8e8124f26941d5f9639a4ebc3
20   - dasu_api_key: ""
  20 + auth_dasu: [dGVzdF9zYXM6dGVzdF9zYXNfdG9rZW4, dGVzdF9zYXM6dGVzdF9zYXNfdG9rZW4]
21 21 broker: Quinta
22 22 auth_edr: [test.quintagroup.com, f5111c99a97a45348d8165ba8fcf0d62]
23 23 browser: phantomjs
... ... @@ -29,7 +29,7 @@ users:
29 29 plans: [test.quintagroup.com, test.quintagroup.com]
30 30 auctions: [test.quintagroup.com, bc698baa8b814908bc75405ed3d63548]
31 31 api_key: e9c3ccb8e8124f26941d5f9639a4ebc3
32   - dasu_api_key: ""
  32 + auth_dasu: [dGVzdF9zYXM6dGVzdF9zYXNfdG9rZW4, dGVzdF9zYXM6dGVzdF9zYXNfdG9rZW4]
33 33 broker: Quinta
34 34 auth_edr: [test.quintagroup.com, f5111c99a97a45348d8165ba8fcf0d62]
35 35 browser: phantomjs
... ... @@ -41,7 +41,7 @@ users:
41 41 plans: [test.quintagroup.com, test.quintagroup.com]
42 42 auctions: [test.quintagroup.com, bc698baa8b814908bc75405ed3d63548]
43 43 api_key: e9c3ccb8e8124f26941d5f9639a4ebc3
44   - dasu_api_key: ""
  44 + auth_dasu: [dGVzdF9zYXM6dGVzdF9zYXNfdG9rZW4, dGVzdF9zYXM6dGVzdF9zYXNfdG9rZW4]
45 45 broker: Quinta
46 46 auth_edr: [test.quintagroup.com, f5111c99a97a45348d8165ba8fcf0d62]
47 47 browser: phantomjs
... ... @@ -54,7 +54,7 @@ users:
54 54 monitorings: [test.quintagroup.com, test.quintagroup.com]
55 55 auctions: [test.quintagroup.com, bc698baa8b814908bc75405ed3d63548]
56 56 api_key: ""
57   - dasu_api_key: ""
  57 + auth_dasu: [dGVzdF9zYXM6dGVzdF9zYXNfdG9rZW4, dGVzdF9zYXM6dGVzdF9zYXNfdG9rZW4]
58 58 broker: Quinta
59 59 browser: chrome
60 60 auth_edr: [test.quintagroup.com, f5111c99a97a45348d8165ba8fcf0d62]
... ... @@ -65,7 +65,7 @@ users:
65 65 monitorings: [test.quintagroup.com, test.quintagroup.com]
66 66 plans: [test.quintagroup.com, test.quintagroup.com]
67 67 tenders: [test.quintagroup.com, test.quintagroup.com]
68   - dasu_api_key: 9987b551710b44699bf2ad10188bcf65
  68 + auth_dasu: [dGVzdF9zYXM6dGVzdF9zYXNfdG9rZW4, dGVzdF9zYXM6dGVzdF9zYXNfdG9rZW4]
69 69 api_key: 9987b551710b44699bf2ad10188bcf65
70 70 broker: Quinta
71 71 browser: phantomjs
... ...
Please register or login to post a comment