Merge pull request #47 from hpe-container-platform-community/improve_coverage

add catalog list() test

Author: snowch

bin/cli.py

@@ -96,6 +96,13 @@ def get_client():
         sys.exit(1)
 
 
+class CatalogProxy(object):
+    def list(self):
+        """Retrieve the list of Catalog Images
+        """
+        print(get_client().catalog.list())
+
+
 class GatewayProxy(object):
     def create_with_ssh_key(
         self,
@@ -1115,6 +1122,7 @@ def configure_cli():
 
 class CLI(object):
     def __init__(self,):
+        self.catalog = CatalogProxy()
         self.k8sworker = K8sWorkerProxy()
         self.k8scluster = K8sClusterProxy()
         self.gateway = GatewayProxy()

hpecp/catalog.py

@@ -23,8 +23,6 @@
 
 from tabulate import tabulate
 
-from hpecp.exceptions import APIItemNotFoundException
-
 
 class CatalogController:
     """This is the main class that users will interact with to talk to catalogs.
@@ -86,12 +84,6 @@ def get(self, catalog_id):
         response = self.client._request(
             url=catalog_id, http_method="get", description="catalog/get"
         )
-        if response.json()["purpose"] != "proxy":
-            raise APIItemNotFoundException(
-                message="catalog not found with id: " + catalog_id,
-                request_method="get",
-                request_url=catalog_id,
-            )
 
         return Catalog(response.json())
 
@@ -205,10 +197,9 @@ class CatalogList:
     """
 
     def __init__(self, json):
-        self.json = [g for g in json if g["purpose"] == "proxy"]
+        self.json = json
         self.catalogs = sorted(
-            [Catalog(g) for g in json if g["purpose"] == "proxy"],
-            key=attrgetter("id"),
+            [Catalog(g) for g in json], key=attrgetter("id"),
         )
         self.display_columns = Catalog.default_display_fields
 

tests/library/catalog_test.py

@@ -18,13 +18,19 @@
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 
+
+import os
+import sys
 import unittest
+from textwrap import dedent
 
 import requests
 from mock import patch
 
 from hpecp import ContainerPlatformClient
+from hpecp.catalog import CatalogList
 from hpecp.exceptions import APIItemNotFoundException
+import tempfile
 
 
 class MockResponse:
@@ -139,3 +145,137 @@ def test_get_catalog(self, mock_get, mock_post):
             "'catalog not found with id: /api/v1/catalog/100'",
         ):
             get_client().catalog.get("/api/v1/catalog/100")
+
+
+catalog_list_json = {
+    "_links": {
+        "self": {"href": "/api/v1/catalog/"},
+        "feedlog": {"href": "/api/v1/catalog/feedlog"},
+        "feed": [
+            {
+                "href": "http://127.0.0.1:8080/api/v1/feed/local",
+                "name": "Feed generated from local bundles.",
+            },
+            {
+                "href": (
+                    "https://s3.amazonaws.com/bluedata-catalog/bundles/"
+                    "catalog/external/docker/EPIC-5.0/feeds/feed.json"
+                ),
+                "name": "BlueData EPIC-5.0 catalog feed for docker",
+            },
+        ],
+    },
+    "catalog_api_version": 6,
+    "feeds_refresh_period_seconds": 86400,
+    "feeds_read_counter": 5,
+    "catalog_write_counter": 5,
+    "_embedded": {
+        "independent_catalog_entries": [
+            {
+                "_links": {
+                    "self": {"href": "/api/v1/catalog/29"},
+                    "feed": [
+                        {
+                            "href": (
+                                "https://s3.amazonaws.com/bluedata-catalog/"
+                                "bundles/catalog/external/docker/EPIC-5.0/"
+                                "feeds/feed.json"
+                            ),
+                            "name": (
+                                "BlueData EPIC-5.0 catalog feed for docker"
+                            ),
+                        }
+                    ],
+                },
+                "distro_id": "bluedata/spark240juphub7xssl",
+                "label": {
+                    "name": "Spark240",
+                    "description": (
+                        "Spark240 multirole with Jupyter Notebook, Jupyterhub"
+                        " with SSL and gateway node"
+                    ),
+                },
+                "version": "2.8",
+                "timestamp": 0,
+                "isdebug": False,
+                "osclass": ["centos"],
+                "logo": {
+                    "checksum": "1471eb59356066ed4a06130566764ea6",
+                    "url": (
+                        "http://10.1.0.53/catalog/logos/"
+                        "bluedata-spark240juphub7xssl-2.8"
+                    ),
+                },
+                "documentation": {
+                    "checksum": "52f53f1b2845463b9e370d17fb80bea6",
+                    "mimetype": "text/markdown",
+                    "file": (
+                        "/opt/bluedata/catalog/documentation/"
+                        "bluedata-spark240juphub7xssl-2.8"
+                    ),
+                },
+                "state": "initialized",
+                "state_info": "",
+            }
+        ]
+    },
+}
+
+
+class TestCatalogList(unittest.TestCase):
+    def mocked_requests_get(*args, **kwargs):
+        if args[0] == "https://127.0.0.1:8080/api/v1/catalog/":
+            return MockResponse(
+                json_data=catalog_list_json, status_code=200, headers=dict(),
+            )
+        raise RuntimeError("Unhandle GET request: " + args[0])
+
+    @patch("requests.get", side_effect=mocked_requests_get)
+    @patch("requests.post", side_effect=mocked_requests_post)
+    def test_list(self, mock_get, mock_post):
+
+        catalogList = get_client().catalog.list()
+        self.assertIsInstance(catalogList, CatalogList)
+
+
+class TestCLI(unittest.TestCase):
+    def setUp(self):
+        file_data = dedent(
+            """[default]
+                        api_host = 127.0.0.1
+                        api_port = 8080
+                        use_ssl = True
+                        verify_ssl = False
+                        warn_ssl = True
+                        username = admin
+                        password = admin123"""
+        )
+
+        self.tmpFile = tempfile.NamedTemporaryFile(delete=True)
+        self.tmpFile.write(file_data.encode("utf-8"))
+        self.tmpFile.flush()
+
+        sys.path.insert(0, os.path.abspath("../../"))
+        from bin import cli
+
+        self.cli = cli
+        self.cli.HPECP_CONFIG_FILE = self.tmpFile.name
+
+    def tearDown(self):
+        self.tmpFile.close()
+
+    def mocked_requests_get(*args, **kwargs):
+        if args[0] == "https://127.0.0.1:8080/api/v1/catalog/":
+            return MockResponse(
+                json_data=catalog_list_json, status_code=200, headers=dict(),
+            )
+        raise RuntimeError("Unhandle GET request: " + args[0])
+
+    @patch("requests.post", side_effect=mocked_requests_post)
+    @patch("requests.get", side_effect=mocked_requests_get)
+    def test_cli(self, mock_post, mock_get):
+
+        hpecp = self.cli.CLI()
+        hpecp.catalog.list()
+
+        self.assertTrue(True)