@@ -80,45 +66,7 @@
});
}
enableSwitch.on('switch-change', function(e, data) {
- if (is_init < 2) {
- return;
- }
- $('#frame_model_main .btn-static').fadeIn("slow");
- if ($(".btn-static").is(":visible")) {
- var buttonH = $(".btn-static").offset().top;
- $(function(){
- $(window).scroll(function(){
- var scrollH = $(this).scrollTop();
- if (scrollH >= buttonH) {
- $(".btn-switch").addClass("btn-fixed");
- }else{
- $(".btn-switch").removeClass("btn-fixed");
- }
- });
- });
- }
- });
- $('.select-level').selectpicker();
- getLogLevel();
- function getLogLevel() {
- $.ajax({
- url: '/api/v1/cloud/az/log/severity/',
- type: 'GET',
- dataType: 'json',
- success: function (res) {
- if (typeof(res["severity"]) == "undefined") {
- return;
- }
- $('.select-level').selectpicker("val", res["severity"]);
- is_init++;
- },
- error: function (xhr, textStatus, errorThrown) {
- console.log(textStatus + "," + errorThrown + "," + xhr.responseText);
- }
- });
- }
- $(".select-level").change(function() {
- if (is_init < 2) {
+ if (is_init < 1) {
return;
}
$('#frame_model_main .btn-static').fadeIn("slow");
@@ -159,20 +107,6 @@
},
error: function (xhr, textStatus, errorThrown) {
console.log(textStatus + "," + errorThrown + "," + xhr.responseText);
- }
- }));
- ajaxes.push($.ajax({
- url: '/api/v1/cloud/az/log/severity/',
- type: 'PUT',
- dataType: 'json',
- data: JSON.stringify({
- severity: $(".select-level").selectpicker('val')
- }),
- success: function (res) {
- refreshPage();
- },
- error: function (xhr, textStatus, errorThrown) {
- console.log(textStatus + "," + errorThrown + "," + xhr.responseText);
}
}));
$.when.apply($, ajaxes)
Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/hive/cloud/aws/aws_log_view.py
===================================================================
--- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/hive/cloud/aws/aws_log_view.py (revision 39070)
+++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/hive/cloud/aws/aws_log_view.py (working copy)
@@ -6,6 +6,7 @@
from hive.utils import aninfo, anerror
+cloud_type = "aws"
def validate_input(data, required_keys):
"""Validates if the required keys are present in the input data."""
@@ -48,7 +49,7 @@
Returns:
HttpResponse: A response containing the log buffer.
"""
- command = "python3 /ca/bin/aws/LoggerManager.py -mode show"
+ command = "python3 /ca/bin/cloud_logger/LoggerManager.py -t %s -mode show" % cloud_type
try:
log_buffer = run_command(command)
return create_json_response({"msg": log_buffer}, 200)
@@ -70,7 +71,7 @@
"True\n": 1,
"False\n": 0
}
- command = "python3 /ca/bin/aws/LoggerManager.py -mode status"
+ command = "python3 /ca/bin/cloud_logger/LoggerManager.py -t %s -mode status" % cloud_type
try:
switcher = run_command(command)
return create_json_response({"status": output_map[switcher]}, 200)
@@ -112,57 +113,6 @@
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.
@@ -170,7 +120,7 @@
Returns:
HttpResponse: A response containing the log file.
"""
- command = "python3 /ca/bin/aws/LoggerManager.py -mode getlogpath"
+ command = "python3 /ca/bin/cloud_logger/LoggerManager.py -t %s -mode getlogpath" % cloud_type
try:
log_file_path = run_command(command)
log_file_path = log_file_path.replace("\n", "")
Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/hive/cloud/aws/urls.py
===================================================================
--- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/hive/cloud/aws/urls.py (revision 39070)
+++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/hive/cloud/aws/urls.py (working copy)
@@ -21,8 +21,6 @@
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
)
@@ -90,14 +88,6 @@
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)
@@ -114,6 +104,5 @@
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/usr/click/webui/htdocs/new/src/hive/cloud/az/az_log_view.py
===================================================================
--- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/hive/cloud/az/az_log_view.py (revision 39070)
+++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/hive/cloud/az/az_log_view.py (working copy)
@@ -4,9 +4,10 @@
from hive.utils import aninfo, anerror
+cloud_type = "azure"
def get_all_log(request):
- command = "python3 /ca/bin/azure/LoggerManager.py -mode show"
+ command = "python3 /ca/bin/cloud_logger/LoggerManager.py -t %s -mode show" % cloud_type
res = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdout, stderr = res.communicate()
if stderr:
@@ -24,7 +25,7 @@
)
def download_log_file(request):
- command = "python3 /ca/bin/azure/LoggerManager.py -mode getlogpath"
+ command = "python3 /ca/bin/cloud_logger/LoggerManager.py -t %s -mode getlogpath" % cloud_type
res = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdout, stderr = res.communicate()
if stderr:
@@ -64,57 +65,9 @@
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"
+ """This method is used to check if az tool log functionality is on or off."""
+ command = "python3 /ca/bin/cloud_logger/LoggerManager.py -t %s -mode status" % cloud_type
res = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdout, stderr = res.communicate()
if stderr:
@@ -133,7 +86,7 @@
)
def switch_log_status(request):
- '''This method is used to set az tool log functionality to on or off.'''
+ """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)
Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/hive/cloud/az/urls.py
===================================================================
--- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/hive/cloud/az/urls.py (revision 39070)
+++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/hive/cloud/az/urls.py (working copy)
@@ -27,9 +27,7 @@
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
+ switch_log_status
)
@@ -127,14 +125,6 @@
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),
@@ -150,5 +140,4 @@
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