Index: /branches/rel_apv_10_7_3/usr/click/bin/backend/sys_cmd.c =================================================================== --- /branches/rel_apv_10_7_3/usr/click/bin/backend/sys_cmd.c (revision 39037) +++ /branches/rel_apv_10_7_3/usr/click/bin/backend/sys_cmd.c (working copy) @@ -3077,322 +3077,271 @@ return ptyrun_ex("ping", ping_path, "ping", "-c", "5", inet_ntoa(in), option) == 0 ? 0 : -1; } - // AZURE CLOUD FUNCTION START -void -cloud_az_ha_enable() +void +cloud_az_ha_enable() { - cloud_az_ha_disable(); - - FILE *fp; - char path[1035]; - char cmd[1024]; - - fp = popen("python3 /ca/bin/azure/SystemRun.py 0 /tmp/az_account az account show", "r"); - if (fp == NULL) { - printf("Fail\n"); - exit(1); - } else { - pclose(fp); - } - - fp = fopen("/tmp/az_account_0", "r"); - if (fp == NULL) { - printf("Fail\n"); - return; - } else { - fclose(fp); - } + cloud_az_ha_disable(); + FILE *fp; + char cmd[1024]; + char path[1035]; + int status; - // run in background - snprintf(cmd, 1024, "python3 /ca/bin/azure/AZFailoverPoller.py -mode 1 &"); - system(cmd); + // Format the command string + snprintf(cmd, 1024, "python3 /ca/bin/azure/AZFailoverPoller.py -mode 1 &"); + status = system(cmd); sleep(2); - // ret = system("ps aux | grep -v grep | grep -q \"python3 /ca/bin/azure/AZFailoverPoller.py -mode 1\""); - // if (ret == -1) { - // printf("Fail\n"); - // return; - // } - - // if (WIFEXITED(ret)) { - // if (WEXITSTATUS(ret) != 0) { - // printf("Fail\n"); - // } else { - // printf("Success\n"); - // } - // } else { - // printf("Fail\n"); - // } - - fp = popen("python3 /ca/bin/azure/SystemRun.py 1 /tmp/az_ha ps aux '|' grep -v grep '|' grep -q 'python3 /ca/bin/azure/AZFailoverPoller.py -mode 1'", "r"); - if (fp == NULL) { - printf("Fail\n"); - exit(1); - } else { - pclose(fp); - } - - fp = fopen("/tmp/az_ha_0", "r"); - if (fp == NULL) { - printf("Fail\n"); - return; - } else { - fclose(fp); - } - printf("Success\n"); - - -// - // fp = popen("python3 /ca/bin/azure/AZFailoverPoller.py -mode 1", "r"); - // if (fp == NULL) { - // printf("Failed to run command\n" ); - // exit(1); - // } - // while (fgets(path, sizeof(path)-1, fp) != NULL) { - // printf("%s", path); - // } - // pclose(fp); -// + // Check if the command executed successfully + if (status == -1) { + // system() failed to start the command + printf("Failed to execute \"cloud az ha enable\"\n"); + + } else { + // Check if the command returned a non-zero status (failure) + if (WIFEXITED(status) && WEXITSTATUS(status) == 0) { + // Format the command string + snprintf(cmd, 1024, "python3 /ca/bin/azure/AZFailoverPoller.py -mode 3"); + // Run the command and capture the return status + fp = popen(cmd, "r"); + if (fp == NULL) { + printf("Failed to execute \"cloud az ha enable\"\n"); + } + while (fgets(path, sizeof(path)-1, fp) != NULL) { + path[strcspn(path, "\n")] = 0; + // Check if the output is "True" + if (strcmp(path, "True\n") == 0 || strcmp(path, "True") == 0) { + printf("Succeed"); + } else if (strcmp(path, "False\n") == 0 || strcmp(path, "False") == 0) { + printf("Failed to execute \"cloud az ha enable\"\n"); + } else { + printf("Failed to execute \"cloud az ha enable\"\n"); + } + } + } else { + printf("Failed to execute \"cloud az ha enable\" with status %d.\n", 3); + } + } } -// void -// cloud_az_show_ha_enable() -// { -// if (system("ps aux | grep -v grep | grep -q \"python3 /ca/bin/azure/AZFailoverPoller.py -mode 1\"")) { -// printf("Disable\n"); -// } else { -// printf("Enable\n"); -// } -// printf("123\n"); -// sleep(1); -// printf("456\n"); -// return; -// } -// Failed to execute "cloud az show ha" +void +cloud_az_ha_disable() +{ + FILE *fp; + char cmd[1024]; + char path[1035]; + int status; + // system("ps aux | grep 'python3 /ca/bin/azure/AZFailoverPoller.py -mode 1' | grep -v grep | awk '{print $2}' | xargs kill -9"); + // Format the command string + snprintf(cmd, 1024, "python3 /ca/bin/azure/AZFailoverPoller.py -mode 2"); + + status = system(cmd); + sleep(1); + // Check if the command executed successfully + if (status == -1) { + // system() failed to start the command + printf("Failed to execute \"cloud az ha disable\"\n"); + + } else { + // Check if the command returned a non-zero status (failure) + if (WIFEXITED(status) && WEXITSTATUS(status) == 0) { + // Format the command string + snprintf(cmd, 1024, "python3 /ca/bin/azure/AZFailoverPoller.py -mode 3"); + // Run the command and capture the return status + fp = popen(cmd, "r"); + if (fp == NULL) { + printf("Failed to execute \"cloud az ha disable\"\n" ); + } + while (fgets(path, sizeof(path)-1, fp) != NULL) { + path[strcspn(path, "\n")] = 0; + // Check if the output is "True" + if (strcmp(path, "True\n") == 0 || strcmp(path, "True") == 0) { + printf("Failed to execute \"cloud az ha disable\""); + } else if (strcmp(path, "False\n") == 0 || strcmp(path, "False") == 0) { + printf(""); + } else { + printf("Failed to execute \"cloud az ha disable\""); + } + } + } else { + printf("Failed to execute \"cloud az ha disable\" with status %d.\n", 3); + } + } +} -void -cloud_az_ha_disable() +void cloud_az_show_ha() { - FILE *fp; - char path[1035]; - char cmd[1024]; + FILE *fp; + char path[1035]; + char cmd[1024]; - // snprintf(cmd, 1024, "python3 /ca/bin/azure/AZFailoverPoller.py -mode 2"); - // system(cmd); + fp = popen("python3 /ca/bin/azure/AZFailoverPoller.py -mode 3", "r"); + if (fp == NULL) { + printf("Failed to run command\n"); + exit(1); + } + while (fgets(path, sizeof(path)-1, fp) != NULL) { + path[strcspn(path, "\n")] = 0; -// - // fp = popen("python3 /ca/bin/azure/AZFailoverPoller.py -mode 2", "r"); - // if (fp == NULL) { - // printf("Failed to run command\n" ); - // exit(1); - // } - // while (fgets(path, sizeof(path)-1, fp) != NULL) { - // printf("%s", path); - // } - // pclose(fp); -// + // Check if the output is "True" + if (strcmp(path, "True\n") == 0 || strcmp(path, "True") == 0) { + printf("az ha on"); + } else if (strcmp(path, "False\n") == 0 || strcmp(path, "False") == 0) { + printf("az ha off"); + } else { + printf("Fail"); - system("ps aux | grep 'python3 /ca/bin/azure/AZFailoverPoller.py -mode 1' | grep -v grep | awk '{print $2}' | xargs kill -9"); + } + } + pclose(fp); } -void -cloud_az_udr_enable() +void +cloud_az_udr_enable() { - cloud_az_udr_disable(); + cloud_az_udr_disable(); - FILE *fp; - char path[1035]; - char cmd[1024]; + FILE *fp; + char path[1035]; + char cmd[1024]; - fp = popen("python3 /ca/bin/azure/SystemRun.py 0 /tmp/az_account az account show", "r"); - if (fp == NULL) { - printf("Fail\n"); - exit(1); - } else { - pclose(fp); - } + fp = popen("python3 /ca/bin/azure/SystemRun.py 0 /tmp/az_account az account show", "r"); + if (fp == NULL) { + printf("Failed to execute \"cloud az udr enable\"\n"); + exit(1); + } else { + pclose(fp); + } - fp = fopen("/tmp/az_account_0", "r"); - if (fp == NULL) { - printf("Fail\n"); - return; - } else { - fclose(fp); - } + fp = fopen("/tmp/az_account_0", "r"); + if (fp == NULL) { + printf("Failed to execute \"cloud az udr enable\"\n"); + return; + } else { + fclose(fp); + } + // run in background + snprintf(cmd, 1024, "python3 /ca/bin/azure/UDRPoller.py -mode 1 &"); + system(cmd); + sleep(2); - // run in background - snprintf(cmd, 1024, "python3 /ca/bin/azure/UDRPoller.py -mode 1 &"); - system(cmd); + fp = popen("python3 /ca/bin/azure/SystemRun.py 1 /tmp/az_udr ps aux '|' grep -v grep '|' grep -q 'python3 /ca/bin/azure/UDRPoller.py -mode 1'", "r"); + if (fp == NULL) { + printf("Failed to execute \"cloud az udr enable\"\n"); + exit(1); + } else { + pclose(fp); + } - sleep(2); - // ret = system("ps aux | grep -v grep | grep -q \"python3 /ca/bin/azure/UDRPoller.py -mode 1\""); - // if (ret == -1) { - // printf("Fail\n"); - // return; - // } - - // if (WIFEXITED(ret)) { - // if (WEXITSTATUS(ret) != 0) { - // printf("Fail\n"); - // } else { - // printf("Success\n"); - // } - // } else { - // printf("Fail\n"); - // } + fp = fopen("/tmp/az_udr_0", "r"); + if (fp == NULL) { + printf("Failed to execute \"cloud az udr enable\"\n"); + return; + } else { + fclose(fp); + } + printf("Success\n"); - fp = popen("python3 /ca/bin/azure/SystemRun.py 1 /tmp/az_udr ps aux '|' grep -v grep '|' grep -q 'python3 /ca/bin/azure/UDRPoller.py -mode 1'", "r"); - if (fp == NULL) { - printf("Fail\n"); - exit(1); - } else { - pclose(fp); - } +} - fp = fopen("/tmp/az_udr_0", "r"); - if (fp == NULL) { - printf("Fail\n"); - return; - } else { - fclose(fp); - } - printf("Success\n"); +void +cloud_az_udr_disable() +{ + FILE *fp; + char path[1035]; + char cmd[1024]; + int status; -// - // fp = popen("python3 /ca/bin/azure/AZFailoverPoller.py -mode 1", "r"); - // if (fp == NULL) { - // printf("Failed to run command\n" ); - // exit(1); - // } - // while (fgets(path, sizeof(path)-1, fp) != NULL) { - // printf("%s", path); - // } - // pclose(fp); -// + snprintf(cmd, 1024, "python3 /ca/bin/azure/AZFailoverPoller.py -mode 2"); + status = system(cmd); } -// void -// cloud_az_show_udr_enable() -// { -// if (system("ps aux | grep -v grep | grep -q \"python3 /ca/bin/azure/UDRPoller.py -mode 1\"")) { -// printf("Disable\n"); -// } else { -// printf("Enable\n"); -// } -// } - -void -cloud_az_udr_disable() +void +cloud_az_login() { - FILE *fp; - char path[1035]; - char cmd[1024]; - - // snprintf(cmd, 1024, "python3 /ca/bin/azure/AZFailoverPoller.py -mode 2"); - // system(cmd); + FILE *fp = NULL; + char path[1035]; + char cmd[1024]; + char buffer[1024]; + size_t bytesRead; -// - // fp = popen("python3 /ca/bin/azure/AZFailoverPoller.py -mode 2", "r"); - // if (fp == NULL) { - // printf("Failed to run command\n" ); - // exit(1); - // } - // while (fgets(path, sizeof(path)-1, fp) != NULL) { - // printf("%s", path); - // } - // pclose(fp); -// + // check and delete file first - system("ps aux | grep 'python3 /ca/bin/azure/UDRPoller.py -mode 1' | grep -v grep | awk '{print $2}' | xargs kill -9"); -} + // First File + fp = fopen("/tmp/login_msg.txt", "r"); + if (fp != NULL) { + fclose(fp); + snprintf(cmd, 1024, "rm -rf /tmp/login_msg.txt"); + system(cmd); + fp = NULL; + } -void -cloud_az_login() -{ - FILE *fp = NULL; - char path[1035]; - char cmd[1024]; - char buffer[1024]; - size_t bytesRead; + //Second File + fp = fopen("/tmp/login_response.txt", "r"); + if (fp != NULL) { + fclose(fp); + snprintf(cmd, 1024, "rm -rf /tmp/login_response.txt"); + system(cmd); + fp = NULL; + } -// check and delete file first + snprintf(cmd, 1024, "python3 /ca/bin/azure/AZAuthManager.py -mode login &"); + system(cmd); - // First File - fp = fopen("/tmp/login_msg.txt", "r"); - if (fp != NULL) { - fclose(fp); - snprintf(cmd, 1024, "rm -rf /tmp/login_msg.txt"); - system(cmd); - fp = NULL; - } + printf("Your authentication code will expire in 60 seconds.\nPlease use the following information to sign in immediately.\n"); + int count = 0; - //Second File - fp = fopen("/tmp/login_response.txt", "r"); - if (fp != NULL) { - fclose(fp); - snprintf(cmd, 1024, "rm -rf /tmp/login_response.txt"); - system(cmd); - fp = NULL; - } + // read the tmp file from Mary + while(fp == NULL && count < 60) { + fp = fopen("/tmp/login_msg.txt", "r"); + sleep(1); + count++; + } - snprintf(cmd, 1024, "python3 /ca/bin/azure/AZAuthManager.py -mode login &"); - system(cmd); + if (fp != NULL) { + fclose(fp); + sleep(3); + fp = fopen("/tmp/login_msg.txt", "r"); + } - printf("Please login using the above information in 1 minute.\nAfter 1 minute the login credential will be clear.\n"); - int count = 0; + if (fp != NULL) { + while (fgets(buffer, sizeof(buffer), fp) != NULL) { + printf("%s", buffer); + } - // read the tmp file from Mary - while(fp == NULL && count < 60) { - fp = fopen("/tmp/login_msg.txt", "r"); - sleep(1); - count++; - } + fclose(fp); + } - if (fp != NULL) { - fclose(fp); - sleep(3); - fp = fopen("/tmp/login_msg.txt", "r"); - } - - if (fp != NULL) { - while (fgets(buffer, sizeof(buffer), fp) != NULL) { - printf("%s", buffer); - } + fp = NULL; - fclose(fp); - } - - fp = NULL; + // read the second file from Mary + while(fp == NULL && count < 60) { + fp = fopen("/tmp/login_response.txt", "r"); + sleep(1); + count++; + } - // read the second file from Mary - while(fp == NULL && count < 60) { - fp = fopen("/tmp/login_response.txt", "r"); - sleep(1); - count++; - } + if (fp != NULL) { + fclose(fp); + sleep(3); + fp = fopen("/tmp/login_response.txt", "r"); + } - if (fp != NULL) { - fclose(fp); - sleep(3); - fp = fopen("/tmp/login_response.txt", "r"); - } + if (fp == NULL) { + fp = fopen("/tmp/login_response.txt", "r"); + } - if (fp == NULL) { - fp = fopen("/tmp/login_response.txt", "r"); - } - - if (fp != NULL) { - while (fgets(buffer, sizeof(buffer), fp) != NULL) { - printf("%s", buffer); - } + if (fp != NULL) { + while (fgets(buffer, sizeof(buffer), fp) != NULL) { + printf("%s", buffer); + } - fclose(fp); - } + fclose(fp); + } - system("ps aux | grep 'az login' | grep -v grep | awk '{print $2}' | xargs kill -9"); - system("ps aux | grep 'python3 -sm azure.cli login' | grep -v grep | awk '{print $2}' | xargs kill -9"); - system("ps aux | grep 'python3 /ca/bin/azure/AZAuthManager.py -mode login' | grep -v grep | awk '{print $2}' | xargs kill -9"); + system("ps aux | grep 'az login' | grep -v grep | awk '{print $2}' | xargs kill -9"); + system("ps aux | grep 'python3 -sm azure.cli login' | grep -v grep | awk '{print $2}' | xargs kill -9"); + system("ps aux | grep 'python3 /ca/bin/azure/AZAuthManager.py -mode login' | grep -v grep | awk '{print $2}' | xargs kill -9"); } @@ -3402,8 +3351,8 @@ FILE *fp; char path[1035]; char cmd[1024]; - -// delete output file + + // delete output file fp = popen("/tmp/output.txt", "r"); if (fp != NULL) { snprintf(cmd, 1024, "rm -rf /tmp/output.txt"); @@ -3503,64 +3452,49 @@ } fclose(fp); } +} - // fp = popen("az account show", "r"); - // if (fp == NULL) { - // printf("Please run 'cloud az login' to setup account. 2"); - // return; - // } else { - // while (fgets(path, sizeof(path)-1, fp) != NULL) { - // printf("%s", path); - // } - // pclose(fp); - // } - - +void cloud_az_failover_trigger() +{ + FILE *fp; + char path[1035]; + char cmd[1024]; + fp = popen("python3 /ca/bin/azure/AZFailoverManager.py -mode 1", "r"); + if (fp == NULL) { + printf("Failed to run command\n" ); + exit(1); + } + while (fgets(path, sizeof(path)-1, fp) != NULL) { + printf("%s", path); + } + pclose(fp); +} - // int ret = system("az account show"); - // printf("1: %d\n", ret); - // if (ret == -1) { - // printf("Please run 'cloud az login' to setup account. 1"); - // return; - // } - - // if (WIFEXITED(ret)) { - // printf("2: %d\n", WEXITSTATUS(ret)); - // if (WEXITSTATUS(ret) != 0) { - // printf("Please run 'cloud az login' to setup account. 2"); - // return; - // } - // } else { - // printf("Please run 'cloud az login' to setup account. 3"); - // return; - // } - - // fp = popen("az account show", "r"); - // if (fp == NULL) { - // printf("Please run 'cloud az login' to setup account."); - // exit(1); - // } else { - // while (fgets(path, sizeof(path)-1, fp) != NULL) { - // printf("%s", path); - // } - // pclose(fp); - // } -// +void cloud_az_set_log_on() +{ + FILE *fp; + char path[1035]; + char cmd[1024]; + snprintf(cmd, 1024, "python3 /ca/bin/azure/LoggerManager.py -mode on"); + fp = popen(cmd, "r"); + if (fp == NULL) { + printf("Failed to run command\n" ); + exit(1); + } + while (fgets(path, sizeof(path)-1, fp) != NULL) { + printf("%s", path); + } + pclose(fp); } -void -cloud_az_failover_trigger() +void cloud_az_set_log_off() { FILE *fp; char path[1035]; char cmd[1024]; - - // snprintf(cmd, 1024, "python3 /ca/bin/azure/AZFailoverManager.py -mode 1"); - // system(cmd); - -// - fp = popen("python3 /ca/bin/azure/AZFailoverManager.py -mode 1", "r"); + snprintf(cmd, 1024, "python3 /ca/bin/azure/LoggerManager.py -mode off"); + fp = popen(cmd, "r"); if (fp == NULL) { printf("Failed to run command\n" ); exit(1); @@ -3569,22 +3503,43 @@ printf("%s", path); } pclose(fp); -// } -void -cloud_az_failover_recover() +void cloud_az_show_log_config() { FILE *fp; char path[1035]; char cmd[1024]; + snprintf(cmd, 1024, "python3 /ca/bin/azure/LoggerManager.py -mode status"); + fp = popen(cmd, "r"); + if (fp == NULL) { + printf("Failed to run command\n" ); + exit(1); + } + while (fgets(path, sizeof(path)-1, fp) != NULL) { + path[strcspn(path, "\n")] = 0; - // snprintf(cmd, 1024, "python3 /ca/bin/azure/AZFailoverManager.py -mode 2"); - // system(cmd); + // Check if the output is "True" + if (strcmp(path, "True\n") == 0 || strcmp(path, "True") == 0) { + printf("az log on"); + } else if (strcmp(path, "False\n") == 0 || strcmp(path, "False") == 0) { + printf("az log off"); + } else { + exit(1); + } + } + pclose(fp); -// - fp = popen("python3 /ca/bin/azure/AZFailoverManager.py -mode 2", "r"); - if (fp == NULL) { +} + +void cloud_az_show_log_buffer(uint32_t number_of_line) +{ + FILE *fp; + char path[1035]; + char cmd[1024]; + snprintf(cmd, 1024, "python3 /ca/bin/azure/LoggerManager.py -mode show -lines %d", number_of_line); + fp = popen(cmd, "r"); + if (fp == NULL) { printf("Failed to run command\n" ); exit(1); } @@ -3592,20 +3547,14 @@ printf("%s", path); } pclose(fp); -// } -void -cloud_az_set_nicconfig(char *subscription_id, char *resource_group_name, char *from_nic_name, char *to_nic_name) +void cloud_az_show_log_loglevel() { FILE *fp; char path[1035]; char cmd[1024]; - - snprintf(cmd, 1024, "python3 /ca/bin/azure/ConfigManager.py -mode set -sub_id %s -res_grp_name %s -src_nic_name %s -dest_nic_name %s", - subscription_id, resource_group_name, from_nic_name, to_nic_name); - // system(cmd); - + snprintf(cmd, 1024, "python3 /ca/bin/azure/LoggerManager.py -level status"); fp = popen(cmd, "r"); if (fp == NULL) { printf("Failed to run command\n" ); @@ -3617,17 +3566,12 @@ pclose(fp); } -void -cloud_az_set_udrconfig(char *subscription_id, char *resource_group_name, char *vm_name, char *ip_running, char *ip_deallocating) +void cloud_az_loglevel_debug() { FILE *fp; char path[1035]; char cmd[1024]; - - snprintf(cmd, 1024, "python3 /ca/bin/azure/RouteConfigManager.py -mode set -sub_id %s -res_grp_name %s -vm_name %s -ip_running %s -ip_deallocating %s", - subscription_id, resource_group_name, vm_name, ip_running, ip_deallocating); - // system(cmd); - + snprintf(cmd, 1024, "python3 /ca/bin/azure/LoggerManager.py -level debug"); fp = popen(cmd, "r"); if (fp == NULL) { printf("Failed to run command\n" ); @@ -3639,18 +3583,47 @@ pclose(fp); } -void -cloud_az_clear_nicconfig() +void cloud_az_loglevel_info() { FILE *fp; char path[1035]; char cmd[1024]; + snprintf(cmd, 1024, "python3 /ca/bin/azure/LoggerManager.py -level info"); + fp = popen(cmd, "r"); + if (fp == NULL) { + printf("Failed to run command\n" ); + exit(1); + } + while (fgets(path, sizeof(path)-1, fp) != NULL) { + printf("%s", path); + } + pclose(fp); +} - // snprintf(cmd, 1024, "python3 /ca/bin/azure/ConfigManager.py -mode clear"); - // system(cmd); +void cloud_az_loglevel_warning() +{ + FILE *fp; + char path[1035]; + char cmd[1024]; + snprintf(cmd, 1024, "python3 /ca/bin/azure/LoggerManager.py -level warning"); + fp = popen(cmd, "r"); + if (fp == NULL) { + printf("Failed to run command\n" ); + exit(1); + } + while (fgets(path, sizeof(path)-1, fp) != NULL) { + printf("%s", path); + } + pclose(fp); +} -// - fp = popen("python3 /ca/bin/azure/ConfigManager.py -mode clear", "r"); +void cloud_az_loglevel_error() +{ + FILE *fp; + char path[1035]; + char cmd[1024]; + snprintf(cmd, 1024, "python3 /ca/bin/azure/LoggerManager.py -level error"); + fp = popen(cmd, "r"); if (fp == NULL) { printf("Failed to run command\n" ); exit(1); @@ -3659,21 +3632,20 @@ printf("%s", path); } pclose(fp); -// } -void -cloud_az_show_nicconfig() +void +cloud_az_failover_recover() { FILE *fp; char path[1035]; char cmd[1024]; - // snprintf(cmd, 1024, "python3 /ca/bin/azure/ConfigManager.py -mode show"); + // snprintf(cmd, 1024, "python3 /ca/bin/azure/AZFailoverManager.py -mode 2"); // system(cmd); // - fp = popen("python3 /ca/bin/azure/ConfigManager.py -mode show", "r"); + fp = popen("python3 /ca/bin/azure/AZFailoverManager.py -mode 2", "r"); if (fp == NULL) { printf("Failed to run command\n" ); exit(1); @@ -3685,18 +3657,101 @@ // } -void -cloud_az_clear_udrconfig() +void +cloud_az_set_nicconfig(char *subscription_id, char *resource_group_name, char *from_nic_name, char *to_nic_name) { FILE *fp; char path[1035]; char cmd[1024]; - // snprintf(cmd, 1024, "python3 /ca/bin/azure/ConfigManager.py -mode clear"); - // system(cmd); + snprintf(cmd, 1024, "ps aux | grep -v grep | grep 'python3 /ca/bin/azure/AZFailoverPoller.py -mode 1' | wc -l"); + fp = popen(cmd, "r"); + if (fp != NULL) { + fgets(path, sizeof(path)-1, fp); + if (path[0] == '0') { + snprintf(cmd, 1024, "python3 /ca/bin/azure/ConfigManager.py -mode set -sub_id %s -res_grp_name %s -src_nic_name %s -dest_nic_name %s", + subscription_id, resource_group_name, from_nic_name, to_nic_name); + fp = popen(cmd, "r"); + if (fp == NULL) { + printf("Failed to run command\n" ); + exit(1); + } + while (fgets(path, sizeof(path)-1, fp) != NULL) { + printf("%s", path); + } + pclose(fp); + } else { + printf("Please execute \"cloud az ha disable\" first."); + } + } +} -// - fp = popen("python3 /ca/bin/azure/RouteConfigManager.py -mode clear", "r"); +void +cloud_az_set_udrconfig(char *subscription_id, char *resource_group_name, char *vm_name, char *ip_running, char *ip_deallocating) +{ + FILE *fp; + char path[1035]; + char cmd[1024]; + + snprintf(cmd, 1024, "ps aux | grep -v grep | grep 'python3 /ca/bin/azure/UDRPoller.py -mode 1' | wc -l"); + fp = popen(cmd, "r"); + if (fp != NULL) { + fgets(path, sizeof(path)-1, fp); + if (path[0] == '0') { + snprintf(cmd, 1024, "python3 /ca/bin/azure/RouteConfigManager.py -mode set -sub_id %s -res_grp_name %s -vm_name %s -ip_running %s -ip_deallocating %s", + subscription_id, resource_group_name, vm_name, ip_running, ip_deallocating); + fp = popen(cmd, "r"); + if (fp == NULL) { + printf("Failed to run command\n" ); + exit(1); + } + while (fgets(path, sizeof(path)-1, fp) != NULL) { + printf("%s", path); + } + pclose(fp); + } else { + printf("Please execute \"cloud az udr disable\" first."); + } + } +} + +void +cloud_az_clear_nicconfig(uint32_t idx) +{ + FILE *fp; + char path[1035]; + char cmd[1024]; + + snprintf(cmd, 1024, "ps aux | grep -v grep | grep 'python3 /ca/bin/azure/AZFailoverPoller.py -mode 1' | wc -l"); + fp = popen(cmd, "r"); + if (fp != NULL) { + fgets(path, sizeof(path)-1, fp); + if (path[0] == '0') { + snprintf(cmd, 1024, "python3 /ca/bin/azure/ConfigManager.py -mode clear -index %d", idx); + fp = popen(cmd, "r"); + if (fp == NULL) { + printf("Failed to run command\n" ); + exit(1); + } + while (fgets(path, sizeof(path)-1, fp) != NULL) { + printf("%s", path); + } + pclose(fp); + } else { + printf("Please execute \"cloud az ha disable\" first."); + } + } +} + +void +cloud_az_show_nicconfig(uint32_t idx) +{ + FILE *fp; + char path[1035]; + char cmd[1024]; + + snprintf(cmd, 1024, "python3 /ca/bin/azure/ConfigManager.py -mode show -index %d", idx); + fp = popen(cmd, "r"); if (fp == NULL) { printf("Failed to run command\n" ); exit(1); @@ -3705,21 +3760,45 @@ printf("%s", path); } pclose(fp); -// } -void -cloud_az_show_udrconfig() +void +cloud_az_clear_udrconfig(uint32_t idx) { FILE *fp; char path[1035]; char cmd[1024]; - // snprintf(cmd, 1024, "python3 /ca/bin/azure/ConfigManager.py -mode show"); - // system(cmd); + snprintf(cmd, 1024, "ps aux | grep -v grep | grep 'python3 /ca/bin/azure/UDRPoller.py -mode 1' | wc -l"); + fp = popen(cmd, "r"); + if (fp != NULL) { + fgets(path, sizeof(path)-1, fp); + if (path[0] == '0') { + snprintf(cmd, 1024, "python3 /ca/bin/azure/RouteConfigManager.py -mode clear -index %d", idx); + fp = popen(cmd, "r"); + if (fp == NULL) { + printf("Failed to run command\n" ); + exit(1); + } + while (fgets(path, sizeof(path)-1, fp) != NULL) { + printf("%s", path); + } + pclose(fp); + } else { + printf("Please execute \"cloud az udr disable\" first."); + } + } +} -// - fp = popen("python3 /ca/bin/azure/RouteConfigManager.py -mode show", "r"); +void +cloud_az_show_udrconfig(uint32_t idx) +{ + FILE *fp; + char path[1035]; + char cmd[1024]; + + snprintf(cmd, 1024, "python3 /ca/bin/azure/RouteConfigManager.py -mode show -index %d", idx); + fp = popen(cmd, "r"); if (fp == NULL) { printf("Failed to run command\n" ); exit(1); @@ -3728,7 +3807,6 @@ printf("%s", path); } pclose(fp); -// } // AZURE CLOUD FUNCTION END Index: /branches/rel_apv_10_7_3/usr/click/lib/libparser/commands.pm =================================================================== --- /branches/rel_apv_10_7_3/usr/click/lib/libparser/commands.pm (revision 39037) +++ /branches/rel_apv_10_7_3/usr/click/lib/libparser/commands.pm (working copy) @@ -463,6 +463,19 @@ function_args => [], }, + # cloud az show ha + + { + obj_type => "ITEM", + name => "ha", + menu => "root_cloud_azure_show", + help_string => "Show Azure ha status", + cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", + user_level => "CLI_LEVEL_CONFIG", + function_name => "cloud_az_show_ha", + function_args => [], + }, + # cloud az udr { @@ -539,7 +552,19 @@ help_string => "Display Cloud Azure Show decision", }, - # cloud az show status + # cloud az show log + + { + obj_type => "MENU", + name => "log", + parent_menu => "root_cloud_azure_show", + uniq_name => "root_cloud_azure_show_log", + cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL", + user_level => "CLI_LEVEL_CONFIG", + help_string => "Display Cloud Azure log and status", + }, + + # cloud az show subscription { obj_type => "ITEM", @@ -608,35 +633,32 @@ obj_type => "ITEM", name => "nicconfig", menu => "root_cloud_azure_set", - cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", + cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", user_level => "CLI_LEVEL_CONFIG", help_string => "Set the configuration of NIC", function_name => "cloud_az_set_nicconfig", function_args => [ - { - type => "STRING", - help_string => "Enter subscription ID: ", - optional => "NO", - - }, - { - type => "STRING", - help_string => "Enter resource group name: ", - optional => "NO", - }, - { - type => "STRING", - help_string => "Enter NIC name of the primary machine: ", - optional => "NO", - - }, - { - type => "STRING", - help_string => "Enter NIC name of the secondary machine: ", - optional => "NO", - - }, - ], + { + type => "STRING", + help_string => "Subscription ID", + optional => "NO", + }, + { + type => "STRING", + help_string => "Resource Group Name", + optional => "NO", + }, + { + type => "STRING", + help_string => "NIC name of the active APV", + optional => "NO", + }, + { + type => "STRING", + help_string => "NIC name of the standby APV", + optional => "NO", + }, + ], }, # cloud az set udrconfig @@ -645,59 +667,80 @@ obj_type => "ITEM", name => "udrconfig", menu => "root_cloud_azure_set", - cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", + cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", user_level => "CLI_LEVEL_CONFIG", help_string => "Set the configuration of UDR", function_name => "cloud_az_set_udrconfig", function_args => [ - { - type => "STRING", - help_string => "Enter subscription ID: ", - optional => "NO", - - }, - { - type => "STRING", - help_string => "Enter resource group name: ", - optional => "NO", - }, - { - type => "STRING", - help_string => "Enter vm name: ", - optional => "NO", - }, - { - type => "IPADDR", - help_string => "Enter ip of set on UDR while monitored vm is up: ", - optional => "NO", - - }, - { - type => "IPADDR", - help_string => "Enterip of set on UDR while monitored vm is down: ", - optional => "NO", - - }, - ], + { + type => "STRING", + help_string => "Subscription ID", + optional => "NO", + }, + { + type => "STRING", + help_string => "Resource Group Name", + optional => "NO", + }, + { + type => "STRING", + help_string => "Virtual Machine Name", + optional => "NO", + }, + { + type => "IPADDR", + help_string => "The IP address in UDR when monitored virtual machine is up", + optional => "NO", + }, + { + type => "IPADDR", + help_string => "The IP address in UDR when monitored virtual machine is down", + optional => "NO", + }, + ], }, # cloud az set subscription + { obj_type => "ITEM", name => "subscription", menu => "root_cloud_azure_set", - cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", + cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", user_level => "CLI_LEVEL_CONFIG", help_string => "Set the subscription of azure", function_name => "cloud_az_set_subscription", function_args => [ - { - type => "STRING", - help_string => "subscription ID: ", - optional => "NO", + { + type => "STRING", + help_string => "subscription ID: ", + optional => "NO", + }, + ], + }, + + # cloud az set log - }, - ], + { + obj_type => "MENU", + name => "log", + parent_menu => "root_cloud_azure_set", + uniq_name => "root_cloud_azure_set_log", + cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL", + user_level => "CLI_LEVEL_CONFIG", + help_string => "Set the status of the log functionality", + }, + + # cloud az set loglevel + + { + obj_type => "MENU", + name => "loglevel", + parent_menu => "root_cloud_azure_set", + uniq_name => "root_cloud_azure_set_loglevel", + cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL", + user_level => "CLI_LEVEL_CONFIG", + help_string => "Set the severity of the log functionality", }, # cloud az clear @@ -718,11 +761,18 @@ obj_type => "ITEM", name => "nicconfig", menu => "root_cloud_azure_clear", - cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", + cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", user_level => "CLI_LEVEL_CONFIG", help_string => "Clear the configuration of NIC", function_name => "cloud_az_clear_nicconfig", - function_args => [], + function_args => [ + { + type => "U32", + help_string => "Index of the NIC configuration to delete (default: 0, to delete all)", + optional => "YES", + default_value => "0", + } + ], }, # cloud az show nicconfig @@ -731,37 +781,37 @@ obj_type => "ITEM", name => "nicconfig", menu => "root_cloud_azure_show", - cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", + cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", user_level => "CLI_LEVEL_CONFIG", help_string => "Show the configuration of NIC", function_name => "cloud_az_show_nicconfig", - function_args => [], + function_args => [ + { + type => "U32", + help_string => "Index of the NIC configuration to display (default: 0, to display all)", + optional => "YES", + default_value => "0", + } + ], }, - # # cloud az show ha_enable - - # { - # obj_type => "ITEM", - # name => "ha", - # menu => "root_cloud_azure_show", - # cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", - # user_level => "CLI_LEVEL_CONFIG", - # help_string => "Show the ha status of Azure", - # function_name => "cloud_az_show_ha_enable", - # function_args => [], - # }, - - # cloud az clear udrconfig { obj_type => "ITEM", name => "udrconfig", menu => "root_cloud_azure_clear", - cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", + cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", user_level => "CLI_LEVEL_CONFIG", help_string => "Clear the configuration of UDR", function_name => "cloud_az_clear_udrconfig", - function_args => [], + function_args => [ + { + type => "U32", + help_string => "Index of the UDR configuration to delete (default: 0, to delete all)", + optional => "YES", + default_value => "0", + } + ], }, # cloud az show udrconfig @@ -770,28 +820,171 @@ obj_type => "ITEM", name => "udrconfig", menu => "root_cloud_azure_show", - cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", + cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", user_level => "CLI_LEVEL_CONFIG", help_string => "Show the configuration of UDR", function_name => "cloud_az_show_udrconfig", + function_args => [ + { + type => "U32", + help_string => "Index of the UDR configuration to display (default: 0, to display all)", + optional => "YES", + default_value => "0", + } + ], + }, + + # cloud az log + + { + obj_type => "MENU", + name => "log", + parent_menu => "root_cloud_azure", + uniq_name => "root_cloud_azure_log", + cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL", + user_level => "CLI_LEVEL_CONFIG", + help_string => "Set the status of the log functionality", + }, + + # cloud az log on + + { + obj_type => "ITEM", + name => "on", + menu => "root_cloud_azure_log", + help_string => "Enable both Failover and Recover function in Azure", + cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", + user_level => "CLI_LEVEL_CONFIG", + function_name => "cloud_az_set_log_on", function_args => [], }, - # # cloud az show udr_enable + # cloud az log off - # { - # obj_type => "ITEM", - # name => "udr", - # menu => "root_cloud_azure_show", - # cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", - # user_level => "CLI_LEVEL_CONFIG", - # help_string => "Show the UDR status of Azure", - # function_name => "cloud_az_show_udr_enable", - # function_args => [], - # }, + { + obj_type => "ITEM", + name => "off", + menu => "root_cloud_azure_log", + help_string => "Disable both Failover and Recover function in Azure", + cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", + user_level => "CLI_LEVEL_CONFIG", + function_name => "cloud_az_set_log_off", + function_args => [], + }, + + # cloud az show log config + + { + obj_type => "ITEM", + name => "config", + menu => "root_cloud_azure_show_log", + cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", + user_level => "CLI_LEVEL_CONFIG", + help_string => "Check Azure CLI log functionality status", + function_name => "cloud_az_show_log_config", + function_args => [], + }, + + # cloud az show log buffer + + { + obj_type => "ITEM", + name => "buffer", + menu => "root_cloud_azure_show_log", + cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", + user_level => "CLI_LEVEL_CONFIG", + help_string => "Show the log of az tools", + function_name => "cloud_az_show_log_buffer", + function_args => [ + { + type => "U32", + help_string => "Enter the number of shown line", + optional => "YES", + default_value => "0", + } + ], + }, + + # cloud az show log loglevel + + { + obj_type => "ITEM", + name => "loglevel", + menu => "root_cloud_azure_show_log", + cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", + user_level => "CLI_LEVEL_CONFIG", + help_string => "Show the log of az tools", + function_name => "cloud_az_show_log_loglevel", + function_args => [], + }, + + # cloud az loglevel + + { + obj_type => "MENU", + name => "loglevel", + parent_menu => "root_cloud_azure", + uniq_name => "root_cloud_azure_loglevel", + cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL", + user_level => "CLI_LEVEL_CONFIG", + help_string => "Display Cloud Azure Set Loglevel decision", + }, + + # cloud az loglevel debug + + { + obj_type => "ITEM", + name => "debug", + menu => "root_cloud_azure_loglevel", + cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", + user_level => "CLI_LEVEL_CONFIG", + help_string => "Set the log severity to debug", + function_name => "cloud_az_loglevel_debug", + function_args => [], + }, + + # cloud az loglevel info + + { + obj_type => "ITEM", + name => "info", + menu => "root_cloud_azure_loglevel", + cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", + user_level => "CLI_LEVEL_CONFIG", + help_string => "Set the log severity to info", + function_name => "cloud_az_loglevel_info", + function_args => [], + }, + + # cloud az loglevel warning + + { + obj_type => "ITEM", + name => "warning", + menu => "root_cloud_azure_loglevel", + cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", + user_level => "CLI_LEVEL_CONFIG", + help_string => "Set the log severity to warning", + function_name => "cloud_az_loglevel_warning", + function_args => [], + }, + + # cloud az loglevel error + + { + obj_type => "ITEM", + name => "error", + menu => "root_cloud_azure_loglevel", + cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", + user_level => "CLI_LEVEL_CONFIG", + help_string => "Set the log severity to error", + function_name => "cloud_az_loglevel_error", + function_args => [], + }, # AZURE COMMAND END + # AWS COMMAND START # cloud aws Index: /branches/rel_apv_10_7_3/usr/click/tools/aws/aws_auth/AWSAuthController.py =================================================================== --- /branches/rel_apv_10_7_3/usr/click/tools/aws/aws_auth/AWSAuthController.py (revision 39037) +++ /branches/rel_apv_10_7_3/usr/click/tools/aws/aws_auth/AWSAuthController.py (working copy) @@ -97,7 +97,7 @@ ) res[key] = process.stdout.replace("\n", "") except Exception as e: - print(str(e)) + ProxyAWSLogger.error(str(e)) if res["aws_access_key_id"] or res["aws_access_key_id"]: res["aws_access_key_id"] = cls._mask_credential( Index: /branches/rel_apv_10_7_3/usr/click/tools/azure/AZAuthManager.py =================================================================== --- /branches/rel_apv_10_7_3/usr/click/tools/azure/AZAuthManager.py (revision 39037) +++ /branches/rel_apv_10_7_3/usr/click/tools/azure/AZAuthManager.py (working copy) @@ -23,9 +23,6 @@ output_controller.end_to_file() elif args.mode=='show': output_controller = OutputController() - output_controller.start_to_file() az_auth_controller.show_az() - output_controller.end_to_file() else: print(f"Error: mode arugment must be login, logout, and show. mode:[{args.mode}]") - Index: /branches/rel_apv_10_7_3/usr/click/tools/azure/AZFailoverManager.py =================================================================== --- /branches/rel_apv_10_7_3/usr/click/tools/azure/AZFailoverManager.py (revision 39037) +++ /branches/rel_apv_10_7_3/usr/click/tools/azure/AZFailoverManager.py (working copy) @@ -1,8 +1,13 @@ import argparse import json import os + from az_nic.NICController import NICController from az_route_table.RouteTableFailoverManager import RouteTableFailoverManager +from ConfigManager import IPConfigManager +from logger.ProxyAZLogger import ProxyAZLogger + + class AZFailoverManager(): '''This class is used while failover happen and failover recover.\n It does two things: @@ -17,18 +22,25 @@ self.to_nic_name = ip_config_setting['to_nic_name'] # self.to_ip_config_name = ip_config_setting['to_ip_config_name'] def failover_happen(self): - '''two things to do: 1. transfer ip config. 2. transfer UDR''' + '''transfer ip config.''' + ProxyAZLogger.info("start to transfer all IPs") nicC = NICController(self.subscription_id, self.resource_group_name) - # nicC.transfer_ip_config(self.from_nic_name, self.from_ip_config_name, self.to_nic_name, self.to_ip_config_name) - nicC.transfer_all_ip_config(from_nic_name=self.from_nic_name, to_nic_name=self.to_nic_name) - # Assumption is that two vAPV is within the same subnet. No need to transfer UDR - # fm = RouteTableFailoverManager() - # fm.handle_failover_happen() + try: + nicC.transfer_all_ip_config(from_nic_name=self.from_nic_name, to_nic_name=self.to_nic_name) + ProxyAZLogger.info("finish transfering all IPs") + except Exception as e: + ProxyAZLogger.error("Fail to transfer all ip config: "+str(e)) def failover_recover(self): + ProxyAZLogger.info("start to transfer all IPs") nicC = NICController(self.subscription_id, self.resource_group_name) - # nicC.transfer_ip_config(self.to_nic_name, self.to_ip_config_name, self.from_nic_name, self.to_ip_config_name) - nicC.transfer_all_ip_config(from_nic_name=self.to_nic_name, to_nic_name= self.from_nic_name) + try: + nicC.transfer_all_ip_config(from_nic_name=self.to_nic_name, to_nic_name= self.from_nic_name) + ProxyAZLogger.info("finish to transfer all IPs") + except Exception as e: + ProxyAZLogger.error("Fail to transfer all ip config: "+str(e)) + + if __name__=="__main__": parser = argparse.ArgumentParser(description='Process optional name argument.') parser.add_argument('-mode', type=str, help='Enter 1 or 2: mode 1 is for failover happen; mode 2 is failover recover') @@ -37,14 +49,18 @@ config_dir = '/ca/conf/' ip_config_setting_file_name = 'ip_config_setting.json' setting_file_location = os.path.join(config_dir, ip_config_setting_file_name) - with open(setting_file_location, 'r') as file: - ip_config_setting = json.load(file) - az_failover_manager = AZFailoverManager(ip_config_setting) - if args.mode=='1': - # print("mode 1") - az_failover_manager.failover_happen() - elif args.mode=='2': - # print("mode 2") - az_failover_manager.failover_recover() + + if args.mode=='1' or args.mode=='2': + ip_config_manager = IPConfigManager(setting_file_location) + ip_config_setting_json = ip_config_manager.get_ip_config() + for i in ip_config_setting_json: + data = ip_config_setting_json[i] + az_failover_manager = AZFailoverManager(data) + if args.mode=='1': + ProxyAZLogger.info("mode 1 is for failover happen") + az_failover_manager.failover_happen() + elif args.mode=='2': + ProxyAZLogger.info("mode 2 is failover recover") + az_failover_manager.failover_recover() else: - print(f"Error: mode must arugment must be 1 or 2. mode:[{args.mode}]") \ No newline at end of file + ProxyAZLogger.error(f"Error: mode must arugment must be 1 or 2. mode:[{args.mode}]") \ No newline at end of file Index: /branches/rel_apv_10_7_3/usr/click/tools/azure/AZFailoverPoller.py =================================================================== --- /branches/rel_apv_10_7_3/usr/click/tools/azure/AZFailoverPoller.py (revision 39037) +++ /branches/rel_apv_10_7_3/usr/click/tools/azure/AZFailoverPoller.py (working copy) @@ -6,26 +6,29 @@ import time import psutil import os + from apv_controller.APVController import APVController from AZFailoverManager import AZFailoverManager +from ConfigManager import IPConfigManager +from logger.ProxyAZLogger import ProxyAZLogger + # todo put it in APV enviroment, parse heartbeat class AZFailoverPoller(): def __init__(self) -> None: pass - def start(self, setting_file_location): - + def start(self, ip_config_setting_json): in_failover = False - polling_period = 2 #seconds - # self.print_current_time(1) + polling_period = 1 #seconds apv_contronller = APVController() if apv_contronller.is_primary(): - print(f"This APV [{apv_contronller.get_apv_name()}] is primary APV in HA.") + ProxyAZLogger.debug(f"This APV [{apv_contronller.get_apv_name()}] is primary APV in HA. Stop pooling.") return - print(f"This APV [{apv_contronller.get_apv_name()}] is secondary APV in HA.") - print(f'APV [{apv_contronller.get_apv_name()}] start polling') + ProxyAZLogger.debug(f"This APV [{apv_contronller.get_apv_name()}] is secondary APV in HA.") + ProxyAZLogger.info(f'APV [{apv_contronller.get_apv_name()}] start polling') # pooling while True: time.sleep(polling_period) + ProxyAZLogger.debug("try pooling") # primary machine doesn't need to do pooling if apv_contronller.is_primary(): break @@ -33,11 +36,14 @@ if not in_failover: # failover happen current_time = datetime.now().strftime("%Y-%m-%d %H %M %S") - print(f"Failover happen on {current_time}") - az_failover_manager = AZFailoverManager(setting_file_location) - az_failover_manager.failover_happen() + ProxyAZLogger.info(f"Failover happen on {current_time}") + for idx in ip_config_setting_json: + data = ip_config_setting_json[idx] + az_failover_manager = AZFailoverManager(data) + az_failover_manager.failover_happen() + #todo need to verify that all setting are set, and then set is_failover=True - print("Succeessfully handle failover transition") + ProxyAZLogger.info("Succeessfully handle failover transition") # set in_failover=True for condition that the primary APV is ON again. in_failover = True @@ -45,22 +51,24 @@ elif in_failover: # failover happended before and now the primary APV is ON current_time = datetime.now().strftime("%Y-%m-%d %H %M %S") - print(f"Failover recover on {current_time}") - az_failover_manager = AZFailoverManager(setting_file_location) - az_failover_manager.failover_recover() + ProxyAZLogger.info(f"Failover recover on {current_time}") + for idx in ip_config_setting_json: + data = ip_config_setting_json[idx] + az_failover_manager = AZFailoverManager(data) + az_failover_manager.failover_recover() # reset in_failover = False - def kill_poller(self, process_name): + '''This method will kill all the process with the same name of process_name.''' for proc in psutil.process_iter(['pid', 'cmdline']): - if process_name in proc.info['cmdline']: - proc.kill() - print('kill ', process_name) - return - print(f"Didn't stop poller. Cannnot found module name:{process_name}. Please check current module name.", ) - + if proc.info['cmdline']: + for peice_of_cmd in proc.info['cmdline']: + if process_name in peice_of_cmd and (not proc.info['pid']==os.getpid()) : + proc.kill() + ProxyAZLogger.info("kill process_name") + def stop(self): '''kill poller that is another running process by its filename, a.k.a. this file name.''' # get this module name (filename) @@ -75,24 +83,51 @@ print("pid: ", pid, " Current Time:", current_time) time.sleep(interval) except KeyboardInterrupt: - print("\nProcess interrupted. Exiting...") + ProxyAZLogger.error("\nProcess interrupted. Exiting...") + def is_poller_running(self, this_mode)->bool: + '''This method is used to determine if the poller is running or not. + return True if it is running + return False if it isn't running + ''' + module_name = os.path.basename(__file__) + for proc in psutil.process_iter(['pid', 'cmdline']): + # print(module_name, proc.info, os.getpid()) + if proc.info['cmdline']: + for peice_of_cmd in proc.info['cmdline']: + if module_name in peice_of_cmd and (not proc.info['pid']==os.getpid()) : + return True + return False + + if __name__=='__main__': - parser = argparse.ArgumentParser(description='Process optional name argument.') - parser.add_argument('-mode', type=str, help='Enter 1 or 2: mode 1: start polling; mode 2: stop polling') + parser = argparse.ArgumentParser(description='''This API is used to start polling, stop polling, and check the status of poller for IPs transfering''') + parser.add_argument('-mode', type=str, choices=["1", "2", "3"], help='Enter 1 or 2: mode 1: start polling; mode 2: stop polling; mode3: check poller status') args = parser.parse_args() - az_polloer = AZFailoverPoller() + az_poller = AZFailoverPoller() config_dir = '/ca/conf/' ip_config_setting_file_name = 'ip_config_setting.json' setting_file_location = os.path.join(config_dir, ip_config_setting_file_name) - with open(setting_file_location, 'r') as f: - data = f.read() - ip_config_setting_json = json.loads(data) + ip_config_manager = IPConfigManager(setting_file_location) + ip_config_setting_json = ip_config_manager.get_ip_config() if args.mode=='1': - print("mode 1") - az_polloer.start(ip_config_setting_json) + if not az_poller.is_poller_running(args.mode): + ProxyAZLogger.info("start polling mode") + az_poller.start(ip_config_setting_json) + else: + ProxyAZLogger.info("try to start polling mode, but poller has been running") elif args.mode=='2': - print("mode 2") - az_polloer.stop() + if az_poller.is_poller_running(args.mode): + ProxyAZLogger.info("stop polling mode") + az_poller.stop() + else: + ProxyAZLogger.info("try to stop polling mode, but the poller isn't running") + elif args.mode=="3": + status = az_poller.is_poller_running(args.mode) + print(status) + if status: + ProxyAZLogger.info(f"check {os.path.basename(__file__)} status: running") + else: + ProxyAZLogger.info(f"check {os.path.basename(__file__)} status: not running") else: - print(f"Error: mode must arugment must be 1 or 2. mode:[{args.mode}]") \ No newline at end of file + ProxyAZLogger.error(f"Error: mode must arugment must be 1 or 2. mode:[{args.mode}]") \ No newline at end of file Index: /branches/rel_apv_10_7_3/usr/click/tools/azure/ConfigManager.py =================================================================== --- /branches/rel_apv_10_7_3/usr/click/tools/azure/ConfigManager.py (revision 39037) +++ /branches/rel_apv_10_7_3/usr/click/tools/azure/ConfigManager.py (working copy) @@ -1,35 +1,79 @@ import json import os import argparse - +from logger.ProxyAZLogger import ProxyAZLogger class IPConfigManager(): '''set needed configuration for transferring routing table and network interface''' def __init__(self, ip_config_file_path) -> None: self.ip_config_file_path = ip_config_file_path - def show_ip_config(self): - try: + + def save_ip_config(self, ip_config_setting_json): + ip_config_setting_json = dict(sorted(ip_config_setting_json.items())) + + with open(self.ip_config_file_path, 'w') as json_file: + json.dump(ip_config_setting_json, json_file, indent=4) + + def get_ip_config(self): + ip_config_setting_json = {} + if os.path.exists(self.ip_config_file_path): with open(self.ip_config_file_path, 'r') as f: data = f.read() - ip_config_setting_json = json.loads(data) - print(f"Subscription ID: {ip_config_setting_json['subscription_id']}") - print(f"Resource group name: {ip_config_setting_json['resource_group_name']}") - print(f"Primary NIC name: {ip_config_setting_json['from_nic_name']}") - # print(f"The name of ip configuration: {ip_config_setting_json['from_ip_config_name']}") - print(f"Secondary NIC name: {ip_config_setting_json['to_nic_name']}") + try: + ip_config_setting_json = json.loads(data) + except Exception: + print(f"load data to json error.") + + return ip_config_setting_json + + def print_ip_config(self, idx, single_data): + ProxyAZLogger.debug("print_ip_config") + print(f"{idx}:") + print(f" Subscription ID: {single_data['subscription_id']}") + print(f" Resource group name: {single_data['resource_group_name']}") + print(f" Primary NIC name: {single_data['from_nic_name']}") + # print(f"The name of ip configuration: {single_data['from_ip_config_name']}") + print(f" Secondary NIC name: {single_data['to_nic_name']}") + + def show_ip_config(self, idx=0): + ip_config_setting_json = self.get_ip_config() + if not ip_config_setting_json: + print("No NIC configuration") + return + try: + if idx == 0: + for idx in ip_config_setting_json: + data = ip_config_setting_json[idx] + self.print_ip_config(idx, data) + else: + if f"{idx}" in ip_config_setting_json: + data = ip_config_setting_json[f"{idx}"] + self.print_ip_config(idx, data) except Exception: + ProxyAZLogger.error("Error: No ip configuration found. Set it before examine it.") print("Error: No ip configuration found. Set it before examine it.") - def clear_ip_config(self): + + def clear_ip_config(self, idx=0): if os.path.exists(self.ip_config_file_path): - os.remove(self.ip_config_file_path) - print('clear ip configuration') + ProxyAZLogger.info(f"clear ip config with idx: {idx}") + if idx == 0: + os.remove(self.ip_config_file_path) + print('clear all ip configuration') + else: + ip_config_setting_json = self.get_ip_config() + if f"{idx}" in ip_config_setting_json: + del ip_config_setting_json[f"{idx}"] + print(f'clear {idx} ip configuration') + + if len(ip_config_setting_json) == 0: + os.remove(self.ip_config_file_path) + print('clear all ip configuration') + else: + self.save_ip_config(ip_config_setting_json) + + def set_ip_config(self, subscription_id, resource_group_name, from_nic_name, to_nic_name): - # subscription_id = input("Enter subscription ID: ") - # resource_group_name = input("Enter resource group name: ") - # from_nic_name = input("Enter NIC name of the primary machine: ") - # from_ip_config_name = input("Enter name of ip configuration need to be switch while failover happen: ") - # to_nic_name = input("Enter NIC name of the secondary machine: ") data = { "subscription_id": subscription_id, "resource_group_name": resource_group_name, @@ -38,9 +82,16 @@ "to_nic_name": to_nic_name, # "to_ip_config_name": from_ip_config_name, } + + ip_config_setting_json = self.get_ip_config() + for idx in range(1, 200+1): + if not f"{idx}" in ip_config_setting_json: + ip_config_setting_json[f"{idx}"] = data + break + # Write the dictionary of setting to a JSON file - with open(self.ip_config_file_path, 'w') as json_file: - json.dump(data, json_file, indent=4) + ProxyAZLogger.info(f"save ip config: {ip_config_setting_json}") + self.save_ip_config(ip_config_setting_json) if __name__=="__main__": parser = argparse.ArgumentParser(description='Process optional name argument.') @@ -51,6 +102,7 @@ parser.add_argument('-src_nic_name', type=str, help='NIC name of the primary machine') # parser.add_argument('-src_ip_cfg_name', type=str, help='name of ip configuration need to be switch while failover happen') parser.add_argument('-dest_nic_name', type=str, help='NIC name of the secondary machine') + parser.add_argument('-index', type=int, help='Show or clear the index config') args = parser.parse_args() @@ -60,14 +112,19 @@ os.makedirs(config_dir) print(f"Directory '{config_dir}' created successfully.") setting_file_location = os.path.join(config_dir, ip_config_setting_file_name) - + ip_config_manager = IPConfigManager(setting_file_location) if args.mode=='set': + ProxyAZLogger.info("config manager set mode") ip_config_manager.set_ip_config(args.sub_id, args.res_grp_name, args.src_nic_name, args.dest_nic_name) elif args.mode=='show': - ip_config_manager.show_ip_config() + ProxyAZLogger.info("config manager show mode") + ip_config_manager.show_ip_config(args.index) elif args.mode=='clear': - ip_config_manager.clear_ip_config() - + ProxyAZLogger.info("config manager clear mode") + ip_config_manager.clear_ip_config(args.index) + elif args.mode=='getipconfig': + ProxyAZLogger.info("config manager getconfig mode") + print(ip_config_manager.get_ip_config()) else: - print(f"Error: mode must arugment must be set, show, and clear. mode:[{args.mode}]") + ProxyAZLogger.error(f"Error: mode must arugment must be set, show, and clear. mode:[{args.mode}]") Index: /branches/rel_apv_10_7_3/usr/click/tools/azure/LoggerManager.py =================================================================== --- /branches/rel_apv_10_7_3/usr/click/tools/azure/LoggerManager.py (revision 0) +++ /branches/rel_apv_10_7_3/usr/click/tools/azure/LoggerManager.py (working copy) @@ -0,0 +1,83 @@ +import argparse +from logger.ProxyAZLogger import ProxyAZLogger +class LoggerManager(): + def __init__(): + pass + @classmethod + def turn_on_logger(cls)->None: + ProxyAZLogger.debug("Turn on log functionality.") + ProxyAZLogger.turn_on() + + @classmethod + def turn_off_logger(cls)->None: + ProxyAZLogger.debug("Turn off log functionality.") + ProxyAZLogger.turn_off() + + @classmethod + def check_Logger_state(cls)->bool: + return ProxyAZLogger.get_Logger_state() + + @classmethod + def check_Logger_level_state(cls)->str: + return ProxyAZLogger.get_Logger_level_state() + + @classmethod + def get_log(cls, number_of_line: int = None) -> None: + log_list = ProxyAZLogger.get_log_list() + reverse_log_list = list(reversed(log_list)) + shown_log_list = [] + if number_of_line==0: + # print all log + shown_log_list = reverse_log_list + else: + # print log according to the number of line + shown_log_list = reverse_log_list[:number_of_line] + for line in shown_log_list: + print(line.strip()) + + @classmethod + def show_log(cls, number_of_line: int = None) -> str: + res = ProxyAZLogger.get_log() + + @classmethod + def set_logger_level(cls, level:str)->None: + ProxyAZLogger.info(f"set new log severity: {level}") + ProxyAZLogger.set_level(level) + + @classmethod + def get_log_file_path(cls)->str: + log_file_path = ProxyAZLogger.get_log_file_path() + ProxyAZLogger.info("get log file path: "+log_file_path) + return log_file_path + + +if __name__=='__main__': + description = '''This API is used to + 1. manipulate the mode(on or off) of the functionality. + 2. dump the log message. + 3. check current logger status + 4. set the log severity and show log severity''' + parser = argparse.ArgumentParser(description=description) + parser.add_argument('-mode', type=str, choices=["on", "off", "show", "status", "getlogpath"], help='Enter [on], [off], [getlogpath], or [show]') + parser.add_argument('-level', type=str, choices=["debug", "info", "warning", "error", "status"], help='choose severity amond [debug], [info], [warning], or [error]') + parser.add_argument('-lines', type=int, help='the number of line of shown log', default=0) + + args = parser.parse_args() + + # set severity + if args.level in ["debug", "info", "warning", "error"]: + LoggerManager.set_logger_level(args.level) + elif args.level in ["status"]: + print(LoggerManager.check_Logger_level_state()) + + # set mode + if args.mode=="on": + LoggerManager.turn_on_logger() + elif args.mode=="off": + LoggerManager.turn_off_logger() + elif args.mode=="show": + log = LoggerManager.get_log(args.lines) + elif args.mode=="status": + print(LoggerManager.check_Logger_state()) + elif args.mode=="getlogpath": + print(LoggerManager.get_log_file_path()) Index: /branches/rel_apv_10_7_3/usr/click/tools/azure/RouteConfigManager.py =================================================================== --- /branches/rel_apv_10_7_3/usr/click/tools/azure/RouteConfigManager.py (revision 39037) +++ /branches/rel_apv_10_7_3/usr/click/tools/azure/RouteConfigManager.py (working copy) @@ -2,28 +2,75 @@ import os import argparse import ipaddress +from logger.ProxyAZLogger import ProxyAZLogger class RouteConfigManager(): '''set needed configuration for transferring routing table and network interface''' def __init__(self, ip_config_file_path) -> None: self.ip_config_file_path = ip_config_file_path - def show_UDR_config(self): - try: + + def save_UDR_config(self, ip_config_setting_json): + ip_config_setting_json = dict(sorted(ip_config_setting_json.items())) + + with open(self.ip_config_file_path, 'w') as json_file: + json.dump(ip_config_setting_json, json_file, indent=4) + + def get_UDR_config(self): + ip_config_setting_json = {} + if os.path.exists(self.ip_config_file_path): with open(self.ip_config_file_path, 'r') as f: data = f.read() - ip_config_setting_json = json.loads(data) - print(f"Subscription ID: {ip_config_setting_json['subscription_id']}") - print(f"Resource group name: {ip_config_setting_json['resource_group_name']}") - print(f"Monitored_vm_name: {ip_config_setting_json['monitored_vm_name']}") - print(f"The required ip while monitored vm is up: {ip_config_setting_json['target_ip_when_running']}") - print(f"The required ip while monitored vm is down: {ip_config_setting_json['target_ip_when_deallocated']}") + try: + ip_config_setting_json = json.loads(data) + except Exception: + print(f"load data to json error.") + + return ip_config_setting_json + + def print_UDR_config(self, idx, single_data): + print(f"{idx}:") + print(f" Subscription ID: {single_data['subscription_id']}") + print(f" Resource group name: {single_data['resource_group_name']}") + print(f" Monitored_vm_name: {single_data['monitored_vm_name']}") + print(f" The required ip while monitored vm is up: {single_data['target_ip_when_running']}") + print(f" The required ip while monitored vm is down: {single_data['target_ip_when_deallocated']}") + + def show_UDR_config(self, idx=0): + udr_config_setting_json = self.get_UDR_config() + if not udr_config_setting_json: + print("No UDR configuration") + return + try: + if idx == 0: + for idx in udr_config_setting_json: + data = udr_config_setting_json[idx] + self.print_UDR_config(idx, data) + else: + if f"{idx}" in udr_config_setting_json: + data = udr_config_setting_json[f"{idx}"] + self.print_UDR_config(idx, data) except Exception: print("Error: No ip configuration found. Set it before examine it.") - def clear_UDR_config(self): + ProxyAZLogger.error("Error: No ip configuration found. Set it before examine it.") + + def clear_UDR_config(self, idx=0): if os.path.exists(self.ip_config_file_path): - os.remove(self.ip_config_file_path) - print('clear ip configuration') + ProxyAZLogger.info(f"clear UDR config with idx: {idx}") + if idx == 0: + os.remove(self.ip_config_file_path) + print('clear all ip configuration') + else: + ip_config_setting_json = self.get_UDR_config() + if f"{idx}" in ip_config_setting_json: + del ip_config_setting_json[f"{idx}"] + print(f'clear {idx} ip configuration') + + if len(ip_config_setting_json) == 0: + os.remove(self.ip_config_file_path) + print('clear all ip configuration') + else: + self.save_UDR_config(ip_config_setting_json) def set_UDR_config(self, subscription_id, resource_group_name, monitored_vm_name, target_ip_when_running, target_ip_when_deallocated): # subscription_id = input("Enter subscription ID: ") @@ -38,9 +85,17 @@ "target_ip_when_running": target_ip_when_running, "target_ip_when_deallocated": target_ip_when_deallocated, } + + ip_config_setting_json = self.get_UDR_config() + ProxyAZLogger.info(ip_config_setting_json) + + for idx in range(1, 200+1): + if not f"{idx}" in ip_config_setting_json: + ip_config_setting_json[f"{idx}"] = data + break # Write the dictionary of setting to a JSON file - with open(self.ip_config_file_path, 'w') as json_file: - json.dump(data, json_file, indent=4) + self.save_UDR_config(ip_config_setting_json) + ProxyAZLogger.info(f"save UDR config: {ip_config_setting_json}") def is_valid_ipv4_address(self, address): try: @@ -48,7 +103,8 @@ return isinstance(ip, ipaddress.IPv4Address) except ValueError: return False - + + if __name__=="__main__": parser = argparse.ArgumentParser(description='Process optional name argument.') parser.add_argument('-mode', type=str, help='Enter [set], [show], or [clear]') @@ -58,6 +114,7 @@ parser.add_argument('-vm_name', type=str, help='the name of vm will be monitored') parser.add_argument('-ip_running', type=str, help='the ip of set on UDR while monitored vm is up') parser.add_argument('-ip_deallocating', type=str, help='the ip of set on UDR while monitored vm is down') + parser.add_argument('-index', type=int, help='Show or clear the index config') args = parser.parse_args() @@ -65,27 +122,34 @@ ip_config_setting_file_name = 'route_table_config_setting.json' if not os.path.exists(config_dir): os.makedirs(config_dir) - print(f"Directory '{config_dir}' created successfully.") + ProxyAZLogger.info(f"Directory '{config_dir}' created successfully.") setting_file_location = os.path.join(config_dir, ip_config_setting_file_name) # print("setting_file_location", setting_file_location) route_config_manager = RouteConfigManager(setting_file_location) if args.mode=='set': + ProxyAZLogger.info("set route config") is_ip_valid = True is_ip_valid &= route_config_manager.is_valid_ipv4_address(args.ip_running) is_ip_valid &= route_config_manager.is_valid_ipv4_address(args.ip_deallocating) if is_ip_valid: - route_config_manager.set_UDR_config(args.sub_id, - args.res_grp_name, - args.vm_name, + route_config_manager.set_UDR_config(args.sub_id, + args.res_grp_name, + args.vm_name, args.ip_running, args.ip_deallocating ) else: print("IP4 format is not correct.") + ProxyAZLogger.error("IP4 format is not correct.") elif args.mode=='show': - route_config_manager.show_UDR_config() + ProxyAZLogger.info("show route config") + route_config_manager.show_UDR_config(args.index) elif args.mode=='clear': - route_config_manager.clear_UDR_config() + ProxyAZLogger.info("clear route config index:"+str(args.index)) + route_config_manager.clear_UDR_config(args.index) + elif args.mode=='getrouteconfig': + ProxyAZLogger.info("get route config") + print(route_config_manager.get_UDR_config()) else: print(f"Error: mode must arugment must be set, show, and clear. mode:[{args.mode}]") Index: /branches/rel_apv_10_7_3/usr/click/tools/azure/UDRPoller.py =================================================================== --- /branches/rel_apv_10_7_3/usr/click/tools/azure/UDRPoller.py (revision 39037) +++ /branches/rel_apv_10_7_3/usr/click/tools/azure/UDRPoller.py (working copy) @@ -6,83 +6,146 @@ from az_vm.VMController import VMController from az_route_table.RouteTableController import RouteTableController - +from RouteConfigManager import RouteConfigManager +from logger.ProxyAZLogger import ProxyAZLogger class UDRPoller(): - def __init__(self, rout_table_config_setting_json) -> None: - self.rout_table_config_setting_json = rout_table_config_setting_json + def __init__(self, setting_file_location:str) -> None: + self.setting_file_location = setting_file_location + self.reload_route_table_config_setting_json() + + def reload_route_table_config_setting_json(self): + route_config_manager = RouteConfigManager(self.setting_file_location) + self.route_table_config_setting_json = route_config_manager.get_UDR_config() + def start(self): polling_period = 2 #seconds - vm_controller = VMController( - self.rout_table_config_setting_json['subscription_id'], - self.rout_table_config_setting_json['resource_group_name'] + + vm_controller_list = [] + is_target_vm_down_list = [] + route_table_update_count_list = [] + route_table_controller_list = [] + + for idx in self.route_table_config_setting_json: + data = self.route_table_config_setting_json[idx] + vm_controller = VMController( + data['subscription_id'], + data['resource_group_name'] ) - is_target_vm_down = False - route_table_update_count = 0 - route_table_controller = RouteTableController( - subscription_id=self.rout_table_config_setting_json['subscription_id'], - resource_group_name=self.rout_table_config_setting_json['resource_group_name'] - ) + route_table_controller = RouteTableController( + subscription_id=data['subscription_id'], + resource_group_name=data['resource_group_name'] + ) + + vm_controller_list.append(vm_controller) + is_target_vm_down_list.append(False) + route_table_update_count_list.append(0) + route_table_controller_list.append(route_table_controller) + while True: + # self.reload_route_table_config_setting_json() time.sleep(polling_period) - print("polling...") - if not vm_controller.is_VM_alive_by_name(self.rout_table_config_setting_json["monitored_vm_name"]): - # target vm is down - print("detect target vm is down") - route_table_controller.change_all_UDR_routes_by_ip( - ori_next_hop_ip=self.rout_table_config_setting_json["target_ip_when_running"], - modify_next_hop_ip=self.rout_table_config_setting_json["target_ip_when_deallocated"], - ) - # set vm status - is_target_vm_down=True - else: - # target vm is up - print("detect target vm is up") - route_table_controller.change_all_UDR_routes_by_ip( - ori_next_hop_ip=self.rout_table_config_setting_json["target_ip_when_deallocated"], - modify_next_hop_ip=self.rout_table_config_setting_json["target_ip_when_running"], - ) - # set vm status - is_target_vm_down=False - - route_table_update_count += 1 - if route_table_update_count >= 60 / polling_period: - route_table_controller = RouteTableController( - subscription_id=self.rout_table_config_setting_json['subscription_id'], - resource_group_name=self.rout_table_config_setting_json['resource_group_name'] - ) - route_table_update_count = 0 - + i = 0 + for idx in self.route_table_config_setting_json: + data = self.route_table_config_setting_json[idx] + + ProxyAZLogger.info("UDR pooling") + if not vm_controller_list[i].is_VM_alive_by_name(data["monitored_vm_name"]): + # target vm is down + ProxyAZLogger.info("detect target vm is down") + print("detect target vm is down") + try: + route_table_controller_list[i].change_all_UDR_routes_by_ip( + ori_next_hop_ip=data["target_ip_when_running"], + modify_next_hop_ip=data["target_ip_when_deallocated"], + ) + except Exception as e: + ProxyAZLogger.error("Fail change all UDR route: "+str(e)) + # set vm status + is_target_vm_down_list[i]=True + else: + # target vm is up + ProxyAZLogger.info("detect target vm is up") + try: + route_table_controller_list[i].change_all_UDR_routes_by_ip( + ori_next_hop_ip=data["target_ip_when_deallocated"], + modify_next_hop_ip=data["target_ip_when_running"], + ) + except Exception as e: + ProxyAZLogger.error("Fail change all UDR route: "+str(e)) + # set vm status + is_target_vm_down_list[i]=False + + route_table_update_count_list[i] += 1 + if route_table_update_count_list[i] >= 60 / polling_period: + vm_controller_list[i] = VMController( + data['subscription_id'], + data['resource_group_name'] + ) + + route_table_controller_list[i] = RouteTableController( + subscription_id=data['subscription_id'], + resource_group_name=data['resource_group_name'] + ) + + route_table_update_count_list[i] = 0 + + i += 1 + def stop(self): '''kill poller that is another running process by its filename, a.k.a. this file name.''' # get this module name (filename) module_name = os.path.basename(__file__) self.kill_poller(module_name) def kill_poller(self, process_name): - for proc in psutil.process_iter(['pid', 'cmdline']): - if process_name in proc.info['cmdline']: - proc.kill() - print('kill ', process_name) - return - print(f"Didn't stop poller. Cannnot found module name:{process_name}. Please check current module name.", ) + '''This method will kill all the process with the same name of process_name.''' + for proc in psutil.process_iter(['pid', 'cmdline']): + if proc.info['cmdline']: + for peice_of_cmd in proc.info['cmdline']: + if process_name in peice_of_cmd and (not proc.info['pid']==os.getpid()) : + proc.kill() + ProxyAZLogger.info("kill "+process_name) + + def is_poller_running(self, this_mode)->bool: + '''This method is used to determine if the poller is running or not. + return True if it is running + return False if it isn't running + ''' + module_name = os.path.basename(__file__) + for proc in psutil.process_iter(['pid', 'cmdline']): + # print(proc.info, os.getpid()) + if proc.info['cmdline']: + for peice_of_cmd in proc.info['cmdline']: + if module_name in peice_of_cmd and (not proc.info['pid']==os.getpid()) : + return True + return False if __name__=='__main__': - parser = argparse.ArgumentParser(description='Process optional name argument.') - parser.add_argument('-mode', type=str, help='Enter 1 or 2: mode 1 is for starting pooling; mode 2 is for stopping pooling') + parser = argparse.ArgumentParser(description='''This API is used to start polling, stop polling, and check the status of poller for UDR transfering''') + parser.add_argument('-mode', type=str, choices=['1', '2', '3'], help='Enter 1 or 2: mode 1 is for starting polling; mode 2 is for stopping polling; mode 3 is for checking poller status') args = parser.parse_args() config_dir = '/ca/conf/' route_table_config_setting_file_name = 'route_table_config_setting.json' setting_file_location = os.path.join(config_dir, route_table_config_setting_file_name) - with open(setting_file_location, 'r') as f: - data = f.read() - rout_table_config_setting_json = json.loads(data) - - udr_pooler = UDRPoller(rout_table_config_setting_json) + udr_poller = UDRPoller(setting_file_location) if args.mode=='1': - # print("mode 1") - udr_pooler.start() - pass - elif args.mode=='2': - # print("mode 2") - udr_pooler.stop() - pass \ No newline at end of file + if not udr_poller.is_poller_running(args.mode): + ProxyAZLogger.info("starting polling mode") + udr_poller.start() + else: + ProxyAZLogger.info("try to start UDR polling mode, but poller has been running") + + elif args.mode=='2': + if udr_poller.is_poller_running(args.mode): + ProxyAZLogger.info("stopping polling mode") + udr_poller.stop() + else: + ProxyAZLogger.info("try to stop UDR polling mode, but the poller isn't running") + + elif args.mode=="3": + status = udr_poller.is_poller_running(args.mode) + print(status) + if status: + ProxyAZLogger.info(f"check {os.path.basename(__file__)} status: running") + else: + ProxyAZLogger.info(f"check {os.path.basename(__file__)} status: not running") Index: /branches/rel_apv_10_7_3/usr/click/tools/azure/apv_controller/APVController.py =================================================================== --- /branches/rel_apv_10_7_3/usr/click/tools/azure/apv_controller/APVController.py (revision 39037) +++ /branches/rel_apv_10_7_3/usr/click/tools/azure/apv_controller/APVController.py (working copy) @@ -1,7 +1,9 @@ -# from apv_controller.APVCommander import APVCommander import re import subprocess import argparse +from collections import deque + +from logger.ProxyAZLogger import ProxyAZLogger class APVCommander(): def __init__(self) -> None: @@ -56,11 +58,14 @@ class APVController(): def __init__(self) -> None: self.name = self.get_apv_name() + peer_state_q_max_len = 3 #workaround + self.peer_state_q:deque = deque(maxlen=peer_state_q_max_len) + def get_apv_version(): commander = APVCommander() res = commander.launch_apv_command("show version") return res - + def get_apv_name(self)->str: ''' get APV name in HA. Algo: @@ -97,9 +102,10 @@ pattern ='ha group priority \"(.+)\" [\d]+ (\d+)' # need to be checked group_priority_list = re.findall(pattern, context) if not group_priority_list: - error_msg = "Error: cannot find APV group priority in "+context - raise Exception(error_msg) - + error_msg = "Error: cannot find APV group priority in " + context + ProxyAZLogger.erro(error_msg) + exit(1) + group_priority_list = [(item[0], int(item[1])) for item in group_priority_list] # make priority of string to integer sorted_group_priority_list = sorted(group_priority_list, key=lambda x: x[1]) #from low priority to heigh priority @@ -107,22 +113,52 @@ return self.name==sorted_group_priority_list[-1][0] def is_primary_alive(self)->bool: '''This function is to check if the primary APV is alive or not. - return True: primary APV is alive + return True: primary APV is alive, do nothing return False: Primary APV is not alive. This must be called in secondary APV. Algo: step1. Use APV CLI "show ha status domain to check if peer(primary APV) is UP or DOWN". - step2. if peer(primary APV) is "DOWN", it means primary is dead, aka not alive. + step2. if peer(primary APV) is "DOWN", it means primary is dead, aka not alive. ''' commander = APVCommander() context = commander.launch_apv_command("show ha status domain") + print(context) pattern ='Peer[\s]+unit:[\s]+(.+)\s(UP|DOWN)\s*' peer_up_or_down_list = re.findall(pattern, context) + print(peer_up_or_down_list) + # print("peer_up_or_down_list", peer_up_or_down_list) + if not peer_up_or_down_list: error_msg = "Error: cannot parse peer status in "+ context - raise Exception(error_msg) - return peer_up_or_down_list[0][1] not in ["DOWN", '-'] + ProxyAZLogger.erro(error_msg) + exit(1) + + import sys + from datetime import datetime + file = open('/tmp/heartbeat_workaround.txt', 'a') + + # Redirect sys.stdout to the file + sys.stdout = file + + + timestamp = datetime.now().strftime('%Y-%m-%d %H:%M:%S') # Current time formatted as YYYY-MM-DD HH:MM:SS + print(f"[{timestamp}] {peer_up_or_down_list[0]}") + sys.stdout = sys.__stdout__ + # to solve ha flapping issue, we use container to store the recent five heartbeat results + # true failure happen <=> in the last five heartbeat check, all state is DOWN + self.peer_state_q.append(peer_up_or_down_list[0][1]) + if self.peer_state_q.count("DOWN")==self.peer_state_q.maxlen: + # after checking recent five heartbeat results, the peer is truely DOWN + return False + elif self.peer_state_q.count("-")==self.peer_state_q.maxlen: + # user doesn't turn on ha functionality + return True + elif self.peer_state_q.count("UP")==self.peer_state_q.maxlen: + # after checking recent five heartbeat results, the peer is truely up + return True + return True # the machine just booted, do nothing + if __name__=='__main__': @@ -131,5 +167,5 @@ args = parser.parse_args() apv_c = APVController() - print("+++++mary", apv_c.is_primary()) + print(apv_c.is_primary_alive()) # print(f"run command {args.c}") \ No newline at end of file Index: /branches/rel_apv_10_7_3/usr/click/tools/azure/az_auth/AZAuthController.py =================================================================== --- /branches/rel_apv_10_7_3/usr/click/tools/azure/az_auth/AZAuthController.py (revision 39037) +++ /branches/rel_apv_10_7_3/usr/click/tools/azure/az_auth/AZAuthController.py (working copy) @@ -4,6 +4,7 @@ import os import time import re +from logger.AZLogger import AZLogger class AZAuthController(): def __init__(self) -> None: @@ -25,11 +26,10 @@ login_msg_file_name = "login_msg.txt" login_response_file_name = "login_response.txt" - command = ["az", "login"] + command = ["az", "login", "--use-device-code"] # print("Execute command ", " ".join(command)) login_msg_file = self.get_login_message_file(file_name=login_msg_file_name) result = subprocess.Popen(command, stdout=login_msg_file, stderr=login_msg_file) - while result.poll() is None: print('waiting user login by broswer') time.sleep(1) @@ -50,9 +50,9 @@ if not len(matches)==0: print("write file") file.write(matches[0]) - + if result.returncode==0: - print("Succeefully log in az account.") + print("Successfully signed in the Azure account.") else: print("Fail to log in az account.\n") print("result", result) @@ -62,7 +62,7 @@ # print("Execute command ", " ".join(command)) result = subprocess.run(command, stdout=sys.stdout, stderr=sys.stderr) if result.returncode==0: - print("Succeefully log out az account.") + print("Successfully signed out of the Azure account.") else: print("Fail to log out az account.\n") @@ -79,19 +79,17 @@ return True else: return False - + def show_az(self): + AZLogger.info("show az log in information") command = ["az", "account", "show"] - # print("Execute command ", " ".join(command)) result = subprocess.run(command, capture_output=True, text=True) if result.returncode==0: - print("result.stdout", result.stdout) + print(result.stdout) else: print("Please log in az first.") - # print(result.stdout) - # print(result.stderr) - + if __name__=="__main__": c = AZAuthController() - c.is_az_login() \ No newline at end of file + c.show_az() \ No newline at end of file Index: /branches/rel_apv_10_7_3/usr/click/tools/azure/az_route_table/RouteTableController.py =================================================================== --- /branches/rel_apv_10_7_3/usr/click/tools/azure/az_route_table/RouteTableController.py (revision 39037) +++ /branches/rel_apv_10_7_3/usr/click/tools/azure/az_route_table/RouteTableController.py (working copy) @@ -1,12 +1,12 @@ from azure.identity import DefaultAzureCredential from azure.mgmt.network import NetworkManagementClient from azure.mgmt.network.models import (Route, RouteNextHopType) - +from logger.ProxyAZLogger import ProxyAZLogger class RouteTableController(): - def __init__(self, - subscription_id= "2960d47a-5c8a-44eb-a95c-c71227757824", - resource_group_name= "test-rg-2", - route_table_name= "route-table-public" + def __init__(self, + subscription_id= "", + resource_group_name= "", + route_table_name= "" ) -> None: self.subscription_id = subscription_id self.resource_group_name = resource_group_name @@ -96,7 +96,7 @@ self.route_table_name, route_rule_name ).wait() - print(f"Route '{route_rule_name}' deleted successfully from route table '{self.route_table_name}'") + ProxyAZLogger.info(f"Route '{route_rule_name}' deleted successfully from route table '{self.route_table_name}'") else: print(f"Route '{route_rule_name}' not found in route table '{self.route_table_name}'") except Exception as e: @@ -128,11 +128,11 @@ if __name__=="__main__": rc = RouteTableController( - subscription_id= "2960d47a-5c8a-44eb-a95c-c71227757824", - resource_group_name= "AZURECENTOS", + subscription_id= "", + resource_group_name= "", ) - target_ip_when_running = "10.0.3.101" - target_ip_when_deallocated = "10.0.3.100" + target_ip_when_running = "10.0.100.30" + target_ip_when_deallocated = "10.0.100.31" rc.change_all_UDR_routes_by_ip( ori_next_hop_ip=target_ip_when_running, modify_next_hop_ip=target_ip_when_deallocated Index: /branches/rel_apv_10_7_3/usr/click/tools/azure/logger/AZLogger.py =================================================================== --- /branches/rel_apv_10_7_3/usr/click/tools/azure/logger/AZLogger.py (revision 0) +++ /branches/rel_apv_10_7_3/usr/click/tools/azure/logger/AZLogger.py (working copy) @@ -0,0 +1,160 @@ +import logging +from logging.handlers import RotatingFileHandler +import json +from abc import ABC, abstractmethod +import os + + +class AbstractAZLogger(ABC): + @classmethod + @abstractmethod + def set_log_path1(cls, log_path:str)->None: + pass + + @classmethod + @abstractmethod + def set_log_path(cls, log_path:str)->None: + cls.log_path = log_path + + @classmethod + @abstractmethod + def debug(cls, message:str)->None: + pass + + @classmethod + @abstractmethod + def info(cls, message:str)->None: + pass + + @classmethod + @abstractmethod + def warning(cls, message:str)->None: + pass + + @classmethod + @abstractmethod + def error(cls, message:str)->None: + pass + + @classmethod + @abstractmethod + def _load_config(file_path): + pass + +log_levels = { + "debug": logging.DEBUG, + "info": logging.INFO, + "warning": logging.WARNING, + "error": logging.ERROR, +} + +class AZLogger(AbstractAZLogger): + ''' + This class is used to log the azure event. + We use the python build-in logging under the hood to implement this class. + This class have several static method to log the message. + There is no interface to configure this class, that is, all the configurations are set inside the class + The AZlogger have four levels of severity, debug, info, warning and error which have the same name of class method. + ''' + # is there a way to make the initilization clean? + def _load_config(file_path): + try: + with open(file_path, 'r') as config_file: + config = json.load(config_file) + return config + except FileNotFoundError: + print(f"Error: The file {file_path} was not found.") + except json.JSONDecodeError: + print(f"Error: The file {file_path} is not a valid JSON file.") + + current_module_directory = os.path.dirname(os.path.abspath(__file__)) + config_file_path = os.path.join(current_module_directory, "config.json") + config = _load_config(config_file_path) + log_path = config["log_path"] + # log_path = "./azure_ha.log" # for developing purpose + log_format = config["log_format"] + max_size_log_file = config["max_size_log_file"] #MB + + # logger + logger = logging.getLogger("azlogger") + log_levels.get(config["level_of_severity"].lower(), logging.DEBUG) + logger.setLevel(log_levels.get(config["level_of_severity"].lower(), logging.DEBUG)) + + + # log handler + file_handler = RotatingFileHandler(log_path, maxBytes=max_size_log_file*1024*1024, backupCount=1) + logger.addHandler(file_handler) + + # log formatter + file_formatter = logging.Formatter(log_format, datefmt=config["datefmt"]) + file_handler.setFormatter(file_formatter) + + def __init__(): + pass + @classmethod + def set_log_path(cls, log_path:str)->None: + cls.log_path = log_path + + @classmethod + def debug(cls, message:str)->None: + cls.logger.debug(message) + @classmethod + def info(cls, message:str)->None: + cls.logger.info(message) + @classmethod + def warning(cls, message:str)->None: + cls.logger.warning(message) + @classmethod + def error(cls, message:str)->None: + cls.logger.error(message) + + @classmethod + def reload_config(cls)->None: + + try: + with open(cls.config_file_path, 'r') as config_file: + config = json.load(config_file) + except FileNotFoundError: + print(f"Error: The file {config_file} was not found.") + except json.JSONDecodeError: + print(f"Error: The file {config_file} is not a valid JSON file.") + + log_path = config["log_path"] + # log_path = "./azure_ha.log" # for developing purpose + log_format = config["log_format"] + max_size_log_file = config["max_size_log_file"] #MB + + # logger + logger = logging.getLogger("azlogger") + log_levels.get(config["level_of_severity"].lower(), logging.DEBUG) + logger.setLevel(log_levels.get(config["level_of_severity"].lower(), logging.DEBUG)) + + # log handler + # Remove all existing handlers + for handler in logger.handlers[:]: # Create a copy of the list for safe iteration + logger.removeHandler(handler) + file_handler = RotatingFileHandler(log_path, maxBytes=max_size_log_file*1024*1024, backupCount=1) + + # log formatter + file_formatter = logging.Formatter(log_format, datefmt=config["datefmt"]) + file_handler.setFormatter(file_formatter) + + logger.addHandler(file_handler) + + +if __name__=="__main__": + # test code + + AZLogger.debug("This is a debug message") + AZLogger.info("This is an info message") + AZLogger.warning("This is a warning message") + AZLogger.error("This is a error message") + mb = 1 + for i in range(mb*5000): + AZLogger.reload_config() + AZLogger.debug(f"This is a debug message {i}") + AZLogger.info(f"This is an info message {i}") + AZLogger.warning(f"This is a warning message {i}") + AZLogger.error(f"This is a error message {i}") + import time + time.sleep(1) \ No newline at end of file Index: /branches/rel_apv_10_7_3/usr/click/tools/azure/logger/ProxyAZLogger.py =================================================================== --- /branches/rel_apv_10_7_3/usr/click/tools/azure/logger/ProxyAZLogger.py (revision 0) +++ /branches/rel_apv_10_7_3/usr/click/tools/azure/logger/ProxyAZLogger.py (working copy) @@ -0,0 +1,163 @@ +from logger.AZLogger import AbstractAZLogger +from logger.AZLogger import AZLogger +import os +import json + +class ProxyAZLogger(AbstractAZLogger): + ''' + This class is designed using the proxy pattern, a structural design pattern. + Becuase there is a requirement of dynamically changing the level of serverity, we use proxy to determine + if configuration file is chaged or not in order to keep the AZLogger class pure. + ''' + config_modified_indicator_file = os.path.join(AZLogger.current_module_directory, 'config_modified.txt') + with open(AZLogger.config_file_path, 'r') as config_file: + config = json.load(config_file) + is_logger_on = config["is_logger_on"] + @classmethod + def get_config(cls)->dict: + '''THe usage of this method refers to the set_config()''' + try: + with open(AZLogger.config_file_path, 'r') as config_file: + config = json.load(config_file) + return config + except FileNotFoundError: + AZLogger.error(f"Error: The file {config_file} was not found.") + except json.JSONDecodeError: + AZLogger.error(f"Error: The file {config_file} is not a valid JSON file.") + + @classmethod + def set_config(cls, config:dict)->None: + '''The suggested method to modify configuration file is to use get_config() method + to get the original configuration dictionary, modify the dictionary objecct, and invoke set_config() with + arugment of modified dictionary object + algo: + 1. take input to override the original config dictionary. + 2. write the file. + 3. set config file modified indictor + ''' + # AZLogger.info(f"setting new config: {config}") + ori_config = cls.get_config() + for key in ori_config.keys(): + ori_config[key] = config[key] + with open(AZLogger.config_file_path, "w") as json_file: + json.dump(ori_config, json_file, indent=4) + with open(cls.config_modified_indicator_file, 'w') as file: + pass + @classmethod + def is_config_modified(cls)->bool: + '''This method is used to check if the configuration file is modified or not. + The alogrithem to do that is check if there is the modified file existed. + If the file existed, the configuration file is modified; otherwise, the configuration is unchaged. + ''' + return os.path.exists(cls.config_modified_indicator_file) + @classmethod + def _refresh_config(cls)->None: + '''If the config file indictor file is existed, then reload the configuration file and delete indictor file.''' + if cls.is_config_modified(): + AZLogger.reload_config() + with open(AZLogger.config_file_path, 'r') as config_file: + config = json.load(config_file) + cls.is_logger_on = config["is_logger_on"] + # delete config file changed indicator + os.remove(cls.config_modified_indicator_file) + @classmethod + def set_level(cls, level:str)->None: + config = cls.get_config() + config["level_of_severity"] = level + cls.set_config(config) + @classmethod + def turn_on(cls)->None: + '''This on off functionality is on off all the invoking debug, info, warning, and error method using ProxyAZLogger class. + That is, if the client directly use AZLogger, the message is still be logger. However, it's not recommanded''' + config = cls.get_config() + config["is_logger_on"] = True + cls.set_config(config) + cls._refresh_config() + # cls.is_logger_on = True + @classmethod + def turn_off(cls)->None: + '''This on off functionality is on off all the invoking debug, info, warning, and error method using ProxyAZLogger class. + That is, if the client directly use AZLogger, the message is still be logger. However, it's not recommanded''' + config = cls.get_config() + config["is_logger_on"] = False + cls.set_config(config) + cls._refresh_config() + # cls.is_logger_on = False + @classmethod + def get_log(cls)->str: + '''return a string of content of log file''' + config = cls.get_config() + with open(config["log_path"], 'r', encoding='utf-8') as file: + content = file.read() + return content + @classmethod + def get_log_list(cls) -> list: + '''return a list of content of log file''' + with open(cls.get_log_file_path(), "r") as file: + lines = file.readlines() + return lines + @classmethod + def get_Logger_state(cls)->bool: + '''This is used to check if logger is on or not + return True if logger is on + return False if logger is off + ''' + config = cls.get_config() + return config["is_logger_on"] + @classmethod + def get_Logger_level_state(cls)->str: + '''This is used to check if logger level is debug, info, warning, and error + return a string of log severity + ''' + config = cls.get_config() + return config["level_of_severity"] + @classmethod + def get_log_file_path(cls)->str: + config = cls.get_config() + return config["log_path"] + @classmethod + def debug(cls, message:str)->None: + cls._refresh_config() + if cls.is_logger_on: + AZLogger.debug(message) + @classmethod + def info(cls, message:str)->None: + cls._refresh_config() + if cls.is_logger_on: + AZLogger.info(message) + @classmethod + def warning(cls, message:str)->None: + cls._refresh_config() + if cls.is_logger_on: + AZLogger.warning(message) + @classmethod + def error(cls, message:str)->None: + cls._refresh_config() + if cls.is_logger_on: + AZLogger.error(message) + + +if __name__=="__main__": + # test code + import os + # Get the location of the current module + current_module_directory = os.path.dirname(os.path.abspath(__file__)) + + ProxyAZLogger.debug("This is a debug message") + ProxyAZLogger.info("This is an info message") + ProxyAZLogger.warning("This is a warning message") + ProxyAZLogger.error("This is a error message") + mb = 5 + for i in range(mb*5000): + ProxyAZLogger.debug(f"This is a debug message {i}") + ProxyAZLogger.info(f"This is an info message {i}") + ProxyAZLogger.warning(f"This is a warning message {i}") + ProxyAZLogger.error(f"This is a error message {i}") + import time + if i%3==0: + # test config file changing + cur_config = ProxyAZLogger.get_config() + cur_config["level_of_severity"] = "info" if cur_config["level_of_severity"]=="debug" else "debug" + ProxyAZLogger.set_config(cur_config) + print("change level") + time.sleep(2) \ No newline at end of file Index: /branches/rel_apv_10_7_3/usr/click/tools/azure/logger/__init__.py (added) =================================================================== --- /branches/rel_apv_10_7_3/usr/click/tools/azure/logger/__init__.py (revision 0) +++ /branches/rel_apv_10_7_3/usr/click/tools/azure/logger/__init__.py (revision 0) Index: /branches/rel_apv_10_7_3/usr/click/tools/azure/logger/config.json =================================================================== --- /branches/rel_apv_10_7_3/usr/click/tools/azure/logger/config.json (revision 0) +++ /branches/rel_apv_10_7_3/usr/click/tools/azure/logger/config.json (working copy) @@ -0,0 +1,8 @@ +{ + "log_path": "/var/crash/azure_ha.log", + "log_format": "[%(asctime)s] - [%(levelname)s] %(message)s", + "max_size_log_file": 10, + "level_of_severity": "info", + "datefmt": "%Y-%m-%dT%H:%M:%S", + "is_logger_on": true +} \ No newline at end of file Index: /branches/rel_apv_10_7_3/usr/click/tools/azure/p/p1.py =================================================================== --- /branches/rel_apv_10_7_3/usr/click/tools/azure/p/p1.py (revision 39037) +++ /branches/rel_apv_10_7_3/usr/click/tools/azure/p/p1.py (working copy) @@ -1,6 +0,0 @@ - - -class p1(): - def __init__(self) -> None: - print("p1 contructor") - Index: /branches/rel_apv_10_7_3/usr/click/tools/azure/p/p2.py =================================================================== --- /branches/rel_apv_10_7_3/usr/click/tools/azure/p/p2.py (revision 39037) +++ /branches/rel_apv_10_7_3/usr/click/tools/azure/p/p2.py (working copy) @@ -1,7 +0,0 @@ -from p.p1 import p1 -class p2(): - def __init__(self) -> None: - pass - -if __name__=="__main__": - p1() \ No newline at end of file Index: /branches/rel_apv_10_7_3/usr/click/tools/azure/textOuput.py =================================================================== --- /branches/rel_apv_10_7_3/usr/click/tools/azure/textOuput.py (revision 39037) +++ /branches/rel_apv_10_7_3/usr/click/tools/azure/textOuput.py (working copy) @@ -1,8 +0,0 @@ -import os -from utils.OutputController import OutputController -print("first") -output_controller = OutputController() -output_controller.start_to_file() -print("start to file") -output_controller.end_to_file() -print("end to file") \ No newline at end of file Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/router.py =================================================================== --- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/router.py (revision 39037) +++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/router.py (working copy) @@ -744,33 +744,49 @@ PackageLoader('apv', 'templates')])) if request.GET['type'] == "azure": if request.GET['page'] == "basic": - template = env.get_template("/ha/cloud/azure/basic.html") + template = env.get_template("/network/cloud/azure/basic.html") response = HttpResponse(template.render()) return response elif request.GET['page'] == "nic": - template = env.get_template("/ha/cloud/azure/nic.html") + template = env.get_template("/network/cloud/azure/nic.html") response = HttpResponse(template.render()) return response elif request.GET['page'] == "udr": - template = env.get_template("/ha/cloud/azure/udr.html") + template = env.get_template("/network/cloud/azure/udr.html") response = HttpResponse(template.render()) return response elif request.GET['page'] == "log": - template = env.get_template("/ha/cloud/azure/log.html") + template = env.get_template("/network/cloud/azure/log.html") response = HttpResponse(template.render()) return response elif request.GET['type'] == "aws": if request.GET['page'] == "basic": - template = env.get_template("/ha/cloud/aws/basic.html") + template = env.get_template("/network/cloud/aws/basic.html") response = HttpResponse(template.render()) return response elif request.GET['page'] == "eni": - template = env.get_template("/ha/cloud/aws/eni.html") + template = env.get_template("/network/cloud/aws/eni.html") response = HttpResponse(template.render()) return response elif request.GET['page'] == "log": - template = env.get_template("/ha/cloud/aws/log.html") + template = env.get_template("/network/cloud/aws/log.html") + response = HttpResponse(template.render()) + return response + raise Http404('Page not found') + +def get_prometheus_page(request): + if not request.GET['type'] or not request.GET['page']: + raise Http404('Page not found') + env = HiveEnvironment(loader=ChoiceLoader([ + PackageLoader('apv', 'templates')])) + if request.GET['type'] == "matrix": + if request.GET['page'] == "basic": + template = env.get_template("/monitoring/prometheus/index/basic.html") + response = HttpResponse(template.render()) + return response + elif request.GET['page'] == "log": + template = env.get_template("/monitoring/prometheus/index/log.html") response = HttpResponse(template.render()) return response raise Http404('Page not found') \ No newline at end of file Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/ha/cloud/aws/basic.html =================================================================== --- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/ha/cloud/aws/basic.html (revision 39037) +++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/ha/cloud/aws/basic.html (working copy) @@ -1,196 +0,0 @@ -
-
-
- -
-
- -
-
...
-
-
-
- -
-
...
-
-
-
- -
-
...
-
-
-
- -
- -
-
-
-
- -
-
-
-
{% trans %}Internal error, please refresh the page.{% endtrans %}
-
-
- - -
- -
- - -{% block box_script %} - - - -{% endblock box_script %} Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/ha/cloud/aws/eni.html =================================================================== --- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/ha/cloud/aws/eni.html (revision 39037) +++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/ha/cloud/aws/eni.html (working copy) @@ -1,464 +0,0 @@ -
-
-
-
-
-
- -
- - -
- -
- - -
-
-
-
-
-
- -
-
-
-
-
-
- -
-
- - -
-
-
- - - - -{% block box_script %} - - -{% endblock box_script %} Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/ha/cloud/aws/index.html =================================================================== --- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/ha/cloud/aws/index.html (revision 39037) +++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/ha/cloud/aws/index.html (working copy) @@ -1,117 +0,0 @@ -{% extends "base.html" %} - -{% block content %} - -{% block horizontal_nav %} -
-
- -
- -
-
-{% endblock horizontal_nav %} - -
-{% block model_nav %} - -{% endblock model_nav %} -
- -{% block sub_nav %} - - - -{% endblock %} - -
-
- - -{% endblock %} - -{% block page_javascript %} - -{% endblock %} - -{% block box_script %} -{% endblock %} Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/ha/cloud/aws/log.html =================================================================== --- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/ha/cloud/aws/log.html (revision 39037) +++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/ha/cloud/aws/log.html (working copy) @@ -1,259 +0,0 @@ - -
-
-
-
-
-
- -
- - -
-
-
-
-
- -
- - -
-
-
-
-
- -
- -
-
-
-
- 

