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
getting the get_resources call working
[sfa.git]
/
sfa
/
plc
/
nodes.py
diff --git
a/sfa/plc/nodes.py
b/sfa/plc/nodes.py
index
f80bd1a
..
9c5cf62
100644
(file)
--- a/
sfa/plc/nodes.py
+++ b/
sfa/plc/nodes.py
@@
-88,7
+88,8
@@
class Nodes(SimpleStorage):
self.update(node_details)
self.write()
self.update(node_details)
self.write()
- def get_remote_resources(self, hrn = None):
+ def get_rspec_smgr(self, xrn = None):
+ hrn, type = urn_to_hrn(xrn)
# convert and threshold to ints
if self.has_key('timestamp') and self['timestamp']:
hr_timestamp = self['timestamp']
# convert and threshold to ints
if self.has_key('timestamp') and self['timestamp']:
hr_timestamp = self['timestamp']
@@
-116,7
+117,7
@@
class Nodes(SimpleStorage):
if aggregate not in [self.api.auth.client_cred.get_gid_caller().get_hrn()]:
try:
# get the rspec from the aggregate
if aggregate not in [self.api.auth.client_cred.get_gid_caller().get_hrn()]:
try:
# get the rspec from the aggregate
- agg_rspec = aggregates[aggregate].get_resources(credential,
h
rn, origin_hrn)
+ agg_rspec = aggregates[aggregate].get_resources(credential,
x
rn, origin_hrn)
# extract the netspec from each aggregates rspec
rspec.parseString(agg_rspec)
networks.extend([{'NetSpec': rspec.getDictsByTagName('NetSpec')}])
# extract the netspec from each aggregates rspec
rspec.parseString(agg_rspec)
networks.extend([{'NetSpec': rspec.getDictsByTagName('NetSpec')}])
@@
-130,11
+131,11
@@
class Nodes(SimpleStorage):
resourceDict = {'RSpec': resources}
# convert rspec dict to xml
rspec.parseDict(resourceDict)
resourceDict = {'RSpec': resources}
# convert rspec dict to xml
rspec.parseDict(resourceDict)
- return rspec
+ return rspec
.toxml()
def refresh_nodes_smgr(self):
def refresh_nodes_smgr(self):
- rspec =
self.get_remote_resources(
)
+ rspec =
RSpec(xml=self.get_rspec_smgr()
)
# filter according to policy
blist = self.policy['node_blacklist']
wlist = self.policy['node_whitelist']
# filter according to policy
blist = self.policy['node_blacklist']
wlist = self.policy['node_whitelist']
@@
-154,23
+155,18
@@
class Nodes(SimpleStorage):
self.update(nodedict)
self.write()
self.update(nodedict)
self.write()
- def get_rspec(self,
h
rn = None):
+ def get_rspec(self,
x
rn = None):
if self.api.interface in ['slicemgr']:
if self.api.interface in ['slicemgr']:
- return self.get_rspec_smgr(
h
rn)
+ return self.get_rspec_smgr(
x
rn)
elif self.api.interface in ['aggregate']:
elif self.api.interface in ['aggregate']:
- return self.get_rspec_aggregate(
h
rn)
+ return self.get_rspec_aggregate(
x
rn)
- def get_rspec_smgr(self, hrn = None):
-
- rspec = self.get_remote_resources(hrn)
- return rspec.toxml()
-
- def get_rspec_aggregate(self, hrn = None):
+ def get_rspec_aggregate(self, xrn = None):
"""
Get resource information from PLC
"""
"""
Get resource information from PLC
"""
-
+ hrn, type = urn_to_hrn(xrn)
slicename = None
# Get the required nodes
if not hrn:
slicename = None
# Get the required nodes
if not hrn: