Merge branch 'ds-master' into devel

godsdog
2 parents 4f9a8dd7 328ad111
Showing 8 changed files with 59 additions and 15 deletions
buildout.cfg
op_robot_tests/tests_files/base_keywords.robot
op_robot_tests/tests_files/brokers/openprocurement_client.robot
op_robot_tests/tests_files/brokers/openprocurement_client_helper.py
op_robot_tests/tests_files/data/brokers.yaml
op_robot_tests/tests_files/data/users.yaml
op_robot_tests/tests_files/keywords.robot
op_robot_tests/tests_files/resource.robot
--- a/buildout.cfg
View file @1fb4722
+++ b/buildout.cfg
View file @1fb4722
@@ -14,6 +14,7 @@ recipe = zc.recipe.egg
 eggs =
     op_robot_tests
     openprocurement_client
+    restkit
     robotframework
     robotframework-lint
     robotframework-debuglibrary
@@ -57,7 +58,7 @@ gh_push = git@github.com:
 [sources]
 barbecue                        = git ${remotes:gh}openprocurement/barbecue.git
-openprocurement_client          = git ${remotes:gh}openprocurement/openprocurement.client.python.git
+openprocurement_client          = git ${remotes:gh}openprocurement/openprocurement.client.python.git branch=use_requests
 robot_tests.broker.alltenders   = git ${remotes:gh}openprocurement/robot_tests.broker.alltenders.git
 robot_tests.broker.dzo          = git ${remotes:gh}openprocurement/robot_tests.broker.dzo.git
 robot_tests.broker.25h8         = git ${remotes:gh}openprocurement/robot_tests.broker.25h8.git
--- a/op_robot_tests/tests_files/base_keywords.robot
View file @1fb4722
+++ b/op_robot_tests/tests_files/base_keywords.robot
View file @1fb4722
@@ -16,6 +16,7 @@ Resource           resource.robot
   ...      tender_meat=${${TENDER_MEAT}}
   ...      lot_meat=${${LOT_MEAT}}
   ...      item_meat=${${ITEM_MEAT}}
+  ...      api_host_url=${API_HOST_URL}
   ${DIALOGUE_TYPE}=  Get Variable Value  ${DIALOGUE_TYPE}
   Run keyword if  '${DIALOGUE_TYPE}' != '${None}'  Set to dictionary  ${tender_parameters}  dialogue_type=${DIALOGUE_TYPE}
   ${tender_data}=  Підготувати дані для створення тендера  ${tender_parameters}
--- a/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @1fb4722
+++ b/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @1fb4722
 *** Settings ***
 Library  openprocurement_client_helper.py
+Library  openprocurement_client.utils
 *** Keywords ***
@@ -18,10 +19,20 @@ Library  openprocurement_client_helper.py
 Підготувати клієнт для користувача
   [Arguments]  ${username}
-  [Documentation]  Відкрити браузер, створити об’єкт api wrapper, створити об’єкт edr_wrapper, тощо
+  [Documentation]  Відкрити браузер, створити об’єкти api wrapper і
+  ...              ds api wrapper, приєднати їх атрибутами до користувача, тощо
+  Log  ${RESOURCE}
   Log  ${API_HOST_URL}
   Log  ${API_VERSION}
-  ${api_wrapper}=  prepare_api_wrapper  ${USERS.users['${username}'].api_key}  ${API_HOST_URL}  ${API_VERSION}
+  Log  ${DS_HOST_URL}
+  ${auth_ds_all}=  get variable value  ${USERS.users.${username}.auth_ds}
+  ${auth_ds}=  set variable  ${auth_ds_all.${RESOURCE}}
+  Log  ${auth_ds}
+
+#  Uncomment this line if there is need to precess files operations without DS.
+#  ${ds_api_wraper}=  set variable  ${None}
+  ${ds_api_wraper}=  prepare_ds_api_wrapper  ${DS_HOST_URL}  ${auth_ds}
+  ${api_wrapper}=  prepare_api_wrapper  ${USERS.users['${username}'].api_key}  ${RESOURCE}  ${API_HOST_URL}  ${API_VERSION}  ${ds_api_wraper}
   Set To Dictionary  ${USERS.users['${username}']}  client=${api_wrapper}
   Set To Dictionary  ${USERS.users['${username}']}  access_token=${EMPTY}
   ${id_map}=  Create Dictionary
