为了防止循环导入,采用__all__导出模块变量

pull/530/head
yumaojun03 2016-12-11 12:05:11 +08:00
parent baba65ad43
commit 84613e51d8
11 changed files with 45 additions and 17 deletions

View File

@ -0,0 +1 @@
from views import *

View File

@ -5,6 +5,16 @@ from rest_framework import viewsets
from serializers import * from serializers import *
from permissions import * from permissions import *
__all__ = ["HostAliaViewSet",
"CmdAliaViewSet",
"UserAliaViewSet",
"RunasAliaViewSet",
"ExtraconfViewSet",
"PrivilegeViewSet",
"SudoViewSet",
"CronTableViewSet",
]
class HostAliaViewSet(viewsets.ModelViewSet): class HostAliaViewSet(viewsets.ModelViewSet):
queryset = HostAlia.objects.all() queryset = HostAlia.objects.all()

View File

@ -1,3 +1,3 @@
from ansible import Tasker, AnsiblePlay, AnsibleTask, AnsibleHostResult from ansible import *
from sudo import HostAlia, UserAlia, CmdAlia, RunasAlia, Privilege, Extra_conf, Sudo from cron import *
from cron import CronTable from sudo import *

View File

@ -7,6 +7,8 @@ import json
from django.db import models from django.db import models
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
__all__ = ["Tasker", "AnsiblePlay", "AnsibleTask", "AnsibleHostResult"]
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

View File

@ -5,6 +5,8 @@ from django.db import models
from assets.models import Asset from assets.models import Asset
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
__all__ = ["CronTable"]
class CronTable(models.Model): class CronTable(models.Model):
name = models.CharField(max_length=128, blank=True, null=True, unique=True, verbose_name=_('Name'), name = models.CharField(max_length=128, blank=True, null=True, unique=True, verbose_name=_('Name'),

View File

@ -6,6 +6,9 @@ from django.db import models
from assets.models import Asset, AssetGroup from assets.models import Asset, AssetGroup
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
__all__ = ["HostAlia", "UserAlia", "CmdAlia", "RunasAlia", "Privilege",
"Extra_conf", "Sudo"]
class HostAlia(models.Model): class HostAlia(models.Model):
name = models.CharField(max_length=128, blank=True, null=True, unique=True, verbose_name=_('Host_Alias')) name = models.CharField(max_length=128, blank=True, null=True, unique=True, verbose_name=_('Host_Alias'))

View File

@ -0,0 +1 @@
from taskers import *

View File

@ -7,6 +7,12 @@ from ops.models import Tasker
from uuid import uuid1 from uuid import uuid1
from celery.result import AsyncResult from celery.result import AsyncResult
__all__ = ["get_result",
"start_get_hardware_info",
"start_ping_test",
"get_hardware_info",
"get_ping_test"]
def get_result(task_id): def get_result(task_id):
result = AsyncResult(task_id) result = AsyncResult(task_id)

View File

@ -1,14 +1,19 @@
# ~*~ coding: utf-8 ~*~
from __future__ import unicode_literals
from rest_framework.routers import DefaultRouter from rest_framework.routers import DefaultRouter
from ops.api import views as ops_api_view from ops import api as v1_api
__all__ = ["urlpatterns"]
api_router = DefaultRouter() api_router = DefaultRouter()
api_router.register(r'host_alia', ops_api_view.HostAliaViewSet) api_router.register(r'host_alia', v1_api.HostAliaViewSet)
api_router.register(r'user_alia', ops_api_view.UserAliaViewSet) api_router.register(r'user_alia', v1_api.UserAliaViewSet)
api_router.register(r'cmd_alia', ops_api_view.CmdAliaViewSet) api_router.register(r'cmd_alia', v1_api.CmdAliaViewSet)
api_router.register(r'runas_alia', ops_api_view.RunasAliaViewSet) api_router.register(r'runas_alia', v1_api.RunasAliaViewSet)
api_router.register(r'extra_conf', ops_api_view.ExtraconfViewSet) api_router.register(r'extra_conf', v1_api.ExtraconfViewSet)
api_router.register(r'privilege', ops_api_view.PrivilegeViewSet) api_router.register(r'privilege', v1_api.PrivilegeViewSet)
api_router.register(r'sudo', ops_api_view.SudoViewSet) api_router.register(r'sudo', v1_api.SudoViewSet)
api_router.register(r'cron', ops_api_view.CronTableViewSet) api_router.register(r'cron', v1_api.CronTableViewSet)
urlpatterns = api_router.urls urlpatterns = api_router.urls

View File

@ -5,9 +5,7 @@ from __future__ import unicode_literals
from django.conf.urls import url from django.conf.urls import url
from ops import views as page_view from ops import views as page_view
__all__ = ["urlpatterns"]
app_name = 'ops'
urlpatterns = [ urlpatterns = [
# Resource Sudo url # Resource Sudo url

View File

@ -7,8 +7,8 @@ from django.views.generic.edit import CreateView, DeleteView, UpdateView
from django.views.generic.detail import DetailView, SingleObjectMixin from django.views.generic.detail import DetailView, SingleObjectMixin
from users.utils import AdminUserRequiredMixin from users.utils import AdminUserRequiredMixin
from .utils.mixins import CreateSudoPrivilegesMixin, ListSudoPrivilegesMixin from ops.utils.mixins import CreateSudoPrivilegesMixin, ListSudoPrivilegesMixin
from models import * from ops.models import *
class SudoListView(AdminUserRequiredMixin, ListSudoPrivilegesMixin, ListView): class SudoListView(AdminUserRequiredMixin, ListSudoPrivilegesMixin, ListView):