From 878a32e07f81e4bdd64edff3ef8ce23ce82a1bbe Mon Sep 17 00:00:00 2001
From: Aija Jaunteva <code@clusums.eu>
Date: Mon, 6 Aug 2018 15:49:05 +0300
Subject: [PATCH] Add support for loading resources from archive file

As Redfish Message registries can be reside inside archives,
added support to load resource from JSON files in archive.

Currently supporting only ZIP archives, support for other
archive types can be added as need arises or specification is
clarified. The Redfish specification does not detail
which types of archives need to be supported, but gives ZIP
as an example.

Change-Id: I3609df39c68f2149c1ff1a6818af7168bbd02df0
Story: 2001791
Task: 23062
---
 sushy/exceptions.py                           |   4 +
 sushy/resources/base.py                       |  69 +++++++++++++++++-
 .../tests/unit/json_samples/TestRegistry.zip  | Bin 0 -> 622 bytes
 sushy/tests/unit/resources/test_base.py       |  45 +++++++++++-
 4 files changed, 115 insertions(+), 3 deletions(-)
 create mode 100644 sushy/tests/unit/json_samples/TestRegistry.zip

diff --git a/sushy/exceptions.py b/sushy/exceptions.py
index 21531c72..e6deb372 100644
--- a/sushy/exceptions.py
+++ b/sushy/exceptions.py
@@ -57,6 +57,10 @@ class InvalidParameterValueError(SushyError):
                'Valid values are: %(valid_values)s')
 
 
+class ArchiveParsingError(SushyError):
+    message = 'Failed parsing archive "%(path)s": %(error)s'
+
+
 class HTTPError(SushyError):
     """Basic exception for HTTP errors"""
 
diff --git a/sushy/resources/base.py b/sushy/resources/base.py
index 8bc46d35..e858ae91 100644
--- a/sushy/resources/base.py
+++ b/sushy/resources/base.py
@@ -16,7 +16,10 @@
 import abc
 import collections
 import copy
+import io
+import json
 import logging
+import zipfile
 
 import six
 
@@ -244,13 +247,69 @@ class MappedField(Field):
             adapter=mapping.get)
 
 
+@six.add_metaclass(abc.ABCMeta)
+class AbstractJsonReader(object):
+
+    def set_connection(self, connector, path):
+        """Sets mandatory connection parameters
+
+        :param connector: A Connector instance
+        :param path: path of the resource
+        """
+        self._conn = connector
+        self._path = path
+
+    @abc.abstractmethod
+    def get_json(self):
+        """Based on data source get data and parse to JSON"""
+
+
+class JsonFileReader(AbstractJsonReader):
+    """Gets the data from JSON file given by path"""
+
+    def get_json(self):
+        """Gets JSON file from URI directly"""
+        return self._conn.get(path=self._path).json()
+
+
+class JsonArchiveReader(AbstractJsonReader):
+    """Gets the data from JSON file in archive"""
+
+    def __init__(self, archive_file):
+        """Initializes the reader
+
+        :param archive_file: file name of JSON file in archive
+        """
+        self._archive_file = archive_file
+
+    def get_json(self):
+        """Gets JSON file from archive. Currently supporting ZIP only"""
+
+        data = self._conn.get(path=self._path)
+        if data.headers.get('content-type') == 'application/zip':
+            try:
+                archive = zipfile.ZipFile(io.BytesIO(data.content))
+                return json.loads(archive.read(self._archive_file)
+                                  .decode(encoding='utf-8'))
+            except (zipfile.BadZipfile, ValueError) as e:
+                raise exceptions.ArchiveParsingError(
+                    path=self._path, error=e)
+        else:
+            LOG.error('Support for %(type)s not implemented',
+                      {'type': data.headers['content-type']})
+
+
 @six.add_metaclass(abc.ABCMeta)
 class ResourceBase(object):
 
     redfish_version = None
     """The Redfish version"""
 
-    def __init__(self, connector, path='', redfish_version=None):
+    def __init__(self,
+                 connector,
+                 path='',
+                 redfish_version=None,
+                 reader=JsonFileReader()):
         """A class representing the base of any Redfish resource
 
         Invokes the ``refresh()`` method of resource for the first
@@ -259,6 +318,8 @@ class ResourceBase(object):
         :param path: sub-URI path to the resource.
         :param redfish_version: The version of Redfish. Used to construct
             the object according to schema of the given version.
+        :param reader: Reader to use to fetch JSON data. Defaults to
+            JsonFileReader
         """
         self._conn = connector
         self._path = path
@@ -269,6 +330,9 @@ class ResourceBase(object):
         # attribute values are fetched.
         self._is_stale = True
 
+        reader.set_connection(connector, path)
+        self._reader = reader
+
         self.refresh()
 
     def _parse_attributes(self):
@@ -299,7 +363,8 @@ class ResourceBase(object):
         if not self._is_stale and not force:
             return
 