-            

-        

-    

-    

-        

-            
-            
-        

-    

-

-
-
-{% block box_script %}
-
-
-{% endblock box_script %}
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/monitoring/prometheus/index/basic.html
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/monitoring/prometheus/index/basic.html	(revision 0)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/monitoring/prometheus/index/basic.html	(working copy)
@@ -0,0 +1,1081 @@
+
+

+    

+        

+            

+                

+                

+                    
+                    

+                        
+                        
+                    

+                

+            

+            

+                

+                    
+                    

+                         (0-65535)
+                    

+                

+            

+            

+                

+                

+                    
+                    

+                        
+                        
+                    

+                

+            

+            

+                

+                    
+                    

+                        
+                        
+                    

+                

+            

+            

+                

+                    
+                    

+                         (3-60)min
+                    

+                

+            

+        

+    

+    

+        

+            
+            
+        

+    

+    

+        

+            

+                

+                    
+                

+            

+            

+                
+                
+                
+            

+            

+            

+        

+        
+            
+                
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                
+            
+        
ID{% trans %}User Name{% endtrans %}{% trans %}Token{% endtrans %}{% trans %}Created Date{% endtrans %}{% trans %}Expired Date{% endtrans %}{% trans %}Last Used Date{% endtrans %}{% trans %}Is Expired{% endtrans %}

