Skip to content

Commit 4c7d0b4

Browse files
Mr9esxMr9esx
committed
整理model文件，还把各个文件不符合PEP8的地方修正掉，model的类函数长得逆天，不过我也不知道怎么命名啊，我也很绝望啊
1 parent 605deaa commit 4c7d0b4

File tree

9 files changed

+379
-484
lines changed

9 files changed

+379
-484
lines changed

‎DockerM_Web/app/api/response.py

+62-52
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,36 @@
11
# -*- coding:utf-8 -*-
22

33
import time
4-
from datetime import datetime
5-
from flask import session, redirect, url_for,jsonify,g,request
4+
from flask import session, redirect, url_for, jsonify, g, request
65
from flask_login import login_required
76
import salt.client
87
import re
98
import simplejson
9+
import json
1010

1111
from . import dockermApi
1212
from ..lib.rawSQL import rawSQLControl
13-
from .. import db
14-
from ..lib.dbModel import Hosts, Images, Containers
15-
from ..lib.dbController import getUser, getAllImage2Host, getAllHost, getAllContainer2Host, getHostInfoByContainerID, HostisExited
13+
from ..lib.dbModel import *
1614
from ..lib.pushMsg import pushMsg
17-
from ..lib.tools import createContainer
1815

1916

2017
@dockermApi.route('/api/container/getstatus/<container_id>', methods=['GET'])
2118
@login_required
22-
def getStatus(container_id):
23-
return jsonify(rawSQLControl().getContainerState(container_id,60))
19+
def get_status(container_id):
20+
return jsonify(rawSQLControl().getContainerState(container_id, 60))
21+
2422

2523
@dockermApi.route('/api/container/getstatus_now/<container_id>', methods=['GET'])
2624
@login_required
27-
def getStatusNow(container_id):
25+
def get_status_now(container_id):
2826
return jsonify(rawSQLControl().getContainerState(container_id, 1))
2927

3028

