Issue-ID: VFC-1429
Signed-off-by: Olivia.Zhan <zhan.jie1@zte.com.cn>
Change-Id: Ie9c810d93c1c7f309f1f82ffec3bfee9b1099e25
import functools
import logging
import os
import functools
import logging
import os
logger = logging.getLogger(__name__)
logger = logging.getLogger(__name__)
if isinstance(inject_files, list):
for inject_file in inject_files:
source_path = os.path.join(self.model.basepath, inject_file['source_path'])
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:
- 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'])
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:
- 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)]
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)]
import functools
import logging
import os
import functools
import logging
import os
logger = logging.getLogger(__name__)
logger = logging.getLogger(__name__)
if isinstance(inject_files, list):
for inject_file in inject_files:
source_path = os.path.join(self.model.basepath, inject_file['source_path'])
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:
- 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'])
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:
- 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)]
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)]