remove image_preference, add default_image, default_flavor to slice

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

diff --git a/planetstack/core/models/__init__.py b/planetstack/core/models/__init__.py
index 79c6611..d7787c4 100644 (file)
--- a/planetstack/core/models/__init__.py
+++ b/planetstack/core/models/__init__.py
@@ -5,14 +5,16 @@ from .service import Service
 from .service import ServiceAttribute
 from .tag import Tag
 from .role import Role
-from .site import Site, Deployment, DeploymentRole, DeploymentPrivilege, Controller, ControllerRole, ControllerPrivilege, ControllerSite, SiteDeployment
+from .site import Site, Deployment, DeploymentRole, DeploymentPrivilege, Controller, ControllerRole, ControllerSite, SiteDeployment
 from .dashboard import DashboardView, ControllerDashboardView
 from .user import User, UserDashboardView
 from .serviceclass import ServiceClass
 from .site import ControllerManager, ControllerDeletionManager, ControllerLinkManager,ControllerLinkDeletionManager
+from .flavor import Flavor
+from .image import Image
 from .slice import Slice, ControllerSlice
-from .controlleruser import ControllerUser
-from .image import Image, ImageDeployments, ControllerImages
+from .controlleruser import ControllerUser, ControllerSitePrivilege, ControllerSlicePrivilege
+from .image import ImageDeployments, ControllerImages
 from .node import Node
 from .serviceresource import ServiceResource
 from .slice import SliceRole
@@ -22,7 +24,6 @@ from .site import SiteRole
 from .site import SitePrivilege
 from .planetstackspecific import PlanetStack,PlanetStackRole,PlanetStackPrivilege
 from .slicetag import SliceTag
-from .flavor import Flavor
 from .sliver import Sliver
 from .reservation import ReservedResource
 from .reservation import Reservation