+    

+

+

+    

+        ×
+    

+    

+        

+            

+                

+                    
+                

+                
Import Certificate

+            

+            

+                

+                
+                

+                    

+                        
+                        Import Certificate
+                        

+                            

+                                
+                                

+                                    

+                                        
+                                        
+                                        
+                                    

+                                

+                                    
+                                    

+                                        

+                                            
+                                            

+                                                
+                                                
+                                                
+                                            

+
+                                            
+                                            

+                                                
+                                                
+                                                
+                                            

+                                        

+                                        

+                                            
+                                        

+                                    

+                                

+                                
+                                
+                                
+                                
+                                
+                                

+                            

+                            
+                        

+                    

+                

+                
+                

+            

+            
+        

+    

+

+
+
+
\ No newline at end of file
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/monitoring/prometheus/index/import_certificate.html
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/monitoring/prometheus/index/import_certificate.html	(revision 0)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/monitoring/prometheus/index/import_certificate.html	(working copy)
@@ -0,0 +1,232 @@
+{% block box_content %}
+

+    

+        
+    

+    

+        Import Certificate
+    

+

+

+    

+        

+            

+                {% trans %}Request{% endtrans %}
+                

+                    

+                        
+                    

+                    

+                        
+                        
+                        
+                    

+                    

+                        
+                    

