projects
/
osm
/
osmclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ns-list: fix when deployment and config status were empty
[osm/osmclient.git]
/
osmclient
/
scripts
/
osm.py
diff --git
a/osmclient/scripts/osm.py
b/osmclient/scripts/osm.py
index
59ecebd
..
c6de974
100755
(executable)
--- a/
osmclient/scripts/osm.py
+++ b/
osmclient/scripts/osm.py
@@
-228,6
+228,8
@@
def ns_list(ctx, filter, long):
def summarize_deployment_status(status_dict):
#Nets
summary = ""
def summarize_deployment_status(status_dict):
#Nets
summary = ""
+ if not status_dict:
+ return summary
n_nets = 0
status_nets = {}
net_list = status_dict.get('nets',[])
n_nets = 0
status_nets = {}
net_list = status_dict.get('nets',[])
@@
-278,6
+280,9
@@
def ns_list(ctx, filter, long):
return summary
def summarize_config_status(ee_list):
return summary
def summarize_config_status(ee_list):
+ summary = ""
+ if not ee_list:
+ return summary
n_ee = 0
status_ee = {}
for ee in ee_list:
n_ee = 0
status_ee = {}
for ee in ee_list:
@@
-290,7
+295,6
@@
def ns_list(ctx, filter, long):
status_ee[ee['elementType']][ee['status']] += 1
else:
status_ee[ee['elementType']][ee['status']] = 1
status_ee[ee['elementType']][ee['status']] += 1
else:
status_ee[ee['elementType']][ee['status']] = 1
- summary = ""
for elementType in ["KDU", "VDU", "PDU", "VNF", "NS"]:
if elementType in status_ee:
message = ""
for elementType in ["KDU", "VDU", "PDU", "VNF", "NS"]:
if elementType in status_ee:
message = ""
@@
-302,6
+306,7
@@
def ns_list(ctx, filter, long):
summary += "{}: {}".format(elementType, message)
summary += "TOTAL Exec. Env.: {}".format(n_ee)
return summary
summary += "{}: {}".format(elementType, message)
summary += "TOTAL Exec. Env.: {}".format(n_ee)
return summary
+
logger.debug("")
if filter:
check_client_version(ctx.obj, '--filter')
logger.debug("")
if filter:
check_client_version(ctx.obj, '--filter')
@@
-334,13
+339,14
@@
def ns_list(ctx, filter, long):
fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__
if fullclassname == 'osmclient.sol005.client.Client':
nsr = ns
fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__
if fullclassname == 'osmclient.sol005.client.Client':
nsr = ns
+ logger.debug('NS info: {}'.format(nsr))
nsr_name = nsr['name']
nsr_id = nsr['_id']
date = datetime.fromtimestamp(nsr['create-time']).strftime("%Y-%m-%dT%H:%M:%S")
nsr_name = nsr['name']
nsr_id = nsr['_id']
date = datetime.fromtimestamp(nsr['create-time']).strftime("%Y-%m-%dT%H:%M:%S")
- ns_state = nsr
['nsState']
+ ns_state = nsr
.get('nsState', nsr['_admin']['nsState'])
if long:
if long:
- deployment_status = summarize_deployment_status(nsr
['deploymentStatus']
)
- config_status = summarize_config_status(nsr
['configurationStatus']
)
+ deployment_status = summarize_deployment_status(nsr
.get('deploymentStatus')
)
+ config_status = summarize_config_status(nsr
.get('configurationStatus')
)
project_id = nsr.get('_admin').get('projects_read')[0]
project_name = '-'
for p in project_list:
project_id = nsr.get('_admin').get('projects_read')[0]
project_name = '-'
for p in project_list:
@@
-357,9
+363,12
@@
def ns_list(ctx, filter, long):
break
#vim = '{} ({})'.format(vim_name, vim_id)
vim = vim_name
break
#vim = '{} ({})'.format(vim_name, vim_id)
vim = vim_name
- current_operation = "{} ({})".format(nsr['currentOperation'],nsr['currentOperationID'])
+ if 'currentOperation' in nsr:
+ current_operation = "{} ({})".format(nsr['currentOperation'],nsr['currentOperationID'])
+ else:
+ current_operation = "{} ({})".format(nsr['_admin'].get('current-operation','-'), nsr['_admin']['nslcmop'])
error_details = "N/A"
error_details = "N/A"
- if ns_state == "BROKEN" or ns_state == "DEGRADED" or nsr
['errorDescription']
:
+ if ns_state == "BROKEN" or ns_state == "DEGRADED" or nsr
.get('errorDescription')
:
error_details = "{}\nDetail: {}".format(nsr['errorDescription'], nsr['errorDetail'])
else:
nsopdata = ctx.obj.ns.get_opdata(ns['id'])
error_details = "{}\nDetail: {}".format(nsr['errorDescription'], nsr['errorDetail'])
else:
nsopdata = ctx.obj.ns.get_opdata(ns['id'])