Skip to content

Commit

Permalink
Upgraded code according to latest django-netjsongraph 0.4.0 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
nemesifier committed Aug 26, 2017
1 parent e627f48 commit de45b67
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 13 deletions.
2 changes: 1 addition & 1 deletion openwisp_network_topology/tests/test_admin.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from django.test import TestCase
from django.urls import reverse
from django_netjsongraph.tests import CreateGraphObjectsMixin
from django_netjsongraph.tests.base.admin import TestAdminMixin
from django_netjsongraph.tests.base.test_admin import TestAdminMixin

from openwisp_users.tests.utils import TestOrganizationMixin
from openwisp_utils.tests.utils import TestMultitenantAdminMixin
Expand Down
2 changes: 1 addition & 1 deletion openwisp_network_topology/tests/test_api.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.test import TestCase
from django_netjsongraph.tests import CreateGraphObjectsMixin
from django_netjsongraph.tests.base.api import TestApiMixin
from django_netjsongraph.tests.base.test_api import TestApiMixin

from . import CreateOrgMixin
from ..models import Link, Node, Snapshot, Topology
Expand Down
2 changes: 1 addition & 1 deletion openwisp_network_topology/tests/test_link.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.test import TestCase
from django_netjsongraph.tests import CreateGraphObjectsMixin
from django_netjsongraph.tests.base.link import TestLinkMixin
from django_netjsongraph.tests.base.test_link import TestLinkMixin

from . import CreateOrgMixin
from ..models import Link, Node, Topology
Expand Down
2 changes: 1 addition & 1 deletion openwisp_network_topology/tests/test_node.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.test import TestCase
from django_netjsongraph.tests import CreateGraphObjectsMixin
from django_netjsongraph.tests.base.node import TestNodeMixin
from django_netjsongraph.tests.base.test_node import TestNodeMixin

from . import CreateOrgMixin
from ..models import Node, Topology
Expand Down
2 changes: 1 addition & 1 deletion openwisp_network_topology/tests/test_topology.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.test import TestCase
from django_netjsongraph.tests import CreateGraphObjectsMixin
from django_netjsongraph.tests.base.topology import TestTopologyMixin
from django_netjsongraph.tests.base.test_topology import TestTopologyMixin

from . import CreateOrgMixin
from ..models import Link, Node, Topology
Expand Down
2 changes: 1 addition & 1 deletion openwisp_network_topology/tests/test_visualizer.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.test import TestCase
from django_netjsongraph.tests import CreateGraphObjectsMixin
from django_netjsongraph.tests.base.visualizer import TestVisualizerMixin
from django_netjsongraph.tests.base.test_visualizer import TestVisualizerMixin

from . import CreateOrgMixin
from ..models import Node, Topology
Expand Down
8 changes: 1 addition & 7 deletions openwisp_network_topology/visualizer/views.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from django_netjsongraph.visualizer.generics import (BaseTopologyDetailView, BaseTopologyHistoryView,
BaseTopologyListView)
from django_netjsongraph.visualizer.generics import BaseTopologyDetailView, BaseTopologyListView

from ..models import Topology

Expand All @@ -12,10 +11,5 @@ class TopologyDetailView(BaseTopologyDetailView):
topology_model = Topology


class TopologyHistoryView(BaseTopologyHistoryView):
topology_model = Topology


topology_list = TopologyListView.as_view()
topology_detail = TopologyDetailView.as_view()
topology_history = TopologyHistoryView.as_view()

0 comments on commit de45b67

Please sign in to comment.