diff --git a/apps/ops/api/__init__.py b/apps/ops/api/__init__.py index e69de29bb..c8b15abe0 100644 --- a/apps/ops/api/__init__.py +++ b/apps/ops/api/__init__.py @@ -0,0 +1 @@ +from views import * \ No newline at end of file diff --git a/apps/ops/api/views.py b/apps/ops/api/views.py index 69cb7ca54..bc5e40617 100644 --- a/apps/ops/api/views.py +++ b/apps/ops/api/views.py @@ -5,6 +5,16 @@ from rest_framework import viewsets from serializers import * from permissions import * +__all__ = ["HostAliaViewSet", + "CmdAliaViewSet", + "UserAliaViewSet", + "RunasAliaViewSet", + "ExtraconfViewSet", + "PrivilegeViewSet", + "SudoViewSet", + "CronTableViewSet", + ] + class HostAliaViewSet(viewsets.ModelViewSet): queryset = HostAlia.objects.all() diff --git a/apps/ops/models/__init__.py b/apps/ops/models/__init__.py index c54d2d467..248828548 100644 --- a/apps/ops/models/__init__.py +++ b/apps/ops/models/__init__.py @@ -1,3 +1,3 @@ -from ansible import Tasker, AnsiblePlay, AnsibleTask, AnsibleHostResult -from sudo import HostAlia, UserAlia, CmdAlia, RunasAlia, Privilege, Extra_conf, Sudo -from cron import CronTable +from ansible import * +from cron import * +from sudo import * diff --git a/apps/ops/models/ansible.py b/apps/ops/models/ansible.py index f71d115a8..c3043cd50 100644 --- a/apps/ops/models/ansible.py +++ b/apps/ops/models/ansible.py @@ -7,6 +7,8 @@ import json from django.db import models from django.utils.translation import ugettext_lazy as _ +__all__ = ["Tasker", "AnsiblePlay", "AnsibleTask", "AnsibleHostResult"] + logger = logging.getLogger(__name__) diff --git a/apps/ops/models/cron.py b/apps/ops/models/cron.py index 634e78be6..1cfbacedb 100644 --- a/apps/ops/models/cron.py +++ b/apps/ops/models/cron.py @@ -5,6 +5,8 @@ from django.db import models from assets.models import Asset from django.utils.translation import ugettext_lazy as _ +__all__ = ["CronTable"] + class CronTable(models.Model): name = models.CharField(max_length=128, blank=True, null=True, unique=True, verbose_name=_('Name'), diff --git a/apps/ops/models/sudo.py b/apps/ops/models/sudo.py index 5c6aae9d8..af5368a26 100644 --- a/apps/ops/models/sudo.py +++ b/apps/ops/models/sudo.py @@ -6,6 +6,9 @@ from django.db import models from assets.models import Asset, AssetGroup from django.utils.translation import ugettext_lazy as _ +__all__ = ["HostAlia", "UserAlia", "CmdAlia", "RunasAlia", "Privilege", + "Extra_conf", "Sudo"] + class HostAlia(models.Model): name = models.CharField(max_length=128, blank=True, null=True, unique=True, verbose_name=_('Host_Alias')) diff --git a/apps/ops/tasks/__init__.py b/apps/ops/tasks/__init__.py index e69de29bb..6fe598964 100644 --- a/apps/ops/tasks/__init__.py +++ b/apps/ops/tasks/__init__.py @@ -0,0 +1 @@ +from taskers import * \ No newline at end of file diff --git a/apps/ops/tasks/taskers.py b/apps/ops/tasks/taskers.py index d7e24dbff..07815b993 100644 --- a/apps/ops/tasks/taskers.py +++ b/apps/ops/tasks/taskers.py @@ -7,6 +7,12 @@ from ops.models import Tasker from uuid import uuid1 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): result = AsyncResult(task_id) diff --git a/apps/ops/urls/api_urls.py b/apps/ops/urls/api_urls.py index aa885df9e..dd621ecb6 100644 --- a/apps/ops/urls/api_urls.py +++ b/apps/ops/urls/api_urls.py @@ -1,14 +1,19 @@ +# ~*~ coding: utf-8 ~*~ +from __future__ import unicode_literals + 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.register(r'host_alia', ops_api_view.HostAliaViewSet) -api_router.register(r'user_alia', ops_api_view.UserAliaViewSet) -api_router.register(r'cmd_alia', ops_api_view.CmdAliaViewSet) -api_router.register(r'runas_alia', ops_api_view.RunasAliaViewSet) -api_router.register(r'extra_conf', ops_api_view.ExtraconfViewSet) -api_router.register(r'privilege', ops_api_view.PrivilegeViewSet) -api_router.register(r'sudo', ops_api_view.SudoViewSet) -api_router.register(r'cron', ops_api_view.CronTableViewSet) +api_router.register(r'host_alia', v1_api.HostAliaViewSet) +api_router.register(r'user_alia', v1_api.UserAliaViewSet) +api_router.register(r'cmd_alia', v1_api.CmdAliaViewSet) +api_router.register(r'runas_alia', v1_api.RunasAliaViewSet) +api_router.register(r'extra_conf', v1_api.ExtraconfViewSet) +api_router.register(r'privilege', v1_api.PrivilegeViewSet) +api_router.register(r'sudo', v1_api.SudoViewSet) +api_router.register(r'cron', v1_api.CronTableViewSet) urlpatterns = api_router.urls \ No newline at end of file diff --git a/apps/ops/urls/view_urls.py b/apps/ops/urls/view_urls.py index 5dde31ed3..cc544db17 100644 --- a/apps/ops/urls/view_urls.py +++ b/apps/ops/urls/view_urls.py @@ -5,9 +5,7 @@ from __future__ import unicode_literals from django.conf.urls import url from ops import views as page_view - -app_name = 'ops' - +__all__ = ["urlpatterns"] urlpatterns = [ # Resource Sudo url diff --git a/apps/ops/views.py b/apps/ops/views.py index fed47ba39..27b24b23d 100644 --- a/apps/ops/views.py +++ b/apps/ops/views.py @@ -7,8 +7,8 @@ from django.views.generic.edit import CreateView, DeleteView, UpdateView from django.views.generic.detail import DetailView, SingleObjectMixin from users.utils import AdminUserRequiredMixin -from .utils.mixins import CreateSudoPrivilegesMixin, ListSudoPrivilegesMixin -from models import * +from ops.utils.mixins import CreateSudoPrivilegesMixin, ListSudoPrivilegesMixin +from ops.models import * class SudoListView(AdminUserRequiredMixin, ListSudoPrivilegesMixin, ListView):