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
DeleteSliver supports call_id
[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
2b56eeb
..
d961443
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 *
@@
-20,30
+20,25
@@
from sfa.managers.vini.vini_network import *
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.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.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
# 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 (
from sfa.managers.aggregate_manager_pl import (
-start_slice, stop_slice, renew_slice, reset_slice, get_slices, get_ticket)
-
-
-def get_version():
- version = {}
- version['geni_api'] = 1
- version['sfa'] = 1
- return version
+start_slice, stop_slice, renew_slice, reset_slice, get_slices, get_ticket, slice_status)
-def slice_status(api, slice_xrn, creds):
- result = {}
- result['geni_urn'] = slice_xrn
- result['geni_status'] = 'unknown'
- result['geni_resources'] = {}
- return result
+def GetVersion(api):
+ xrn=Xrn(api.hrn)
+ return version_core({'interface':'aggregate',
+ 'testbed':'myplc.vini',
+ 'hrn':xrn.get_hrn(),
+ })
-def delete_slice(api, xrn, creds):
- hrn, type = urn_to_hrn(xrn)
+def DeleteSliver(api, xrn, creds, call_id):
+ if Callids().already_handled(call_id): return ""
+ (hrn, type) = urn_to_hrn(xrn)
slicename = hrn_to_pl_slicename(hrn)
slices = api.plshell.GetSlices(api.plauth, {'name': slicename})
if not slices:
slicename = hrn_to_pl_slicename(hrn)
slices = api.plshell.GetSlices(api.plauth, {'name': slicename})
if not slices:
@@
-53,14
+48,16
@@
def delete_slice(api, xrn, creds):
api.plshell.DeleteSliceFromNodes(api.plauth, slicename, slice['node_ids'])
return 1
api.plshell.DeleteSliceFromNodes(api.plauth, slicename, slice['node_ids'])
return 1
-def
create_slice(api, xrn, creds, xml, users
):
+def
CreateSliver(api, xrn, creds, xml, users, call_id
):
"""
Verify HRN and initialize the slice record in PLC if necessary.
"""
"""
Verify HRN and initialize the slice record in PLC if necessary.
"""
+ if Callids().already_handled(call_id): return ""
+
hrn, type = urn_to_hrn(xrn)
peer = None
hrn, type = urn_to_hrn(xrn)
peer = None
- reg_objects = __get_registry_objects(
slice_
xrn, creds, users)
+ reg_objects = __get_registry_objects(xrn, creds, users)
slices = Slices(api)
peer = slices.get_peer(hrn)
sfa_peer = slices.get_sfa_peer(hrn)
slices = Slices(api)
peer = slices.get_peer(hrn)
sfa_peer = slices.get_sfa_peer(hrn)
@@
-91,11
+88,11
@@
def create_slice(api, xrn, creds, xml, users):
api.plshell.DeleteSliceFromNodes(api.plauth, slice.name, deleted_nodes)
network.updateSliceTags()
api.plshell.DeleteSliceFromNodes(api.plauth, slice.name, deleted_nodes)
network.updateSliceTags()
- # print network.toxml()
-
- return True
+ # xxx - check this holds enough data for the client to understand what's happened
+ return network.toxml()
-def get_rspec(api, creds, options):
+def ListResources(api, creds, options,call_id):
+ if Callids().already_handled(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)
@@
-122,14
+119,14
@@
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 =
ListResources(api, None, None,
)
+ rspec =
ListResources(api, "plc.princeton.iias", None, 'vini_test'
)
print rspec
"""
f = open(sys.argv[1])
xml = f.read()
f.close()
print rspec
"""
f = open(sys.argv[1])
xml = f.read()
f.close()
-
create_slice(api, "plc.princeton.iias", xml
)
+
CreateSliver(api, "plc.princeton.iias", xml, 'call-id-iias'
)
if __name__ == "__main__":
main()
if __name__ == "__main__":
main()