3129
@dockermApi.route('/api/get/hosts/', methods=['GET'])
3230
@login_required
33-
def getHostList():
31+
def get_host_list():
3432
req_list = []
35-
id = 0
36-
for host_info in getAllHost():
33+
for host_info in Hosts.get_all_host():
3734
info = simplejson.loads(host_info.host_info)
3835
req_list.append({
3936
"id": host_info.saltstack_id,
@@ -48,9 +45,9 @@ def getHostList():
4845

4946
@dockermApi.route('/api/get/images/<saltstack_id>', methods=['GET'])
5047
@login_required
51-
def getAllImageList(saltstack_id):
48+
def get_all_image_list(saltstack_id):
5249
req_list = []
53-
for image_info in getAllImage2Host(saltstack_id):
50+
for image_info in Images.get_image_according_to_host(saltstack_id):
5451
info = simplejson.loads(image_info.info)
5552
req_list.append({
5653
"id": info['Id'][7:],
@@ -62,9 +59,9 @@ def getAllImageList(saltstack_id):
6259

6360
@dockermApi.route('/api/get/containers/<saltstack_id>', methods=['GET'])
6461
@login_required
65-
def getAllContainerList(saltstack_id):
62+
def get_all_container_list(saltstack_id):
6663
req_list = []
67-
for container_info in getAllContainer2Host(saltstack_id):
64+
for container_info in Containers.get_container_info_according_to_container_id(saltstack_id):
6865
req_list.append({
6966
"id": container_info.container_id[0:12],
7067
"text": container_info.container_name,
@@ -75,37 +72,46 @@ def getAllContainerList(saltstack_id):
7572

7673
@dockermApi.route('/control/container/<control_type>', methods=['POST'])
7774
@login_required
78-
def containerControl(control_type):
79-
print control_type
80-
user = getUser(session['user_id'])
75+
def container_control(control_type):
8176
if control_type == 'start':
82-
saltstack_id = getHostInfoByContainerID(request.form['container_id']).saltstack_id
83-
if (checkHost(saltstack_id)):
84-
pushMsg(control_type, user.username, {"container_id": request.form['container_id']}, getHostInfoByContainerID(request.form['container_id']).saltstack_id).push()
77+
saltstack_id = Containers.get_container_info_according_to_container_id(
78+
request.form['container_id']).saltstack_id
79+
if _check_host(saltstack_id):
80+
pushMsg(control_type, current_app.username, {"container_id": request.form['container_id']},
81+
saltstack_id).push()
8582
return jsonify({'status': 'success', 'title': '操作发送成功！',
8683
'text': u'启动容器 ' + request.form['container_name'] + ' [' + request.form['container_id'][
87-
0:12] + u'] 成功！',})
84+
0:12] + u'] 成功！'})
8885
else:
89-
return jsonify({'status': 'error', 'title': '操作发送失败！', 'text': u'失败！' + saltstack_id + u' 主机无法访问！'})
86+
return jsonify({'status': 'error', 'title': '操作发送失败！',
87+
'text': u'失败！' + saltstack_id + u' 主机无法访问！'})
88+
9089
elif control_type == 'stop':
91-
saltstack_id = getHostInfoByContainerID(request.form['container_id']).saltstack_id
90+
saltstack_id = Containers.get_container_info_according_to_container_id(
91+
request.form['container_id']).saltstack_id
9292
print saltstack_id
93-
if (checkHost(saltstack_id)):
94-
pushMsg(control_type, user.username, {"container_id": request.form['container_id']}, getHostInfoByContainerID(request.form['container_id']).saltstack_id).push()
93+
if _check_host(saltstack_id):
94+
pushMsg(control_type, current_app.username, {"container_id": request.form['container_id']},
95+
saltstack_id).push()
9596
return jsonify({'status': 'success', 'title': '操作发送成功！',
9697
'text': u'关闭容器 ' + request.form['container_name'] + ' [' + request.form['container_id'][
97-
0:12] + u'] 成功！',})
98+
0:12] + u'] 成功！'})
9899
else:
99-
return jsonify({'status': 'error', 'title': '操作发送失败！', 'text': u'失败！' + saltstack_id + u' 主机无法访问！'})
100+
return jsonify({'status': 'error', 'title': '操作发送失败！',
101+
'text': u'失败！' + saltstack_id + u' 主机无法访问！'})
102+
100103
elif control_type == 'follow':
101-
updateContainerFollowState(request.form['container_id'],1)
104+
Containers.update_container_follow_state(request.form['container_id'], 1)
105+
102106
elif control_type == 'unfollow':
103107
print 'unfollow'
104-
updateContainerFollowState(request.form['container_id'], 0)
108+
Containers.update_container_follow_state(request.form['container_id'], 0)
109+
105110
elif control_type == 'create':
106111
saltstack_id = request.form['saltstack_id']
107-
if (checkHost(saltstack_id)):
112+
if _check_host(saltstack_id):
108113
image_id = request.form['image_id']
114+
host_address = request.form['host_address']
109115

110116
for link in request.form.getlist("link[]"):
111117
link_dict = simplejson.loads(link)
@@ -119,13 +125,14 @@ def containerControl(control_type):
119125
int(port_dict['host-port'])
120126
except ValueError:
121127
return jsonify({'status': 'error', 'title': '操作失败！', 'text': u'失败！端口只能是数字！'})
122-
if not re.compile('^((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$').match('55.258.365.12'):
128+
if not re.compile('^((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$').match(
129+
host_address):
123130
return jsonify({'status': 'error', 'title': '操作失败！', 'text': u'失败！IP 地址不规范！'})
124131

125132
if Images.query.filter_by(image_id=image_id).first() is None:
126133
return jsonify({'status': 'error', 'title': '操作失败！', 'text': u'失败！无此镜像！'})
127134

