X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fmodels%2F__init__.py;h=6926d902239b8229f98e111ddbaa5f7197c4006f;hb=332ee1d3fe906c4b7e7a226d6a8d9cc66f6099fe;hp=9b19821c6b51aa7747efdca0a354c039b0872435;hpb=78ce7694b6fb4a1decf3859f563ef1e3bbdaaa0b;p=plstackapi.git

diff --git a/planetstack/core/models/__init__.py b/planetstack/core/models/__init__.py
index 9b19821..6926d90 100644
--- a/planetstack/core/models/__init__.py
+++ b/planetstack/core/models/__init__.py
@@ -1,19 +1,31 @@
 from .plcorebase import PlCoreBase
-from .deployment import Deployment
+from .planetstack import PlanetStack
 from .project import Project
+from .singletonmodel import SingletonModel
+from .service import Service
+from .service import ServiceAttribute
 from .tag import Tag
-from .site import Site
+from .role import Role
+#from .deployment import Deployment
+from .site import Site,Deployment, DeploymentRole, DeploymentPrivilege, SiteDeployments
+from .user import User
+from .serviceclass import ServiceClass
+from .slice import Slice
 from .site import SitePrivilege
 from .image import Image
-from .user import User
-from .role import Role
 from .node import Node
-from .serviceclass import ServiceClass
 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 .network import Network, NetworkParameterType, NetworkParameter, NetworkSliver, NetworkTemplate, Router, NetworkSlice
+from .billing import Account, Invoice, Charge, UsableObject, Payment