Code Review
/
ric-plt
/
a1.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Testcase for Policy type Creation
[ric-plt/a1.git]
/
a1
/
controller.py
diff --git
a/a1/controller.py
b/a1/controller.py
index
24c9e8e
..
19b8a26
100644
(file)
--- a/
a1/controller.py
+++ b/
a1/controller.py
@@
-27,7
+27,9
@@
from a1 import a1rmr, exceptions, data
mdc_logger = Logger(name=__name__)
mdc_logger = Logger(name=__name__)
-request_counter = Counter('policy_requests', 'Policy type and instance requests', ['action', 'target'])
+mdc_logger.mdclog_format_init(configmap_monitor=True)
+
+a1_counters = Counter('A1Policy', 'Policy type and instance counters', ['counter'])
def _log_build_http_resp(exception, http_resp_code):
def _log_build_http_resp(exception, http_resp_code):
@@
-75,10
+77,10
@@
def get_healthcheck():
3. checks that our SDL connection is healthy
"""
if not a1rmr.healthcheck_rmr_thread():
3. checks that our SDL connection is healthy
"""
if not a1rmr.healthcheck_rmr_thread():
- mdc_logger.
debug
("A1 is not healthy due to the rmr thread")
+ mdc_logger.
error
("A1 is not healthy due to the rmr thread")
return "rmr thread is unhealthy", 500
if not data.SDL.healthcheck():
return "rmr thread is unhealthy", 500
if not data.SDL.healthcheck():
- mdc_logger.
debug
("A1 is not healthy because it does not have a connection to SDL")
+ mdc_logger.
error
("A1 is not healthy because it does not have a connection to SDL")
return "sdl connection is unhealthy", 500
return "", 200
return "sdl connection is unhealthy", 500
return "", 200
@@
-97,7
+99,7
@@
def create_policy_type(policy_type_id):
"""
Handles PUT /a1-p/policytypes/policy_type_id
"""
"""
Handles PUT /a1-p/policytypes/policy_type_id
"""
-
request_counter.labels(action='create', target='policy_type
').inc()
+
a1_counters.labels(counter='CreatePolicyTypeReqs
').inc()
def put_type_handler():
data.store_policy_type(policy_type_id, body)
def put_type_handler():
data.store_policy_type(policy_type_id, body)
@@
-119,7
+121,7
@@
def delete_policy_type(policy_type_id):
"""
Handles DELETE /a1-p/policytypes/policy_type_id
"""
"""
Handles DELETE /a1-p/policytypes/policy_type_id
"""
-
request_counter.labels(action='delete', target='policy_type
').inc()
+
a1_counters.labels(counter='DeletePolicyTypeReqs
').inc()
def delete_policy_type_handler():
data.delete_policy_type(policy_type_id)
def delete_policy_type_handler():
data.delete_policy_type(policy_type_id)
@@
-162,7
+164,7
@@
def create_or_replace_policy_instance(policy_type_id, policy_instance_id):
"""
Handles PUT /a1-p/policytypes/polidyid/policies/policy_instance_id
"""
"""
Handles PUT /a1-p/policytypes/polidyid/policies/policy_instance_id
"""
-
request_counter.labels(action='create', target='policy_inst
').inc()
+
a1_counters.labels(counter='CreatePolicyInstanceReqs
').inc()
instance = connexion.request.json
def put_instance_handler():
instance = connexion.request.json
def put_instance_handler():
@@
-190,7
+192,7
@@
def delete_policy_instance(policy_type_id, policy_instance_id):
"""
Handles DELETE /a1-p/policytypes/polidyid/policies/policy_instance_id
"""
"""
Handles DELETE /a1-p/policytypes/polidyid/policies/policy_instance_id
"""
-
request_counter.labels(action='delete', target='policy_inst
').inc()
+
a1_counters.labels(counter='DeletePolicyInstanceReqs
').inc()
def delete_instance_handler():
data.delete_policy_instance(policy_type_id, policy_instance_id)
def delete_instance_handler():
data.delete_policy_instance(policy_type_id, policy_instance_id)