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
taking out request_hash and adding call tracability for get_self_credential method
[sfa.git]
/
sfa
/
managers
/
aggregate_manager_vini.py
diff --git
a/sfa/managers/aggregate_manager_vini.py
b/sfa/managers/aggregate_manager_vini.py
index
faeaebb
..
6e96804
100644
(file)
--- a/
sfa/managers/aggregate_manager_vini.py
+++ b/
sfa/managers/aggregate_manager_vini.py
@@
-1,11
+1,9
@@
from sfa.util.faults import *
from sfa.util.namespace import *
from sfa.util.faults import *
from sfa.util.namespace import *
-from sfa.util.rspec import RSpec
from sfa.server.registry import Registries
from sfa.plc.nodes import *
from sfa.plc.api import *
from sfa.server.registry import Registries
from sfa.plc.nodes import *
from sfa.plc.api import *
-from sfa.rspecs.aggregates.vini.utils import *
-from sfa.rspecs.aggregates.vini.rspec import *
+from sfa.managers.vini.utils import *
import sys
"""
import sys
"""
@@
-131,7
+129,7
@@
def create_slice_vini_aggregate(api, hrn, nodes):
return 1
return 1
-def get_rspec(api, xrn):
+def get_rspec(api, xrn
, origin_hrn
):
hrn = urn_to_hrn(xrn)[0]
topo = Topology(api)
if (hrn):
hrn = urn_to_hrn(xrn)[0]
topo = Topology(api)
if (hrn):
@@
-153,10
+151,8
@@
Hook called via 'sfi.py create'
"""
def create_slice(api, xrn, xml):
hrn = urn_to_hrn(xrn)[0]
"""
def create_slice(api, xrn, xml):
hrn = urn_to_hrn(xrn)[0]
- rspec = RSpec(xml)
topo = Topology(api)
topo = Topology(api)
-
- topo.nodeTopoFromRSpec(rspec)
+ topo.nodeTopoFromRSpec(xml)
# Check request against current allocations
topo.verifyNodeTopo(hrn, topo)
# Check request against current allocations
topo.verifyNodeTopo(hrn, topo)
@@
-187,7
+183,7
@@
def fetch_context(slice_hrn, user_hrn, contexts):
return base_context
def main():
return base_context
def main():
- api =
Geni
API()
+ api =
Sfa
API()
#rspec = get_rspec(api, "plc.princeton.iias", None)
#print rspec
f = open(sys.argv[1])
#rspec = get_rspec(api, "plc.princeton.iias", None)
#print rspec
f = open(sys.argv[1])