Skip to content

Commit

Permalink
ansible UI上线测试
Browse files Browse the repository at this point in the history
  • Loading branch information
guohongze committed Feb 1, 2017
1 parent bf4b452 commit 4d854e3
Show file tree
Hide file tree
Showing 1,242 changed files with 497 additions and 1,111 deletions.
396 changes: 229 additions & 167 deletions .idea/workspace.xml

Large diffs are not rendered by default.

Empty file removed app01/__init__.py
Empty file.
Binary file removed app01/__init__.pyc
Binary file not shown.
3 changes: 0 additions & 3 deletions app01/admin.py

This file was deleted.

Binary file removed app01/admin.pyc
Binary file not shown.
7 changes: 0 additions & 7 deletions app01/apps.py

This file was deleted.

Binary file removed app01/apps.pyc
Binary file not shown.
24 changes: 0 additions & 24 deletions app01/migrations/0001_initial.py

This file was deleted.

Binary file removed app01/migrations/0001_initial.pyc
Binary file not shown.
Empty file removed app01/migrations/__init__.py
Empty file.
Binary file removed app01/migrations/__init__.pyc
Binary file not shown.
7 changes: 0 additions & 7 deletions app01/models.py

This file was deleted.

Binary file removed app01/models.pyc
Binary file not shown.
3 changes: 0 additions & 3 deletions app01/tests.py

This file was deleted.

42 changes: 0 additions & 42 deletions app01/urls.py

This file was deleted.

Binary file removed app01/urls.pyc
Binary file not shown.
Empty file removed app01/views.py
Empty file.
Binary file removed app01/views.pyc
Binary file not shown.
Empty file removed app02/__init__.py
Empty file.
Binary file removed app02/__init__.pyc
Binary file not shown.
3 changes: 0 additions & 3 deletions app02/admin.py

This file was deleted.

Binary file removed app02/admin.pyc
Binary file not shown.
7 changes: 0 additions & 7 deletions app02/apps.py

This file was deleted.

Empty file removed app02/migrations/__init__.py
Empty file.
Binary file removed app02/migrations/__init__.pyc
Binary file not shown.
13 changes: 0 additions & 13 deletions app02/models.py

This file was deleted.

Binary file removed app02/models.pyc
Binary file not shown.
3 changes: 0 additions & 3 deletions app02/tests.py

This file was deleted.

9 changes: 0 additions & 9 deletions app02/urls.py

This file was deleted.

Binary file removed app02/urls.pyc
Binary file not shown.
3 changes: 0 additions & 3 deletions app02/views.py

This file was deleted.

Binary file removed app02/views.pyc
Binary file not shown.
Binary file modified cmdb/models.pyc
Binary file not shown.
2 changes: 1 addition & 1 deletion cmdb/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
urlpatterns = [
url(r'^$', views.IndexView.as_view(), name='index'),
url(r'^cmdb', views.cmdb, name='cmdb'),
url(r'^ansible', views.ansible, name='ansible'),
url(r'^index3', views.index3, name='index3'),
url(r'^excel', views.excel, name='excel'),
url(r'^login', views.login, name='login'),
url(r'^collect', api.collect, name='update api'),
#url(r'^api/gethostsjson', api.gethostsjson, name='gethostsjson'),
url(r'^api/host', api.get_host, name='get_host'),
url(r'^api/group', api.get_group, name='get_group'),
]
Binary file modified cmdb/urls.pyc
Binary file not shown.
10 changes: 7 additions & 3 deletions cmdb/views.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /usr/bin/env python
# -*- coding: utf-8 -*-
from django.views import generic
from .models import Host
from .models import Host, HostGroup
from django.http import HttpResponse
from django.shortcuts import render_to_response,redirect
import csv
Expand All @@ -12,14 +12,18 @@


def cmdb(request):
hosts = Host.objects.all()
return render_to_response('cmdb.html', {'host_list':hosts})
host_list = Host.objects.all()
return render_to_response('cmdb.html', locals())


def index3(request):
host_list = Host.objects.all()
return render_to_response('index.html',locals())

def ansible(request):
host_list = Host.objects.all()
hostgroup = HostGroup.objects.all()
return render_to_response('ansible.html',locals())

class IndexView(generic.ListView):
template_name = 'index.html'
Expand Down
Binary file modified cmdb/views.pyc
Binary file not shown.
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
django==1.9.8
django==1.9.8
pymysql=0.7.2
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
Loading

0 comments on commit 4d854e3

Please sign in to comment.