AETHER-3262 Update for upgrade
- Update edge-mon-agent.service for config path change
- Update edge-mon-agent.service to use venv
- Set pycurl version to 7.43
- Fix report error when UP test failed
- Fix log error when inband report is disabled
Change-Id: Ib345d7119d586cc1a965ce07be439c73bd824fdd
diff --git a/VERSION b/VERSION
index 88a7b22..a48658c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.7.12
+0.7.13
diff --git a/edge-monitoring/agent_modem/edge-mon-agent.service b/edge-monitoring/agent_modem/edge-mon-agent.service
index 8f80c05..5d24c3d 100644
--- a/edge-monitoring/agent_modem/edge-mon-agent.service
+++ b/edge-monitoring/agent_modem/edge-mon-agent.service
@@ -3,9 +3,9 @@
After=multi-user.target
[Service]
-Environment=CONFIG_FILE=/home/pi/Aether/aether-monitoring/edge-monitoring/agent_modem/config.json
+Environment=CONFIG_FILE=/etc/aether/monitoring/config.json
Type=simple
-ExecStart=/home/pi/Aether/aether-monitoring/edge-monitoring/agent_modem/edge_monitoring_agent_modem.py
+ExecStart=/home/pi/Aether/venv/bin/python /home/pi/Aether/aether-monitoring/edge-monitoring/agent_modem/edge_monitoring_agent_modem.py
Restart=on-failure
ExecStartPre=/bin/sleep 5
diff --git a/edge-monitoring/agent_modem/edge_monitoring_agent_modem.py b/edge-monitoring/agent_modem/edge_monitoring_agent_modem.py
index 7b0739c..0fe16d0 100755
--- a/edge-monitoring/agent_modem/edge_monitoring_agent_modem.py
+++ b/edge-monitoring/agent_modem/edge_monitoring_agent_modem.py
@@ -479,7 +479,8 @@
elif report_via_given_iface: # report over given interface
interface = CONF.report_iface
c.setopt(pycurl.INTERFACE, interface)
- # else, reports over default interface
+ else:
+ interface = "default"
try:
c.perform()
@@ -612,6 +613,8 @@
# If either of the ping tests pass, then declare user plane connected
if dry_run_ping_result or ping_result:
up_state = State.connected
+ else:
+ up_state = State.disconnected
speedtest_iperf = iperf_test(counters)
diff --git a/edge-monitoring/agent_modem/requirements.txt b/edge-monitoring/agent_modem/requirements.txt
index d2b8396..b058718 100644
--- a/edge-monitoring/agent_modem/requirements.txt
+++ b/edge-monitoring/agent_modem/requirements.txt
@@ -4,4 +4,4 @@
requests
pyserial
-pycurl
+pycurl==7.43