Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
be09db05
J
jumpserver
项目概览
gjl2004yn
/
jumpserver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jumpserver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
be09db05
编写于
4月 04, 2017
作者:
baltery
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update some bug
上级
5a5d5bdd
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
9 addition
and
15 deletion
+9
-15
apps/assets/tasks.py
apps/assets/tasks.py
+8
-5
apps/assets/urls/views_urls.py
apps/assets/urls/views_urls.py
+0
-1
apps/assets/views/asset.py
apps/assets/views/asset.py
+1
-9
未找到文件。
apps/assets/tasks.py
浏览文件 @
be09db05
...
...
@@ -53,14 +53,17 @@ def update_assets_hardware_info(assets):
asset
.
save
()
@
shared_task
(
name
=
"asset_test_ping_check"
)
def
asset_test_ping_check
(
assets
):
@
shared_task
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
=
(
(
'ping'
,
''
),
)
hoc
=
AdHocRunner
(
assets
)
result
=
hoc
.
run
(
task_tuple
)
return
result
[
'contacted'
].
keys
(),
result
[
'dark'
].
keys
()
summary
,
result
=
run_AdHoc
(
task_tuple
,
assets
,
record
=
False
)
return
summary
,
result
def
get_assets_hardware_info
(
assets
):
...
...
apps/assets/urls/views_urls.py
浏览文件 @
be09db05
...
...
@@ -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]+)/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]+)/refresh/$'
,
views
.
AssetRefreshHardwareView
.
as_view
(),
name
=
'asset-refresh'
),
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'
),
...
...
apps/assets/views/asset.py
浏览文件 @
be09db05
...
...
@@ -32,7 +32,7 @@ from ..tasks import update_assets_hardware_info
__all__
=
[
'AssetListView'
,
'AssetCreateView'
,
'AssetUpdateView'
,
'UserAssetListView'
,
'AssetModalCreateView'
,
'AssetDetailView'
,
'AssetModalListView'
,
'AssetDeleteView'
,
'AssetExportView'
,
'BulkImportAssetView'
,
'AssetRefreshHardwareView'
,
'BulkImportAssetView'
,
]
...
...
@@ -329,11 +329,3 @@ class BulkImportAssetView(AdminUserRequiredMixin, JSONResponseMixin, FormView):
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
}))
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录