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
Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
[plstackapi.git]
/
planetstack
/
openstack_observer
/
steps
/
sync_slivers.py
diff --git
a/planetstack/openstack_observer/steps/sync_slivers.py
b/planetstack/openstack_observer/steps/sync_slivers.py
index
6f61f53
..
a2d0e81
100644
(file)
--- a/
planetstack/openstack_observer/steps/sync_slivers.py
+++ b/
planetstack/openstack_observer/steps/sync_slivers.py
@@
-4,11
+4,10
@@
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 Slice, SlicePrivilege, ControllerSlice
s
-from core.models.network import Network, NetworkSlice, ControllerNetwork
s
+from core.models.slice import Slice, SlicePrivilege, ControllerSlice
+from core.models.network import Network, NetworkSlice, ControllerNetwork
from util.logger import Logger, logging
from observer.ansible import *
from util.logger import Logger, logging
from observer.ansible import *
-import pdb
logger = Logger(level=logging.INFO)
logger = Logger(level=logging.INFO)
@@
-46,7
+45,7
@@
class SyncSlivers(OpenStackSyncStep):
nics = []
networks = [ns.network for ns in NetworkSlice.objects.filter(slice=sliver.slice)]
nics = []
networks = [ns.network for ns in NetworkSlice.objects.filter(slice=sliver.slice)]
- controller_networks = ControllerNetwork
s
.objects.filter(network__in=networks,
+ controller_networks = ControllerNetwork.objects.filter(network__in=networks,
controller=sliver.node.site_deployment.controller)
for controller_network in controller_networks:
controller=sliver.node.site_deployment.controller)
for controller_network in controller_networks:
@@
-55,11
+54,11
@@
class SyncSlivers(OpenStackSyncStep):
nics.append(controller_network.net_id)
# now include network template
nics.append(controller_network.net_id)
# now include network template
- network_templates = [network.template.shared
NetworkN
ame for network in networks \
- if network.template.shared
NetworkN
ame]
+ network_templates = [network.template.shared
_network_n
ame for network in networks \
+ if network.template.shared
_network_n
ame]
#driver = self.driver.client_driver(caller=sliver.creator, tenant=sliver.slice.name, controller=sliver.controllerNetwork)
#driver = self.driver.client_driver(caller=sliver.creator, tenant=sliver.slice.name, controller=sliver.controllerNetwork)
- driver = self.driver.admin_driver(tenant='admin', controller=sliver.
controllerNetwork
)
+ driver = self.driver.admin_driver(tenant='admin', controller=sliver.
node.site_deployment.controller
)
nets = driver.shell.quantum.list_networks()['networks']
for net in nets:
if net['name'] in network_templates:
nets = driver.shell.quantum.list_networks()['networks']
for net in nets:
if net['name'] in network_templates:
@@
-71,7
+70,7
@@
class SyncSlivers(OpenStackSyncStep):
nics.append(net['id'])
# look up image id
nics.append(net['id'])
# look up image id
- controller_driver = self.driver.admin_driver(controller=sliver.
controllerNetwork
)
+ controller_driver = self.driver.admin_driver(controller=sliver.
node.site_deployment.controller
)
image_id = None
images = controller_driver.shell.glanceclient.images.list()
for image in images:
image_id = None
images = controller_driver.shell.glanceclient.images.list()
for image in images:
@@
-94,7
+93,7
@@
class SyncSlivers(OpenStackSyncStep):
if (legacy):
host_filter = sliver.node.name.split('.',1)[0]
else:
if (legacy):
host_filter = sliver.node.name.split('.',1)[0]
else:
- host_filter = sliver.node.name
+ host_filter = sliver.node.name
.strip()
availability_zone_filter = 'nova:%s'%host_filter
sliver_name = '%s-%d'%(sliver.slice.name,sliver.id)
availability_zone_filter = 'nova:%s'%host_filter
sliver_name = '%s-%d'%(sliver.slice.name,sliver.id)
@@
-103,10
+102,10
@@
class SyncSlivers(OpenStackSyncStep):
if sliver.userData:
userData = sliver.userData
if sliver.userData:
userData = sliver.userData
- controller = sliver.
controllerNetwork
+ controller = sliver.
node.site_deployment.controller
tenant_fields = {'endpoint':controller.auth_url,
tenant_fields = {'endpoint':controller.auth_url,
- 'admin_user': sliver.creator.
username
,
- 'admin_password': sliver.creator.password,
+ 'admin_user': sliver.creator.
email
,
+ 'admin_password': sliver.creator.
remote_
password,
'admin_tenant': sliver.slice.name,
'tenant': sliver.slice.name,
'tenant_description': sliver.slice.description,
'admin_tenant': sliver.slice.name,
'tenant': sliver.slice.name,
'tenant_description': sliver.slice.description,
@@
-115,7
+114,7
@@
class SyncSlivers(OpenStackSyncStep):
'availability_zone': availability_zone_filter,
'image_id':image_id,
'key_name':keyname,
'availability_zone': availability_zone_filter,
'image_id':image_id,
'key_name':keyname,
- 'flavor_id':
3
,
+ 'flavor_id':
sliver.flavor.id
,
'nics':nics,
'meta':metadata_update,
'key':key_fields,
'nics':nics,
'meta':metadata_update,
'key':key_fields,