Index: /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/avx/models/va/instance/__init__.py =================================================================== --- /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/avx/models/va/instance/__init__.py (revision 9177) +++ /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/avx/models/va/instance/__init__.py (working copy) @@ -405,9 +405,24 @@ def _perform_Backup(self, options): pk_list = options['__pk_list'] self.cli.set_config() + + # Check if backup name already exists + confirm_str = "" + sess = get_current_session() + backup_model = get_model('avx', ['va', 'instance', 'VABackup']) + backup_manager = backup_model.get_manager(sess) + backup_instance = backup_manager.all() + for each in backup_instance: + if each.backup_name == options["backup_name"]: + confirm_str = "\nYES\n" + break + for pk_dict in pk_list: - result = self.cli.cmd('va backup "%s" "%s" %s' % (pk_dict['va_name'], options["backup_name"], "1" if options["enable"] else "0"), - BlankParser(nonblank_exception=CLICmdError, supplement=True),timeout=600.0) + cmd_str = 'va backup "%s" "%s" %s%s' % (pk_dict['va_name'], options["backup_name"], "1" if options["enable"] else "0", confirm_str) + self.cli.cmd(cmd_str, + RegexParser('Backup .* successfully', match_exception=CLICmdNormal, exclusive=True), + RegexParser('already exists', match_exception=CLICmdNormal, exclusive=True), + BlankParser(nonblank_exception=CLICmdError, supplement=True), timeout=1800.0) mark_expire_all(VABackup) class VAInstanceASSO(ANModel): @@ -1202,7 +1217,7 @@ result = cli_parse(output, RegexParser('RestfulAPI (?Pon|off)\n', MATCHONE, reflags=re.S)) data = { - 'enable_restapi':True if result['enable_restapi'] == 'on' else False, + 'enable_restapi': True if result.get('enable_restapi') == 'on' else False, 'restapi_type': result['restapi_type'] if 'restapi_type' in result else 'https', 'restapi_port': result['restapi_port'] if 'restapi_port' in result else 9997, } Index: /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/locales/en.json =================================================================== --- /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/locales/en.json (revision 9177) +++ /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/locales/en.json (working copy) @@ -383,6 +383,7 @@ "This operation will clear the primary network configuration. Are you sure you want to do this?": "This operation will clear the primary network configuration. Are you sure you want to do this?", "This operation will clear the entire configuration. Are you sure you want to do this?": "This operation will clear the entire configuration. Are you sure you want to do this?", "This operation will clear all the config files saved on the system disk. Are you sure you want to do this?": "This operation will clear all the config files saved on the system disk. Are you sure you want to do this?", + "Configuration has been cleared. The system is restarting. Your WebUI session will be terminated.": "Configuration has been cleared. The system is restarting. Your WebUI session will be terminated.", "vAPV License Status": "vAPV License Status", "Software Version": "Software Version", "vxAG License Status": "vxAG License Status", Index: /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/locales/ja.json =================================================================== --- /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/locales/ja.json (revision 9177) +++ /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/locales/ja.json (working copy) @@ -383,6 +383,7 @@ "This operation will clear the primary network configuration. Are you sure you want to do this?": "この操作により、プライマリネットワーク設定がクリアされます。 これを行ってもよろしいですか？", "This operation will clear the entire configuration. Are you sure you want to do this?": "この操作により、設定全体がクリアされます。これを行ってもよろしいですか？", "This operation will clear all the config files saved on the system disk. Are you sure you want to do this?": "この操作により、システムディスクに保存されているすべての設定ファイルがクリアされます。 これを行ってもよろしいですか？", + "Configuration has been cleared. The system is restarting. Your WebUI session will be terminated.": "設定がクリアされました。システムが再起動しています。WebUIセッションは終了されます。", "vAPV License Status": "vAPVライセンスステイタス", "Software Version": "ソフトウェアバージョン", "vxAG License Status": "vxAGライセンスステイタス", Index: /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/locales/zh-cn.json =================================================================== --- /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/locales/zh-cn.json (revision 9177) +++ /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/locales/zh-cn.json (working copy) @@ -383,6 +383,7 @@ "This operation will clear the primary network configuration. Are you sure you want to do this?": "该操作将清除主要网络配置。确认要执行该操作吗？", "This operation will clear the entire configuration. Are you sure you want to do this?": "该操作将清除全部配置。确认要执行该操作吗？", "This operation will clear all the config files saved on the system disk. Are you sure you want to do this?": "该操作将清除所有保存在系统磁盘上的配置文件。确认要执行该操作吗？", + "Configuration has been cleared. The system is restarting. Your WebUI session will be terminated.": "配置已清除。系统正在重新启动。您的 WebUI 会话将被终止。", "vAPV License Status": "vAPV许可证状态", "Software Version": "软件版本", "vxAG License Status": "vxAG许可证状态", Index: /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/locales/zh-tw.json =================================================================== --- /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/locales/zh-tw.json (revision 9177) +++ /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/locales/zh-tw.json (working copy) @@ -383,6 +383,7 @@ "This operation will clear the primary network configuration. Are you sure you want to do this?": "該操作將清除主要網路設定。您確定執行嗎？", "This operation will clear the entire configuration. Are you sure you want to do this?": "該操作將清除所有設定設定包含網路部分。您確定執行嗎？", "This operation will clear all the config files saved on the system disk. Are you sure you want to do this?": "該操作將清除所有儲存在系統內的設定檔案。您確定要執行嗎？", + "Configuration has been cleared. The system is restarting. Your WebUI session will be terminated.": "設定已清除。系統正在重新啟動。您的 WebUI 連線將被中斷。", "vAPV License Status": "vAPV授權狀態", "Software Version": "軟體版本", "vxAG License Status": "vxAG授權狀態", Index: /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/config_mgmt/backup_and_load/backup.controller.js =================================================================== --- /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/config_mgmt/backup_and_load/backup.controller.js (revision 9177) +++ /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/config_mgmt/backup_and_load/backup.controller.js (working copy) @@ -162,6 +162,11 @@ } else { alert($filter("T")("Internal server error.")); } + }) + .catch(function(error) { + $rootScope.$broadcast('endLoading', true); + // file option should not cause system restart, so this is a real error + alert($filter("T")("Internal server error.")); }); } }; Index: /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/config_mgmt/clear/clear.controller.js =================================================================== --- /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/config_mgmt/clear/clear.controller.js (revision 9177) +++ /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/config_mgmt/clear/clear.controller.js (working copy) @@ -45,6 +45,27 @@ $state.go("index.system.config_mgmt.clear", {}, {reload:true}); } } else { + // For primary/secondary/all, a 500 error likely means system is restarting + if (tabViewModel.clearOption === "primary" || tabViewModel.clearOption === "secondary" || tabViewModel.clearOption === "all") { + alert($filter("T")("Configuration has been cleared. The system is restarting. Your WebUI session will be terminated.")); + setTimeout(function() { + window.location.href = "/#/login"; + }, 2000); + } else { + alert($filter("T")("Internal server error.")); + } + } + }) + .catch(function(error) { + $rootScope.$broadcast('endLoading', true); + // For primary/secondary/all options, system restarts and connection is terminated + if (tabViewModel.clearOption === "primary" || tabViewModel.clearOption === "secondary" || tabViewModel.clearOption === "all") { + alert($filter("T")("Configuration has been cleared. The system is restarting. Your WebUI session will be terminated.")); + // Redirect to login page after a delay + setTimeout(function() { + window.location.href = "/#/login"; + }, 2000); + } else { alert($filter("T")("Internal server error.")); } });