@@ -38,11 +49,11 @@ Library  openprocurement_client_helper.py
   Log  ${tender_uaid}
   Log  ${filepath}
   ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uaid}
-  ${tender}=  set_access_key  ${tender}   ${USERS.users['${username}'].access_token}
+  ${tender}=  set_access_key  ${tender}  ${USERS.users['${username}'].access_token}
   ${reply}=  Call Method  ${USERS.users['${username}'].client}  upload_document  ${filepath}  ${tender}
   Log object data   ${reply}  reply
   #return here is needed to have uploaded doc data in `Завантажити документ в лот` keyword
-  [return]   ${reply}
+  [return]  ${reply}
 Отримати інформацію із документа
@@ -773,13 +784,13 @@ Library  openprocurement_client_helper.py
 Змінити документ в ставці
-  [Arguments]  ${username}  ${tender_uaid}  ${path}  ${doc_id}
+  [Arguments]  ${username}  ${tender_uaid}  ${path}  ${doc_id}  ${doc_type}=documents
   ${bid_id}=  Get Variable Value   ${USERS.users['${username}'].bidresponses['bid'].data.id}
   ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uaid}
   ${tender}=  set_access_key  ${tender}  ${USERS.users['${username}']['access_token']}
   ${bid}=  openprocurement_client.Отримати пропозицію  ${username}  ${tender_uaid}
   ${bid_doc}=  get_document_by_id  ${bid.data}  ${doc_id}
-  ${response}=  Call Method  ${USERS.users['${username}'].client}  update_bid_document  ${path}  ${tender}   ${bid_id}   ${bid_doc['id']}
+  ${response}=  Call Method  ${USERS.users['${username}'].client}  update_bid_document  ${path}  ${tender}  ${bid_id}  ${bid_doc['id']}  ${doc_type}
   ${uploaded_file} =  Create Dictionary
   ...      filepath=${path}
   ...      upload_response=${response}
--- a/op_robot_tests/tests_files/brokers/openprocurement_client_helper.py
View file @1fb4722
+++ b/op_robot_tests/tests_files/brokers/openprocurement_client_helper.py
View file @1fb4722
 from openprocurement_client.client import Client, EDRClient
-from openprocurement_client.utils import get_tender_id_by_uaid
+from openprocurement_client.document_service_client \
+    import DocumentServiceClient
 from openprocurement_client.exceptions import IdNotFound
 from restkit.errors import RequestFailed, BadStatusLine
 from retrying import retry
@@ -19,13 +20,26 @@ def retry_if_request_failed(exception):
 class StableClient(Client):
-    @retry(stop_max_attempt_number=100, wait_random_min=500, wait_random_max=4000, retry_on_exception=retry_if_request_failed)
+    @retry(stop_max_attempt_number=100, wait_random_min=500,
+           wait_random_max=4000, retry_on_exception=retry_if_request_failed)
     def request(self, *args, **kwargs):
         return super(StableClient, self).request(*args, **kwargs)
-def prepare_api_wrapper(key, host_url, api_version):
-    return StableClient(key, host_url, api_version)
+class StableDsClient(DocumentServiceClient):
+    @retry(stop_max_attempt_number=100, wait_random_min=500,
+           wait_random_max=4000, retry_on_exception=retry_if_request_failed)
+    def request(self, *args, **kwargs):
+        return super(StableDsClient, self).request(*args, **kwargs)
+
+
+def prepare_api_wrapper(key, resource, host_url, api_version, ds_client=None):
+    return StableClient(key, resource, host_url, api_version,
+                        ds_client=ds_client)
+
+
+def prepare_ds_api_wrapper(ds_host_url, auth_ds):
+    return StableDsClient(ds_host_url, auth_ds)
 class StableEDRClient(EDRClient):
