Skip to content

for remote make sure file system path is absolute #1143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 8, 2022
Merged

for remote make sure file system path is absolute #1143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions core/src/main/python/wlsdeploy/tool/discover/common_resources_discoverer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

from oracle.weblogic.deploy.util import PyOrderedDict as OrderedDict
from oracle.weblogic.deploy.util import StringUtils
from oracle.weblogic.deploy.util import WLSDeployArchive
from oracle.weblogic.deploy.util import WLSDeployArchiveIOException

from wlsdeploy.aliases import model_constants
Expand Down Expand Up @@ -205,17 +206,22 @@ def archive_file_store_directory(self, file_store_name, file_store_dictionary):
directory = file_store_dictionary[model_constants.DIRECTORY]
if not StringUtils.isEmpty(directory):
archive_file = self._model_context.get_archive_file()
try:
new_source_name = archive_file.addFileStoreDirectory(file_store_name)
except WLSDeployArchiveIOException, wioe:
de = exception_helper.create_discover_exception('WLSDPLY-06348', file_store_name, directory,
wioe.getLocalizedMessage())
_logger.throwing(class_name=_class_name, method_name=_method_name, error=de)
raise de
if new_source_name is not None:
_logger.info('WLSDPLY-06349', file_store_name, new_source_name, class_name=_class_name,
method_name=_method_name)
file_store_dictionary[model_constants.DIRECTORY] = new_source_name
if self._model_context.is_remote():
new_name = archive_file.getFileStoreArchivePath(file_store_name)
self.add_to_remote_map(file_store_name, new_name,
WLSDeployArchive.ArchiveEntryType.FILE_STORE.name())
elif not self._model_context.skip_archive():
try:
new_source_name = archive_file.addFileStoreDirectory(file_store_name)
except WLSDeployArchiveIOException, wioe:
de = exception_helper.create_discover_exception('WLSDPLY-06348', file_store_name, directory,
wioe.getLocalizedMessage())
_logger.throwing(class_name=_class_name, method_name=_method_name, error=de)
raise de
if new_source_name is not None:
_logger.info('WLSDPLY-06349', file_store_name, new_source_name, class_name=_class_name,
method_name=_method_name)
file_store_dictionary[model_constants.DIRECTORY] = new_source_name

_logger.exiting(class_name=_class_name, method_name=_method_name)
return
Expand Down
5 changes: 5 additions & 0 deletions core/src/main/python/wlsdeploy/tool/discover/discoverer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ def __init__(self, model_context, base_location, wlst_mode, aliases=None, creden
self._wls_version = self._weblogic_helper.get_actual_weblogic_version()

def add_to_remote_map(self, local_name, archive_name, file_type):
if not os.path.isabs(local_name):
local_name = os.path.join(self._model_context.get_domain_home(), local_name)
# we don't know the remote machine type, so automatically turn into forward
# slashes.
local_name = local_name.replace('\\', '/')
remote_dict[local_name] = OrderedDict()
remote_dict[local_name][REMOTE_TYPE] = file_type
remote_dict[local_name][REMOTE_ARCHIVE_PATH] = archive_name
Expand Down