diff --git a/jasset/asset_api.py b/jasset/asset_api.py index 998d669c5..284574379 100644 --- a/jasset/asset_api.py +++ b/jasset/asset_api.py @@ -381,13 +381,13 @@ def excel_to_db(excel_file): row = table.row_values(row_num) if row: ip, port, hostname, use_default_auth, username, password, group = row - print ip use_default_auth = 1 if use_default_auth == u'默认' else 0 if get_object(Asset, ip=ip): continue if ip and port: asset = Asset(ip=ip, port=port, + hostname=hostname, use_default_auth=use_default_auth, username=username, password=password diff --git a/jasset/models.py b/jasset/models.py index e011302a2..f1e5b46fc 100644 --- a/jasset/models.py +++ b/jasset/models.py @@ -37,8 +37,8 @@ class AssetGroup(models.Model): class IDC(models.Model): name = models.CharField(max_length=32, verbose_name=u'机房名称') bandwidth = models.CharField(max_length=32, blank=True, null=True, verbose_name=u'机房带宽') - linkman = models.CharField(max_length=16, null=True, verbose_name=u'联系人') - phone = models.CharField(max_length=32, verbose_name=u'联系电话') + linkman = models.CharField(max_length=16, blank=True, null=True, verbose_name=u'联系人') + phone = models.CharField(max_length=32, blank=True, null=True, verbose_name=u'联系电话') address = models.CharField(max_length=128, blank=True, null=True, verbose_name=u"机房地址") network = models.TextField(blank=True, null=True, verbose_name=u"IP地址段") date_added = models.DateField(auto_now=True, null=True) diff --git a/jasset/views.py b/jasset/views.py index 8427f9f67..6bafd5664 100644 --- a/jasset/views.py +++ b/jasset/views.py @@ -2,9 +2,9 @@ import ast from django.db.models import Q -from django.shortcuts import get_object_or_404 from jasset.asset_api import * from jumpserver.api import * +from jumpserver.models import Setting from jasset.forms import AssetForm, IdcForm from jasset.models import Asset, IDC, AssetGroup, ASSET_TYPE, ASSET_STATUS from ansible_api import Tasks @@ -330,13 +330,20 @@ def asset_update(request): return HttpResponseRedirect('/jasset/asset_detail/?id=%s' % asset_id) name = request.session.get('username', 'admin') if asset.use_default_auth: - username = 'root' - password = '123456' + default = Setting.objects.all() + if default: + default = default[0] + username = default.default_user + password = default.default_password + port = default.default_port + else: + return HttpResponse(u'没有设置默认用户名和密码!') else: username = asset.username password = asset.password + port = asset.port - resource = [{"hostname": asset.ip, "port": asset.port, + resource = [{"hostname": asset.ip, "port": port, "username": username, "password": password}] ansible_instance = Tasks(resource) @@ -446,9 +453,10 @@ def idc_del(request): """ IDC delete view """ - uuid = request.GET.get('uuid', '') - idc = get_object_or_404(IDC, uuid=uuid) - idc.delete() + uuid = request.GET.get('id', '') + idc = get_object(IDC, id=uuid) + if idc: + idc.delete() return HttpResponseRedirect('/jasset/idc_list/') diff --git a/static/files/excels/cmdb_excel_2015_11_17_22_38.xlsx b/static/files/excels/cmdb_excel_2015_11_17_22_38.xlsx new file mode 100644 index 000000000..705c54347 Binary files /dev/null and b/static/files/excels/cmdb_excel_2015_11_17_22_38.xlsx differ diff --git a/static/files/excels/cmdb_excel_2015_11_17_22_39.xlsx b/static/files/excels/cmdb_excel_2015_11_17_22_39.xlsx new file mode 100644 index 000000000..83ea97d23 Binary files /dev/null and b/static/files/excels/cmdb_excel_2015_11_17_22_39.xlsx differ diff --git a/static/files/excels/cmdb_excel_2015_11_17_23_19.xlsx b/static/files/excels/cmdb_excel_2015_11_17_23_19.xlsx new file mode 100644 index 000000000..26eb98307 Binary files /dev/null and b/static/files/excels/cmdb_excel_2015_11_17_23_19.xlsx differ diff --git a/templates/jasset/asset_detail.html b/templates/jasset/asset_detail.html index 1f8d0d130..143ca6a48 100644 --- a/templates/jasset/asset_detail.html +++ b/templates/jasset/asset_detail.html @@ -31,11 +31,11 @@ - + - + @@ -53,11 +53,11 @@ - + - + @@ -66,7 +66,7 @@
IP{{ asset.ip }}{{ asset.ip|default_if_none:"" }}
主机名{{ asset.hostname }}{{ asset.hostname|default_if_none:"" }}
其他IP
远控IP{{ asset.remote_ip }}{{ asset.remote_ip|default_if_none:"" }}
端口{{ asset.port }}{{ asset.port|default_if_none:"" }}
{% for asset_group in asset.group.all %} - + {% endfor %}
{{ asset_group.name }}{{ asset_group.name|default_if_none:"" }}
@@ -79,19 +79,19 @@ 机房 - {{ asset.idc.name }} + {{ asset.idc.name|default_if_none:"" }} 硬件厂商型号 - {{ asset.brand }} + {{ asset.brand|default_if_none:"" }} CPU - {{ asset.cpu }} + {{ asset.cpu|default_if_none:"" }} 内存 - {{ asset.memory }}M + {{ asset.memory|default_if_none:"" }} 硬盘 @@ -100,7 +100,7 @@ {% if asset.disk %} {% for disk, value in asset.disk|str_to_dic %} - {{ disk }}     {{ value }} + {{ disk|default_if_none:"" }}     {{ value|default_if_none:"" }} {% endfor %} {% endif %} @@ -109,35 +109,35 @@ 资产编号 - {{ asset.number }} + {{ asset.number|default_if_none:"" }} SN - {{ asset.sn }} + {{ asset.sn|default_if_none:"" }} 主机类型 - {{ asset.get_asset_type_display }} + {{ asset.get_asset_type_display|default_if_none:"" }} 系统版本 - {{ asset.system_type }} {{ asset.system_version }} + {{ asset.system_type|default_if_none:"" }} {{ asset.system_version|default_if_none:"" }} 运行环境 - {{ asset.get_env_display }} + {{ asset.get_env_display|default_if_none:"" }} 机器状态 - {{ asset.get_status_display }} + {{ asset.get_status_display|default_if_none:"" }} 机柜号 - {{ asset.cabinet }} + {{ asset.cabinet|default_if_none:"" }} 机柜位置 - {{ asset.position }} + {{ asset.position|default_if_none:"" }} 激活 @@ -149,7 +149,7 @@ 备注 - {{ asset.comment }} + {{ asset.comment|default_if_none:"" }} diff --git a/templates/jasset/asset_list.html b/templates/jasset/asset_list.html index 133e41eea..63eb123ad 100644 --- a/templates/jasset/asset_list.html +++ b/templates/jasset/asset_list.html @@ -119,12 +119,12 @@ - {{ asset.ip }} - {{ asset.hostname }} - {{ asset.idc.name }} + {{ asset.ip|default_if_none:"" }} + {{ asset.hostname|default_if_none:"" }} + {{ asset.idc.name|default_if_none:"" }} {{ asset.group.all|group_str2 }} {# {{ asset.cpu }}|{{ asset.memory }}|{{ asset.disk }}#} - {{ asset.system_type }}{{ asset.system_version }} + {{ asset.system_type|default_if_none:"" }}{{ asset.system_version|default_if_none:"" }} {{ asset.use_default_auth|bool2str }} 详情 diff --git a/templates/jasset/group_add.html b/templates/jasset/group_add.html index f5013ae14..51ffd23c1 100644 --- a/templates/jasset/group_add.html +++ b/templates/jasset/group_add.html @@ -75,12 +75,12 @@
- +
@@ -133,12 +133,12 @@ timely: 2, theme: "yellow_right_effect", fields: { - "j_group": { + "name": { rule: "required", - tip: "输入业务组名", + tip: "输入主机组名", ok: "", - msg: {required: "业务组名必须填写!"}, - data: {'data-ok':"业务组名可以使用"} + msg: {required: "主机组名必须填写!"}, + data: {'data-ok':"主机组名可以使用"} } }, valid: function(form) { diff --git a/templates/jasset/group_detail.html b/templates/jasset/group_detail.html index e31a5d69a..b2b95e963 100644 --- a/templates/jasset/group_detail.html +++ b/templates/jasset/group_detail.html @@ -52,17 +52,17 @@ {% for asset in contacts.object_list %} - - {{ asset.ip }} - {{ asset.port }} - {{ asset.idc.name }} + + {{ asset.ip|default_if_none:"" }} + {{ asset.port|default_if_none:"" }} + {{ asset.idc.name|default_if_none:"" }} {{ asset.bis_group.all | group_str2 }} {{ asset.is_active|bool2str }} {{ asset.date_added|date:"Y-m-d H:i:s" }} - {{ asset.comment }} + {{ asset.comment|default_if_none:"" }} - 详情 - 编辑 + 详情 + 编辑 删除 diff --git a/templates/jasset/group_edit.html b/templates/jasset/group_edit.html index e9054ccaf..8cb4ca9bb 100644 --- a/templates/jasset/group_edit.html +++ b/templates/jasset/group_edit.html @@ -86,7 +86,7 @@
@@ -103,7 +103,7 @@
diff --git a/templates/nav.html b/templates/nav.html index 3f3e76d42..979110492 100644 --- a/templates/nav.html +++ b/templates/nav.html @@ -76,7 +76,7 @@ 资产管理