else:
table = PrettyTable(['nsd name', 'id'])
for nsd in resp:
- name = nsd.get('name','-')
+ name = nsd.get('id','-')
if long:
onb_state = nsd['_admin'].get('onboardingState','-')
op_state = nsd['_admin'].get('operationalState','-')
else:
table = PrettyTable(['nfpkg name', 'repository'])
for vnfd in resp:
- name = vnfd.get('product-name', '-')
+ name = vnfd.get('id', vnfd.get('name','-'))
repository = vnfd.get('repository')
if long:
- vendor = vnfd.get('provider')
+ vendor = vnfd.get('provider', vnfd.get('vendor'))
version = vnfd.get('version')
description = vnfd.get('description')
latest = vnfd.get('latest')
fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__
if fullclassname == 'osmclient.sol005.client.Client':
if long:
- table = PrettyTable(['nfpkg name', 'id', 'vendor', 'version', 'onboarding state', 'operational state',
+ table = PrettyTable(['nfpkg name', 'id', 'desc type', 'vendor', 'version', 'onboarding state', 'operational state',
'usage state', 'date', 'last update'])
else:
- table = PrettyTable(['nfpkg name', 'id'])
+ table = PrettyTable(['nfpkg name', 'id', 'desc type'])
for vnfd in resp:
- name = vnfd['product-name'] if 'product-name' in vnfd else '-'
+ name = vnfd.get('id', vnfd.get('name','-'))
+ descriptor_type = 'sol005' if 'product-name' in vnfd else 'rel8'
if long:
onb_state = vnfd['_admin'].get('onboardingState','-')
op_state = vnfd['_admin'].get('operationalState','-')
- vendor = vnfd.get('provider')
+ vendor = vnfd.get('provider', vnfd.get('vendor'))
version = vnfd.get('version')
usage_state = vnfd['_admin'].get('usageState','-')
date = datetime.fromtimestamp(vnfd['_admin']['created']).strftime("%Y-%m-%dT%H:%M:%S")
last_update = datetime.fromtimestamp(vnfd['_admin']['modified']).strftime("%Y-%m-%dT%H:%M:%S")
- table.add_row([name, vnfd['_id'], vendor, version, onb_state, op_state, usage_state, date, last_update])
+ table.add_row([name, vnfd['_id'], descriptor_type, vendor, version, onb_state, op_state, usage_state, date, last_update])
else:
- table.add_row([name, vnfd['_id']])
+ table.add_row([name, vnfd['_id'], descriptor_type])
else:
table = PrettyTable(['nfpkg name', 'id'])
for vnfd in resp:
- table.add_row([vnfd['product-name'], vnfd['id']])
+ table.add_row([vnfd['name'], vnfd['id']])
table.align = 'l'
print(table)