refactor and bug fixes

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

diff --git a/planetstack/core/models/__init__.py b/planetstack/core/models/__init__.py
index 2070e16..aa64676 100644 (file)
--- a/planetstack/core/models/__init__.py
+++ b/planetstack/core/models/__init__.py
@@ -5,15 +5,14 @@ from .service import Service
 from .service import ServiceAttribute
 from .tag import Tag
 from .role import Role
 from .service import ServiceAttribute
 from .tag import Tag
 from .role import Role

-from .site import Site,Deployment, DeploymentRole, DeploymentPrivilege, SiteDeployments
+from .site import Site, Deployment, DeploymentRole, DeploymentPrivilege, Controller, ControllerRole, ControllerPrivilege, SiteDeployments, ControllerSiteDeployments

 from .dashboard import DashboardView
 from .user import User, UserDashboardView
 from .serviceclass import ServiceClass
 from .dashboard import DashboardView
 from .user import User, UserDashboardView
 from .serviceclass import ServiceClass

-from .site import DeploymentLinkManager,DeploymentLinkDeletionManager
-from .slice import Slice, SliceDeployments
-from .site import SitePrivilege, SiteDeployments
-from .userdeployments import UserDeployments
-from .image import Image, ImageDeployments
+from .site import ControllerManager, ControllerDeletionManager, ControllerLinkManager,ControllerLinkDeletionManager
+from .slice import Slice, ControllerSlices
+from .controllerusers import ControllerUsers
+from .image import Image, ImageDeployments, ControllerImages

 from .node import Node
 from .serviceresource import ServiceResource
 from .slice import SliceRole
 from .node import Node
 from .serviceresource import ServiceResource
 from .slice import SliceRole


@@ -27,6 +26,6 @@ from .flavor import Flavor
 from .sliver import Sliver
 from .reservation import ReservedResource
 from .reservation import Reservation
 from .sliver import Sliver
 from .reservation import ReservedResource
 from .reservation import Reservation

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

 from .billing import Account, Invoice, Charge, UsableObject, Payment
 
 from .billing import Account, Invoice, Charge, UsableObject, Payment