+                

+                Header
+                
+                

+                    
+                        

+                            

+                                    

+                                        
+                                        

+                                            
+                                        

+                                    

+                                    

+                                        
+                                        

+                                            
+                                        

+                                    

+                                    

+                                        
+                                        

+                                            
+                                            
+                                        

+                                    

+                                
+                            

+                        

+                    
+                

+                

+                

+                Request Body
+                

+                    

+                        
+                    

+                

+                

+                Response
+                

+                    
+                        

+                        
+                        

+                            

+                        

+                        

+                    

+                    

+                

+            

+        

+    
+

+
+
+{% endblock box_content %}
+
+{% block box_script %}
+{% endblock %}
\ No newline at end of file
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/monitoring/prometheus/index/index.html
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/monitoring/prometheus/index/index.html	(revision 0)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/monitoring/prometheus/index/index.html	(working copy)
@@ -0,0 +1,134 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+{% block horizontal_nav %}
+

+    

+        
+    

+    
+

+

+{% endblock horizontal_nav %}
+
+

+{% block model_nav %}
+
+{% endblock model_nav %}
+

+
+{% block sub_nav %}
+
+
+
+{% endblock %}
+
+

+

+
+{% endblock %}
+
+{% block page_javascript %}
+
+
+{% endblock %}
+
+{% block box_script %}
+{% endblock %}
\ No newline at end of file
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/monitoring/prometheus/index/log.html
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/monitoring/prometheus/index/log.html	(revision 0)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/monitoring/prometheus/index/log.html	(working copy)
@@ -0,0 +1,50 @@
+