--- a/op_robot_tests/tests_files/data/brokers.yaml
View file @1fb4722
+++ b/op_robot_tests/tests_files/data/brokers.yaml
View file @1fb4722
@@ -151,9 +151,9 @@ ztv:
     keywords_file: ztv
     roles:
         tender_owner:   ztv_Owner
-        provider:   ztv_Provider
-        provider1:   ztv_Provider1
-        viewer:   ztv_Viewer
+        provider:       ztv_Provider
+        provider1:      ztv_Provider1
+        viewer:         ztv_Viewer
     timeout_on_wait: 300
 Newtend:
     keywords_file: newtend
--- a/op_robot_tests/tests_files/data/users.yaml
View file @1fb4722
+++ b/op_robot_tests/tests_files/data/users.yaml
View file @1fb4722
 users:
     Tender_Owner:
+        auth_ds:
+            tenders:  [test.quintagroup.com, test.quintagroup.com]
+            auctions: [test.quintagroup.com, bc698baa8b814908bc75405ed3d63548]
         api_key:  e9c3ccb8e8124f26941d5f9639a4ebc3
         broker:   Quinta
         auth_edr: [test.quintagroup.com, f5111c99a97a45348d8165ba8fcf0d62]
     Tender_User:
+        auth_ds:
+            tenders:  [test.quintagroup.com, test.quintagroup.com]
+            auctions: [test.quintagroup.com, bc698baa8b814908bc75405ed3d63548]
         api_key:  e9c3ccb8e8124f26941d5f9639a4ebc3
         broker:   Quinta
         auth_edr: [test.quintagroup.com, f5111c99a97a45348d8165ba8fcf0d62]
     Tender_User1:
+        auth_ds:
+            tenders:  [test.quintagroup.com, test.quintagroup.com]
+            auctions: [test.quintagroup.com, bc698baa8b814908bc75405ed3d63548]
         api_key:  e9c3ccb8e8124f26941d5f9639a4ebc3
         broker:   Quinta
         auth_edr: [test.quintagroup.com, f5111c99a97a45348d8165ba8fcf0d62]
     Tender_User2:
+        auth_ds:
+            tenders:  [test.quintagroup.com, test.quintagroup.com]
+            auctions: [test.quintagroup.com, bc698baa8b814908bc75405ed3d63548]
         api_key:  e9c3ccb8e8124f26941d5f9639a4ebc3
         broker:   Quinta
         auth_edr: [test.quintagroup.com, f5111c99a97a45348d8165ba8fcf0d62]
     Tender_Viewer:
+        auth_ds:
+            tenders:  [test.quintagroup.com, test.quintagroup.com]
+            auctions: [test.quintagroup.com, bc698baa8b814908bc75405ed3d63548]
         api_key:  ""
         broker:   Quinta
         browser:  firefox
--- a/op_robot_tests/tests_files/keywords.robot
View file @1fb4722
+++ b/op_robot_tests/tests_files/keywords.robot
View file @1fb4722
@@ -49,7 +49,7 @@ Set Suite Variable With Default Value
   ${repo}=    Run  git remote -v
   ${branch}=  Run  git branch -vva
   ${status}=  Run  git status
-  ${diff}=  Run  git diff
+  ${diff}=    Run  git diff
   ${reflog}=  Run  git reflog
   Log  ${commit}
   Log  ${repo}
--- a/op_robot_tests/tests_files/resource.robot
View file @1fb4722
+++ b/op_robot_tests/tests_files/resource.robot
View file @1fb4722
 *** Variables ***
+${RESOURCE}      tenders   # possible values: tenders, auctions
 ${API_HOST_URL}  https://lb.api-sandbox.openprocurement.org
 ${API_VERSION}   2.3
 ${BROKER}        Quinta
+${DS_HOST_URL}   https://upload.docs-sandbox.openprocurement.org
 ${ROLE}          viewer
 ${EDR_HOST_URL}  https://lb.edr-sandbox.openprocurement.org
 ${EDR_VERSION}   0