diff --git a/connect.py b/connect.py
index b269eeb42..d0dc36796 100644
--- a/connect.py
+++ b/connect.py
@@ -22,11 +22,11 @@ os.environ['DJANGO_SETTINGS_MODULE'] = 'jumpserver.settings'
if django.get_version() != '1.6':
django.setup()
from django.contrib.sessions.models import Session
-from jumpserver.api import ServerError, User, Asset, PermRole, AssetGroup, get_object, mkdir, get_asset_info, get_role
+from jumpserver.api import ServerError, User, Asset, PermRole, AssetGroup, get_object, mkdir, get_asset_info
from jumpserver.api import logger, Log, TtyLog, get_role_key, CRYPTOR, bash, get_tmp_dir
from jperm.perm_api import gen_resource, get_group_asset_perm, get_group_user_perm, user_have_perm, PermRole
from jumpserver.settings import LOG_DIR
-from jperm.ansible_api import Command, MyRunner
+from jperm.ansible_api import MyRunner
# from jlog.log_api import escapeString
from jlog.models import ExecLog, FileLog
diff --git a/jasset/asset_api.py b/jasset/asset_api.py
index c3c966965..7edb391da 100644
--- a/jasset/asset_api.py
+++ b/jasset/asset_api.py
@@ -350,7 +350,6 @@ def get_ansible_asset_info(asset_ip, setup_info):
# asset_type = setup_info.get("ansible_system")
sn = setup_info.get("ansible_product_serial")
asset_info = [other_ip, mac, cpu, memory_format, disk, sn, system_type, system_version, brand, system_arch]
- print asset_info
return asset_info
@@ -358,6 +357,7 @@ def asset_ansible_update(obj_list, name=''):
resource = gen_resource(obj_list)
ansible_instance = MyRunner(resource)
ansible_asset_info = ansible_instance.run(module_name='setup', pattern='*')
+ logger.debug('获取硬件信息: %s' % ansible_asset_info)
for asset in obj_list:
try:
setup_info = ansible_asset_info['contacted'][asset.hostname]['ansible_facts']
@@ -365,7 +365,6 @@ def asset_ansible_update(obj_list, name=''):
continue
else:
asset_info = get_ansible_asset_info(asset.ip, setup_info)
- print asset
other_ip, mac, cpu, memory, disk, sn, system_type, system_version, brand, system_arch = asset_info
asset_dic = {"other_ip": other_ip,
"mac": mac,
diff --git a/jasset/views.py b/jasset/views.py
index 9eaa8beef..0d9e07c82 100644
--- a/jasset/views.py
+++ b/jasset/views.py
@@ -167,7 +167,7 @@ def asset_add(request):
@require_role('admin')
def asset_add_batch(request):
header_title, path1, path2 = u'添加资产', u'资产管理', u'批量添加'
- return my_render('jasset/server_add_batch.html', locals(), request)
+ return my_render('jasset/asset_add_batch.html', locals(), request)
@require_role('admin')
@@ -561,4 +561,4 @@ def asset_upload(request):
smg = u'批量添加成功'
else:
emg = u'批量添加失败,请检查格式.'
- return my_render('jasset/server_add_batch.html', locals(), request)
+ return my_render('jasset/asset_add_batch.html', locals(), request)
diff --git a/static/files/excels/asset.xlsx b/static/files/excels/asset.xlsx
index 1b92db891..76ff02165 100644
Binary files a/static/files/excels/asset.xlsx and b/static/files/excels/asset.xlsx differ
diff --git a/templates/nav.html b/templates/nav.html
index cbe70db7c..90685c858 100644
--- a/templates/nav.html
+++ b/templates/nav.html
@@ -17,7 +17,7 @@
资产管理