git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
verify_slice_nodes now returns the correct set of nodes
[sfa.git]
/
sfa
/
planetlab
/
plslices.py
diff --git
a/sfa/planetlab/plslices.py
b/sfa/planetlab/plslices.py
index
eb60066
..
3cfc2f6
100644
(file)
--- a/
sfa/planetlab/plslices.py
+++ b/
sfa/planetlab/plslices.py
@@
-4,10
+4,9
@@
from collections import defaultdict
from sfa.util.sfatime import utcparse, datetime_to_epoch
from sfa.util.sfalogging import logger
from sfa.util.xrn import Xrn, get_leaf, get_authority, urn_to_hrn
from sfa.util.sfatime import utcparse, datetime_to_epoch
from sfa.util.sfalogging import logger
from sfa.util.xrn import Xrn, get_leaf, get_authority, urn_to_hrn
-
from sfa.rspecs.rspec import RSpec
from sfa.rspecs.rspec import RSpec
-
from sfa.planetlab.vlink import VLink
from sfa.planetlab.vlink import VLink
+from sfa.planetlab.topology import Topology
from sfa.planetlab.plxrn import PlXrn, hrn_to_pl_slicename
MAXINT = 2L**31-1
from sfa.planetlab.plxrn import PlXrn, hrn_to_pl_slicename
MAXINT = 2L**31-1
@@
-198,7
+197,10
@@
class PlSlices:
except:
logger.log_exc('Failed to add/remove slice from nodes')
except:
logger.log_exc('Failed to add/remove slice from nodes')
- return nodes
+
+ slices = self.driver.shell.GetSlices(slice['name'], ['node_ids'])
+ resulting_nodes = self.driver.shell.GetNodes(slices[0]['node_ids'])
+ return resulting_nodes
def free_egre_key(self):
used = set()
def free_egre_key(self):
used = set()
@@
-215,10
+217,15
@@
class PlSlices:
return str(key)
def verify_slice_links(self, slice, requested_links, nodes):
return str(key)
def verify_slice_links(self, slice, requested_links, nodes):
- # nodes is undefined here
+
if not requested_links:
return
if not requested_links:
return
-
+
+ # exit if links are not supported here
+ topology = Topology()
+ if not topology:
+ return
+
# build dict of nodes
nodes_dict = {}
interface_ids = []
# build dict of nodes
nodes_dict = {}
interface_ids = []
@@
-246,7
+253,11
@@
class PlSlices:
for link in requested_links:
# get the ip address of the first node in the link
ifname1 = Xrn(link['interface1']['component_id']).get_leaf()
for link in requested_links:
# get the ip address of the first node in the link
ifname1 = Xrn(link['interface1']['component_id']).get_leaf()
- (node_raw, device) = ifname1.split(':')
+ ifname_parts = ifname1.split(':')
+ node_raw = ifname_parts[0]
+ device = None
+ if len(ifname_parts) > 1:
+ device = ifname_parts[1]
node_id = int(node_raw.replace('node', ''))
node = nodes_dict[node_id]
if1 = interfaces_dict[node['interface_ids'][0]]
node_id = int(node_raw.replace('node', ''))
node = nodes_dict[node_id]
if1 = interfaces_dict[node['interface_ids'][0]]
@@
-342,27
+353,22
@@
class PlSlices:
slices = self.driver.shell.GetSlices([slicename])
if not slices:
slice = {'name': slicename,
slices = self.driver.shell.GetSlices([slicename])
if not slices:
slice = {'name': slicename,
- 'url':
slice_record.get('url', slice_hrn)
,
- 'description':
slice_record.get('description', slice_hrn)
}
+ 'url':
'No Url'
,
+ 'description':
'No Description'
}
# add the slice
slice['slice_id'] = self.driver.shell.AddSlice(slice)
slice['node_ids'] = []
slice['person_ids'] = []
# add the slice
slice['slice_id'] = self.driver.shell.AddSlice(slice)
slice['node_ids'] = []
slice['person_ids'] = []
- if peer:
+ if peer
and slice_record
:
slice['peer_slice_id'] = slice_record.get('slice_id', None)
slice['peer_slice_id'] = slice_record.get('slice_id', None)
- # mark this slice as an sfa peer record
-# if sfa_peer:
-# peer_dict = {'type': 'slice', 'hrn': slice_hrn,
-# 'peer_authority': sfa_peer, 'pointer': slice['slice_id']}
-# self.registry.register_peer_object(self.credential, peer_dict)
else:
slice = slices[0]
else:
slice = slices[0]
- if peer:
+ if peer
and slice_record
:
slice['peer_slice_id'] = slice_record.get('slice_id', None)
# unbind from peer so we can modify if necessary. Will bind back later
self.driver.shell.UnBindObjectFromPeer('slice', slice['slice_id'], peer['shortname'])
#Update existing record (e.g. expires field) it with the latest info.
slice['peer_slice_id'] = slice_record.get('slice_id', None)
# unbind from peer so we can modify if necessary. Will bind back later
self.driver.shell.UnBindObjectFromPeer('slice', slice['slice_id'], peer['shortname'])
#Update existing record (e.g. expires field) it with the latest info.
- if slice_record.get('expires'):
+ if slice_record
and slice_record
.get('expires'):
requested_expires = int(datetime_to_epoch(utcparse(slice_record['expires'])))
if requested_expires and slice['expires'] != requested_expires:
self.driver.shell.UpdateSlice( slice['slice_id'], {'expires' : requested_expires})
requested_expires = int(datetime_to_epoch(utcparse(slice_record['expires'])))
if requested_expires and slice['expires'] != requested_expires:
self.driver.shell.UpdateSlice( slice['slice_id'], {'expires' : requested_expires})