Merge pull request #127 from ProzorroUKR/dasu_user

Dasu user/MPC validation

@@ -72,7 +72,13 @@ Library  openprocurement_client.utils
   ${api_wrapper}=  Run Keyword If  '${RESOURCE}' == 'plans'
   ...     prepare_plan_api_wrapper  ${USERS.users['${username}'].api_key}  PLANS  ${API_HOST_URL}  ${API_VERSION}
   ...                     ELSE  prepare_api_wrapper  ${USERS.users['${username}'].api_key}  ${RESOURCE}  ${API_HOST_URL}  ${API_VERSION}  ${ds_config}
-  ${dasu_api_wraper}=  prepare_dasu_api_wrapper  ${USERS.users['${username}'].dasu_api_key}  ${DASU_RESOURCE}  ${DASU_API_HOST_URL}  ${DASU_API_VERSION}  ${ds_config}
+  ${dasu_api_wraper}=  prepare_dasu_api_wrapper
+  ...  ${DASU_RESOURCE}
+  ...  ${DASU_API_HOST_URL}
+  ...  ${DASU_API_VERSION}
+  ...  ${USERS.users['${username}'].auth_dasu[0]}
+  ...  ${USERS.users['${username}'].auth_dasu[1]}
+  ...  ${ds_config}
   ${agreement_wrapper}=  prepare_agreement_api_wrapper  ${USERS.users['${username}'].api_key}  AGREEMENTS  ${API_HOST_URL}  ${API_VERSION}  ${ds_config}
   Set To Dictionary  ${USERS.users['${username}']}  client=${api_wrapper}
   Set To Dictionary  ${USERS.users['${username}']}  agreement_client=${agreement_wrapper}

@@ -12,6 +12,7 @@ from time import sleep
 import os
 import urllib
 
+
 def retry_if_request_failed(exception):
     status_code = getattr(exception, 'status_code', None)
     print(status_code)
@@ -146,6 +147,7 @@ def get_contracts_feed(client, interval=0.5):
     for item in get_items_feed(client, 'get_contracts', interval):
         yield item
 
+
 def get_items_feed(client, client_method, interval=0.5):
     items = True
     while items:
@@ -179,6 +181,5 @@ class StableClient_dasu(DasuClient):
         return super(StableClient_dasu, self).request(*args, **kwargs)
 
 
-def prepare_dasu_api_wrapper(key, resource, host_url, api_version, ds_config=None):
-    return StableClient_dasu(key, resource, host_url, api_version,
-                        ds_config=ds_config)
\ No newline at end of file
+def prepare_dasu_api_wrapper(resource, host_url, api_version, username, password, ds_config=None):
+    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:
             plans:    [test.quintagroup.com, test.quintagroup.com]
             auctions: [test.quintagroup.com, bc698baa8b814908bc75405ed3d63548]
         api_key:      e9c3ccb8e8124f26941d5f9639a4ebc3
-        dasu_api_key: e9c3ccb8e8124f26941d5f9639a4ebc3
+        auth_dasu: [test.quintagroup.com, e9c3ccb8e8124f26941d5f9639a4ebc3]
         broker:   Quinta
         auth_edr: [test.quintagroup.com, f5111c99a97a45348d8165ba8fcf0d62]
         browser:  phantomjs
@@ -17,7 +17,7 @@ users:
             plans:    [test.quintagroup.com, test.quintagroup.com]
             auctions: [test.quintagroup.com, bc698baa8b814908bc75405ed3d63548]
         api_key:  e9c3ccb8e8124f26941d5f9639a4ebc3
-        dasu_api_key: ""
+        auth_dasu: [test.quintagroup.com, e9c3ccb8e8124f26941d5f9639a4ebc3]
         broker:   Quinta
         auth_edr: [test.quintagroup.com, f5111c99a97a45348d8165ba8fcf0d62]
         browser:  phantomjs
@@ -29,7 +29,7 @@ users:
             plans:    [test.quintagroup.com, test.quintagroup.com]
             auctions: [test.quintagroup.com, bc698baa8b814908bc75405ed3d63548]
         api_key:  e9c3ccb8e8124f26941d5f9639a4ebc3
-        dasu_api_key: ""
+        auth_dasu: [test.quintagroup.com, e9c3ccb8e8124f26941d5f9639a4ebc3]
         broker:   Quinta
         auth_edr: [test.quintagroup.com, f5111c99a97a45348d8165ba8fcf0d62]
         browser:  phantomjs
@@ -41,7 +41,7 @@ users:
             plans:    [test.quintagroup.com, test.quintagroup.com]
             auctions: [test.quintagroup.com, bc698baa8b814908bc75405ed3d63548]
         api_key:  e9c3ccb8e8124f26941d5f9639a4ebc3
-        dasu_api_key: ""
+        auth_dasu: [test.quintagroup.com, e9c3ccb8e8124f26941d5f9639a4ebc3]
         broker:   Quinta
         auth_edr: [test.quintagroup.com, f5111c99a97a45348d8165ba8fcf0d62]
         browser:  phantomjs
@@ -54,7 +54,7 @@ users:
             monitorings:  [test.quintagroup.com, test.quintagroup.com]
             auctions: [test.quintagroup.com, bc698baa8b814908bc75405ed3d63548]
         api_key:  ""
-        dasu_api_key: ""
+        auth_dasu: [test.quintagroup.com, e9c3ccb8e8124f26941d5f9639a4ebc3]
         broker:   Quinta
         browser:  chrome
         auth_edr: [test.quintagroup.com, f5111c99a97a45348d8165ba8fcf0d62]
@@ -65,7 +65,7 @@ users:
             monitorings:  [test.quintagroup.com, test.quintagroup.com]
             plans:        [test.quintagroup.com, test.quintagroup.com]
             tenders:      [test.quintagroup.com, test.quintagroup.com]
-        dasu_api_key:  9987b551710b44699bf2ad10188bcf65
+        auth_dasu: [robot_test_sas, 9987b551710b44699bf2ad10188bcf65]
         api_key:  9987b551710b44699bf2ad10188bcf65
         broker:   Quinta
         browser:  phantomjs

@@ -172,7 +172,6 @@ def test_tender_data(params,
     data = {
         "mode": "test",
         "submissionMethodDetails": submissionMethodDetails,
-        "mainProcurementCategory": fake.random_element(('goods', 'services', 'works')),
         "description": fake.description(),
         "description_en": fake_en.sentence(nb_words=10, variable_nb_words=True),
         "description_ru": fake_ru.sentence(nb_words=10, variable_nb_words=True),
@@ -193,6 +192,12 @@ def test_tender_data(params,
         "items": [],
         "features": []
     }
+    if params.get("mode") == "open_framework":
+        data["mainProcurementCategory"] = random.choice(['goods', 'services'])
+    elif params.get("mode") == "open_competitive_dialogue":
+        data["mainProcurementCategory"] = random.choice(['services', 'works'])
+    else:
+        data["mainProcurementCategory"] = random.choice(['goods', 'services', 'works'])
     accelerator = accelerator \
         if accelerator else params['intervals']['accelerator']
     data['procurementMethodDetails'] = 'quick, ' \