128-
pushMsg('create', user.username,
135+
pushMsg('create', current_app.username,
129136
{"container_name": request.form['container_name'], "saltstack_id": saltstack_id,
130137
"image": image_id, "hostname": request.form['hostname'],
131138
"command": request.form["command"].replace(',', ' && '), "link": request.form.getlist("link[]"),
@@ -134,24 +141,26 @@ def containerControl(control_type):
134141

135142
return jsonify({'status': 'success', 'title': '操作发送成功！', 'text': u'成功！容器已创建！'})
136143
else:
137-
return jsonify({'status': 'error', 'title': '操作发送失败！', 'text': u'失败！' + saltstack_id + u' 主机无法访问！'})
144+
return jsonify({'status': 'error', 'title': '操作发送失败！',
145+
'text': u'失败！' + saltstack_id + u' 主机无法访问！'})
146+
138147
return '0'
139148

140149

141150
@dockermApi.route('/api/hostIsAlive/', methods=['POST'])
142151
@login_required
143-
def hostIsAlive():
144-
return jsonify({"saltstack_id": request.form['saltstack_id'],"status": checkHost(request.form['saltstack_id'])})
152+
def host_is_alive():
153+
return jsonify({"saltstack_id": request.form['saltstack_id'], "status": _check_host(request.form['saltstack_id'])})
145154

146155

147-
def checkHost(saltstack_id):
156+
def _check_host(saltstack_id):
148157
client = salt.client.LocalClient()
149158
try:
150-
ping = client.cmd(saltstack_id, 'test.ping',timeout=3)
159+
ping = client.cmd(saltstack_id, 'test.ping', timeout=3)
151160
print ping
152161
except SaltClientError:
153162
return False
154-
if (ping.has_key(saltstack_id) and ping[saltstack_id] == True and HostisExited(saltstack_id)):
163+
if ping.has_key(saltstack_id) and ping[saltstack_id] is True and Hosts.host_is_exited(saltstack_id):
155164
print saltstack_id
156165
return True
157166
else:
@@ -160,23 +169,24 @@ def checkHost(saltstack_id):
160169

161170
@dockermApi.route('/api/createHost/', methods=['POST'])
162171
@login_required
163-
def createHost():
164-
#检查saltstack_id是否已存在数据库中
165-
if (not Hosts.query.filter_by(saltstack_id=request.form['saltstack_id']).first()):
172+
def create_host():
173+
# 检查saltstack_id是否已存在数据库中
174+
if not Hosts.query.filter_by(saltstack_id=request.form['saltstack_id']).first():
166175
# 运行 test.ping 检查是否连通
167176
client = salt.client.LocalClient()
168177
ping = client.cmd(request.form['saltstack_id'], 'test.ping')
169-
if (ping.has_key(request.form['saltstack_id']) and ping[request.form['saltstack_id']] == True):
178+
if ping.has_key(request.form['saltstack_id']) and ping[request.form['saltstack_id']] is True:
170179
if (client.cmd(request.form['saltstack_id'], 'cp.get_dir', ['salt://dockerm-minion', '/srv'])[
171180
request.form['saltstack_id']] == []):
172-
return jsonify({'status': '103', 'msg': u'失败！'+request.form['saltstack_id']+u' 主机文件复制错误！'}) #已存在数据库中 #文件复制失败
173-
db.session.add(Hosts(request.form['saltstack_id'], time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time())), getUser(session['user_id']).username, json.dumps(client.cmd(request.form['saltstack_id'], 'grains.items'))))
181+
return jsonify(
182+
{'status': '103', 'msg': u'失败！' + request.form['saltstack_id'] + u' 主机文件复制错误！'}) # 已存在数据库中 #文件复制失败
183+
db.session.add(
184+
Hosts(request.form['saltstack_id'], time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time())),
185+
current_app.username, json.dumps(client.cmd(request.form['saltstack_id'], 'grains.items'))))
174186
db.session.commit()
175-
return jsonify({'status': '100', 'msg': u'成功！'+request.form['saltstack_id']+u' 主机已成功添加！'})
187+
return jsonify({'status': '100', 'msg': u'成功！' + request.form['saltstack_id'] + u' 主机已成功添加！'})
176188
else:
177-
return jsonify({'status': '102', 'msg': u'失败！'+request.form['saltstack_id']+u' 主机无法访问！'}) #主机无法连通
189+
return jsonify({'status': '102',
190+
'msg': u'失败！' + request.form['saltstack_id'] + u' 主机无法访问！'}) # 主机无法连通
178191
else:
179-
return jsonify({'status': '101', 'msg': u'失败！'+request.form['saltstack_id']+u' 主机已存在！'}) #已存在数据库中
180-
181-
182-
192+
return jsonify({'status': '101', 'msg': u'失败！' + request.form['saltstack_id'] + u' 主机已存在！'}) # 已存在数据库中

‎DockerM_Web/app/auth/views.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def unconfirmed():
4646

4747
@dockermAuth.route('/resendfirmed', methods=['GET'])
4848
@login_required
49-
def resendconfirmed():
49+
def resend_confirmed():
5050
if not current_app._get_current_object().config['CONFIRMED']:
5151
return redirect(url_for('dockerm.index'))
5252
if not current_user.confirmed:

0 commit comments

Comments
 (0)