Renamed SliceDeployment back to SliceDeployments

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

diff --git a/planetstack/core/models/__init__.py b/planetstack/core/models/__init__.py
index 40d9f29..76c9590 100644 (file)
--- a/planetstack/core/models/__init__.py
+++ b/planetstack/core/models/__init__.py
@@ -1,5 +1,4 @@
-from .plcorebase import PlCoreBase
-from .planetstack import PlanetStack
+from .plcorebase import PlCoreBase,PlCoreBaseManager,PlCoreBaseDeletionManager,DiffModelMixIn

 from .project import Project
 from .singletonmodel import SingletonModel
 from .service import Service
 from .project import Project
 from .singletonmodel import SingletonModel
 from .service import Service


@@ -10,23 +9,24 @@ from .site import Site,Deployment, DeploymentRole, DeploymentPrivilege, SiteDepl
 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 .slice import Slice, SliceDeployments
 from .site import SitePrivilege, SiteDeployments

-from .userdeployments import UserDeployments
-from .image import Image, ImageDeployments
+from .userdeployments import UserDeployment
+from .image import Image, ImageDeployment

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

+from .credential import UserCredential,SiteCredential,SliceCredential

 from .site import SiteRole
 from .site import SitePrivilege
 from .site import SiteRole
 from .site import SitePrivilege

-from .planetstack import PlanetStackRole
-from .planetstack import PlanetStackPrivilege
+from .planetstackspecific import PlanetStack,PlanetStackRole,PlanetStackPrivilege

 from .slicetag import SliceTag
 from .slicetag import SliceTag

+from .flavor import Flavor

 from .sliver import Sliver
 from .reservation import ReservedResource
 from .reservation import Reservation
 from .network import Network, NetworkParameterType, NetworkParameter, NetworkSliver, NetworkTemplate, Router, NetworkSlice, NetworkDeployments
 from .sliver import Sliver
 from .reservation import ReservedResource
 from .reservation import Reservation
 from .network import Network, NetworkParameterType, NetworkParameter, NetworkSliver, NetworkTemplate, Router, NetworkSlice, NetworkDeployments

-from .flavor import Flavor

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