From dd912e8958eabbfb40a9b0a8ddeb8a51b6fd844e Mon Sep 17 00:00:00 2001
From: halcyon <864072399@qq.com>
Date: Tue, 1 Dec 2015 23:39:49 +0800
Subject: [PATCH] asset list and add system_arch

---
 jasset/asset_api.py                           |  89 ++----------------
 jasset/forms.py                               |   3 +-
 jasset/models.py                              |   1 +
 jumpserver/templatetags/mytags.py             |   5 +
 .../excels/cmdb_excel_2015_12_01_22_17.xlsx   | Bin 0 -> 5898 bytes
 templates/jasset/asset_detail.html            |   6 +-
 templates/jasset/asset_edit.html              |   3 +
 templates/jasset/asset_list.html              |  33 ++-----
 8 files changed, 31 insertions(+), 109 deletions(-)
 create mode 100644 static/files/excels/cmdb_excel_2015_12_01_22_17.xlsx

diff --git a/jasset/asset_api.py b/jasset/asset_api.py
index 0034f6495..2c8446f70 100644
--- a/jasset/asset_api.py
+++ b/jasset/asset_api.py
@@ -1,4 +1,5 @@
 # coding: utf-8
+from __future__ import division
 import xlrd
 import xlsxwriter
 from django.db.models import AutoField
@@ -75,83 +76,6 @@ def db_asset_update(**kwargs):
     Asset.objects.filter(id=asset_id).update(**kwargs)
 
 
-#
-#
-# def batch_host_edit(host_alter_dic, j_user='', j_password=''):
-#     """ 批量修改主机函数 """
-#     j_id, j_ip, j_idc, j_port, j_type, j_group, j_dept, j_active, j_comment = host_alter_dic
-#     groups, depts = [], []
-#     is_active = {u'是': '1', u'否': '2'}
-#     login_types = {'LDAP': 'L', 'MAP': 'M'}
-#     a = Asset.objects.get(id=j_id)
-#     if '...' in j_group[0].split():
-#         groups = a.bis_group.all()
-#     else:
-#         for group in j_group[0].split():
-#             c = BisGroup.objects.get(name=group.strip())
-#             groups.append(c)
-#
-#     if '...' in j_dept[0].split():
-#         depts = a.dept.all()
-#     else:
-#         for d in j_dept[0].split():
-#             p = DEPT.objects.get(name=d.strip())
-#             depts.append(p)
-#
-#     j_type = login_types[j_type]
-#     j_idc = IDC.objects.get(name=j_idc)
-#     if j_type == 'M':
-#         if a.password != j_password:
-#             j_password = cryptor.decrypt(j_password)
-#         a.ip = j_ip
-#         a.port = j_port
-#         a.login_type = j_type
-#         a.idc = j_idc
-#         a.is_active = j_active
-#         a.comment = j_comment
-#         a.username = j_user
-#         a.password = j_password
-#     else:
-#         a.ip = j_ip
-#         a.port = j_port
-#         a.idc = j_idc
-#         a.login_type = j_type
-#         a.is_active = is_active[j_active]
-#         a.comment = j_comment
-#     a.save()
-#     a.bis_group = groups
-#     a.dept = depts
-#     a.save()
-#
-#
-# def db_host_delete(request, host_id):
-#     """ 删除主机操作 """
-#     if is_group_admin(request) and not validate(request, asset=[host_id]):
-#         return httperror(request, '删除失败, 您无权删除!')
-#
-#     asset = Asset.objects.filter(id=host_id)
-#     if asset:
-#         asset.delete()
-#     else:
-#         return httperror(request, '删除失败, 没有此主机!')
-#
-#
-# def db_idc_delete(request, idc_id):
-#     """ 删除IDC操作 """
-#     if idc_id == 1:
-#         return httperror(request, '删除失败, 默认IDC不能删除!')
-#
-#     default_idc = IDC.objects.get(id=1)
-#
-#     idc = IDC.objects.filter(id=idc_id)
-#     if idc:
-#         idc_class = idc[0]
-#         idc_class.asset_set.update(idc=default_idc)
-#         idc.delete()
-#     else:
-#         return httperror(request, '删除失败, 没有这个IDC!')
-
-
 def sort_ip_list(ip_list):
     """ ip地址排序 """
     ip_list.sort(key=lambda s: map(int, s.split('.')))
@@ -389,7 +313,6 @@ def get_ansible_asset_info(asset_ip, setup_info):
     for disk_name, disk_info in disk_all.iteritems():
         if disk_name.startswith('sd') or disk_name.startswith('hd') or disk_name.startswith('vd'):
             disk_need[disk_name] = disk_info.get("size")
