Added Directory.list_marketplaces, Directory.get_marketplace and unit tests

Author: JaviCerveraIngram

connect/config.py

@@ -35,7 +35,7 @@ def __init__(self, api_url=None, api_key=None, products=None, file=None):
         # Load config from file name
         if file:
             if not os.path.exists(file):
-                raise IOError('No file `{}` on directory'.format(file))
+                raise IOError('No file `{}` on directory `{}`'.format(file, os.getcwd()))
 
             with open(file) as config_file:
                 configs = config_file.read()

connect/resources/directory.py

@@ -7,6 +7,7 @@
 
 from connect.config import Config
 from connect.models.asset import Asset
+from connect.models.marketplace import Marketplace
 from connect.models.product import Product
 from connect.models.tier_config import TierConfig
 from connect.resources.base import ApiClient
@@ -47,6 +48,27 @@ def get_asset(self, asset_id):
         text, code = ApiClient(self._config, 'assets/' + asset_id).get()
         return Asset.deserialize(text)
 
+    def list_marketplaces(self, filters=None):
+        """ List the marketplaces.
+
+        :param dict|Query filters: Filters to pass to the request.
+        :return: A list with the marketplaces that match the given filters.
+        :rtype: list[Asset]
+        """
+        query = self._get_filters_query(filters, False)
+        text, code = ApiClient(self._config, 'marketplaces' + query.compile()).get()
+        return Marketplace.deserialize(text)
+
+    def get_marketplace(self, marketplace_id):
+        """ Returns the marketplace with the given id.
+
+        :param str marketplace_id: The id of the marketplace.
+        :return: The asset with the given id, or ``None`` if such asset does not exist.
+        :rtype: Asset|None
+        """
+        text, code = ApiClient(self._config, 'marketplaces/' + marketplace_id).get()
+        return Marketplace.deserialize(text)
+
     def list_products(self, filters=None):
         """ List the products.
 

tests/data/response_marketplace.json

@@ -0,0 +1,35 @@
+{
+  "id": "MP-12345",
+  "name": "France and territories",
+  "description": "Use the marketplace to distribute services in France and it's territories.",
+  "active_contracts": 34,
+  "icon": "/media/PA-123-123/marketplaces/MP-12345/image.png",
+  "owner": {
+    "id": "PA-123-123",
+    "name": "Awesome Provider"
+  },
+  "hubs": [
+    {
+      "hub": {
+        "id": "HB-1234-1234",
+        "name": "Staging OA 7.4"
+      },
+      "external_id": "20190101"
+    },
+    {
+      "hub": {
+        "id": "HB-4321-4321",
+        "name": "Staging OA 7.3"
+      },
+      "external_id": "70190121"
+    }
+  ],
+  "countries": [
+    {
+      "id": "IN",
+      "name": "India",
+      "icon": "/media/countries/india.png",
+      "zone": "Asia"
+    }
+  ]
+}

tests/test_directory.py

@@ -11,7 +11,7 @@
 import pytest
 
 from connect.exceptions import ServerError
-from connect.models import Asset, Product, TierConfig, ProductConfiguration
+from connect.models import Asset, Marketplace, Product, TierConfig, ProductConfiguration
 from connect.resources import Directory
 from .common import Response, load_str
 
@@ -20,6 +20,10 @@ def _get_asset_response():
     return _get_response_from_file('response_asset.json')
 
 
+def _get_marketplace_response():
+    return _get_response_from_file('response_marketplace.json')
+
+
 def _get_product_response():
     return _get_response_from_file('response_product.json')
 
@@ -86,6 +90,40 @@ def test_get_asset_bad():
         Directory().get_asset('AS-9861-7949-8492')
 
 
+@patch('requests.get')
+def test_list_marketplaces(get_mock):
+    get_mock.return_value = _get_array_response(_get_marketplace_response())
+    marketplaces = Directory().list_marketplaces()
+    assert isinstance(marketplaces, list)
+    assert len(marketplaces) == 1
+    assert isinstance(marketplaces[0], Marketplace)
+    assert marketplaces[0].id == 'MP-12345'
+
+    get_mock.assert_called_with(
+        url='http://localhost:8080/api/public/v1/marketplaces',
+        headers={'Content-Type': 'application/json', 'Authorization': 'ApiKey XXXX:YYYYY'},
+        timeout=300)
+
+
+@patch('requests.get')
+def test_get_marketplace(get_mock):
+    get_mock.return_value = _get_marketplace_response()
+    marketplace = Directory().get_marketplace('MP-12345')
+    assert isinstance(marketplace, Marketplace)
+    assert marketplace.id == 'MP-12345'
+
+    get_mock.assert_called_with(
+        url='http://localhost:8080/api/public/v1/marketplaces/MP-12345',
+        headers={'Content-Type': 'application/json', 'Authorization': 'ApiKey XXXX:YYYYY'},
+        timeout=300)
+
+
+@patch('requests.get', MagicMock(return_value=_get_bad_response()))
+def test_get_marketplace_bad():
+    with pytest.raises(ServerError):
+        Directory().get_marketplace('MP-00000')
+
+
 @patch('requests.get')
 def test_list_products(get_mock):
     get_mock.return_value = _get_array_response(_get_product_response())
@@ -167,4 +205,3 @@ def test_search_tier_account_bad():
 def test_get_tier_account_bad():
     with pytest.raises(ServerError):
         Directory().get_tier_account('TAR-0000-0000-0000-000-000')
-