On first call to energy recording API, if API
is unreachable, SDK don't do anything anymore.
This change add logs on error for this first connection.
Change-Id: I88892c769d6208c6ddf5d714d438ab584826844e
Signed-off-by: Benoit HERARD <benoit.herard@orange.com>
INITIAL_STEP = "running"
# Default connection timeout
INITIAL_STEP = "running"
# Default connection timeout
- CONNECTION_TIMOUT = urllib3.Timeout(connect=1, read=3)
+ CONNECTION_TIMEOUT = urllib3.Timeout(connect=1, read=3)
@staticmethod
def load_config():
@staticmethod
def load_config():
headers={
'content-type': 'application/json'
},
headers={
'content-type': 'application/json'
},
- timeout=EnergyRecorder.CONNECTION_TIMOUT)
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT)
api_available = json.loads(resp.text)["status"] == "OK"
api_available = json.loads(resp.text)["status"] == "OK"
- except Exception: # pylint: disable=broad-except
- EnergyRecorder.logger.error(
- "Energy recorder API is not available")
+ except Exception as exc: # pylint: disable=broad-except
+ EnergyRecorder.logger.info(
+ "Energy recorder API is not available, cause=%s",
+ exc.message)
api_available = False
# Final config
EnergyRecorder.energy_recorder_api = {
api_available = False
# Final config
EnergyRecorder.energy_recorder_api = {
headers={
'content-type': 'application/json'
},
headers={
'content-type': 'application/json'
},
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
if response.status_code != 200:
EnergyRecorder.logger.error(
)
if response.status_code != 200:
EnergyRecorder.logger.error(
headers={
'content-type': 'application/json'
},
headers={
'content-type': 'application/json'
},
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
if response.status_code != 200:
EnergyRecorder.logger.error(
)
if response.status_code != 200:
EnergyRecorder.logger.error(
headers={
'content-type': 'application/json'
},
headers={
'content-type': 'application/json'
},
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
if response.status_code != 200:
EnergyRecorder.logger.error(
)
if response.status_code != 200:
EnergyRecorder.logger.error(
response = requests.get(
EnergyRecorder.energy_recorder_api["uri"],
auth=EnergyRecorder.energy_recorder_api["auth"],
response = requests.get(
EnergyRecorder.energy_recorder_api["uri"],
auth=EnergyRecorder.energy_recorder_api["auth"],
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
if response.status_code == 200:
return_value = json.loads(response.text)
)
if response.status_code == 200:
return_value = json.loads(response.text)
auth=EnergyRecorder.energy_recorder_api["auth"],
data=mock.ANY,
headers=self.request_headers,
auth=EnergyRecorder.energy_recorder_api["auth"],
data=mock.ANY,
headers=self.request_headers,
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
@mock.patch('functest.energy.energy.requests.post',
)
@mock.patch('functest.energy.energy.requests.post',
auth=EnergyRecorder.energy_recorder_api["auth"],
data=mock.ANY,
headers=self.request_headers,
auth=EnergyRecorder.energy_recorder_api["auth"],
data=mock.ANY,
headers=self.request_headers,
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
@mock.patch('functest.energy.energy.requests.post',
)
@mock.patch('functest.energy.energy.requests.post',
auth=EnergyRecorder.energy_recorder_api["auth"],
data=mock.ANY,
headers=self.request_headers,
auth=EnergyRecorder.energy_recorder_api["auth"],
data=mock.ANY,
headers=self.request_headers,
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
@mock.patch('functest.energy.energy.requests.post',
)
@mock.patch('functest.energy.energy.requests.post',
auth=EnergyRecorder.energy_recorder_api["auth"],
data=mock.ANY,
headers=self.request_headers,
auth=EnergyRecorder.energy_recorder_api["auth"],
data=mock.ANY,
headers=self.request_headers,
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
@mock.patch('functest.energy.energy.requests.post',
)
@mock.patch('functest.energy.energy.requests.post',
auth=EnergyRecorder.energy_recorder_api["auth"],
data=mock.ANY,
headers=self.request_headers,
auth=EnergyRecorder.energy_recorder_api["auth"],
data=mock.ANY,
headers=self.request_headers,
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
@mock.patch('functest.energy.energy.requests.post',
)
@mock.patch('functest.energy.energy.requests.post',
auth=EnergyRecorder.energy_recorder_api["auth"],
data=mock.ANY,
headers=self.request_headers,
auth=EnergyRecorder.energy_recorder_api["auth"],
data=mock.ANY,
headers=self.request_headers,
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
@mock.patch('functest.energy.energy.requests.delete',
)
@mock.patch('functest.energy.energy.requests.delete',
EnergyRecorder.energy_recorder_api["uri"],
auth=EnergyRecorder.energy_recorder_api["auth"],
headers=self.request_headers,
EnergyRecorder.energy_recorder_api["uri"],
auth=EnergyRecorder.energy_recorder_api["auth"],
headers=self.request_headers,
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
@mock.patch('functest.energy.energy.requests.delete',
)
@mock.patch('functest.energy.energy.requests.delete',
EnergyRecorder.energy_recorder_api["uri"],
auth=EnergyRecorder.energy_recorder_api["auth"],
headers=self.request_headers,
EnergyRecorder.energy_recorder_api["uri"],
auth=EnergyRecorder.energy_recorder_api["auth"],
headers=self.request_headers,
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
@mock.patch('functest.energy.energy.requests.delete',
)
@mock.patch('functest.energy.energy.requests.delete',
EnergyRecorder.energy_recorder_api["uri"],
auth=EnergyRecorder.energy_recorder_api["auth"],
headers=self.request_headers,
EnergyRecorder.energy_recorder_api["uri"],
auth=EnergyRecorder.energy_recorder_api["auth"],
headers=self.request_headers,
- timeout=EnergyRecorder.CONNECTION_TIMOUT
+ timeout=EnergyRecorder.CONNECTION_TIMEOUT
)
@energy.enable_recording
)
@energy.enable_recording