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
split api and driver
[sfa.git]
/
sfa
/
managers
/
aggregate_manager_max.py
diff --git
a/sfa/managers/aggregate_manager_max.py
b/sfa/managers/aggregate_manager_max.py
index
ff6ea73
..
315f543
100644
(file)
--- a/
sfa/managers/aggregate_manager_max.py
+++ b/
sfa/managers/aggregate_manager_max.py
@@
-1,20
+1,26
@@
-from sfa.plc.slices import Slices
\r
-from sfa.server.registry import Registries
\r
-from sfa.util.xrn import urn_to_hrn, hrn_to_urn, get_authority, Xrn
\r
-from sfa.util.plxrn import hrn_to_pl_slicename
\r
-from sfa.util.sfalogging import logger
\r
+import os
\r
+import time
\r
+import re
\r
+
\r
from sfa.util.faults import *
\r
from sfa.util.faults import *
\r
+from sfa.util.sfalogging import logger
\r
from sfa.util.config import Config
\r
from sfa.util.sfatime import utcparse
\r
from sfa.util.callids import Callids
\r
from sfa.util.version import version_core
\r
from sfa.util.config import Config
\r
from sfa.util.sfatime import utcparse
\r
from sfa.util.callids import Callids
\r
from sfa.util.version import version_core
\r
+from sfa.util.xrn import urn_to_hrn, hrn_to_urn, get_authority, Xrn
\r
+from sfa.util.plxrn import hrn_to_pl_slicename
\r
+
\r
+from sfa.server.sfaapi import SfaApi
\r
+from sfa.server.registry import Registries
\r
from sfa.rspecs.rspec_version import RSpecVersion
\r
from sfa.rspecs.sfa_rspec import sfa_rspec_version
\r
from sfa.rspecs.rspec_parser import parse_rspec
\r
from sfa.rspecs.rspec_version import RSpecVersion
\r
from sfa.rspecs.sfa_rspec import sfa_rspec_version
\r
from sfa.rspecs.rspec_parser import parse_rspec
\r
-from sfa.managers.aggregate_manager_pl import __get_registry_objects, ListSlices
\r
-import os
\r
-import time
\r
-import re
\r
+
\r
+from sfa.managers.aggregate_manager import __get_registry_objects, ListSlices
\r
+
\r
+from sfa.plc.slices import Slices
\r
+
\r
\r
RSPEC_TMP_FILE_PREFIX = "/tmp/max_rspec"
\r
\r
\r
RSPEC_TMP_FILE_PREFIX = "/tmp/max_rspec"
\r
\r
@@
-251,14
+257,14
@@
def ListResources(api, creds, options,call_id):
slice_urn = options.get('geni_slice_urn')
\r
return get_rspec(api, creds, slice_urn)
\r
\r
slice_urn = options.get('geni_slice_urn')
\r
return get_rspec(api, creds, slice_urn)
\r
\r
-"""
\r
-Returns the request context required by sfatables. At some point, this mechanism should be changed
\r
-to refer to "contexts", which is the information that sfatables is requesting. But for now, we just
\r
-return the basic information needed in a dict.
\r
-"""
\r
def fetch_context(slice_hrn, user_hrn, contexts):
\r
def fetch_context(slice_hrn, user_hrn, contexts):
\r
+ """
\r
+ Returns the request context required by sfatables. At some point, this mechanism should be changed
\r
+ to refer to "contexts", which is the information that sfatables is requesting. But for now, we just
\r
+ return the basic information needed in a dict.
\r
+ """
\r
base_context = {'sfa':{'user':{'hrn':user_hrn}}}
\r
return base_context
\r
base_context = {'sfa':{'user':{'hrn':user_hrn}}}
\r
return base_context
\r
- api =
Plc
SfaApi()
\r
+ api = SfaApi()
\r
create_slice(api, "plc.maxpl.test000", None, rspec_xml, None)
\r
\r
create_slice(api, "plc.maxpl.test000", None, rspec_xml, None)
\r
\r