x
/
vmware-nsx
Code Issues Proposed changes

Merge "AdminUtil|NSXv: Add az & db status to edges utils"

This commit is contained in:
Jenkins 2017-02-19 14:07:27 +00:00 committed by Gerrit Code Review
parent 2c2407fe31 998ab0e0e3
commit 54a8fdf0e8
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vmware_nsx/shell/admin/plugins/nsxv/resources/backup_edges.py
View File

@ -45,19 +45,32 @@ def get_nsxv_backup_edges():
edgeapi = utils.NeutronDbClient()
for edge in edges:
if edge['name'].startswith("backup-"):
# Make sure it is really a backup edge
edge_vnic_binds = nsxv_db.get_edge_vnic_bindings_by_edge(
edgeapi.context.session, edge['id'])
if not edge_vnic_binds:
extend_edge_info(edge)
backup_edges.append(edge)
return backup_edges
def extend_edge_info(edge):
"""Add information from the nsxv-db, if available"""
edgeapi = utils.NeutronDbClient()
rtr_binding = nsxv_db.get_nsxv_router_binding_by_edge(
edgeapi.context.session, edge['id'])
if rtr_binding:
edge['availability_zone'] = rtr_binding['availability_zone']
edge['db_status'] = rtr_binding['status']
@admin_utils.output_header
def nsx_list_backup_edges(resource, event, trigger, **kwargs):
"""List backup edges"""
backup_edges = get_nsxv_backup_edges()
LOG.info(formatters.output_formatter(constants.BACKUP_EDGES, backup_edges,
['id', 'name', 'size', 'type']))
LOG.info(formatters.output_formatter(
constants.BACKUP_EDGES, backup_edges,
['id', 'name', 'size', 'type', 'availability_zone', 'db_status']))
def _delete_backup_from_neutron_db(edge_id, router_id):

5
vmware_nsx/shell/admin/plugins/nsxv/resources/edges.py
View File

@ -71,8 +71,9 @@ def get_router_edge_bindings():
def neutron_list_router_edge_bindings(resource, event, trigger, **kwargs):
"""List NSXv edges from Neutron DB"""
edges = get_router_edge_bindings()
LOG.info(formatters.output_formatter(constants.EDGES, edges,
['edge_id', 'router_id']))
LOG.info(formatters.output_formatter(
constants.EDGES, edges,
['edge_id', 'router_id', 'availability_zone', 'status']))
def get_orphaned_edges():