diff --git a/abonapp/locale/ru/LC_MESSAGES/django.po b/abonapp/locale/ru/LC_MESSAGES/django.po
index 63f19d5..7e81d54 100644
--- a/abonapp/locale/ru/LC_MESSAGES/django.po
+++ b/abonapp/locale/ru/LC_MESSAGES/django.po
@@ -948,3 +948,6 @@ msgstr "Привязать услуги к этой группе"
msgid "User that is no staff can not buy admin services"
msgstr "Пользователь, который не является персоналом не может покупать услуги для внутренних нужд"
+
+msgid "Ip not passed"
+msgstr "Ip адрес не передан"
diff --git a/abonapp/views.py b/abonapp/views.py
index a08d9ea..b47f23d 100644
--- a/abonapp/views.py
+++ b/abonapp/views.py
@@ -738,6 +738,8 @@ def abon_ping(request):
status = False
text = ' %s' % _('no ping')
try:
+ if ip is None:
+ raise mydefs.LogicError(_('Ip not passed'))
tm = Transmitter()
ping_result = tm.ping(ip)
if ping_result is None:
@@ -756,7 +758,7 @@ def abon_ping(request):
text = ' %s' % _('ping ok') + ' ' + str(ping_result)
status = True
- except NasFailedResult as e:
+ except (NasFailedResult, mydefs.LogicError) as e:
messages.error(request, e)
except NasNetworkError as e:
messages.warning(request, e)
diff --git a/agent/core.py b/agent/core.py
index 4478149..8299755 100644
--- a/agent/core.py
+++ b/agent/core.py
@@ -97,7 +97,7 @@ class BaseTransmitter(metaclass=ABCMeta):
"""
@abstractmethod
- @check_input_type(TariffStruct)
+ @check_input_type(str)
def ping(self, host, count=10):
"""
:param host: ip адрес в текстовом виде, например '192.168.0.1'
diff --git a/agent/mod_mikrotik.py b/agent/mod_mikrotik.py
index 440a5b4..1924b14 100644
--- a/agent/mod_mikrotik.py
+++ b/agent/mod_mikrotik.py
@@ -162,7 +162,7 @@ class TransmitterManager(BaseTransmitter, metaclass=ABCMeta):
def _exec_cmd(self, cmd):
assert isinstance(cmd, list)
- result_iter = ''#self.ar.talk_iter(cmd)
+ result_iter = self.ar.talk_iter(cmd)
res = []
for rt in result_iter:
if rt[0] == '!trap':
@@ -172,7 +172,7 @@ class TransmitterManager(BaseTransmitter, metaclass=ABCMeta):
def _exec_cmd_iter(self, cmd):
assert isinstance(cmd, list)
- result_iter = ''#self.ar.talk_iter(cmd)
+ result_iter = self.ar.talk_iter(cmd)
for rt in result_iter:
if len(rt) < 2:
continue