Commit 58efab83 authored by Tien-Thinh Nguyen's avatar Tien-Thinh Nguyen

Merge branch 'fix_ausf' into 'develop'

Fix issue to get correct response from AUSF

See merge request oai/cn5g/oai-cn5g-amf!38
parents e85ba2df 696ae1e4
...@@ -147,7 +147,7 @@ pipeline { ...@@ -147,7 +147,7 @@ pipeline {
sh 'sed -e "s#AMF_IMAGE_TAG#' + amfTag + '#" ci-scripts/dsTesterDockerCompose/docker-compose.tplt > ci-scripts/dsTesterDockerCompose/docker-compose.yml' sh 'sed -e "s#AMF_IMAGE_TAG#' + amfTag + '#" ci-scripts/dsTesterDockerCompose/docker-compose.tplt > ci-scripts/dsTesterDockerCompose/docker-compose.yml'
dir('ci-scripts/dsTesterDockerCompose') { dir('ci-scripts/dsTesterDockerCompose') {
sh 'docker-compose up -d > ../../archives/compose_amf_up.log 2>&1' sh 'docker-compose up -d > ../../archives/compose_amf_up.log 2>&1'
sh 'sleep 60' sh 'sleep 100'
// Do a check on number of healthy containers // Do a check on number of healthy containers
// 2 == mysql + amf // 2 == mysql + amf
ret = sh returnStdout: true, script: 'docker-compose ps -a | grep -v unhealthy | grep -c healthy || true' ret = sh returnStdout: true, script: 'docker-compose ps -a | grep -v unhealthy | grep -c healthy || true'
......
...@@ -1072,7 +1072,7 @@ void amf_n11::curl_http_client( ...@@ -1072,7 +1072,7 @@ void amf_n11::curl_http_client(
curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &httpCode); curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &httpCode);
// get the response // get the response
std::string response = *httpData.get(); response = *httpData.get();
std::string json_data_response = {}; std::string json_data_response = {};
std::string resMsg = {}; std::string resMsg = {};
bool is_response_ok = true; bool is_response_ok = true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment