diff --git a/core/src/main/python/deploy.py b/core/src/main/python/deploy.py index 7fcc60c77..7b1f3e124 100644 --- a/core/src/main/python/deploy.py +++ b/core/src/main/python/deploy.py @@ -4,7 +4,6 @@ The entry point for the deployApps tool. """ -import exceptions import os import sys @@ -50,7 +49,6 @@ # Used by shell script to locate WLST CommandLineArgUtil.DOMAIN_TYPE_SWITCH, CommandLineArgUtil.ARCHIVE_FILE_SWITCH, - CommandLineArgUtil.PREVIOUS_MODEL_FILE_SWITCH, CommandLineArgUtil.VARIABLE_FILE_SWITCH, CommandLineArgUtil.ADMIN_URL_SWITCH, CommandLineArgUtil.ADMIN_USER_SWITCH, diff --git a/core/src/main/python/update.py b/core/src/main/python/update.py index 4f1b01801..4b7b9d85b 100644 --- a/core/src/main/python/update.py +++ b/core/src/main/python/update.py @@ -52,7 +52,6 @@ # Used by shell script to locate WLST CommandLineArgUtil.DOMAIN_TYPE_SWITCH, CommandLineArgUtil.ARCHIVE_FILE_SWITCH, - CommandLineArgUtil.PREVIOUS_MODEL_FILE_SWITCH, CommandLineArgUtil.VARIABLE_FILE_SWITCH, CommandLineArgUtil.ADMIN_URL_SWITCH, CommandLineArgUtil.ADMIN_USER_SWITCH, diff --git a/core/src/main/python/wlsdeploy/util/cla_utils.py b/core/src/main/python/wlsdeploy/util/cla_utils.py index 1a535881b..b58316496 100644 --- a/core/src/main/python/wlsdeploy/util/cla_utils.py +++ b/core/src/main/python/wlsdeploy/util/cla_utils.py @@ -62,7 +62,6 @@ class CommandLineArgUtil(object): OPSS_WALLET_PASSPHRASE = '-opss_wallet_passphrase' OPSS_WALLET_FILE_PASSPHRASE = '-opss_wallet_passphrase_file' OPSS_WALLET_ENV_PASSPHRASE = '-opss_wallet_passphrase_env' - PREVIOUS_MODEL_FILE_SWITCH = '-prev_model_file' VARIABLE_FILE_SWITCH = '-variable_file' RCU_DB_SWITCH = '-rcu_db' RCU_DB_USER_SWITCH = '-rcu_db_user' @@ -262,10 +261,6 @@ def process_args(self, args, tool_type=TOOL_TYPE_DEFAULT, trailing_arg_count=0): value, idx = self._get_arg_value(args, idx) full_path = self._validate_model_file_arg(value) self._add_arg(key, full_path, True) - elif self.is_previous_model_file_key(key): - value, idx = self._get_arg_value(args, idx) - full_path = self._validate_previous_model_file_arg(value) - self._add_arg(key, full_path, True) elif self.is_validate_method_key(key): value, idx = self._get_arg_value(args, idx) context = self._validate_validate_method_arg(value) @@ -762,12 +757,6 @@ def _validate_model_file_arg(self, value): return ",".join(result_model_files) - def get_previous_model_file_key(self): - return self.PREVIOUS_MODEL_FILE_SWITCH - - def is_previous_model_file_key(self, key): - return self.PREVIOUS_MODEL_FILE_SWITCH == key - def _validate_previous_model_file_arg(self, value): method_name = '_validate_previous_model_file_arg' diff --git a/core/src/main/python/wlsdeploy/util/model_context.py b/core/src/main/python/wlsdeploy/util/model_context.py index 65f37d01d..0596db0df 100644 --- a/core/src/main/python/wlsdeploy/util/model_context.py +++ b/core/src/main/python/wlsdeploy/util/model_context.py @@ -69,7 +69,6 @@ def __init__(self, program_name, arg_map): self._archive_file_name = None self._archive_file = None self._model_file = None - self._previous_model_file = None self._variable_file_name = None self._run_rcu = False self._rcu_database = None @@ -162,9 +161,6 @@ def __copy_from_args(self, arg_map): if CommandLineArgUtil.WAIT_FOR_EDIT_LOCK_SWITCH in arg_map: self._wait_for_edit_lock = arg_map[CommandLineArgUtil.WAIT_FOR_EDIT_LOCK_SWITCH] - if CommandLineArgUtil.PREVIOUS_MODEL_FILE_SWITCH in arg_map: - self._previous_model_file = arg_map[CommandLineArgUtil.PREVIOUS_MODEL_FILE_SWITCH] - if CommandLineArgUtil.ATTRIBUTES_ONLY_SWITCH in arg_map: self._attributes_only = arg_map[CommandLineArgUtil.ATTRIBUTES_ONLY_SWITCH] @@ -293,8 +289,6 @@ def __copy__(self): arg_map[CommandLineArgUtil.ARCHIVE_FILE_SWITCH] = self._archive_file_name if self._model_file is not None: arg_map[CommandLineArgUtil.MODEL_FILE_SWITCH] = self._model_file - if self._previous_model_file is not None: - arg_map[CommandLineArgUtil.PREVIOUS_MODEL_FILE_SWITCH] = self._previous_model_file if self._attributes_only is not None: arg_map[CommandLineArgUtil.ATTRIBUTES_ONLY_SWITCH] = self._attributes_only if self._folders_only is not None: @@ -568,13 +562,6 @@ def get_model_file(self): """ return self._model_file - def get_previous_model_file(self): - """ - Get the previous model file. - :return: the previous model file - """ - return self._previous_model_file - def get_folders_only_control_option(self): """ Get the -folders_only command-line switch for model help tool.