git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9df26a2
)
merge changes not committed
author
Scott Baker
<smbaker@gmail.com>
Wed, 5 Nov 2014 17:05:14 +0000
(09:05 -0800)
committer
Scott Baker
<smbaker@gmail.com>
Wed, 5 Nov 2014 17:05:14 +0000
(09:05 -0800)
planetstack/openstack_observer/steps/sync_network_deployments.py
patch
|
blob
|
history
planetstack/openstack_observer/steps/sync_network_slivers.py
patch
|
blob
|
history
planetstack/openstack_observer/steps/sync_slivers.py
patch
|
blob
|
history
diff --git
a/planetstack/openstack_observer/steps/sync_network_deployments.py
b/planetstack/openstack_observer/steps/sync_network_deployments.py
index
0312f3a
..
a6fc389
100644
(file)
--- a/
planetstack/openstack_observer/steps/sync_network_deployments.py
+++ b/
planetstack/openstack_observer/steps/sync_network_deployments.py
@@
-104,6
+104,8
@@
class SyncNetworkDeployments(OpenStackSyncStep):
network_deployment.save()
def sync_record(self, network_deployment):
network_deployment.save()
def sync_record(self, network_deployment):
+ logger.info("sync'ing network deployment %s for network %s slice %s deployment %s" % (network_deployment, network_deployment.network, str(network_deployment.network.owner), network_deployment.deployment))
+
if not network_deployment.deployment.admin_user:
logger.info("deployment %r has no admin_user, skipping" % network_deployment.deployment)
return
if not network_deployment.deployment.admin_user:
logger.info("deployment %r has no admin_user, skipping" % network_deployment.deployment)
return
diff --git
a/planetstack/openstack_observer/steps/sync_network_slivers.py
b/planetstack/openstack_observer/steps/sync_network_slivers.py
index
3e85e05
..
086308e
100644
(file)
--- a/
planetstack/openstack_observer/steps/sync_network_slivers.py
+++ b/
planetstack/openstack_observer/steps/sync_network_slivers.py
@@
-17,6
+17,8
@@
class SyncNetworkSlivers(OpenStackSyncStep):
# which Network is associated from the port.
def call(self, **args):
# which Network is associated from the port.
def call(self, **args):
+ logger.info("sync'ing network slivers")
+
networkSlivers = NetworkSliver.objects.all()
networkSlivers_by_id = {}
networkSlivers_by_port = {}
networkSlivers = NetworkSliver.objects.all()
networkSlivers_by_id = {}
networkSlivers_by_port = {}
diff --git
a/planetstack/openstack_observer/steps/sync_slivers.py
b/planetstack/openstack_observer/steps/sync_slivers.py
index
4f33bba
..
8237896
100644
(file)
--- a/
planetstack/openstack_observer/steps/sync_slivers.py
+++ b/
planetstack/openstack_observer/steps/sync_slivers.py
@@
-24,7
+24,7
@@
class SyncSlivers(OpenStackSyncStep):
return userdata
def sync_record(self, sliver):
return userdata
def sync_record(self, sliver):
- logger.info("sync'ing sliver:%s
deployment:%s " % (sliver
, sliver.node.deployment))
+ logger.info("sync'ing sliver:%s
slice:%s deployment:%s " % (sliver, sliver.slice.name
, sliver.node.deployment))
metadata_update = {}
if (sliver.numberCores):
metadata_update = {}
if (sliver.numberCores):