x/vmware-nsx
Code Issues Proposed changes

dfw_api.py: fix nsxclient typo

Browse Source 
In dfw_api.py file, we need to use nsxclient in stead of nsclient
as nsxclient is more self-explanatory. Also fix the unit test to
use nsxclient.

Change-Id: I4c0f45df0f7f5c67783798ce9550964959350429
This commit is contained in:
Tong Liu 2015-09-19 11:25:32 -07:00
parent c0bd90b691
commit dba21e7045
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
vmware_nsx/nsxlib/v3/dfw_api.py
View File

@ -20,7 +20,7 @@ NSX-V3 Distributed Firewall
from vmware_nsx.common import exceptions as nsx_exc from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.common import utils from vmware_nsx.common import utils
from vmware_nsx.nsxlib.v3 import client as nsclient from vmware_nsx.nsxlib.v3 import client as nsxclient
# firewall section types # firewall section types
@ -72,11 +72,11 @@ def create_nsgroup(display_name, description, tags):
body = {'display_name': display_name, body = {'display_name': display_name,
'description': description, 'description': description,
'tags': tags} 'tags': tags}
return nsclient.create_resource('ns-groups', body) return nsxclient.create_resource('ns-groups', body)
def list_nsgroups(): def list_nsgroups():
return nsclient.get_resource('ns-groups').get('results', []) return nsxclient.get_resource('ns-groups').get('results', [])
@utils.retry_upon_exception_nsxv3(nsx_exc.StaleRevision) @utils.retry_upon_exception_nsxv3(nsx_exc.StaleRevision)
@ -84,7 +84,7 @@ def update_nsgroup(nsgroup_id, display_name, description):
nsgroup = read_nsgroup(nsgroup_id) nsgroup = read_nsgroup(nsgroup_id)
nsgroup.update({'display_name': display_name, nsgroup.update({'display_name': display_name,
'description': description}) 'description': description})
return nsclient.update_resource('ns-groups/%s' % nsgroup_id, nsgroup) return nsxclient.update_resource('ns-groups/%s' % nsgroup_id, nsgroup)
@utils.retry_upon_exception_nsxv3(nsx_exc.StaleRevision) @utils.retry_upon_exception_nsxv3(nsx_exc.StaleRevision)
@ -96,7 +96,7 @@ def add_nsgroup_member(nsgroup_id, target_type, target_id):
'target_type': target_type, 'target_type': target_type,
'op': EQUALS, 'op': EQUALS,
'value': target_id}) 'value': target_id})
return nsclient.update_resource('ns-groups/%s' % nsgroup_id, nsgroup) return nsxclient.update_resource('ns-groups/%s' % nsgroup_id, nsgroup)
@utils.retry_upon_exception_nsxv3(nsx_exc.StaleRevision) @utils.retry_upon_exception_nsxv3(nsx_exc.StaleRevision)
@ -108,15 +108,15 @@ def remove_nsgroup_member(nsgroup_id, target_id):
else: else:
return return
del nsgroup['members'][i] del nsgroup['members'][i]
return nsclient.update_resource('ns-groups/%s' % nsgroup_id, nsgroup) return nsxclient.update_resource('ns-groups/%s' % nsgroup_id, nsgroup)
def read_nsgroup(nsgroup_id): def read_nsgroup(nsgroup_id):
return nsclient.get_resource('ns-groups/%s' % nsgroup_id) return nsxclient.get_resource('ns-groups/%s' % nsgroup_id)
def delete_nsgroup(nsgroup_id): def delete_nsgroup(nsgroup_id):
return nsclient.delete_resource('ns-groups/%s' % nsgroup_id) return nsxclient.delete_resource('ns-groups/%s' % nsgroup_id)
def _build_section(display_name, description, applied_tos, tags): def _build_section(display_name, description, applied_tos, tags):
@ -135,7 +135,7 @@ def create_empty_section(display_name, description, applied_tos, tags,
body = _build_section(display_name, description, applied_tos, tags) body = _build_section(display_name, description, applied_tos, tags)
if other_section: if other_section:
resource += '&id=%s' % other_section resource += '&id=%s' % other_section
return nsclient.create_resource(resource, body) return nsxclient.create_resource(resource, body)
@utils.retry_upon_exception_nsxv3(nsx_exc.StaleRevision) @utils.retry_upon_exception_nsxv3(nsx_exc.StaleRevision)
@ -146,22 +146,22 @@ def update_section(section_id, display_name, description, applied_tos=None):
'description': description}) 'description': description})
if applied_tos is not None: if applied_tos is not None:
section['applied_tos'] = applied_tos section['applied_tos'] = applied_tos
return nsclient.update_resource(resource, section) return nsxclient.update_resource(resource, section)
def read_section(section_id): def read_section(section_id):
resource = 'firewall/sections/%s' % section_id resource = 'firewall/sections/%s' % section_id
return nsclient.get_resource(resource) return nsxclient.get_resource(resource)
def list_sections(): def list_sections():
resource = 'firewall/sections' resource = 'firewall/sections'
return nsclient.get_resource(resource).get('results', []) return nsxclient.get_resource(resource).get('results', [])
def delete_section(section_id): def delete_section(section_id):
resource = 'firewall/sections/%s?cascade=true' % section_id resource = 'firewall/sections/%s?cascade=true' % section_id
return nsclient.delete_resource(resource) return nsxclient.delete_resource(resource)
def get_nsgroup_reference(nsgroup_id): def get_nsgroup_reference(nsgroup_id):
@ -189,14 +189,14 @@ def get_firewall_rule_dict(display_name, source=None, destination=None,
def add_rule_in_section(rule, section_id): def add_rule_in_section(rule, section_id):
resource = 'firewall/sections/%s/rules' % section_id resource = 'firewall/sections/%s/rules' % section_id
return nsclient.create_resource(resource, rule) return nsxclient.create_resource(resource, rule)
def add_rules_in_section(rules, section_id): def add_rules_in_section(rules, section_id):
resource = 'firewall/sections/%s/rules?action=create_multiple' % section_id resource = 'firewall/sections/%s/rules?action=create_multiple' % section_id
return nsclient.create_resource(resource, {'rules': rules}) return nsxclient.create_resource(resource, {'rules': rules})
def delete_rule(section_id, rule_id): def delete_rule(section_id, rule_id):
resource = 'firewall/sections/%s/rules/%s' % (section_id, rule_id) resource = 'firewall/sections/%s/rules/%s' % (section_id, rule_id)
return nsclient.delete_resource(resource) return nsxclient.delete_resource(resource)

16
vmware_nsx/tests/unit/vmware/test_nsx_v3_plugin.py
View File

@ -61,10 +61,10 @@ class NsxPluginV3TestCase(test_plugin.NeutronDbPluginV2TestCase):
nsxlib.get_logical_port = nsx_v3_mocks.get_logical_port nsxlib.get_logical_port = nsx_v3_mocks.get_logical_port
nsxlib.update_logical_port = nsx_v3_mocks.update_logical_port nsxlib.update_logical_port = nsx_v3_mocks.update_logical_port
firewall.add_rules_in_section = nsx_v3_mocks.add_rules_in_section firewall.add_rules_in_section = nsx_v3_mocks.add_rules_in_section
firewall.nsclient.create_resource = nsx_v3_mocks.create_resource firewall.nsxclient.create_resource = nsx_v3_mocks.create_resource
firewall.nsclient.update_resource = nsx_v3_mocks.update_resource firewall.nsxclient.update_resource = nsx_v3_mocks.update_resource
firewall.nsclient.get_resource = nsx_v3_mocks.get_resource firewall.nsxclient.get_resource = nsx_v3_mocks.get_resource
firewall.nsclient.delete_resource = nsx_v3_mocks.delete_resource firewall.nsxclient.delete_resource = nsx_v3_mocks.delete_resource
super(NsxPluginV3TestCase, self).setUp(plugin=plugin, super(NsxPluginV3TestCase, self).setUp(plugin=plugin,
ext_mgr=ext_mgr) ext_mgr=ext_mgr)
@ -121,10 +121,10 @@ class SecurityGroupsTestCase(ext_sg.SecurityGroupDBTestCase):
nsxlib.get_logical_port = nsx_v3_mocks.get_logical_port nsxlib.get_logical_port = nsx_v3_mocks.get_logical_port
nsxlib.update_logical_port = nsx_v3_mocks.update_logical_port nsxlib.update_logical_port = nsx_v3_mocks.update_logical_port
firewall.add_rules_in_section = nsx_v3_mocks.add_rules_in_section firewall.add_rules_in_section = nsx_v3_mocks.add_rules_in_section
firewall.nsclient.create_resource = nsx_v3_mocks.create_resource firewall.nsxclient.create_resource = nsx_v3_mocks.create_resource
firewall.nsclient.update_resource = nsx_v3_mocks.update_resource firewall.nsxclient.update_resource = nsx_v3_mocks.update_resource
firewall.nsclient.get_resource = nsx_v3_mocks.get_resource firewall.nsxclient.get_resource = nsx_v3_mocks.get_resource
firewall.nsclient.delete_resource = nsx_v3_mocks.delete_resource firewall.nsxclient.delete_resource = nsx_v3_mocks.delete_resource
super(SecurityGroupsTestCase, self).setUp(plugin=PLUGIN_NAME, super(SecurityGroupsTestCase, self).setUp(plugin=PLUGIN_NAME,
ext_mgr=ext_mgr) ext_mgr=ext_mgr)