From 91463d92cb5f49822fa4935b4dc424c2ab84df35 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Thu, 19 Jun 2014 20:42:03 -0400 Subject: [PATCH] fix import errors --- planetstack/observer/steps/garbage_collector.py | 1 - planetstack/observer/steps/sync_image_deployments.py | 4 ++-- planetstack/observer/steps/sync_nodes.py | 3 +-- planetstack/observer/steps/sync_roles.py | 3 +-- planetstack/observer/steps/sync_site_privileges.py | 3 +-- planetstack/observer/steps/sync_slice_deployments.py | 5 ++--- planetstack/observer/steps/sync_slice_memberships.py | 2 +- planetstack/observer/steps/sync_user_deployments.py | 3 ++- planetstack/observer/steps/sync_users.py | 3 ++- 9 files changed, 12 insertions(+), 15 deletions(-) diff --git a/planetstack/observer/steps/garbage_collector.py b/planetstack/observer/steps/garbage_collector.py index 6feff14..7c42922 100644 --- a/planetstack/observer/steps/garbage_collector.py +++ b/planetstack/observer/steps/garbage_collector.py @@ -6,7 +6,6 @@ from django.db.models import F, Q from planetstack.config import Config from util.logger import Logger, logging from observer.openstacksyncstep import OpenStackSyncStep -from core.models.deployment import Deployment from core.models import * logger = Logger(logfile='/var/log/observer.log', level=logging.INFO) diff --git a/planetstack/observer/steps/sync_image_deployments.py b/planetstack/observer/steps/sync_image_deployments.py index 3957e74..4a69b1c 100644 --- a/planetstack/observer/steps/sync_image_deployments.py +++ b/planetstack/observer/steps/sync_image_deployments.py @@ -4,8 +4,8 @@ from collections import defaultdict from django.db.models import F, Q from planetstack.config import Config from observer.openstacksyncstep import OpenStackSyncStep -from core.models.deployment import Deployment -from core.models.image import Image, ImageDeployments +from core.models import Deployment +from core.models import Image, ImageDeployments from util.logger import Logger, logging logger = Logger(level=logging.INFO) diff --git a/planetstack/observer/steps/sync_nodes.py b/planetstack/observer/steps/sync_nodes.py index ecd32b4..030d57c 100644 --- a/planetstack/observer/steps/sync_nodes.py +++ b/planetstack/observer/steps/sync_nodes.py @@ -6,8 +6,7 @@ from django.db.models import F, Q from planetstack.config import Config from observer.openstacksyncstep import OpenStackSyncStep from core.models.node import Node -from core.models.deployment import Deployment -from core.models.site import Site +from core.models.site import Site, Deployment class SyncNodes(OpenStackSyncStep): provides=[Node] diff --git a/planetstack/observer/steps/sync_roles.py b/planetstack/observer/steps/sync_roles.py index ca85d57..e3a20e9 100644 --- a/planetstack/observer/steps/sync_roles.py +++ b/planetstack/observer/steps/sync_roles.py @@ -4,9 +4,8 @@ from django.db.models import F, Q from planetstack.config import Config from observer.openstacksyncstep import OpenStackSyncStep from core.models.role import Role -from core.models.site import SiteRole +from core.models.site import SiteRole, Deployment, DeploymentRole from core.models.slice import SliceRole -from core.models.deployment import Deployment, DeploymentRole class SyncRoles(OpenStackSyncStep): provides=[Role] diff --git a/planetstack/observer/steps/sync_site_privileges.py b/planetstack/observer/steps/sync_site_privileges.py index b57ae43..c229257 100644 --- a/planetstack/observer/steps/sync_site_privileges.py +++ b/planetstack/observer/steps/sync_site_privileges.py @@ -3,8 +3,7 @@ import base64 from django.db.models import F, Q from planetstack.config import Config from observer.openstacksyncstep import OpenStackSyncStep -from core.models.site import * -from core.models.user import User, UserDeployments +from core.models import User, UserDeployments, SitePrivilege, SiteDeployments class SyncSitePrivileges(OpenStackSyncStep): requested_interval=0 diff --git a/planetstack/observer/steps/sync_slice_deployments.py b/planetstack/observer/steps/sync_slice_deployments.py index b40eb6b..7cce152 100644 --- a/planetstack/observer/steps/sync_slice_deployments.py +++ b/planetstack/observer/steps/sync_slice_deployments.py @@ -5,10 +5,9 @@ from netaddr import IPAddress, IPNetwork from django.db.models import F, Q from planetstack.config import Config from observer.openstacksyncstep import OpenStackSyncStep -from core.models.deployment import Deployment -from core.models.site import SiteDeployments +from core.models.site import Deployment, SiteDeployments from core.models.slice import Slice, SliceDeployments -from core.models.user import UserDeployments +from core.models.userdeployments import UserDeployments from util.logger import Logger, logging logger = Logger(level=logging.INFO) diff --git a/planetstack/observer/steps/sync_slice_memberships.py b/planetstack/observer/steps/sync_slice_memberships.py index 38bd26c..d2ec03e 100644 --- a/planetstack/observer/steps/sync_slice_memberships.py +++ b/planetstack/observer/steps/sync_slice_memberships.py @@ -4,7 +4,7 @@ from django.db.models import F, Q from planetstack.config import Config from observer.openstacksyncstep import OpenStackSyncStep from core.models.slice import * -from core.models.user import UserDeployments +from core.models.userdeployments import UserDeployments from util.logger import Logger, logging logger = Logger(level=logging.INFO) diff --git a/planetstack/observer/steps/sync_user_deployments.py b/planetstack/observer/steps/sync_user_deployments.py index 39943f7..a6995ab 100644 --- a/planetstack/observer/steps/sync_user_deployments.py +++ b/planetstack/observer/steps/sync_user_deployments.py @@ -6,7 +6,8 @@ from django.db.models import F, Q from planetstack.config import Config from observer.openstacksyncstep import OpenStackSyncStep from core.models.site import SiteDeployments, Deployment -from core.models.user import User, UserDeployments +from core.models.user import User +from core.models.userdeployments import UserDeployments from util.logger import Logger, logging logger = Logger(level=logging.INFO) diff --git a/planetstack/observer/steps/sync_users.py b/planetstack/observer/steps/sync_users.py index 71f9c0f..9d88918 100644 --- a/planetstack/observer/steps/sync_users.py +++ b/planetstack/observer/steps/sync_users.py @@ -4,7 +4,8 @@ import hashlib from django.db.models import F, Q from planetstack.config import Config from observer.openstacksyncstep import OpenStackSyncStep -from core.models.user import User, UserDeployments +from core.models.user import User +from core.models.userdeployments import UserDeployments class SyncUsers(OpenStackSyncStep): provides=[User] -- 2.47.0