-        self._json = self._conn.get(path=self._path).json()
+        self._json = self._reader.get_json()
+
         LOG.debug('Received representation of %(type)s %(path)s: %(json)s',
                   {'type': self.__class__.__name__,
                    'path': self._path, 'json': self._json})
diff --git a/sushy/tests/unit/json_samples/TestRegistry.zip b/sushy/tests/unit/json_samples/TestRegistry.zip
new file mode 100644
index 0000000000000000000000000000000000000000..565c7c88648262e4bbc7bd9738514bf72d74accc
GIT binary patch
literal 622
zcmWIWW@Zs#-~hrowQRl&P_UbYfq|DnfgvQdxJ1uL&p<D$I6p5mgqMN+gi}T|43}1L
zGcdBeU}j(d6LW)4=N&Q-*z;L*b;ye8T3j;Kue!ZLqa6e;I)^S)jg(n^&~2NuwBo<L
z=epe&IOg&NZrN<S+j!%3-3|T4%FZS)W|erJGqn(3zr@r?O7QWm6<1<Qm)*NkoSpi7
zRf2u1<Vp41JL_KWj0=7LxJiq}OYh1_eT|5u#x)aNLTeRdHTIdrbj2t>k_tK5GT~Xw
zgf>^jm5F+yFI?O;C9J!+!%l`AZaWpUZ*}ae7cEot*cvb2G&lGm6t+g4$2`;RTzW`C
zrbl$b-0)AYEI66CWkmcfU#<06s<!EqL4}^`_Pt9>*6L4bT5~q0e%_J7SJx_&H{E@@
z?)a*|DTd0XGwy3md;9$A1Hnv5^{aKY)@N>-<&^C`r~GNgq0MZ+H{H1PZ--lRoy&%h
zBF|GxF1$P7bJCyb)~!5~%6$8ZhL4h~=StbQv~u5<`^Hmaf1v1&T-O@`SqAyuLf*g+
z4@%<pO(~x<_iT1kp;N+=7RhwpO5W3J^h&2)(@JO6XfZKRPUyNYfk}8_L)mu2J?0@v
z<>7Uw*ZtoAW?i4)MDG8pq4(p;QcfI=+qCx4-ps!Y0p9E!xxK&EEn;L~07Y?tHzSh>
kGa~wt<v`I714|k~ERqsKfHx}}NE0IvMg!@;Kr0y-0PP6#&;S4c

literal 0
HcmV?d00001

diff --git a/sushy/tests/unit/resources/test_base.py b/sushy/tests/unit/resources/test_base.py
index 3b14245b..c0f07479 100644
--- a/sushy/tests/unit/resources/test_base.py
+++ b/sushy/tests/unit/resources/test_base.py
@@ -14,13 +14,15 @@
 #    under the License.
 
 import copy
-
+import io
 import mock
+
 from six.moves import http_client
 
 from sushy import exceptions
 from sushy.resources import base as resource_base
 from sushy.tests.unit import base
+import zipfile
 
 
 class BaseResource(resource_base.ResourceBase):
@@ -59,6 +61,47 @@ class ResourceBaseTestCase(base.TestCase):
         self.base_resource.invalidate(force_refresh=True)
         self.conn.get.assert_called_once_with(path='/Foo')
 
+    def test_refresh_archive(self):
+        mock_response = mock.Mock(
+            headers={'content-type': 'application/zip'})
+        with open('sushy/tests/unit/json_samples/TestRegistry.zip', 'rb') as f:
+            mock_response.content = f.read()
+        self.conn.get.return_value = mock_response
+
+        resource = BaseResource(connector=self.conn,
+                                path='/Foo',
+                                redfish_version='1.0.2',
+                                reader=resource_base.
+                                JsonArchiveReader('Test.2.0.json'))
+
+        self.assertIsNotNone(resource._json)
+        self.assertEqual('Test.2.0.0', resource._json['Id'])
+
+    @mock.patch.object(resource_base, 'LOG', autospec=True)
+    def test_refresh_archive_not_implemented(self, mock_log):
+        mock_response = mock.Mock(
+            headers={'content-type': 'application/gzip'})
+        self.conn.get.return_value = mock_response
+        BaseResource(connector=self.conn,
+                     path='/Foo',
+                     redfish_version='1.0.2',
+                     reader=resource_base.JsonArchiveReader('Test.2.0.json'))
+        mock_log.error.assert_called_once()
+
+    @mock.patch.object(io, 'BytesIO', autospec=True)
+    def test_refresh_archive_badzip_error(self, mock_io):
+        mock_response = mock.Mock(
+            headers={'content-type': 'application/zip'})
+        mock_io.side_effect = zipfile.BadZipfile('Something wrong')
+        self.conn.get.return_value = mock_response
+
+        self.assertRaises(exceptions.SushyError,
+                          BaseResource, connector=self.conn,
+                          path='/Foo',
+                          redfish_version='1.0.2',
+                          reader=resource_base.
+                          JsonArchiveReader('Test.2.0.json'))
+
 
 class TestResource(resource_base.ResourceBase):
     """A concrete Test Resource to test against"""