-
     all_ip = setup_info.get("ansible_all_ipv4_addresses")
     other_ip_list = all_ip.remove(asset_ip) if asset_ip in all_ip else []
     other_ip = ','.join(other_ip_list) if other_ip_list else ''
@@ -401,12 +324,17 @@ def get_ansible_asset_info(asset_ip, setup_info):
     cpu_cores = setup_info.get("ansible_processor_count")
     cpu = cpu_type + ' * ' + unicode(cpu_cores)
     memory = setup_info.get("ansible_memtotal_mb")
+    try:
+        memory_format = round((int(memory) / 1000), 1)
+    except Exception:
+        memory_format = memory
     disk = disk_need
     system_type = setup_info.get("ansible_distribution")
     system_version = setup_info.get("ansible_distribution_version")
+    system_arch = setup_info.get("ansible_architecture")
     # asset_type = setup_info.get("ansible_system")
     sn = setup_info.get("ansible_product_serial")
-    asset_info = [other_ip, mac, cpu, memory, disk, sn, system_type, system_version, brand]
+    asset_info = [other_ip, mac, cpu, memory_format, disk, sn, system_type, system_version, brand, system_arch]
 
     return asset_info
 
@@ -422,7 +350,7 @@ def asset_ansible_update(obj_list, name=''):
             continue
         else:
             asset_info = get_ansible_asset_info(asset.ip, setup_info)
-            other_ip, mac, cpu, memory, disk, sn, system_type, system_version, brand = asset_info
+            other_ip, mac, cpu, memory, disk, sn, system_type, system_version, brand, system_arch = asset_info
             asset_dic = {"other_ip": other_ip,
                          "mac": mac,
                          "cpu": cpu,
@@ -431,6 +359,7 @@ def asset_ansible_update(obj_list, name=''):
                          "sn": sn,
                          "system_type": system_type,
                          "system_version": system_version,
+                         "system_arch": system_arch,
                          "brand": brand
                          }
 
diff --git a/jasset/forms.py b/jasset/forms.py
index 03eca04ed..7f96b30c6 100644
--- a/jasset/forms.py
+++ b/jasset/forms.py
@@ -12,7 +12,8 @@ class AssetForm(forms.ModelForm):
         fields = [
             "ip", "other_ip", "hostname", "port", "group", "username", "password", "use_default_auth",
             "idc", "mac", "remote_ip", "brand", "cpu", "memory", "disk", "system_type", "system_version",
-            "cabinet", "position", "number", "status", "asset_type", "env", "sn", "is_active", "comment"
+            "cabinet", "position", "number", "status", "asset_type", "env", "sn", "is_active", "comment",
+            "system_arch"
         ]
 
 
diff --git a/jasset/models.py b/jasset/models.py
index b3765fbe4..558479111 100644
--- a/jasset/models.py
+++ b/jasset/models.py
@@ -78,6 +78,7 @@ class Asset(models.Model):
     disk = models.CharField(max_length=128, blank=True, null=True, verbose_name=u'硬盘')
     system_type = models.CharField(max_length=32, blank=True, null=True, verbose_name=u"系统类型")
     system_version = models.CharField(max_length=8, blank=True, null=True, verbose_name=u"系统版本号")
+    system_arch = models.CharField(max_length=16, blank=True, null=True, verbose_name=u"系统平台")
     cabinet = models.CharField(max_length=32, blank=True, null=True, verbose_name=u'机柜号')
     position = models.IntegerField(blank=True, null=True, verbose_name=u'机器位置')
     number = models.CharField(max_length=32, blank=True, null=True, verbose_name=u'资产编号')
diff --git a/jumpserver/templatetags/mytags.py b/jumpserver/templatetags/mytags.py
index 2adb62deb..b23a14b96 100644
--- a/jumpserver/templatetags/mytags.py
+++ b/jumpserver/templatetags/mytags.py
@@ -272,3 +272,8 @@ def get_push_info(push_id, arg):
             return [role.name for role in push.role.all()]
     else:
         return []
+
+
+@register.filter(name='get_cpu_core')
+def get_cpu_core(cpu_info):
+    return cpu_info.split('* ')[1] if cpu_info else ''
diff --git a/static/files/excels/cmdb_excel_2015_12_01_22_17.xlsx b/static/files/excels/cmdb_excel_2015_12_01_22_17.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..37718bab375fd8f0f1228321a03d78923e381f02
GIT binary patch
literal 5898
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
D8uumu

literal 0
HcmV?d00001

diff --git a/templates/jasset/asset_detail.html b/templates/jasset/asset_detail.html
index bc38235ed..7109888eb 100644
--- a/templates/jasset/asset_detail.html
+++ b/templates/jasset/asset_detail.html
@@ -97,7 +97,7 @@
                                     </tr>
                                     <tr>
                                         <td class="text-navy">内存</td>
