From cd22c39078ac389af002454884167ae3bc38c1f3 Mon Sep 17 00:00:00 2001
From: Administrator <yumaojun@tongfangcloud.com>
Date: Wed, 23 Nov 2016 11:45:50 +0800
Subject: [PATCH] =?UTF-8?q?[future]=20=E5=B0=86Task=E7=A7=BB=E5=88=B0?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=8C=85=E5=86=85=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/ops/hands.py                             | 14 --------------
 apps/ops/tasks/__init__.py                    |  0
 apps/ops/{tasks.py => tasks/_celery_tasks.py} |  0
 apps/ops/{ => tasks}/taskers.py               |  8 ++++----
 apps/ops/views.py                             |  2 +-
 5 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 apps/ops/hands.py
 create mode 100644 apps/ops/tasks/__init__.py
 rename apps/ops/{tasks.py => tasks/_celery_tasks.py} (100%)
 rename apps/ops/{ => tasks}/taskers.py (95%)

diff --git a/apps/ops/hands.py b/apps/ops/hands.py
deleted file mode 100644
index 1cdbd13a2..000000000
--- a/apps/ops/hands.py
+++ /dev/null
@@ -1,14 +0,0 @@
-"""
-    jumpserver.__app__.hands.py
-    ~~~~~~~~~~~~~~~~~
-
-    This app depends other apps api, function .. should be import or write mack here.
-
-    Other module of this app shouldn't connect with other app.
-
-    :copyright: (c) 2014-2016 by Jumpserver Team.
-    :license: GPL v2, see LICENSE for more details.
-"""
-
-
-from users.utils import AdminUserRequiredMixin
\ No newline at end of file
diff --git a/apps/ops/tasks/__init__.py b/apps/ops/tasks/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/apps/ops/tasks.py b/apps/ops/tasks/_celery_tasks.py
similarity index 100%
rename from apps/ops/tasks.py
rename to apps/ops/tasks/_celery_tasks.py
diff --git a/apps/ops/taskers.py b/apps/ops/tasks/taskers.py
similarity index 95%
rename from apps/ops/taskers.py
rename to apps/ops/tasks/taskers.py
index 814a202ea..d7e24dbff 100644
--- a/apps/ops/taskers.py
+++ b/apps/ops/tasks/taskers.py
@@ -1,9 +1,9 @@
 # ~*~ coding: utf-8 ~*~
 from __future__ import unicode_literals
 
-from .tasks import *
+from ops.tasks import _celery_tasks
 
-from .models import Tasker
+from ops.models import Tasker
 from uuid import uuid1
 from celery.result import AsyncResult
 
@@ -52,7 +52,7 @@ def __get_result_by_tasker_id(tasker_uuid, deal_method):
 def start_get_hardware_info(*assets):
     name = "Get host hardware information"
     uuid = "tasker-" + uuid1().hex
-    get_asset_hardware_info.delay(name, uuid, *assets)
+    _celery_tasks.get_asset_hardware_info.delay(name, uuid, *assets)
     return uuid
 
 
@@ -90,7 +90,7 @@ def get_hardware_info(tasker_uuid):
 def start_ping_test(*assets):
     name = "Test host connection"
     uuid = "tasker-" + uuid1().hex
-    asset_test_ping_check.delay(name, uuid, *assets)
+    _celery_tasks.asset_test_ping_check.delay(name, uuid, *assets)
     return uuid
 
 
diff --git a/apps/ops/views.py b/apps/ops/views.py
index 5423b4942..9730098f5 100644
--- a/apps/ops/views.py
+++ b/apps/ops/views.py
@@ -6,7 +6,7 @@ from django.views.generic.list import ListView, MultipleObjectMixin
 from django.views.generic.edit import CreateView, DeleteView, UpdateView
 from django.views.generic.detail import DetailView, SingleObjectMixin
 
-from .hands import AdminUserRequiredMixin
+from users.utils import AdminUserRequiredMixin
 from .utils.mixins import CreateSudoPrivilegesMixin, ListSudoPrivilegesMixin
 from models import *