projects
/
osm
/
osmclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Standardize Formatting
[osm/osmclient.git]
/
osmclient
/
common
/
utils.py
diff --git
a/osmclient/common/utils.py
b/osmclient/common/utils.py
index
94bd72f
..
aed7d29
100644
(file)
--- a/
osmclient/common/utils.py
+++ b/
osmclient/common/utils.py
@@
-59,8
+59,7
@@
def get_key_val_from_pkg(descriptor_file):
tar = tarfile.open(descriptor_file)
yamlfile = None
for member in tar.getmembers():
tar = tarfile.open(descriptor_file)
yamlfile = None
for member in tar.getmembers():
- if (re.match('.*.yaml', member.name) and
- len(member.name.split('/')) == 2):
+ if re.match(".*.yaml", member.name) and len(member.name.split("/")) == 2:
yamlfile = member.name
break
if yamlfile is None:
yamlfile = member.name
break
if yamlfile is None:
@@
-69,25
+68,25
@@
def get_key_val_from_pkg(descriptor_file):
dict = yaml.safe_load(tar.extractfile(yamlfile))
result = {}
for k in dict:
dict = yaml.safe_load(tar.extractfile(yamlfile))
result = {}
for k in dict:
- if
'nsd'
in k:
- result[
'type'] = 'nsd'
+ if
"nsd"
in k:
+ result[
"type"] = "nsd"
else:
else:
- result[
'type'] = 'vnfd'
- if
'type'
not in result:
+ result[
"type"] = "vnfd"
+ if
"type"
not in result:
for k1, v1 in list(dict.items()):
for k1, v1 in list(dict.items()):
- if not k1.endswith(
'-catalog'
):
+ if not k1.endswith(
"-catalog"
):
continue
for k2, v2 in v1.items():
continue
for k2, v2 in v1.items():
- if not k2.endswith(
'nsd') and not k2.endswith('vnfd'
):
+ if not k2.endswith(
"nsd") and not k2.endswith("vnfd"
):
continue
continue
- if
'nsd'
in k2:
- result[
'type'] = 'nsd'
+ if
"nsd"
in k2:
+ result[
"type"] = "nsd"
else:
else:
- result[
'type'] = 'vnfd'
+ result[
"type"] = "vnfd"
for entry in v2:
for k3, v3 in list(entry.items()):
# strip off preceeding chars before :
for entry in v2:
for k3, v3 in list(entry.items()):
# strip off preceeding chars before :
- key_name = k3.split(
':'
).pop()
+ key_name = k3.split(
":"
).pop()
result[key_name] = v3
tar.close()
result[key_name] = v3
tar.close()