-                                        <td>{{ asset.memory|default_if_none:"" }}{% if asset.memory %}M{% endif %}</td>
+                                        <td>{{ asset.memory|default_if_none:"" }}{% if asset.memory %}G{% endif %}</td>
                                     </tr>
                                     <tr>
                                         <td class="text-navy">硬盘</td>
@@ -129,6 +129,10 @@
                                         <td class="text-navy">系统版本</td>
                                         <td>{{ asset.system_type|default_if_none:"" }} {{ asset.system_version|default_if_none:"" }}</td>
                                     </tr>
+                                    <tr>
+                                        <td class="text-navy">系统平台</td>
+                                        <td>{{ asset.system_arch|default_if_none:"" }}</td>
+                                    </tr>
                                     <tr>
                                         <td class="text-navy">运行环境</td>
                                         <td>{{ asset.get_env_display|default_if_none:"" }}</td>
diff --git a/templates/jasset/asset_edit.html b/templates/jasset/asset_edit.html
index 0faa89a37..339fde387 100644
--- a/templates/jasset/asset_edit.html
+++ b/templates/jasset/asset_edit.html
@@ -105,6 +105,9 @@
                                         <div class="hr-line-dashed"></div>
                                         {{ af.system_version|bootstrap_horizontal }}
 
+                                        <div class="hr-line-dashed"></div>
+                                        {{ af.system_arch|bootstrap_horizontal }}
+
                                         <div class="hr-line-dashed"></div>
                                         {{ af.number|bootstrap_horizontal }}
 
diff --git a/templates/jasset/asset_list.html b/templates/jasset/asset_list.html
index 887ce81a3..8373f8a0f 100644
--- a/templates/jasset/asset_list.html
+++ b/templates/jasset/asset_list.html
@@ -96,31 +96,6 @@
                                 </div>
                             </div>
                         </div>
-{#                        <div class="col-sm-2">#}
-
-{#                        </div>#}
-{##}
-{#                        <div class="col-sm-2">#}
-
-{#                        </div>#}
-{#                        <div class="col-sm-2">#}
-
-{#                        </div>#}
-{#                         <div class="col-sm-4">#}
-{#                            <div class="input-group">#}
-{#                                <input type="text" class="form-control m-b" id="search_input" name="keyword" value="{{ keyword }}" placeholder="Search">#}
-{#                                <input type="text" style="display: none">#}
-{#                                <div class="input-group-btn">#}
-{#                                    <button id='search_btn' href="/jasset/asset_list/?search=true" type="button" class="btn btn-xm btn-primary search-btn"  onclick="change_info()">#}
-{#                                        - 搜索 -#}
-{#                                    </button>#}
-{#                                    <button type="button" href="/jasset/asset_list/?export=true" name="export" class="btn btn-xm btn-success search-btn-excel" onclick="return false">#}
-{#                                        - 导出 -#}
-{#                                    </button>#}
-{#                                </div>#}
-{#                            </div>#}
-{#                        </div>#}
-
                         <div id="export"></div>
                         <table class="table table-striped table-bordered table-hover " id="editable" name="editable">
                             <thead>
@@ -134,7 +109,9 @@
                                     <th class="text-center"> 所属主机组 </th>
 {#                                    <th class="text-center"> 配置信息 </th>#}
                                     <th class="text-center"> 操作系统 </th>
-                                    <th class="text-center"> 使用默认管理 </th>
+                                    <th class="text-center"> cpu核数 </th>
+                                    <th class="text-center"> 内存 </th>
+                                    <th class="text-center"> 硬盘 </th>
                                     <th class="text-center"> 操作 </th>
                                 </tr>
                             </thead>
@@ -150,7 +127,9 @@
                                     <td class="text-center">{{ asset.group.all|group_str2 }}</td>
 {#                                    <td class="text-center">{{ asset.cpu }}|{{ asset.memory }}|{{ asset.disk }}</td>#}
                                     <td class="text-center">{{ asset.system_type|default_if_none:"" }}{{ asset.system_version|default_if_none:"" }}</td>
-                                    <td class="text-center"> {{ asset.use_default_auth|bool2str }} </td>
+                                    <td class="text-center"> {{ asset.cpu|get_cpu_core }} </td>
+                                    <td class="text-center"> {{ asset.memory }}{% if asset.memory %}G{% endif %} </td>
+                                    <td class="text-center"> {{ asset.disk }} </td>
                                     <td class="text-center" data-editable='false'>
                                         <a href="/jasset/asset_detail/?id={{ asset.id }}" class="btn btn-xs btn-primary">详情</a>
                                         {% ifnotequal session_role_id 0 %}