github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Update some bug

pull/417/head
ibuler 2017-04-04 21:47:58 +08:00
parent 5a5d5bdd51
commit be09db059d
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/assets/tasks.py
View File

@ -53,14 +53,17 @@ def update_assets_hardware_info(assets):
asset.save() asset.save()
@shared_task(name="asset_test_ping_check") @shared_task
def asset_test_ping_check(assets): def test_admin_user_connective(assets=None):
if None:
assets = Asset.objects.filter(type__in=['Server', 'VM'])
if not assets:
return 'No asset get'
task_tuple = ( task_tuple = (
('ping', ''), ('ping', ''),
) )
hoc = AdHocRunner(assets) summary, result = run_AdHoc(task_tuple, assets, record=False)
result = hoc.run(task_tuple) return summary, result
return result['contacted'].keys(), result['dark'].keys()
def get_assets_hardware_info(assets): def get_assets_hardware_info(assets):

1
apps/assets/urls/views_urls.py
View File

@ -14,7 +14,6 @@ urlpatterns = [
url(r'^asset/(?P<pk>[0-9]+)/$', views.AssetDetailView.as_view(), name='asset-detail'), url(r'^asset/(?P<pk>[0-9]+)/$', views.AssetDetailView.as_view(), name='asset-detail'),
url(r'^asset/(?P<pk>[0-9]+)/update/$', views.AssetUpdateView.as_view(), name='asset-update'), url(r'^asset/(?P<pk>[0-9]+)/update/$', views.AssetUpdateView.as_view(), name='asset-update'),
url(r'^asset/(?P<pk>[0-9]+)/delete/$', views.AssetDeleteView.as_view(), name='asset-delete'), url(r'^asset/(?P<pk>[0-9]+)/delete/$', views.AssetDeleteView.as_view(), name='asset-delete'),
url(r'^asset/(?P<pk>[0-9]+)/refresh/$', views.AssetRefreshHardwareView.as_view(), name='asset-refresh'),
url(r'^asset-modal$', views.AssetModalListView.as_view(), name='asset-modal-list'), url(r'^asset-modal$', views.AssetModalListView.as_view(), name='asset-modal-list'),
url(r'^asset-modal-update$', views.AssetModalCreateView.as_view(), name='asset-modal-update'), url(r'^asset-modal-update$', views.AssetModalCreateView.as_view(), name='asset-modal-update'),

10
apps/assets/views/asset.py
View File

@ -32,7 +32,7 @@ from ..tasks import update_assets_hardware_info
__all__ = ['AssetListView', 'AssetCreateView', 'AssetUpdateView', __all__ = ['AssetListView', 'AssetCreateView', 'AssetUpdateView',
'UserAssetListView', 'AssetModalCreateView', 'AssetDetailView', 'UserAssetListView', 'AssetModalCreateView', 'AssetDetailView',
'AssetModalListView', 'AssetDeleteView', 'AssetExportView', 'AssetModalListView', 'AssetDeleteView', 'AssetExportView',
'BulkImportAssetView', 'AssetRefreshHardwareView', 'BulkImportAssetView',
] ]
@ -329,11 +329,3 @@ class BulkImportAssetView(AdminUserRequiredMixin, JSONResponseMixin, FormView):
return self.render_json_response(data) return self.render_json_response(data)
class AssetRefreshHardwareView(AdminUserRequiredMixin, View):
def get(self, request, *args, **kwargs):
asset_id = kwargs.get('pk')
asset = get_object_or_404(Asset, pk=asset_id)
update_assets_hardware_info([asset])
return redirect(reverse('assets:asset-detail', kwargs={'pk': asset_id}))