X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=genericparser%2Fpub%2Futils%2Ftoscaparsers%2Fvnfdparser%2Fvnfd_sol_251.py;h=e71623a2e696575826f8bac0136912fd673691b0;hb=639db9dcedc7cb7eb3f340016fcf799c4c13551f;hp=d0365a776cc6b9feed5e35a0de257c3a55841642;hpb=c9ee73f174a18d163d4f0a70c81204a3ba7c2fc2;p=modeling%2Fetsicatalog.git diff --git a/genericparser/pub/utils/toscaparsers/vnfdparser/vnfd_sol_251.py b/genericparser/pub/utils/toscaparsers/vnfdparser/vnfd_sol_251.py index d0365a7..e71623a 100644 --- a/genericparser/pub/utils/toscaparsers/vnfdparser/vnfd_sol_251.py +++ b/genericparser/pub/utils/toscaparsers/vnfdparser/vnfd_sol_251.py @@ -15,6 +15,7 @@ import functools import logging import os +import base64 logger = logging.getLogger(__name__) @@ -139,14 +140,16 @@ class VnfdSOL251(): if isinstance(inject_files, list): for inject_file in inject_files: source_path = os.path.join(self.model.basepath, inject_file['source_path']) - with open(source_path, "rt") as f: + with open(source_path, "rb") as f: source_data = f.read() - inject_file["source_data_base64"] = source_data + source_data_base64 = base64.b64encode(source_data) + inject_file["source_data_base64"] = source_data_base64.decode() if isinstance(inject_files, dict): source_path = os.path.join(self.model.basepath, inject_files['source_path']) - with open(source_path, "rt") as f: + with open(source_path, "rb") as f: source_data = f.read() - inject_files["source_data_base64"] = source_data + source_data_base64 = base64.b64encode(source_data) + inject_files["source_data_base64"] = source_data_base64.decode() virtual_storages = self.model.getRequirementByName(node, 'virtual_storage') ret['virtual_storages'] = list(map(functools.partial(self._trans_virtual_storage), virtual_storages)) ret['dependencies'] = [self.model.get_requirement_node_name(x) for x in self.model.getNodeDependencys(node)]