git://git.onelab.eu
/
plstackapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix files I checked into the wrong directory
[plstackapi.git]
/
planetstack
/
observer
/
steps
/
sync_slivers.py
diff --git
a/planetstack/observer/steps/sync_slivers.py
b/planetstack/observer/steps/sync_slivers.py
index
b576bbc
..
a794ccf
100644
(file)
--- a/
planetstack/observer/steps/sync_slivers.py
+++ b/
planetstack/observer/steps/sync_slivers.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.sliver import Sliver
from planetstack.config import Config
from observer.openstacksyncstep import OpenStackSyncStep
from core.models.sliver import Sliver
-from core.models.slice import SlicePrivilege, SliceDeployments
+from core.models.slice import Slice
, Slice
Privilege, SliceDeployments
from core.models.network import Network, NetworkSlice, NetworkDeployments
from util.logger import Logger, logging
from core.models.network import Network, NetworkSlice, NetworkDeployments
from util.logger import Logger, logging
@@
-52,6
+52,7
@@
class SyncSlivers(OpenStackSyncStep):
# now include network template
network_templates = [network.template.sharedNetworkName for network in networks \
if network.template.sharedNetworkName]
# now include network template
network_templates = [network.template.sharedNetworkName for network in networks \
if network.template.sharedNetworkName]
+ #logger.info("%s %s %s %s" % (driver.shell.quantum.username, driver.shell.quantum.password, driver.shell.quantum.tenant, driver.shell.quantum.url))
for net in driver.shell.quantum.list_networks()['networks']:
if net['name'] in network_templates:
nics.append({'net-id': net['id']})
for net in driver.shell.quantum.list_networks()['networks']:
if net['name'] in network_templates:
nics.append({'net-id': net['id']})