x/vmware-nsx
Code Issues Proposed changes

Merge "[Admin utility nsxv3] Fix import error"

Browse Source
This commit is contained in:
Jenkins 2015-12-04 07:33:32 +00:00 committed by Gerrit Code Review
commit f3bf53bf60
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
tools/python_nsxadmin/admin/plugins/nsxv3/resources/securitygroups.py
View File

@ -14,11 +14,10 @@
import logging import logging
from admin.plugins.common import constants from tools.python_nsxadmin.admin.plugins.common import constants
from admin.plugins.common import formatters from tools.python_nsxadmin.admin.plugins.common import formatters
from admin.plugins.common.utils import output_header from tools.python_nsxadmin.admin.plugins.common import utils as admin_utils
from admin.plugins.common.utils import query_yes_no from tools.python_nsxadmin.admin import shell
from admin.shell import Operations
from neutron.callbacks import registry from neutron.callbacks import registry
from neutron import context as neutron_context from neutron import context as neutron_context
@ -47,7 +46,7 @@ class NeutronSecurityGroupApi(sg_db.SecurityGroupDbMixin,
neutron_sg = NeutronSecurityGroupApi() neutron_sg = NeutronSecurityGroupApi()
@output_header @admin_utils.output_header
def nsx_list_security_groups(resource, event, trigger, **kwargs): def nsx_list_security_groups(resource, event, trigger, **kwargs):
sections = firewall.list_sections() sections = firewall.list_sections()
LOG.info(formatters.output_formatter(constants.FIREWALL_SECTIONS, LOG.info(formatters.output_formatter(constants.FIREWALL_SECTIONS,
@ -58,13 +57,13 @@ def nsx_list_security_groups(resource, event, trigger, **kwargs):
return bool(sections) or bool(nsgroups) return bool(sections) or bool(nsgroups)
@output_header @admin_utils.output_header
def nsx_delete_security_groups(resource, event, trigger, **kwargs): def nsx_delete_security_groups(resource, event, trigger, **kwargs):
if kwargs['force'] is False: if kwargs['force'] is False:
if nsx_list_security_groups(resource, event, trigger, **kwargs): if nsx_list_security_groups(resource, event, trigger, **kwargs):
user_confirm = query_yes_no('Do you want to delete the following ' msg = ('Do you want to delete the following NSX firewall '
'NSX firewall sections/nsgroups?', 'sections/nsgroups?')
default='no') user_confirm = admin_utils.query_yes_no(msg, default='no')
if user_confirm is False: if user_confirm is False:
LOG.info(_LI('NSX security groups cleanup aborted by user')) LOG.info(_LI('NSX security groups cleanup aborted by user'))
@ -92,7 +91,7 @@ def nsx_delete_security_groups(resource, event, trigger, **kwargs):
firewall.delete_nsgroup(nsgroup['id']) firewall.delete_nsgroup(nsgroup['id'])
@output_header @admin_utils.output_header
def neutron_list_security_groups(resource, event, trigger, **kwargs): def neutron_list_security_groups(resource, event, trigger, **kwargs):
security_groups = neutron_sg.get_security_groups() security_groups = neutron_sg.get_security_groups()
LOG.info(formatters.output_formatter(constants.SECURITY_GROUPS, LOG.info(formatters.output_formatter(constants.SECURITY_GROUPS,
@ -100,13 +99,13 @@ def neutron_list_security_groups(resource, event, trigger, **kwargs):
return bool(security_groups) return bool(security_groups)
@output_header @admin_utils.output_header
def neutron_delete_security_groups(resource, event, trigger, **kwargs): def neutron_delete_security_groups(resource, event, trigger, **kwargs):
if kwargs['force'] is False: if kwargs['force'] is False:
if neutron_list_security_groups(resource, event, trigger, **kwargs): if neutron_list_security_groups(resource, event, trigger, **kwargs):
user_confirm = query_yes_no('Do you want to delete the followin ' msg = ('Do you want to delete the following neutron '
'neutron security groups?', 'security groups?')
default='no') user_confirm = admin_utils.query_yes_no(msg, default='no')
if user_confirm is False: if user_confirm is False:
LOG.info(_LI('Neutron security groups cleanup aborted by ' LOG.info(_LI('Neutron security groups cleanup aborted by '
'user')) 'user'))
@ -130,28 +129,28 @@ def neutron_delete_security_groups(resource, event, trigger, **kwargs):
registry.subscribe(nsx_list_security_groups, registry.subscribe(nsx_list_security_groups,
constants.SECURITY_GROUPS, constants.SECURITY_GROUPS,
Operations.LIST.value) shell.Operations.LIST.value)
registry.subscribe(nsx_list_security_groups, registry.subscribe(nsx_list_security_groups,
constants.SECURITY_GROUPS, constants.SECURITY_GROUPS,
Operations.NSX_LIST.value) shell.Operations.NSX_LIST.value)
registry.subscribe(neutron_list_security_groups, registry.subscribe(neutron_list_security_groups,
constants.SECURITY_GROUPS, constants.SECURITY_GROUPS,
Operations.LIST.value) shell.Operations.LIST.value)
registry.subscribe(neutron_list_security_groups, registry.subscribe(neutron_list_security_groups,
constants.SECURITY_GROUPS, constants.SECURITY_GROUPS,
Operations.NEUTRON_LIST.value) shell.Operations.NEUTRON_LIST.value)
registry.subscribe(nsx_delete_security_groups, registry.subscribe(nsx_delete_security_groups,
constants.SECURITY_GROUPS, constants.SECURITY_GROUPS,
Operations.CLEAN.value) shell.Operations.CLEAN.value)
registry.subscribe(nsx_delete_security_groups, registry.subscribe(nsx_delete_security_groups,
constants.SECURITY_GROUPS, constants.SECURITY_GROUPS,
Operations.NSX_CLEAN.value) shell.Operations.NSX_CLEAN.value)
registry.subscribe(neutron_delete_security_groups, registry.subscribe(neutron_delete_security_groups,
constants.SECURITY_GROUPS, constants.SECURITY_GROUPS,
Operations.CLEAN.value) shell.Operations.CLEAN.value)
registry.subscribe(neutron_delete_security_groups, registry.subscribe(neutron_delete_security_groups,
constants.SECURITY_GROUPS, constants.SECURITY_GROUPS,
Operations.NEUTRON_CLEAN.value) shell.Operations.NEUTRON_CLEAN.value)