+    

+        

+            

+                
    
+                    
    • 
+                    
    • 
+                

+                
[[ prometheus_log ]]

+            

+        

+    

+

+
+
\ No newline at end of file
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/aws/basic.html
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/aws/basic.html	(revision 0)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/aws/basic.html	(working copy)
@@ -0,0 +1,196 @@
+

+

+    

+
+        

+            

+                
+                

+                    
...

+                

+            

+            

+                
+                

+                    
...

+                

+            

+            

+                
+                

+                    
...

+                

+            

+            

+                
+                

+                    
+                

+            

+        

+        

+        
+        

+            

+                

+                
{% trans %}Internal error, please refresh the page.{% endtrans %}

+            

+        

+
+
+    

+
+

+
+
+{% block box_script %}
+
+
+
+{% endblock box_script %}
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/aws/eni.html
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/aws/eni.html	(revision 0)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/aws/eni.html	(working copy)
@@ -0,0 +1,464 @@
+

+

+    

+        

+            

+            

+                
+                

+                    
+                    
+                

+                
+                

+                    
+                    
+                

+            

+        

+        

+            

+                

+                    
+                

+                

+            

+        

+    

+

+
+

+    

+        
+        
+    

+

+

+
+
+
+
+{% block box_script %}
+
+
+{% endblock box_script %}
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/aws/index.html
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/aws/index.html	(revision 0)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/aws/index.html	(working copy)
@@ -0,0 +1,117 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+{% block horizontal_nav %}
+

+    

+        
+    

+
+

+

+{% endblock horizontal_nav %}
+
+

+{% block model_nav %}
+
+{% endblock model_nav %}
+

+
+{% block sub_nav %}
+
+
+
+{% endblock %}
+
+

+

+
+
+{% endblock %}
+
+{% block page_javascript %}
+
+{% endblock %}
+
+{% block box_script %}
+{% endblock %}
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/aws/log.html
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/aws/log.html	(revision 0)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/aws/log.html	(working copy)
@@ -0,0 +1,259 @@
+
+

+    

+        

+            

+                

+                

+                    
+                    

+                        
+                        
+                    

+                

+            

+            

+                

+                    
+                    

+                        
+                        
+                    

+                

+            

+            

+                

+                    
+                    

+                        
+                    

+                

+            

+            

+                

+            

+        

+    

+    

+        

+            
+            
+        

+    

+

+
+
+{% block box_script %}
+
+
+{% endblock box_script %}
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/azure/basic.html
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/azure/basic.html	(revision 0)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/azure/basic.html	(working copy)
@@ -0,0 +1,159 @@
+

+

+    

+        

+            

+                
+                

+                    
...

+                

+            

+        

+        

+            

+                
+                

+                    ...
+                    
+                

+            

+        

+        

+            

+                
+                

+                    
...

+                    
+                

+            

+        

+        

+            

+                

+                
{% trans %}Internal error, please refresh the page.{% endtrans %}

+            

+        

+        

+            

+                
+                

+                    
+                

+            

+        

+    

+

+

+
+
+{% block box_script %}
+
+
+
+{% endblock box_script %}
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/azure/index.html
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/azure/index.html	(revision 0)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/azure/index.html	(working copy)
@@ -0,0 +1,123 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+{% block horizontal_nav %}
+

+    

+        
+    

+
+

+

+{% endblock horizontal_nav %}
+
+

+{% block model_nav %}
+
+{% endblock model_nav %}
+

+
+{% block sub_nav %}
+
+
+
+{% endblock %}
+
+

+

+
+
+{% endblock %}
+
+{% block page_javascript %}
+
+{% endblock %}
+
+{% block box_script %}
+{% endblock %}
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/azure/log.html
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/azure/log.html	(revision 0)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/azure/log.html	(working copy)
@@ -0,0 +1,215 @@
+
+

+    

+        

+            

+                

+                

+                    
+                    

+                        
+                        
+                    

+                

+            

+            

+                

+                    
+                    

+                        
+                        
+                    

+                

+            

+            

+                

+                    
+                    

+                        
+                    

+                

+            

+            

+                

+            

+        

+    

+    

+        

+            
+            
+        

+    

+

+
+
+{% block box_script %}
+
+
+{% endblock box_script %}
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/azure/nic.html
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/azure/nic.html	(revision 0)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/azure/nic.html	(working copy)
@@ -0,0 +1,458 @@
+

+

+    

+        

+            

+            

+                
+                

+                    
+                    
+                

+                
+                

+                    
+                    
+                

+            

+        

+        

+            

+                

+                    
+                

+                

+            

+        

+    

+

+
+

+    

+        
+        
+    

+

+

+
+
+
+
+{% block box_script %}
+
+
+{% endblock box_script %}
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/azure/udr.html
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/azure/udr.html	(revision 0)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/templates/network/cloud/azure/udr.html	(working copy)
@@ -0,0 +1,407 @@
+

+

+    

+        

+            

+            

+                
+                

+                    
+                    
+                

+            

+        

+        

+            

+                

+                    
+                

+                

+            

+        

+    

+

+
+

+    

+        
+        
+    

+

+

+
+
+
+
+{% block box_script %}
+
+
+{% endblock box_script %}
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/tree.py
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/tree.py	(revision 39037)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/tree.py	(working copy)
@@ -39,6 +39,9 @@
         ('report', {'cls':MenuNode, 'verbose_name':_('Statistics Report'),'sub_nodes':D([
             ('report', {'cls':ModuleNode, 'default_action':'monitor', 'package':''}),
         ])}),
+        ('prometheus', {'cls':MenuNode, 'verbose_name':_('Prometheus Metrix'),'sub_nodes':D([
+            ('index', {'cls':ModuleNode, 'default_action':'index', 'package':''}),
+        ])}),
     ])}),
 
     ('slb', {'cls':ModuleNode, 'verbose_name':_('SLB'), 'icon':'fa-sitemap', 'package':'loadbalancing.slb', 'sub_nodes':D([
@@ -264,6 +267,10 @@
             ('dnsnat46', {'cls':ModelNode, 'model':'network.ipv6.DNSNAT46Settings'}),
             ('ipv6', {'cls':ModelNode, 'model':'network.ipv6.IPv6Tune'}),
         ])}),
