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
a missing part of the call_id on ListResources/get_rspec
[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
e79dcf4
..
e16d201
100644
(file)
--- a/
sfa/managers/aggregate_manager_vini.py
+++ b/
sfa/managers/aggregate_manager_vini.py
@@
-4,7
+4,7
@@
import traceback
import sys
from types import StringTypes
import sys
from types import StringTypes
-from sfa.util.xrn import urn_to_hrn
+from sfa.util.xrn import urn_to_hrn
, Xrn
from sfa.util.plxrn import hrn_to_pl_slicename
from sfa.util.rspec import *
from sfa.util.specdict import *
from sfa.util.plxrn import hrn_to_pl_slicename
from sfa.util.rspec import *
from sfa.util.specdict import *
@@
-21,24
+21,20
@@
from sfa.plc.api import SfaAPI
from sfa.plc.slices import *
from sfa.managers.aggregate_manager_pl import __get_registry_objects, __get_hostnames
from sfa.util.version import version_core
from sfa.plc.slices import *
from sfa.managers.aggregate_manager_pl import __get_registry_objects, __get_hostnames
from sfa.util.version import version_core
+from sfa.util.callids import Callids
# VINI aggregate is almost identical to PLC aggregate for many operations,
# so lets just import the methods form the PLC manager
from sfa.managers.aggregate_manager_pl import (
# VINI aggregate is almost identical to PLC aggregate for many operations,
# so lets just import the methods form the PLC manager
from sfa.managers.aggregate_manager_pl import (
-start_slice, stop_slice, renew_slice, reset_slice, get_slices, get_ticket)
+start_slice, stop_slice, renew_slice, reset_slice, get_slices, get_ticket
, slice_status
)
def GetVersion(api):
def GetVersion(api):
+ xrn=Xrn(api.hrn)
return version_core({'interface':'aggregate',
return version_core({'interface':'aggregate',
- 'testbed':'myplc.vini'})
-
-def slice_status(api, slice_xrn, creds):
- result = {}
- result['geni_urn'] = slice_xrn
- result['geni_status'] = 'unknown'
- result['geni_resources'] = {}
- return result
-
+ 'testbed':'myplc.vini',
+ 'hrn':xrn.get_hrn(),
+ })
def delete_slice(api, xrn, creds):
hrn, type = urn_to_hrn(xrn)
def delete_slice(api, xrn, creds):
hrn, type = urn_to_hrn(xrn)
@@
-93,7
+89,8
@@
def create_slice(api, xrn, creds, xml, users):
return True
return True
-def get_rspec(api, creds, options):
+def get_rspec(api, creds, options,call_id):
+ if not Callids().should_handle_call_id(call_id): return ""
# get slice's hrn from options
xrn = options.get('geni_slice_urn', '')
hrn, type = urn_to_hrn(xrn)
# get slice's hrn from options
xrn = options.get('geni_slice_urn', '')
hrn, type = urn_to_hrn(xrn)
@@
-120,8
+117,8
@@
def get_rspec(api, creds, options):
def main():
api = SfaAPI()
"""
def main():
api = SfaAPI()
"""
- #rspec = get_rspec(api, None, None)
- rspec = get_rspec(api, "plc.princeton.iias", None)
+ #rspec = get_rspec(api, None, None
,
)
+ rspec = get_rspec(api, "plc.princeton.iias", None
, 'vini_test'
)
print rspec
"""
f = open(sys.argv[1])
print rspec
"""
f = open(sys.argv[1])