Merge branch 'master' of git.planet-lab.org:/git/plstackapi

[plstackapi.git] / planetstack / core / models / __init__.py

diff --git a/planetstack/core/models/__init__.py b/planetstack/core/models/__init__.py
index 2280822..b4c7cf6 100644 (file)
--- a/planetstack/core/models/__init__.py
+++ b/planetstack/core/models/__init__.py
@@ -1,18 +1,27 @@
 from .plcorebase import PlCoreBase
 from .plcorebase import PlCoreBase

-from .deployment import Deployment
+from .planetstack import PlanetStack

 from .project import Project
 from .tag import Tag
 from .project import Project
 from .tag import Tag

+from .role import Role
+from .deployment import Deployment

 from .site import Site
 from .site import Site

+from .user import User
+from .serviceclass import ServiceClass
+from .slice import Slice

 from .site import SitePrivilege
 from .image import Image
 from .site import SitePrivilege
 from .image import Image

-from .user import User
-from .role import Role

 from .node import Node
 from .node import Node

-from .serviceclass import ServiceClass

 from .serviceresource import ServiceResource
 from .serviceresource import ServiceResource

-from .slice import Slice
-from .slice import SliceMembership
+from .slice import SliceRole
+from .slice import SlicePrivilege
+from .site import SiteRole
+from .site import SitePrivilege
+from .deployment import DeploymentRole
+from .deployment import DeploymentPrivilege
+from .planetstack import PlanetStackRole
+from .planetstack import PlanetStackPrivilege

 from .slicetag import SliceTag
 from .sliver import Sliver
 from .reservation import ReservedResource
 from .reservation import Reservation
 from .slicetag import SliceTag
 from .sliver import Sliver
 from .reservation import ReservedResource
 from .reservation import Reservation

+from .network import Network, NetworkParameterType, NetworkParameter, NetworkSliver, NetworkTemplate, Router, NetworkSlice