+        ('cloud', {'cls':MenuNode, 'verbose_name':_('Cloud'),'sub_nodes':D([
+            ('azure', {'cls':ModuleNode, 'default_action':'index', 'package':''}),
+            ('aws', {'cls':ModuleNode, 'default_action':'index', 'package':''}),
+        ])}),
         ('route', {'cls':MenuNode, 'verbose_name':_('Routing'), 'icon':'fa-code-fork', 'sub_nodes':D([
             ('basic', {'cls':MenuNode, 'verbose_name':_('Basic Routing'),'sub_nodes':D([
                 ('default', {'cls':ModelNode, 'model':'routing.static.DefaultRoutingSetting'}),
@@ -459,9 +466,6 @@
             ('synchronization', {'cls':ModelNode, 'model':'ha.synconfig.SynconfigGeneralSettings'}),
             ('IncrementalSynconfig', {'cls':ModelNode, 'model':'ha.synconfig.IncrementalSynconfig'}),
         ])}),
-        ('cloud', {'cls':MenuNode, 'verbose_name':_('Cloud'),'sub_nodes':D([
-            ('aws', {'cls':ModuleNode, 'default_action':'index', 'package':''}),
-        ])}),
     ])}),
             
     ('ajax', {'cls':MenuNode, 'hidden':True, 'sub_nodes':D([
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/urls.py
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/urls.py	(revision 39037)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/apv/urls.py	(working copy)
@@ -49,4 +49,5 @@
     url(r'^%s/get_sslo_status$' % PRODUCT_KEYWORD, get_sslo_status),
     url(r'^%s/prometheus/Log/download' % PRODUCT_KEYWORD, prometheus_log_download),
     url(r'^%s/get_cloud_page$' % PRODUCT_KEYWORD, get_cloud_page),
+    url(r'^%s/get_prometheus_page$' % PRODUCT_KEYWORD, get_prometheus_page),
 )
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/aws/__init__.py	(added)
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/aws/__init__.py	(revision 0)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/aws/__init__.py	(revision 0)
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/aws/aws_basic_view.py
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/aws/aws_basic_view.py	(revision 0)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/aws/aws_basic_view.py	(working copy)
@@ -0,0 +1,129 @@
+import json
+import subprocess
+from django.http import HttpResponse
+from hive.utils import aninfo, anerror
+
+
+def get_aws_credential(request):
+    '''
+    Get the AWS credential stored on vAPV.
+
+    Returns:
+        HttpResponse: A response with the AWS credential details or an error message.
+    '''
+    command = "python3 /ca/bin/aws/AWSAuthManager.py -mode show"
+    res = subprocess.Popen(
+        command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+    )
+    stdout, stderr = res.communicate()
+
+    if res.returncode != 0:
+        anerror("hive.debug", stderr)
+        return HttpResponse(
+            json.dumps({"message": "error while running aws tools"}),
+            content_type="application/json",
+            status=500
+        )
+    try:
+        credential = json.loads(stdout.decode().replace("'", '"'))
+        return HttpResponse(
+            json.dumps(credential),
+            content_type="application/json",
+            status=200
+        )
+    except json.JSONDecodeError as e:
+        anerror("hive.debug", "Fail to decode enconfig to json:{}".format(e))
+        return HttpResponse(
+            json.dumps({}),
+            content_type="application/json",
+            status=500
+        )
+    except UnicodeDecodeError as e:
+        anerror("hive.debug", "Fail to decode stdout:{}".format(e))
+        return HttpResponse(
+            json.dumps({}),
+            content_type="application/json",
+            status=500
+        )
+
+
+def delete_aws_credential(request):
+    '''
+    Delete the AWS credential stored on vAPV
+
+    Returns:
+        HttpResponse: A response indicating the success or failure of
+                      the authentication process.
+    '''
+    command = "python3 /ca/bin/aws/AWSAuthManager.py -mode logout"
+    res = subprocess.Popen(
+        command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+    )
+    stdout, stderr = res.communicate()
+
+    if res.returncode != 0:
+        anerror("hive.debug", stderr)
+        return HttpResponse(
+            json.dumps({"message": "error while running aws tools"}),
+            content_type="application/json",
+            status=500
+        )
+
+    response_data = {
+        "msg": "Succeed"
+    }
+    aninfo("hive.debug", "Succeed to delete aws credential")
+    return HttpResponse(
+        json.dumps(response_data),
+        content_type="application/json",
+        status=200
+    )
+
+
+def post_aws_credential(request):
+    '''
+    Authenticate AWS credentials to vAPV.
+
+    Returns:
+        HttpResponse: A response indicating the success or failure of
+                      the authentication process.
+    '''
+    # verify user input
+    required_keys = ["aws_access_key_id", "aws_secret_access_key", "region"]
+    data = json.loads(request.body)
+    for key in required_keys:
+        if key not in data:
+            return HttpResponse(
+                json.dumps({"message": "body should contain key: "
+                                       "{}".format(', '.join(required_keys))}),
+                content_type="application/json",
+                status=400
+            )
+
+    command = (
+        "python3 /ca/bin/aws/AWSAuthManager.py -mode login "
+        "-access_key {} -secret_access_key {} -region {}"
+    ).format(data["aws_access_key_id"], data["aws_secret_access_key"], data["region"])
+    res = subprocess.Popen(
+        command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+    )
+    stdout, stderr = res.communicate()
+
+    if res.returncode != 0:
+        anerror("hive.debug", stderr)
+        return HttpResponse(
+            json.dumps({"message": "error while running aws tools"}),
+            content_type="application/json",
+            status=500
+        )
+
+    response_data = {
+        "msg": "Succeed"
+    }
+    aninfo("hive.debug", "Succeed to authenticate aws credential")
+
+    return HttpResponse(
+        json.dumps(response_data),
+        content_type="application/json",
+        status=200
+    )
\ No newline at end of file
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/aws/aws_eni_view.py
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/aws/aws_eni_view.py	(revision 0)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/aws/aws_eni_view.py	(working copy)
@@ -0,0 +1,208 @@
+import json
+import subprocess
+import shlex
+from django.http import HttpResponse
+from hive.utils import aninfo, anerror
+
+
+def validate_input(data, required_keys):
+    """Validates if the required keys are present in the input data."""
+    missing_keys = [key for key in required_keys if key not in data]
+    if missing_keys:
+        return False, "Body should contain key: {}".format(', '.join(missing_keys))
+    return True, ""
+
+
+def create_json_response(data, status_code):
+    """Creates a JSON response with the given data and status code."""
+    return HttpResponse(
+        json.dumps(data),
+        content_type="application/json",
+        status=status_code
+    )
+
+
+def run_command(command):
+    """Executes a command and returns the result or raises an error."""
+    try:
+        res = subprocess.Popen(
+            command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+        )
+        stdout, stderr = res.communicate()
+
+        if res.returncode != 0:
+            anerror("hive.debug", stderr)
+            raise RuntimeError("Error while running AWS tools.")
+        return stdout.decode()
+
+    except subprocess.SubprocessError as e:
+        anerror("hive.debug", str(e))
+        raise RuntimeError("Subprocess execution failed.")
+
+
+def post_eniconfig(request):
+    """
+    Add the eni configuration of AWS to vAPV.
+
+    Returns:
+        HttpResponse: A response indicating the success or failure of
+                      the eni configuration process.
+    """
+    required_keys = ["src_eni_id", "dest_eni_id"]
+    data = json.loads(request.body)
+    is_valid, message = validate_input(data, required_keys)
+    if not is_valid:
+        return create_json_response({"message": message}, 400)
+
+    command = (
+        "python3 /ca/bin/aws/AWSConfigManager.py -ENI set "
+        "-src_eni_id {} -dest_eni_id {}".format(
+            data["src_eni_id"], data["dest_eni_id"]
+        )
+    )
+    try:
+        run_command(command)
+        aninfo("hive.debug", "Succeeded to add eni configuration")
+        return create_json_response({"msg": "Succeed"}, 200)
+    except RuntimeError:
+        return create_json_response({"message": "error while running aws tools"}, 500)
+
+
+def get_eniconfig(request):
+    """
+    Get the eni configuration of AWS from vAPV.
+
+    Returns:
+        HttpResponse: A response with the eni configuration
+                      details or an error message.
+    """
+    command = "python3 /ca/bin/aws/AWSConfigManager.py -ENI show"
+    try:
+        output = run_command(command)
+        enconfig = json.loads(output.replace("'", '"'))
+        return create_json_response(enconfig, 200)
+    except (RuntimeError, json.JSONDecodeError, UnicodeDecodeError) as e:
+        anerror("hive.debug", "Error decoding or running command: {}".format(str(e)))
+        return create_json_response({}, 500)
+
+
+def delete_eniconfig(request):
+    """
+    Delete the eni configuration of AWS from vAPV.
+
+    Returns:
+        HttpResponse: A response indicating the success or failure of
+                      the eni configuration process.
+    """
+    required_keys = ["index"]
+    data = json.loads(request.body)
+
+    # Validate input
+    is_valid, message = validate_input(data, required_keys)
+    if not is_valid:
+        return create_json_response({"message": message}, 400)
+
+    command = (
+        "python3 /ca/bin/aws/AWSConfigManager.py -ENI remove -index "
+        "{}".format(data["index"])
+    )
+    try:
+        run_command(command)
+        aninfo("hive.debug", "Succeeded to delete aws eni configuration")
+        return create_json_response({"msg": "Succeed"}, 200)
+    except RuntimeError:
+        return create_json_response({"message": "error while running aws tools"}, 500)
+
+
+def post_failover(request):
+    """
+    Manually trigger IP swifting while failover happening.
+
+    Returns:
+        HttpResponse: A response indicating the success or failure of
+                      the eni configuration process.
+    """
+    command = "python3 /ca/bin/aws/AWSENIManager.py -mode trigger"
+    try:
+        run_command(command)
+        aninfo("hive.debug", "Succeeded to trigger IP transfering.")
+        return create_json_response({"msg": "Succeed"}, 200)
+    except RuntimeError:
+        return create_json_response({"message": "error while running aws tools."}, 500)
+
+
+def post_recover(request):
+    """
+    Manually trigger IP swifting while recover happening.
+
+    Returns:
+        HttpResponse: A response indicating the success or failure of
+                      the eni configuration process.
+    """
+    command = "python3 /ca/bin/aws/AWSENIManager.py -mode recover"
+    try:
+        run_command(command)
+        aninfo("hive.debug", "Succeeded to trigger IP transfering.")
+        return create_json_response({"msg": "Succeed"}, 200)
+    except RuntimeError:
+        return create_json_response({"message": "error while running aws tools"}, 500)
+
+
+def get_ha_status(request):
+    """
+    Get the HA polling status of AWS from vAPV.
+
+    Returns:
+        HttpResponse: A response with the HA status details
+                      or an error message.
+    """
+    # the output of the command is either "True\n" or "False\n"
+    output_map = {
+        "True\n": 1,
+        "False\n": 0
+    }
+    command = "python3 /ca/bin/aws/AWSFailoverPoller.py -mode status"
+    try:
+        output = run_command(command)
+        aninfo("hive.debug", "Succeeded to get ha poller status.")
+        return create_json_response({"status": output_map[output]}, 200)
+    except RuntimeError:
+        return create_json_response({"message": "error while running aws tools."}, 500)
+
+
+def post_ha_status(request):
+    """
+    Enable or disable the HA polling of AWS from vAPV.
+
+    Returns:
+        HttpResponse: A response indicating the success or failure of
+                      the HA status process.
+    """
+    input_map = {
+        1: "enable",
+        0: "disable"
+    }
+    required_keys = ["status"]
+    data = json.loads(request.body)
+
+    # Validate input
+    is_valid, message = validate_input(data, required_keys)
+    if not is_valid:
+        return create_json_response({"message": message}, 400)
+    if data["status"] not in [0, 1]:
+        return create_json_response({"message": "status should be number 0 or 1"}, 400)
+
+    command = (
+        "python3 /ca/bin/aws/AWSFailoverPoller.py -mode "
+        "{}".format(input_map[data["status"]])
+    )
+    aninfo("hive.debug", "command")
+
+    try:
+        # Start the command in the background. That is why we use Popen instead of call.
+        args = shlex.split(command)
+        subprocess.Popen(args)
+        aninfo("hive.debug", "Succeeded to set ha poller status: {}".format(input_map[data["status"]]))
+        return create_json_response({"msg": "Succeed"}, 200)
+    except RuntimeError:
+        return create_json_response({"message": "error while running aws tools."}, 500)
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/aws/aws_log_view.py
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/aws/aws_log_view.py	(revision 0)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/aws/aws_log_view.py	(working copy)
@@ -0,0 +1,190 @@
+import json
+import os
+import subprocess
+from django.http import HttpResponse
+from hive.utils import aninfo, anerror
+
+
+def validate_input(data, required_keys):
+    """Validates if the required keys are present in the input data."""
+    missing_keys = [key for key in required_keys if key not in data]
+    if missing_keys:
+        return False, "Body should contain key: {}".format(', '.join(missing_keys))
+    return True, ""
+
+
+def create_json_response(data, status_code):
+    """Creates a JSON response with the given data and status code."""
+    return HttpResponse(
+        json.dumps(data),
+        content_type="application/json",
+        status=status_code
+    )
+
+
+def run_command(command):
+    """Executes a command and returns the result or raises an error."""
+    try:
+        res = subprocess.Popen(
+            command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+        )
+        stdout, stderr = res.communicate()
+        if res.returncode != 0:
+            anerror("hive.debug", stderr)
+            raise RuntimeError("Error while running AWS tools.")
+        return stdout.decode()
+
+    except subprocess.SubprocessError as e:
+        anerror("hive.debug", str(e))
+        raise RuntimeError("Subprocess execution failed.")
+
+
+def get_log_buffer(request):
+    """
+    Get the log file content of aws tool from vAPV.
+
+    Returns:
+        HttpResponse: A response containing the log buffer.
+    """
+    command = "python3 /ca/bin/aws/LoggerManager.py -mode show"
+    try:
+        log_buffer = run_command(command)
+        return create_json_response({"msg": log_buffer}, 200)
+    except RuntimeError as e:
+        anerror("hive.debug", str(e))
+        return create_json_response(
+            {"msg": "Error while getting log buffer"}, 500)
+
+
+def get_switcher(request):
+    """
+    Get the status of log functionality aws tool from vAPV.
+
+    Returns:
+        HttpResponse: A response containing the switcher status{}.
+    """
+    # the output of the command is either "True\n" or "False\n"
+    output_map = {
+        "True\n": 1,
+        "False\n": 0
+    }
+    command = "python3 /ca/bin/aws/LoggerManager.py -mode status"
+    try:
+        switcher = run_command(command)
+        return create_json_response({"status": output_map[switcher]}, 200)
+    except RuntimeError as e:
+        anerror("hive.debug", str(e))
+        return create_json_response(
+            {"msg": "Error while getting switcher status"}, 500)
+
+
+def post_switcher(request):
+    """
+    Turn on or off the status of log functionality aws tool on vAPV.
+
+    Returns:
+        HttpResponse: A response indicating the success or failure of
+    """
+    input_map = {
+        1: "on",
+        0: "off"
+    }
+    required_keys = ["status"]
+    data = json.loads(request.body)
+
+    # Validate input
+    is_valid, message = validate_input(data, required_keys)
+    if not is_valid:
+        return create_json_response({"msg": message}, 400)
+    if data["status"] not in [0, 1]:
+        return create_json_response({"msg": "status should be number 0 or 1"}, 400)
+
+    command = ("python3 /ca/bin/aws/LoggerManager.py -mode "
+               "{}".format(input_map[data["status"]]))
+
+    try:
+        output = run_command(command)
+        aninfo("hive.debug", "Succeeded to set log functionality: "
+               "{}".format(data["status"]))
+        return create_json_response({"msg": "Succeed"}, 200)
+    except RuntimeError:
+        return create_json_response({"msg": "error while running aws tools."}, 500)
+
+
+def get_log_severity(request):
+    """
+    Get the severity level of log functionality of aws tool from vAPV.
+
+    Returns:
+        HttpResponse: A response containing the severity level.
+    """
+    command = "python3 /ca/bin/aws/LoggerManager.py -level status"
+    try:
+        severity = run_command(command)
+        aninfo("hive.debug", "Succeeded to get log severity.")
+        return create_json_response({"severity": severity.replace("\n", "")}, 200)
+    except RuntimeError as e:
+        anerror("hive.debug", str(e))
+        return create_json_response(
+            {"msg": "Error while getting severity level"}, 500)
+
+
+def post_log_severity(request):
+    """
+    Set the severity level of log functionality of aws tool on vAPV.
+
+    Returns:
+        HttpResponse: A response indicating the success or failure of
+                      the severity level setting process.
+    """
+    required_keys = ["severity"]
+    data = json.loads(request.body)
+
+    # Validate input
+    is_valid, message = validate_input(data, required_keys)
+    if not is_valid:
+        return create_json_response({"msg": message}, 400)
+
+    if data["severity"] not in ["debug", "info", "warning", "error"]:
+        return create_json_response(
+            {"msg": "severity should be one of debug, info, warning, error"}, 400)
+
+    command = ("python3 /ca/bin/aws/LoggerManager.py -level "
+               "{}".format(data["severity"]))
+    try:
+        output = run_command(command)
+        aninfo("hive.debug", "Succeeded to set log severity: "
+               "{}".format(data["severity"]))
+        return create_json_response({"msg": "Succeed"}, 200)
+    except RuntimeError as e:
+        aninfo("hive.debug", str(e))
+        return create_json_response({"msg": "error while running aws tools."}, 501)
+
+
+def download_log_file(request):
+    """
+    Get the log file of aws tool from vAPV.
+
+    Returns:
+        HttpResponse: A response containing the log file.
+    """
+    command = "python3 /ca/bin/aws/LoggerManager.py -mode getlogpath"
+    try:
+        log_file_path = run_command(command)
+        log_file_path = log_file_path.replace("\n", "")
+
+        if not os.path.exists(log_file_path):
+            return HttpResponse(
+                json.dumps({"msg": "No log file found"}),
+                content_type="application/json",
+                status=200
+            )
+        with open(log_file_path, 'rb') as file:
+            response = HttpResponse(file.read(), content_type='text/plain')
+            response['Content-Disposition'] = 'attachment; filename="{}"'.format("aws_tool.log")
+            response['Content-Length'] = os.path.getsize(log_file_path)
+            return response
+    except RuntimeError as e:
+        anerror("hive.debug", str(e))
+        return create_json_response(
+            {"msg": "Error while getting log file"}, 500)
\ No newline at end of file
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/aws/urls.py
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/aws/urls.py	(revision 0)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/aws/urls.py	(working copy)
@@ -0,0 +1,119 @@
+import json
+
+from django.http import HttpResponse
+from django.conf.urls import patterns, url
+
+from hive.cloud.aws.aws_basic_view import (
+    post_aws_credential,
+    get_aws_credential,
+    delete_aws_credential
+)
+from hive.cloud.aws.aws_eni_view import (
+    get_eniconfig,
+    post_eniconfig,
+    delete_eniconfig,
+    post_failover,
+    post_recover,
+    get_ha_status,
+    post_ha_status
+)
+from hive.cloud.aws.aws_log_view import (
+    get_log_buffer,
+    get_switcher,
+    post_switcher,
+    get_log_severity as get_aws_log_severity,
+    post_log_severity,
+    download_log_file as download_aws_log_file
+)
+
+
+def get_bad_http_method():
+    return HttpResponse(
+        json.dumps({"message": "Bad http method"}),
+        content_type="application/json",
+        status=400
+    )
+
+
+# aws router start
+def aws_credential_method_router(request):
+    if request.method == "GET":
+        return get_aws_credential(request)
+    elif request.method == "POST":
+        return post_aws_credential(request)
+    elif request.method == "DELETE":
+        return delete_aws_credential(request)
+    return get_bad_http_method()
+
+
+def aws_eniconfig_method_router(request):
+    if request.method == "GET":
+        return get_eniconfig(request)
+    elif request.method == "POST":
+        return post_eniconfig(request)
+    elif request.method == "DELETE":
+        return delete_eniconfig(request)
+    return get_bad_http_method()
+
+
+def aws_failover_method_router(request):
+    if request.method == "PUT":
+        return post_failover(request)
+    return get_bad_http_method()
+
+
+def aws_recover_method_router(request):
+    if request.method == "PUT":
+        return post_recover(request)
+    return get_bad_http_method()
+
+
+def aws_ha_status_method_router(request):
+    if request.method == "POST":
+        return post_ha_status(request)
+    elif request.method == "GET":
+        return get_ha_status(request)
+    return get_bad_http_method()
+
+
+def aws_log_buffer_method_router(request):
+    if request.method == "GET":
+        return get_log_buffer(request)
+    return get_bad_http_method()
+
+
+def aws_switcher_method_router(request):
+    if request.method == "GET":
+        return get_switcher(request)
+    elif request.method == "PUT":
+        return post_switcher(request)
+    return get_bad_http_method()
+
+
+def aws_log_severity_method_router(request):
+    if request.method == "GET":
+        return get_aws_log_severity(request)
+    elif request.method == "PUT":
+        return post_log_severity(request)
+    return get_bad_http_method()
+
+
+def aws_log_file_method_router(request):
+    if request.method == "GET":
+        return download_aws_log_file(request)
+    return get_bad_http_method()
+# aws router end
+
+
+urlpatterns = patterns(
+    '',
+    url(r'^credential/$', aws_credential_method_router),
+    url(r'^eniconfig/$', aws_eniconfig_method_router),
+    url(r'^failover/$', aws_failover_method_router),
+    url(r'^recover/$', aws_recover_method_router),
+    url(r'^ha/status/$', aws_ha_status_method_router),
+    url(r'^log/buffer/$', aws_log_buffer_method_router),
+    url(r'^log/status/$', aws_switcher_method_router),
+    url(r'^log/severity/$', aws_log_severity_method_router),
+    url(r'^log/file/$', aws_log_file_method_router),
+)
\ No newline at end of file
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/aws_basic_view.py
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/aws_basic_view.py	(revision 39037)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/aws_basic_view.py	(working copy)
@@ -1,129 +0,0 @@
-import json
-import subprocess
-from django.http import HttpResponse
-from hive.utils import aninfo, anerror
-
-
-def get_aws_credential(request):
-    '''
-    Get the AWS credential stored on vAPV.
-
-    Returns:
-        HttpResponse: A response with the AWS credential details or an error message.
-    '''
-    command = "python3 /ca/bin/aws/AWSAuthManager.py -mode show"
-    res = subprocess.Popen(
-        command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
-    )
-    stdout, stderr = res.communicate()
-
-    if res.returncode != 0:
-        anerror("hive.debug", stderr)
-        return HttpResponse(
-            json.dumps({"message": "error while running aws tools"}),
-            content_type="application/json",
-            status=500
-        )
-    try:
-        credential = json.loads(stdout.decode().replace("'", '"'))
-        return HttpResponse(
-            json.dumps(credential),
-            content_type="application/json",
-            status=200
-        )
-    except json.JSONDecodeError as e:
-        anerror("hive.debug", "Fail to decode enconfig to json:{}".format(e))
-        return HttpResponse(
-            json.dumps({}),
-            content_type="application/json",
-            status=500
-        )
-    except UnicodeDecodeError as e:
-        anerror("hive.debug", "Fail to decode stdout:{}".format(e))
-        return HttpResponse(
-            json.dumps({}),
-            content_type="application/json",
-            status=500
-        )
-
-
-def delete_aws_credential(request):
-    '''
-    Delete the AWS credential stored on vAPV
-
-    Returns:
-        HttpResponse: A response indicating the success or failure of
-                      the authentication process.
-    '''
-    command = "python3 /ca/bin/aws/AWSAuthManager.py -mode logout"
-    res = subprocess.Popen(
-        command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
-    )
-    stdout, stderr = res.communicate()
-
-    if res.returncode != 0:
-        anerror("hive.debug", stderr)
-        return HttpResponse(
-            json.dumps({"message": "error while running aws tools"}),
-            content_type="application/json",
-            status=500
-        )
-
-    response_data = {
-        "msg": "Succeed"
-    }
-    aninfo("hive.debug", "Succeed to delete aws credential")
-    return HttpResponse(
-        json.dumps(response_data),
-        content_type="application/json",
-        status=200
-    )
-
-
-def post_aws_credential(request):
-    '''
-    Authenticate AWS credentials to vAPV.
-
-    Returns:
-        HttpResponse: A response indicating the success or failure of
-                      the authentication process.
-    '''
-    # verify user input
-    required_keys = ["aws_access_key_id", "aws_secret_access_key", "region"]
-    data = json.loads(request.body)
-    for key in required_keys:
-        if key not in data:
-            return HttpResponse(
-                json.dumps({"message": "body should contain key: "
-                                       "{}".format(', '.join(required_keys))}),
-                content_type="application/json",
-                status=400
-            )
-
-    command = (
-        "python3 /ca/bin/aws/AWSAuthManager.py -mode login "
-        "-access_key {} -secret_access_key {} -region {}"
-    ).format(data["aws_access_key_id"], data["aws_secret_access_key"], data["region"])
-    res = subprocess.Popen(
-        command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
-    )
-    stdout, stderr = res.communicate()
-
-    if res.returncode != 0:
-        anerror("hive.debug", stderr)
-        return HttpResponse(
-            json.dumps({"message": "error while running aws tools"}),
-            content_type="application/json",
-            status=500
-        )
-
-    response_data = {
-        "msg": "Succeed"
-    }
-    aninfo("hive.debug", "Succeed to authenticate aws credential")
-
-    return HttpResponse(
-        json.dumps(response_data),
-        content_type="application/json",
-        status=200
-    )
\ No newline at end of file
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/aws_eni_view.py
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/aws_eni_view.py	(revision 39037)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/aws_eni_view.py	(working copy)
@@ -1,208 +0,0 @@
-import json
-import subprocess
-import shlex
-from django.http import HttpResponse
-from hive.utils import aninfo, anerror
-
-
-def validate_input(data, required_keys):
-    """Validates if the required keys are present in the input data."""
-    missing_keys = [key for key in required_keys if key not in data]
-    if missing_keys:
-        return False, "Body should contain key: {}".format(', '.join(missing_keys))
-    return True, ""
-
-
-def create_json_response(data, status_code):
-    """Creates a JSON response with the given data and status code."""
-    return HttpResponse(
-        json.dumps(data),
-        content_type="application/json",
-        status=status_code
-    )
-
-
-def run_command(command):
-    """Executes a command and returns the result or raises an error."""
-    try:
-        res = subprocess.Popen(
-            command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
-        )
-        stdout, stderr = res.communicate()
-
-        if res.returncode != 0:
-            anerror("hive.debug", stderr)
-            raise RuntimeError("Error while running AWS tools.")
-        return stdout.decode()
-
-    except subprocess.SubprocessError as e:
-        anerror("hive.debug", str(e))
-        raise RuntimeError("Subprocess execution failed.")
-
-
-def post_eniconfig(request):
-    """
-    Add the eni configuration of AWS to vAPV.
-
-    Returns:
-        HttpResponse: A response indicating the success or failure of
-                      the eni configuration process.
-    """
-    required_keys = ["src_eni_id", "dest_eni_id"]
-    data = json.loads(request.body)
-    is_valid, message = validate_input(data, required_keys)
-    if not is_valid:
-        return create_json_response({"message": message}, 400)
-
-    command = (
-        "python3 /ca/bin/aws/AWSConfigManager.py -ENI set "
-        "-src_eni_id {} -dest_eni_id {}".format(
-            data["src_eni_id"], data["dest_eni_id"]
-        )
-    )
-    try:
-        run_command(command)
-        aninfo("hive.debug", "Succeeded to add eni configuration")
-        return create_json_response({"msg": "Succeed"}, 200)
-    except RuntimeError:
-        return create_json_response({"message": "error while running aws tools"}, 500)
-
-
-def get_eniconfig(request):
-    """
-    Get the eni configuration of AWS from vAPV.
-
-    Returns:
-        HttpResponse: A response with the eni configuration
-                      details or an error message.
-    """
-    command = "python3 /ca/bin/aws/AWSConfigManager.py -ENI show"
-    try:
-        output = run_command(command)
-        enconfig = json.loads(output.replace("'", '"'))
-        return create_json_response(enconfig, 200)
-    except (RuntimeError, json.JSONDecodeError, UnicodeDecodeError) as e:
-        anerror("hive.debug", "Error decoding or running command: {}".format(str(e)))
-        return create_json_response({}, 500)
-
-
-def delete_eniconfig(request):
-    """
-    Delete the eni configuration of AWS from vAPV.
-
-    Returns:
-        HttpResponse: A response indicating the success or failure of
-                      the eni configuration process.
-    """
-    required_keys = ["index"]
-    data = json.loads(request.body)
-
-    # Validate input
-    is_valid, message = validate_input(data, required_keys)
-    if not is_valid:
-        return create_json_response({"message": message}, 400)
-
-    command = (
-        "python3 /ca/bin/aws/AWSConfigManager.py -ENI remove -index "
-        "{}".format(data["index"])
-    )
-    try:
-        run_command(command)
-        aninfo("hive.debug", "Succeeded to delete aws eni configuration")
-        return create_json_response({"msg": "Succeed"}, 200)
-    except RuntimeError:
-        return create_json_response({"message": "error while running aws tools"}, 500)
-
-
-def post_failover(request):
-    """
-    Manually trigger IP swifting while failover happening.
-
-    Returns:
-        HttpResponse: A response indicating the success or failure of
-                      the eni configuration process.
-    """
-    command = "python3 /ca/bin/aws/AWSENIManager.py -mode trigger"
-    try:
-        run_command(command)
-        aninfo("hive.debug", "Succeeded to trigger IP transfering.")
-        return create_json_response({"msg": "Succeed"}, 200)
-    except RuntimeError:
-        return create_json_response({"message": "error while running aws tools."}, 500)
-
-
-def post_recover(request):
-    """
-    Manually trigger IP swifting while recover happening.
-
-    Returns:
-        HttpResponse: A response indicating the success or failure of
-                      the eni configuration process.
-    """
-    command = "python3 /ca/bin/aws/AWSENIManager.py -mode recover"
-    try:
-        run_command(command)
-        aninfo("hive.debug", "Succeeded to trigger IP transfering.")
-        return create_json_response({"msg": "Succeed"}, 200)
-    except RuntimeError:
-        return create_json_response({"message": "error while running aws tools"}, 500)
-
-
-def get_ha_status(request):
-    """
-    Get the HA polling status of AWS from vAPV.
-
-    Returns:
-        HttpResponse: A response with the HA status details
-                      or an error message.
-    """
-    # the output of the command is either "True\n" or "False\n"
-    output_map = {
-        "True\n": 1,
-        "False\n": 0
-    }
-    command = "python3 /ca/bin/aws/AWSFailoverPoller.py -mode status"
-    try:
-        output = run_command(command)
-        aninfo("hive.debug", "Succeeded to get ha poller status.")
-        return create_json_response({"status": output_map[output]}, 200)
-    except RuntimeError:
-        return create_json_response({"message": "error while running aws tools."}, 500)
-
-
-def post_ha_status(request):
-    """
-    Enable or disable the HA polling of AWS from vAPV.
-
-    Returns:
-        HttpResponse: A response indicating the success or failure of
-                      the HA status process.
-    """
-    input_map = {
-        1: "enable",
-        0: "disable"
-    }
-    required_keys = ["status"]
-    data = json.loads(request.body)
-
-    # Validate input
-    is_valid, message = validate_input(data, required_keys)
-    if not is_valid:
-        return create_json_response({"message": message}, 400)
-    if data["status"] not in [0, 1]:
-        return create_json_response({"message": "status should be number 0 or 1"}, 400)
-
-    command = (
-        "python3 /ca/bin/aws/AWSFailoverPoller.py -mode "
-        "{}".format(input_map[data["status"]])
-    )
-    aninfo("hive.debug", "command")
-
-    try:
-        # Start the command in the background. That is why we use Popen instead of call.
-        args = shlex.split(command)
-        subprocess.Popen(args)
-        aninfo("hive.debug", "Succeeded to set ha poller status: {}".format(input_map[data["status"]]))
-        return create_json_response({"msg": "Succeed"}, 200)
-    except RuntimeError:
-        return create_json_response({"message": "error while running aws tools."}, 500)
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/aws_log_view.py
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/aws_log_view.py	(revision 39037)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/aws_log_view.py	(working copy)
@@ -1,190 +0,0 @@
-import json
-import os
-import subprocess
-from django.http import HttpResponse
-from hive.utils import aninfo, anerror
-
-
-def validate_input(data, required_keys):
-    """Validates if the required keys are present in the input data."""
-    missing_keys = [key for key in required_keys if key not in data]
-    if missing_keys:
-        return False, "Body should contain key: {}".format(', '.join(missing_keys))
-    return True, ""
-
-
-def create_json_response(data, status_code):
-    """Creates a JSON response with the given data and status code."""
-    return HttpResponse(
-        json.dumps(data),
-        content_type="application/json",
-        status=status_code
-    )
-
-
-def run_command(command):
-    """Executes a command and returns the result or raises an error."""
-    try:
-        res = subprocess.Popen(
-            command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
-        )
-        stdout, stderr = res.communicate()
-        if res.returncode != 0:
-            anerror("hive.debug", stderr)
-            raise RuntimeError("Error while running AWS tools.")
-        return stdout.decode()
-
-    except subprocess.SubprocessError as e:
-        anerror("hive.debug", str(e))
-        raise RuntimeError("Subprocess execution failed.")
-
-
-def get_log_buffer(request):
-    """
-    Get the log file content of aws tool from vAPV.
-
-    Returns:
-        HttpResponse: A response containing the log buffer.
-    """
-    command = "python3 /ca/bin/aws/LoggerManager.py -mode show"
-    try:
-        log_buffer = run_command(command)
-        return create_json_response({"msg": log_buffer}, 200)
-    except RuntimeError as e:
-        anerror("hive.debug", str(e))
-        return create_json_response(
-            {"msg": "Error while getting log buffer"}, 500)
-
-
-def get_switcher(request):
-    """
-    Get the status of log functionality aws tool from vAPV.
-
-    Returns:
-        HttpResponse: A response containing the switcher status{}.
-    """
-    # the output of the command is either "True\n" or "False\n"
-    output_map = {
-        "True\n": 1,
-        "False\n": 0
-    }
-    command = "python3 /ca/bin/aws/LoggerManager.py -mode status"
-    try:
-        switcher = run_command(command)
-        return create_json_response({"status": output_map[switcher]}, 200)
-    except RuntimeError as e:
-        anerror("hive.debug", str(e))
-        return create_json_response(
-            {"msg": "Error while getting switcher status"}, 500)
-
-
-def post_switcher(request):
-    """
-    Turn on or off the status of log functionality aws tool on vAPV.
-
-    Returns:
-        HttpResponse: A response indicating the success or failure of
-    """
-    input_map = {
-        1: "on",
-        0: "off"
-    }
-    required_keys = ["status"]
-    data = json.loads(request.body)
-
-    # Validate input
-    is_valid, message = validate_input(data, required_keys)
-    if not is_valid:
-        return create_json_response({"msg": message}, 400)
-    if data["status"] not in [0, 1]:
-        return create_json_response({"msg": "status should be number 0 or 1"}, 400)
-
-    command = ("python3 /ca/bin/aws/LoggerManager.py -mode "
-               "{}".format(input_map[data["status"]]))
-
-    try:
-        output = run_command(command)
-        aninfo("hive.debug", "Succeeded to set log functionality: "
-               "{}".format(data["status"]))
-        return create_json_response({"msg": "Succeed"}, 200)
-    except RuntimeError:
-        return create_json_response({"msg": "error while running aws tools."}, 500)
-
-
-def get_log_severity(request):
-    """
-    Get the severity level of log functionality of aws tool from vAPV.
-
-    Returns:
-        HttpResponse: A response containing the severity level.
-    """
-    command = "python3 /ca/bin/aws/LoggerManager.py -level status"
-    try:
-        severity = run_command(command)
-        aninfo("hive.debug", "Succeeded to get log severity.")
-        return create_json_response({"severity": severity.replace("\n", "")}, 200)
-    except RuntimeError as e:
-        anerror("hive.debug", str(e))
-        return create_json_response(
-            {"msg": "Error while getting severity level"}, 500)
-
-
-def post_log_severity(request):
-    """
-    Set the severity level of log functionality of aws tool on vAPV.
-
-    Returns:
-        HttpResponse: A response indicating the success or failure of
-                      the severity level setting process.
-    """
-    required_keys = ["severity"]
-    data = json.loads(request.body)
-
-    # Validate input
-    is_valid, message = validate_input(data, required_keys)
-    if not is_valid:
-        return create_json_response({"msg": message}, 400)
-
-    if data["severity"] not in ["debug", "info", "warning", "error"]:
-        return create_json_response(
-            {"msg": "severity should be one of debug, info, warning, error"}, 400)
-
-    command = ("python3 /ca/bin/aws/LoggerManager.py -level "
-               "{}".format(data["severity"]))
-    try:
-        output = run_command(command)
-        aninfo("hive.debug", "Succeeded to set log severity: "
-               "{}".format(data["severity"]))
-        return create_json_response({"msg": "Succeed"}, 200)
-    except RuntimeError as e:
-        aninfo("hive.debug", str(e))
-        return create_json_response({"msg": "error while running aws tools."}, 501)
-
-
-def download_log_file(request):
-    """
-    Get the log file of aws tool from vAPV.
-
-    Returns:
-        HttpResponse: A response containing the log file.
-    """
-    command = "python3 /ca/bin/aws/LoggerManager.py -mode getlogpath"
-    try:
-        log_file_path = run_command(command)
-        log_file_path = log_file_path.replace("\n", "")
-
-        if not os.path.exists(log_file_path):
-            return HttpResponse(
-                json.dumps({"msg": "No log file found"}),
-                content_type="application/json",
-                status=200
-            )
-        with open(log_file_path, 'rb') as file:
-            response = HttpResponse(file.read(), content_type='text/plain')
-            response['Content-Disposition'] = 'attachment; filename="{}"'.format("aws_tool.log")
-            response['Content-Length'] = os.path.getsize(log_file_path)
-            return response
-    except RuntimeError as e:
-        anerror("hive.debug", str(e))
-        return create_json_response(
-            {"msg": "Error while getting log file"}, 500)
\ No newline at end of file
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/az/__init__.py	(added)
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/az/__init__.py	(revision 0)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/az/__init__.py	(revision 0)
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/az/az_basic_view.py
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/az/az_basic_view.py	(revision 0)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/az/az_basic_view.py	(working copy)
@@ -0,0 +1,125 @@
+from django.http import HttpResponse
+import subprocess, os, time, json, re
+from hive.utils import aninfo, anerror
+
+def logout(request):
+    command = "python3 /ca/bin/azure/AZAuthManager.py -mode logout"
+    res = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = res.communicate()
+    if stderr:
+        anerror("hive.debug", stderr)
+        return HttpResponse(
+        json.dumps({"message":"error while running az tools"}),
+            content_type="application/json",
+            status=500
+        )
+    aninfo("hive.debug","log out az account")
+    response = {
+        "message":"success to log out"
+    }
+    return HttpResponse(
+        json.dumps(response),
+        content_type="application/json",
+        status=200
+    )
+
+def get_login_code(request):
+    '''This is used to get the azure log in url and its code.
+    User can use this url and code to authenticate our app.
+    Eighter url and code cannot be resolve by regular express will retrun status code 500.
+    The way to run the az tool is to code the az tool API, and read the information from the related content from the file where API stores the output.
+    This method doesn't directly call Array CLI because of the limitation of architecture.'''
+
+    # launch process and read the content of file
+    file_path = "/tmp/login_msg.txt"
+    count = 0
+    fp = None
+    if os.path.exists(file_path):
+        os.remove(file_path)
+    command = "python3 /ca/bin/azure/AZAuthManager.py -mode login"
+    subprocess.Popen(command, shell=True)
+
+    # Wait for the file to become available, up to 60 seconds
+    while fp is None and count < 60:
+        if os.path.exists(file_path):
+            fp = open(file_path, "r")
+        else:
+            time.sleep(1)
+            count += 1
+    msg = ""
+    if fp is not None:
+        for line in fp:
+            msg+=line
+        fp.close()
+
+    # extract the url and code by regrex to form json response
+    url = ""
+    code = ""
+    url_pattern = r'https?:\/\/[^\s]+'
+    code_pattern = r'code\s([A-Za-z0-9]+)'
+    code_match = re.search(code_pattern, msg)
+    if code_match:
+        code = code_match.group(1)
+    else:
+        error_response = {
+            "message": "Not Found code",
+        }
+        anerror("hive.debug", error_response)
+        return HttpResponse(
+        error_response,
+        content_type="application/json",
+        status=500
+    )
+    url_match = re.search(url_pattern, msg)
+    if url_match:
+        url = url_match.group(0)
+    else:
+        error_response = {
+            "message": "Not Found url",
+        }
+        anerror("hive.debug", error_response)
+        return HttpResponse(
+        error_response,
+        content_type="application/json",
+        status=500
+    )
+
+    response_data = {
+        "url": url,
+        "code": code
+    }
+    return HttpResponse(
+        json.dumps(response_data),
+        content_type="application/json",
+        status=200
+    )
+
+def get_login_status(request):
+    '''Use to get login status.
+    return statuscode=401 if az tool return nothiing, which meaning that use haven't login.
+    return statuscode=200 if user have logged in. return all 
+    '''
+    command = "python3 /ca/bin/azure/AZAuthManager.py -mode show"
+    res = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = res.communicate()
+    response_data = {
+        "status":True
+    }
+    try:
+        json.loads(stdout.decode())
+    except Exception as e:
+        anerror("hive.debug", "Fail to decode return to json:{}".format(e))
+        response_data["status"] = False
+        return HttpResponse(
+            json.dumps(response_data),
+            content_type="application/json",
+            status=200
+        )
+    aninfo("hive.debug", response_data)
+
+    return HttpResponse(
+        json.dumps(response_data),
+        # stdout.decode(),
+        content_type="application/json",
+        status=200
+    )
\ No newline at end of file
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/az/az_log_view.py
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/az/az_log_view.py	(revision 0)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/az/az_log_view.py	(working copy)
@@ -0,0 +1,177 @@
+from django.http import HttpResponse
+import subprocess, os, json
+from hive.utils import aninfo, anerror
+import logging
+
+log_file_path = '/ca/webui/htdocs/new/logfile.log'
+logging.basicConfig(
+    filename=log_file_path,            # Path to the log file
+    level=logging.DEBUG,               # Log level (DEBUG, INFO, WARNING, ERROR, CRITICAL)
+    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',  # Log message format
+    datefmt='%Y-%m-%d %H:%M:%S'         # Date format in the logs
+)
+
+def get_all_log(request):
+    command = "python3 /ca/bin/azure/LoggerManager.py -mode show"
+    res = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = res.communicate()
+    if stderr:
+        anerror("hive.debug", stderr)
+        return HttpResponse(
+        json.dumps({"message":"error while running az tools"}),
+            content_type="application/json",
+            status=500
+        )
+    aninfo("hive.debug", "get all log")
+    return HttpResponse(
+        json.dumps({"message":stdout}),
+            content_type="application/json",
+            status=200
+        )
+
+def download_log_file(request):
+    command = "python3 /ca/bin/azure/LoggerManager.py -mode getlogpath"
+    res = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = res.communicate()
+    if stderr:
+        anerror("hive.debug", stderr)
+        return HttpResponse(
+        json.dumps({"message":"error while running az tools"}),
+            content_type="application/json",
+            status=500
+        )
+
+    log_file_path = stdout.replace("\n", "")
+
+    if not os.path.exists(log_file_path):
+        return HttpResponse(
+        json.dumps({"message":"No log file found"}),
+            content_type="application/json",
+            status=200
+        )
+    # Open the file in binary mode and prepare it for downloading
+    with open(log_file_path, 'rb') as file:
+        response = HttpResponse(file.read(), content_type='text/plain')  # Assuming the file is a log file (plain text)
+        response['Content-Disposition'] = 'attachment; filename="{}"'.format("az_tool.log")
+        response['Content-Length'] = os.path.getsize(log_file_path)
+        return response
+
+    if is_running is None:
+        anerror("hive.debug", stderr)
+        return HttpResponse(
+        json.dumps({"message":"error while running az tools"}),
+            content_type="application/json",
+            status=500
+        ) 
+    aninfo("hive.debug", "download log file")
+    return HttpResponse(
+        json.dumps({"is_running":is_running}),
+        content_type="application/json",
+        status=200
+    )
+
+def get_log_severity(request):
+    command = "python3 /ca/bin/azure/LoggerManager.py -level status"
+    res = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = res.communicate()
+
+    if stderr:
+        anerror("hive.debug", stderr)
+        return HttpResponse(
+        json.dumps({"message":"error while running az tools"}),
+            content_type="application/json",
+            status=500
+        )
+    aninfo("hive.debug", "get log severity: {}".format(stdout.replace("\n", "")))
+    return HttpResponse(
+        json.dumps({"severity":stdout.replace("\n", "")}),
+        content_type="application/json",
+        status=200
+    )
+def set_log_severity(request):
+    # verify user input
+    required_keys = ["severity"]
+
+    data = json.loads(request.body)
+    for key in required_keys:
+        if key not in data:
+            return HttpResponse(
+                json.dumps({"message":"body should contain key: {}".format(', '.join(required_keys))}),
+                content_type="application/json",
+                status=400
+            ) 
+    allow_severity = ["debug", "info", "warning", "error"]
+    if not data["severity"] in allow_severity:
+        return HttpResponse(
+            json.dumps({"message":"status should be: {}".format(','.join(allow_severity))}),
+            content_type="application/json",
+            status=400
+        )
+    # call az tools
+    command = 'python3 /ca/bin/azure/LoggerManager.py -level {}'.format(data["severity"])
+    res = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = res.communicate()
+    if stderr:
+        anerror("hive.debug", stderr)
+    return HttpResponse(
+        json.dumps({"message":"succeed"}),
+        content_type="application/json",
+        status=201
+    )
+def get_log_status(request):
+    '''This method is used to check if az tool log functionality is on or off.'''
+    command = "python3 /ca/bin/azure/LoggerManager.py -mode status"
+    res = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = res.communicate()
+    if stderr:
+        anerror("hive.debug", stderr)
+        return HttpResponse(
+        json.dumps({"message":"error while running az tools"}),
+            content_type="application/json",
+            status=500
+        )
+    is_on = {"True": True, "False": False}.get(stdout.replace("\n", ""))
+    aninfo("hive.debug", "get log status: {}".format(is_on))
+    return HttpResponse(
+        json.dumps({"is_on":is_on}),
+        content_type="application/json",
+        status=200
+    )
+
+def switch_log_status(request):
+    '''This method is used to set az tool log functionality to on or off.'''
+    # verify user input
+    required_keys = ["status"]
+    data = json.loads(request.body)
+    for key in required_keys:
+        if key not in data:
+            return HttpResponse(
+                json.dumps({"message":"body should contain key: {}".format(', '.join(required_keys))}),
+                content_type="application/json",
+                status=400
+            )
+
+    allow_status = ["on", "off"]
+    if not data["status"] in allow_status:
+        return HttpResponse(
+            json.dumps({"message":"status should be: {}".format(', or '.join(allow_status))}),
+            content_type="application/json",
+            status=400
+        )
+    # use az tool
+    command = "python3 /ca/bin/azure/LoggerManager.py -mode {}".format(data["status"])
+    res = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = res.communicate()
+    if stderr:
+        anerror("hive.debug", stderr)
+        return HttpResponse(
+        json.dumps({"message":"error while running az tools"}),
+            content_type="application/json",
+            status=500
+        )
+    aninfo("hive.debug", "swtich log status to {}".format(data["status"]))
+    return HttpResponse(
+        json.dumps({"message":"succeed"}),
+        content_type="application/json",
+        status=200
+    )
\ No newline at end of file
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/az/az_nic_view.py
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/az/az_nic_view.py	(revision 0)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/az/az_nic_view.py	(working copy)
@@ -0,0 +1,172 @@
+from django.http import HttpResponse
+import subprocess, json
+from hive.utils import aninfo, anerror
+
+def get_all_nic_config(request):
+    command = "python3 /ca/bin/azure/ConfigManager.py -mode getipconfig"
+    res = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = res.communicate()
+    aninfo("hive.debug", stdout)
+    try:
+        return HttpResponse(
+                json.dumps(json.loads(stdout.decode().replace("'", '"'))),
+                content_type="application/json",
+                status=200
+        )
+    except Exception as e:
+        anerror("hive.debug", str(e)+". Got "+stdout)
+        return HttpResponse(
+                json.dumps({}),
+                content_type="application/json",
+                status=200
+        )
+
+def delete_nic_config_by_index(request):
+    required_keys = ["index"]
+    data = json.loads(request.body)
+    for key in required_keys:
+        if key not in data:
+            return HttpResponse(
+                json.dumps({"message":"body should contain key: {}".format(', '.join(required_keys))}),
+                content_type="application/json",
+                status=400
+            ) 
+    # call az tools
+    command = 'python3 /ca/bin/azure/ConfigManager.py -mode clear -index {}'.format(data["index"])
+    res = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = res.communicate()
+    aninfo("hive.debug", "delete nic with index: {}".format(data["index"]))
+
+    return HttpResponse(
+        json.dumps({"message":stdout}),
+        content_type="application/json",
+        status=201
+    )
+
+def add_nic_config(request):
+    '''add nic ip configuration'''
+    # verify user input
+    required_keys = ["sub_id", "res_grp_name", "src_nic_name", "dest_nic_name"]
+    data = json.loads(request.body)
+    for key in required_keys:
+        if key not in data:
+            return HttpResponse(
+                json.dumps({"message":"body should contain key: {}".format(', '.join(required_keys))}),
+                content_type="application/json",
+                status=400
+            ) 
+    # call az tools
+    command = 'python3 /ca/bin/azure/ConfigManager.py -mode set -sub_id {} -res_grp_name {} -src_nic_name {} -dest_nic_name {}'.format(data["sub_id"], data["res_grp_name"], data["src_nic_name"], data["dest_nic_name"])
+    res = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = res.communicate()
+    if stderr:
+        anerror("hive.debug", stderr)
+        return HttpResponse(
+        json.dumps({"message":"error while running az tools"}),
+            content_type="application/json",
+            status=500
+    )
+    aninfo("hive.debug", "add nic: {}".format(data))
+    return HttpResponse(
+        json.dumps({"message":"succeed"}),
+        content_type="application/json",
+        status=201
+    )
+
+
+def get_nic_poller_status(request):
+    command = "python3 /ca/bin/azure/AZFailoverPoller.py -mode 3"
+    res = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = res.communicate()
+    if stderr:
+        anerror("hive.debug", stderr)
+        return HttpResponse(
+        json.dumps({"message":"error while running az tools"}),
+            content_type="application/json",
+            status=500
+        )
+    
+    is_running = {"True": True, "False": False}.get(stdout.replace("\n", ""))
+    aninfo("hive.debug", "get nic poller status: {}".format(is_running))
+    if is_running is None:
+        anerror("hive.debug", "fail to resolve ".format(stdout.replace("\n", "")))
+        return HttpResponse(
+        json.dumps({"message":"error while running az tools"}),
+            content_type="application/json",
+            status=500
+        )
+    return HttpResponse(
+        json.dumps({"is_running":is_running}),
+        content_type="application/json",
+        status=200
+    )
+def switch_nic_poller(request):
+    # verify user input
+    required_keys = ["status"]
+
+    data = json.loads(request.body)
+    for key in required_keys:
+        if key not in data:
+            return HttpResponse(
+                json.dumps({"message":"body should contain key: {}".format(', '.join(required_keys))}),
+                content_type="application/json",
+                status=400
+            )
+    # use az tool
+    status = {"on": "1", "off": "2"}.get(data["status"])
+    command = "python3 /ca/bin/azure/AZFailoverPoller.py -mode {}".format(status)
+    res = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = res.communicate()
+
+    if stderr:
+        anerror("hive.debug", stderr)
+        return HttpResponse(
+        json.dumps({"message":"error while running az tools"}),
+            content_type="application/json",
+            status=500
+        )
+    aninfo("hive.debug", "switch nic poller to {}".format(data["status"]))
+    return HttpResponse(
+        json.dumps({"message":"succeed"}),
+        content_type="application/json",
+        status=200
+    )
+
+
+def trigger_ip_transfering(request):
+    # verify user input
+    required_keys = ["status"]
+    data = json.loads(request.body)
+    for key in required_keys:
+        if key not in data:
+            return HttpResponse(
+                json.dumps({"message":"body should contain key: {}".format(', '.join(required_keys))}),
+                content_type="application/json",
+                status=400
+            )
+
+    allow_status = ["failover", "recover"]
+    if not data["status"] in allow_status:
+        return HttpResponse(
+            json.dumps({"message":"status should be: {}".format(', or '.join(allow_status))}),
+            content_type="application/json",
+            status=400
+        )
+    # use az tool
+    status = {"failover": "1", "recover": "2"}.get(data["status"])
+    command = "python3 /ca/bin/azure/AZFailoverManager.py -mode {}".format(status)
+    res = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = res.communicate()
+
+    if stderr:
+        return HttpResponse(
+        json.dumps({"message":"error while running az tools"}),
+            content_type="application/json",
+            status=500
+        )
+    aninfo("hive.debug", "trigger ip transfering {}".format(data["status"]))
+    return HttpResponse(
+        json.dumps({"message":"succeed"}),
+        content_type="application/json",
+        status=200
+    )
\ No newline at end of file
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/az/az_udr_view.py
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/az/az_udr_view.py	(revision 0)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/az/az_udr_view.py	(working copy)
@@ -0,0 +1,156 @@
+import subprocess, json, os
+
+from django.http import HttpResponse
+
+from hive.utils import aninfo, anerror
+
+def switch_udr_poller(request):
+    # verify user input
+    required_keys = ["status"]
+    data = json.loads(request.body)
+    for key in required_keys:
+        if key not in data:
+            return HttpResponse(
+                json.dumps({"message":"body should contain key: {}".format(', '.join(required_keys))}),
+                content_type="application/json",
+                status=400
+            )
+    allow_status = ["on", "off"]
+    if not data["status"] in allow_status:
+        return HttpResponse(
+            json.dumps({"message":"status should be: {}".format(', or '.join(allow_status))}),
+            content_type="application/json",
+            status=400
+        )
+
+    # use az tool
+    status = {"on": "1", "off": "2"}.get(data["status"])
+    command = "python3 /ca/bin/azure/UDRPoller.py -mode {}".format(status)
+    res = subprocess.Popen(command.split(), stdout=open(os.devnull, 'w'), stderr=open(os.devnull, 'w'))
+    stdout, stderr = res.communicate()
+    if stderr:
+        anerror("hive.debug", stderr)
+        return HttpResponse(
+        json.dumps({"message":"error while running az tools"}),
+            content_type="application/json",
+            status=500
+        )
+    aninfo("hive.debug", "swtich udr status to {}".format(data["status"]))
+    return HttpResponse(
+        json.dumps({"message":"succeed"}),
+        content_type="application/json",
+        status=200
+    )
+
+
+def get_udr_poller_status(request):
+    command = "python3 /ca/bin/azure/UDRPoller.py -mode 3"
+    res = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = res.communicate()
+    if stderr:
+        anerror("hive.debug", stderr)
+        return HttpResponse(
+        json.dumps({"message":"error while running az tools"}),
+            content_type="application/json",
+            status=500
+        )
+    is_running = {"True": True, "False": False}.get(stdout.replace("\n", ""))
+    if is_running is None:
+        anerror("hive.debug", stderr)
+        return HttpResponse(
+        json.dumps({"message":"error while running az tools"}),
+            content_type="application/json",
+            status=500
+        )
+    aninfo("hive.debug", "get udr poller status {}".format(is_running))
+    return HttpResponse(
+        json.dumps({"is_running":is_running}),
+        content_type="application/json",
+        status=200
+    )
+
+
+def add_udr_config(request):
+    '''add udr ip configuration'''
+    # verify user input
+    required_keys = ["sub_id", "res_grp_name", "vm_name", "ip_running", "ip_deallocating"]
+   
+    data = json.loads(request.body)
+    for key in required_keys:
+        if key not in data:
+            return HttpResponse(
+                json.dumps({"message":"body should contain key: {}".format(', '.join(required_keys))}),
+                content_type="application/json",
+                status=400
+            )
+    # call az tools
+    command = 'python3 /ca/bin/azure/RouteConfigManager.py -mode set -sub_id {} -res_grp_name {} -vm_name {} -ip_running {} -ip_deallocating {}'.format(data["sub_id"], data["res_grp_name"], data["vm_name"], data["ip_running"], data["ip_deallocating"])
+    res = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = res.communicate()
+    if stderr:
+        anerror("hive.debug", stderr)
+        return HttpResponse(
+        json.dumps({"message":"error while running az tools"}),
+            content_type="application/json",
+            status=500
+    )
+    aninfo("hive.debug", "swtich udr status to {}".format(data["status"]))
+    return HttpResponse(
+        json.dumps({"message":"succeed"}),
+        content_type="application/json",
+        status=201
+    )
+
+
+def delete_udr_config(request):
+    '''delete udr configuration'''
+    required_keys = ["index"]
+    data = json.loads(request.body)
+    for key in required_keys:
+        if key not in data:
+            return HttpResponse(
+                json.dumps({"message":"body should contain key: {}".format(', '.join(required_keys))}),
+                content_type="application/json",
+                status=400
+            )
+    # call az tools
+    command = 'python3 /ca/bin/azure/RouteConfigManager.py -mode clear -index {}'.format(data["index"])
+    res = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = res.communicate()
+    if stderr:
+        anerror("hive.debug", stderr)
+        return HttpResponse(
+        json.dumps({"message":"error while running az tools"}),
+            content_type="application/json",
+            status=500
+    )
+    aninfo("hive.debug", "delete udr config with index: {}".format(data["index"]))
+    return HttpResponse(
+        json.dumps({"message":"succeed"}),
+        content_type="application/json",
+        status=200
+    )
+
+
+def get_udr_config(request):
+    command = "python3 /ca/bin/azure/RouteConfigManager.py -mode getrouteconfig"
+    res = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = res.communicate()
+    try:
+        udr_config = json.dumps(json.loads(stdout.decode().replace("'", '"')))
+        aninfo("hive.debug", "get udr config")
+        return HttpResponse(
+                udr_config,
+                content_type="application/json",
+                status=200
+        )
+    except Exception as e:
+        anerror("hive.debug", stderr)
+        return HttpResponse(
+                json.dumps({}),
+                content_type="application/json",
+                status=200
+        )
+
+if __name__=="__main__":
+    pass
\ No newline at end of file
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/az/urls.py
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/az/urls.py	(revision 0)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/az/urls.py	(working copy)
@@ -0,0 +1,154 @@
+import json
+
+from django.http import HttpResponse
+from django.conf.urls import patterns, url
+
+from hive.cloud.az.az_basic_view import (
+    get_login_code,
+    get_login_status,
+    logout
+)
+from hive.cloud.az.az_nic_view import (
+    get_all_nic_config,
+    add_nic_config,
+    delete_nic_config_by_index,
+    get_nic_poller_status,
+    switch_nic_poller,
+    trigger_ip_transfering
+)
+from hive.cloud.az.az_udr_view import (
+    switch_udr_poller,
+    add_udr_config,
+    delete_udr_config,
+    get_udr_config,
+    get_udr_poller_status
+)
+from hive.cloud.az.az_log_view import (
+    get_all_log,
+    get_log_status,
+    download_log_file as download_az_log_file,
+    switch_log_status,
+    get_log_severity as get_az_log_severity,
+    set_log_severity
+)
+
+
+def get_bad_http_method():
+    return HttpResponse(
+        json.dumps({"message": "Bad http method"}),
+        content_type="application/json",
+        status=400
+    )
+
+
+def az_nicconfig_method_router(request):
+    if request.method=="GET":
+        return get_all_nic_config(request)
+    elif request.method=="POST":
+        return add_nic_config(request)
+    elif request.method=="DELETE":
+        return delete_nic_config_by_index(request)
+    return get_bad_http_method()
+
+
+def az_login_method_router(request):
+    if request.method=="GET":
+        return get_login_code(request)
+    return get_bad_http_method()
+
+
+def az_login_status_method_router(request):
+    if request.method=="GET":
+        return get_login_status(request)
+    return get_bad_http_method()
+
+
+def az_logout_method_router(request):
+    if request.method=="POST":
+        return logout(request)
+    return get_bad_http_method()
+
+
+def az_nicpoller_status_method_router(request):
+    if request.method=="GET":
+        return get_nic_poller_status(request)
+    return get_bad_http_method()
+
+
+def az_nicpoller_method_router(request):
+    if request.method=="PUT":
+        return switch_nic_poller(request)
+    return get_bad_http_method()
+
+
+def az_nictrigger_method_router(request):
+    if request.method=="PUT":
+        return trigger_ip_transfering(request)
+    return get_bad_http_method()
+
+
+def az_udrpoller_method_router(request):
+    if request.method=='PUT':
+        return switch_udr_poller(request)
+
+
+def az_udrpoller_status_method_router(request):
+    if request.method=='GET':
+        return get_udr_poller_status(request)
+
+
+def az_udrconfig_method_router(request):
+    if request.method=="GET":
+        return get_udr_config(request)
+    elif request.method=="POST":
+        return add_udr_config(request)
+    elif request.method=="DELETE":
+        return delete_udr_config(request)
+    return get_bad_http_method()
+
+
+def az_logfile_method_router(request):
+    if request.method=="GET":
+        return download_az_log_file(request)
+    return get_bad_http_method()
+
+
+def az_log_method_router(request):
+    if request.method=="GET":
+        return get_all_log(request)
+    return get_bad_http_method()
+
+
+def az_log_status_method_router(request):
+    if request.method=="GET":
+        return get_log_status(request)
+    if request.method=="PUT":
+        return switch_log_status(request)
+    return get_bad_http_method()
+
+
+def az_log_severity_method_router(request):
+    if request.method=="GET":
+        return get_az_log_severity(request)
+    if request.method=="PUT":
+        return set_log_severity(request)
+    return get_bad_http_method()
+
+
+urlpatterns = patterns(
+    '',
+    url(r'^login/$', az_login_method_router),
+    url(r'^login/status/$', az_login_status_method_router),
+    url(r'^logout/$', az_logout_method_router),
+    url(r'^nicconfig/$', az_nicconfig_method_router),
+    url(r'^nicpoller/status/$', az_nicpoller_status_method_router),
+    url(r'^nicpoller/$', az_nicpoller_method_router),
+    url(r'^nictrigger/$', az_nictrigger_method_router),
+    url(r'^udrpoller/$', az_udrpoller_method_router),
+    url(r'^udrpoller/status/$', az_udrpoller_status_method_router),
+    url(r'^udrconfig/$', az_udrconfig_method_router),
+    url(r'^logfile/$', az_logfile_method_router),
+    url(r'^log/$', az_log_method_router),
+    url(r'^log/status/$', az_log_status_method_router),
+    url(r'^log/severity/$', az_log_severity_method_router),
+)
\ No newline at end of file
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/urls.py
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/urls.py	(revision 39037)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/hive/cloud/urls.py	(working copy)
@@ -1,122 +1,8 @@
-from django.http import HttpResponse
-import json
+from django.conf.urls import include
 from django.conf.urls import patterns, url
-from hive.cloud.aws_basic_view import (
-    post_aws_credential,
-    get_aws_credential,
-    delete_aws_credential
-)
-from hive.cloud.aws_eni_view import (
-    get_eniconfig,
-    post_eniconfig,
-    delete_eniconfig,
-    post_failover,
-    post_recover,
-    get_ha_status,
-    post_ha_status
-)
-from hive.cloud.aws_log_view import (
-    get_log_buffer,
-    get_switcher,
-    post_switcher,
-    get_log_severity,
-    post_log_severity,
-    download_log_file as aws_download_log_file
-)
-
-
-def get_bad_http_method():
-    return HttpResponse(
-        json.dumps({"message": "Bad http method"}),
-        content_type="application/json",
-        status=400
-    )
-
-
-# aws router start
-
-def aws_credential_method_router(request):
-    if request.method == "GET":
-        return get_aws_credential(request)
-    elif request.method == "POST":
-        return post_aws_credential(request)
-    elif request.method == "DELETE":
-        return delete_aws_credential(request)
-    return get_bad_http_method()
-
-
-def aws_eniconfig_method_router(request):
-    if request.method == "GET":
-        return get_eniconfig(request)
-    elif request.method == "POST":
-        return post_eniconfig(request)
-    elif request.method == "DELETE":
-        return delete_eniconfig(request)
-    return get_bad_http_method()
-
-
-def aws_failover_method_router(request):
-    if request.method == "PUT":
-        return post_failover(request)
-    return get_bad_http_method()
-
-
-def aws_recover_method_router(request):
-    if request.method == "PUT":
-        return post_recover(request)
-    return get_bad_http_method()
-
-
-def aws_ha_status_method_router(request):
-    if request.method == "POST":
-        return post_ha_status(request)
-    elif request.method == "GET":
-        return get_ha_status(request)
-    return get_bad_http_method()
-
-
-def aws_log_buffer_method_router(request):
-    if request.method == "GET":
-        return get_log_buffer(request)
-    return get_bad_http_method()
-
-
-def aws_switcher_method_router(request):
-    if request.method == "GET":
-        return get_switcher(request)
-    elif request.method == "PUT":
-        return post_switcher(request)
-    return get_bad_http_method()
-
-
-def aws_log_severity_method_router(request):
-    if request.method == "GET":
-        return get_log_severity(request)
-    elif request.method == "PUT":
-        return post_log_severity(request)
-    return get_bad_http_method()
-
-
-def aws_log_file_method_router(request):
-    if request.method == "GET":
-        return download_log_file(request)
-    return get_bad_http_method()
-
-
-# aws router end
 
 urlpatterns = patterns(
     '',
-    # aws url start
-    url(r'^aws/credential/$', aws_credential_method_router),
-    url(r'^aws/eniconfig/$', aws_eniconfig_method_router),
-    url(r'^aws/failover/$', aws_failover_method_router),
-    url(r'^aws/recover/$', aws_recover_method_router),
-    url(r'^aws/ha/status/$', aws_ha_status_method_router),
-    url(r'^aws/log/buffer/$', aws_log_buffer_method_router),
-    url(r'^aws/log/status/$', aws_switcher_method_router),
-    url(r'^aws/log/severity/$', aws_log_severity_method_router),
-    url(r'^aws/log/file/$', aws_log_file_method_router),
-    # aws url end
-    
+    url(r'^aws/', include("hive.cloud.aws.urls")),
+    url(r'^az/', include("hive.cloud.az.urls")),
 )
\ No newline at end of file
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/locale/en/LC_MESSAGES/django.po
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/locale/en/LC_MESSAGES/django.po	(revision 39037)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/locale/en/LC_MESSAGES/django.po	(working copy)
@@ -5597,6 +5597,96 @@
 msgid "Authentication Server is required."
 msgstr ""
 
+msgid "Cloud"
+msgstr ""
+
+msgid "Log"
+msgstr ""
+
+msgid "Login Url"
+msgstr ""
+
+msgid "Logged in"
+msgstr ""
+
+msgid "Not logged in"
+msgstr ""
+
+msgid "Code"
+msgstr ""
+
+msgid "Internal error, please refresh the page."
+msgstr ""
+
+msgid "Refresh"
+msgstr ""
+
+msgid "Log Out"
+msgstr ""
+
+msgid "Your authentication code will expire in 60 seconds."
+msgstr ""
+
+msgid "Please use the following information to sign in immediately."
+msgstr ""
+
+msgid "WARNING: To sign in, use a web browser to open the page %s "
+msgstr ""
+
+msgid " and enter the code "
+msgstr ""
+
+msgid " to authenticate."
+msgstr ""
+
+msgid "Manual Trigger"
+msgstr ""
+
+msgid "Failover"
+msgstr ""
+
+msgid "Recover"
+msgstr ""
+
+msgid "Sub ID"
+msgstr ""
+
+msgid "Resource Grop Name"
+msgstr ""
+
+msgid "Source NIC Name"
+msgstr ""
+
+msgid "Destination NIC Name"
+msgstr ""
+
+msgid "Monitored VM Name"
+msgstr ""
+
+msgid "Target IP When Running"
+msgstr ""
+
+msgid "Target IP When Deallocated"
+msgstr ""
+
+msgid "Level"
+msgstr ""
+
+msgid "Debug"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
+msgid "Download"
+msgstr ""
+
+msgid "On"
+msgstr ""
+
+msgid "Off"
+msgstr ""
+
 #~ msgid "Graphs"
 #~ msgstr ""
 
@@ -5639,7 +5729,7 @@
 #~ msgid "©2021 Beijing Array Networks, Inc."
 #~ msgstr ""
 
-#~ msgid "©2021 Array Networks, Inc."
+#~ msgid "©2025 Array Networks, Inc."
 #~ msgstr ""
 
 #~ msgid "Signin"
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/locale/ja/LC_MESSAGES/django.po
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/locale/ja/LC_MESSAGES/django.po	(revision 39037)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/locale/ja/LC_MESSAGES/django.po	(working copy)
@@ -5645,6 +5645,96 @@
 msgid "Authentication Server is required."
 msgstr "認証サーバーは必要です。"
 
+msgid "Cloud"
+msgstr "クラウドサービス"
+
+msgid "Log"
+msgstr "ログ"
+
+msgid "Login Url"
+msgstr "ログインURL"
+
+msgid "Logged in"
+msgstr "ログイン済み"
+
+msgid "Not logged in"
+msgstr "ログインしていません"
+
+msgid "Code"
+msgstr "コード"
+
+msgid "Internal error, please refresh the page."
+msgstr "内部エラーが発生しました。ページを再読み込みしてください。"
+
+msgid "Refresh"
+msgstr "更新効力"
+
+msgid "Log Out"
+msgstr "ログアウト"
+
+msgid "Your authentication code will expire in 60 seconds."
+msgstr "ログイン認証情報は60秒以内に失効します。"
+
+msgid "Please use the following information to sign in immediately."
+msgstr "直ちに以下の情報を使用してログインしてください。"
+
+msgid "WARNING: To sign in, use a web browser to open the page %s "
+msgstr "注意：ブラウザで %s を開き、"
+
+msgid " and enter the code "
+msgstr "コード「"
+
+msgid " to authenticate."
+msgstr "」を入力して認証を行ってください。"
+
+msgid "Manual Trigger"
+msgstr "手動で起動する"
+
+msgid "Failover"
+msgstr "フェイルオーバー"
+
+msgid "Recover"
+msgstr "復旧"
+
+msgid "Sub ID"
+msgstr "購読ID"
+
+msgid "Resource Grop Name"
+msgstr "リソースグループ名"
+
+msgid "Source NIC Name"
+msgstr "ソースNIC名"
+
+msgid "Destination NIC Name"
+msgstr "宛先NIC名"
+
+msgid "Monitored VM Name"
+msgstr "監視されたVMの名前"
+
+msgid "Target IP When Running"
+msgstr "実行中のターゲットIP"
+
+msgid "Target IP When Deallocated"
+msgstr "解放時のターゲットIP"
+
+msgid "Level"
+msgstr "レベル"
+
+msgid "Debug"
+msgstr "デバッグ"
+
+msgid "Info"
+msgstr "情報"
+
+msgid "Download"
+msgstr "ダウンロード"
+
+msgid "On"
+msgstr "開く"
+
+msgid "Off"
+msgstr "閉じる"
+
 #~ msgid "L2 Bridge"
 #~ msgstr "L2ブリッジ"
 
@@ -5715,7 +5805,7 @@
 #~ msgid "©2021 Beijing Array Networks, Inc."
 #~ msgstr ""
 
-#~ msgid "©2023 Array Networks, Inc."
+#~ msgid "©2025 Array Networks, Inc."
 #~ msgstr ""
 
 #~ msgid "Signin"
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/locale/zh_CN/LC_MESSAGES/django.po
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/locale/zh_CN/LC_MESSAGES/django.po	(revision 39037)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/locale/zh_CN/LC_MESSAGES/django.po	(working copy)
@@ -5627,6 +5627,96 @@
 msgid "Authentication Server is required."
 msgstr "认证服务器不能为空。"
 
+msgid "Cloud"
+msgstr "云服务"
+
+msgid "Log"
+msgstr "日志"
+
+msgid "Login Url"
+msgstr "登录网址"
+
+msgid "Logged in"
+msgstr "已登录"
+
+msgid "Not logged in"
+msgstr "未登录"
+
+msgid "Code"
+msgstr "代码"
+
+msgid "Internal error, please refresh the page."
+msgstr "内部错误，请刷新页面。"
+
+msgid "Refresh"
+msgstr "刷新效力"
+
+msgid "Log Out"
+msgstr "登出"
+
+msgid "Your authentication code will expire in 60 seconds."
+msgstr "登录凭证将在 60 秒内过期，"
+
+msgid "Please use the following information to sign in immediately."
+msgstr "请立即使用以下信息登录。"
+
+msgid "WARNING: To sign in, use a web browser to open the page %s "
+msgstr "提醒：请使用浏览器打开 %s 进行登录操作，"
+
+msgid " and enter the code "
+msgstr "输入代码「"
+
+msgid " to authenticate."
+msgstr "」进行验证。"
+
+msgid "Manual Trigger"
+msgstr "手动触发"
+
+msgid "Failover"
+msgstr "失效转移"
+
+msgid "Recover"
+msgstr "恢复"
+
+msgid "Sub ID"
+msgstr "订阅ID"
+
+msgid "Resource Grop Name"
+msgstr "资源组名称"
+
+msgid "Source NIC Name"
+msgstr "源网卡名称"
+
+msgid "Destination NIC Name"
+msgstr "目标网卡名称"
+
+msgid "Monitored VM Name"
+msgstr "监控的虚拟机名称"
+
+msgid "Target IP When Running"
+msgstr "運行時的目標IP"
+
+msgid "Target IP When Deallocated"
+msgstr "解除分配時的目標IP"
+
+msgid "Level"
+msgstr "级别"
+
+msgid "Debug"
+msgstr "调试"
+
+msgid "Info"
+msgstr "信息"
+
+msgid "Download"
+msgstr "下载"
+
+msgid "On"
+msgstr "开启"
+
+msgid "Off"
+msgstr "关闭"
+
 #~ msgid "Graphs"
 #~ msgstr "图表"
 
@@ -5645,8 +5735,8 @@
 #~ msgid "©2021 Beijing Array Networks, Inc."
 #~ msgstr "©2021 北京华耀科技有限公司"
 
-#~ msgid "©2021 Array Networks, Inc."
-#~ msgstr "©2021 Array Networks公司"
+#~ msgid "©2025 Array Networks, Inc."
+#~ msgstr "©2025 Array Networks公司"
 
 #~ msgid "Signin"
 #~ msgstr "登录"
Index: /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/locale/zh_TW/LC_MESSAGES/django.po
===================================================================
--- /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/locale/zh_TW/LC_MESSAGES/django.po	(revision 39037)
+++ /branches/rel_apv_10_7_3/usr/click/webui/htdocs/new/src/locale/zh_TW/LC_MESSAGES/django.po	(working copy)
@@ -1,5 +1,5 @@
 # Chinese (Simplified, China) translations for APV WebUI.
-# Copyright (C) 2020 Array Networks Inc.
+# Copyright (C) 2025 Array Networks Inc.
 # This file is distributed under the same license as the APV WebUI project.
 # Li Qian , 2015.
 #
@@ -5635,6 +5635,96 @@
 msgid "Authentication Server is required."
 msgstr "認證服務器不能為空。"
 
+msgid "Cloud"
+msgstr "雲端服務"
+
+msgid "Log"
+msgstr "日誌"
+
+msgid "Login Url"
+msgstr "登入網址"
+
+msgid "Logged in"
+msgstr "已登入"
+
+msgid "Not logged in"
+msgstr "未登入"
+
+msgid "Code"
+msgstr "代碼"
+
+msgid "Internal error, please refresh the page."
+msgstr "內部錯誤，請重新整理網頁。"
+
+msgid "Refresh"
+msgstr "刷新時效"
+
+msgid "Log Out"
+msgstr "登出"
+
+msgid "Your authentication code will expire in 60 seconds."
+msgstr "登入憑證將在 60 秒內過期，"
+
+msgid "Please use the following information to sign in immediately."
+msgstr "請立刻用下列資訊登入。"
+
+msgid "WARNING: To sign in, use a web browser to open the page %s "
+msgstr "提醒：請用瀏覽器開啟 %s 進行登入動作，"
+
+msgid " and enter the code "
+msgstr "輸入代碼「"
+
+msgid " to authenticate."
+msgstr "」以進行驗證。"
+
+msgid "Manual Trigger"
+msgstr "手動觸發"
+
+msgid "Failover"
+msgstr "故障切換"
+
+msgid "Recover"
+msgstr "恢復"
+
+msgid "Sub ID"
+msgstr "訂閱ID"
+
+msgid "Resource Grop Name"
+msgstr "資源群組名稱"
+
+msgid "Source NIC Name"
+msgstr "源網卡名稱"
+
+msgid "Destination NIC Name"
+msgstr "目標網卡名稱"
+
+msgid "Monitored VM Name"
+msgstr "監控的虛擬機名稱"
+
+msgid "Target IP When Running"
+msgstr "執行時的目標IP"
+
+msgid "Target IP When Deallocated"
+msgstr "解除配置時的目標IP"
+
+msgid "Level"
+msgstr "級別"
+
+msgid "Debug"
+msgstr "除錯"
+
+msgid "Info"
+msgstr "一般訊息"
+
+msgid "Download"
+msgstr "下載"
+
+msgid "On"
+msgstr "開啟"
+
+msgid "Off"
+msgstr "關閉"
+
 #~ msgid "Graphs"
 #~ msgstr "圖表"
 
@@ -5677,7 +5767,7 @@
 #~ msgid "©2021 Beijing Array Networks, Inc."
 #~ msgstr ""
 
-#~ msgid "©2021 Array Networks, Inc."
+#~ msgid "©2025 Array Networks, Inc."
 #~ msgstr ""
 
 #~ msgid "Signin"