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
avoid as much as possible accessing logger through class instances, whenever that...
[sfa.git]
/
sfa
/
openstack
/
osxrn.py
diff --git
a/sfa/openstack/osxrn.py
b/sfa/openstack/osxrn.py
index
e7d1d21
..
8584b39
100644
(file)
--- a/
sfa/openstack/osxrn.py
+++ b/
sfa/openstack/osxrn.py
@@
-2,6
+2,7
@@
import re
from sfa.util.xrn import Xrn
from sfa.util.config import Config
from sfa.util.xrn import Xrn
from sfa.util.config import Config
+
def hrn_to_os_slicename(hrn):
return OSXrn(xrn=hrn, type='slice').get_slicename()
def hrn_to_os_slicename(hrn):
return OSXrn(xrn=hrn, type='slice').get_slicename()
@@
-9,27
+10,31
@@
def hrn_to_os_slicename(hrn):
def hrn_to_os_tenant_name(hrn):
return OSXrn(xrn=hrn, type='slice').get_tenant_name()
def hrn_to_os_tenant_name(hrn):
return OSXrn(xrn=hrn, type='slice').get_tenant_name()
+
def cleanup_name(name):
def cleanup_name(name):
- return name.replace(".", "_").replace("+", "_")
+ return name.replace(".", "_").replace("+", "_")
+
class OSXrn(Xrn):
def __init__(self, name=None, auth=None, **kwds):
class OSXrn(Xrn):
def __init__(self, name=None, auth=None, **kwds):
-
+
config = Config()
config = Config()
+ self.id = id
if name is not None:
if name is not None:
+ Xrn.__init__(self, **kwds)
if 'type' in kwds:
self.type = kwds['type']
if auth is not None:
if 'type' in kwds:
self.type = kwds['type']
if auth is not None:
- self.hrn
='.'.join([auth, cleanup_name(name)])
+ self.hrn
= '.'.join([auth, cleanup_name(name)])
else:
else:
- self.hrn =
config.SFA_INTERFACE_HRN + "." + cleanup_name(name
)
+ self.hrn =
name.replace('_', '.'
)
self.hrn_to_urn()
else:
self.hrn_to_urn()
else:
- Xrn.__init__(self, **kwds)
-
- self.name = self.get_name()
-
+ Xrn.__init__(self, **kwds)
+
+ self.name = self.get_name()
+
def get_name(self):
self._normalize()
leaf = self.leaf
def get_name(self):
self._normalize()
leaf = self.leaf
@@
-38,7
+43,6
@@
class OSXrn(Xrn):
name = re.sub('[^a-zA-Z0-9_]', '', name)
return name
name = re.sub('[^a-zA-Z0-9_]', '', name)
return name
-
def get_slicename(self):
self._normalize()
slicename = self.hrn
def get_slicename(self):
self._normalize()
slicename = self.hrn
@@
-50,6
+54,3
@@
class OSXrn(Xrn):
self._normalize()
tenant_name = self.hrn.replace('\.', '')
return tenant_name
self._normalize()
tenant_name = self.hrn.replace('\.', '')
return tenant_name
-
-
-