x/vmware-nsx
Code Issues Proposed changes

Adds delete of a extra_dhcp_opt on a port

Browse Source 
Add support for delete of extra_dhcp_opt(s) on a port. Where
[{'opt_name': 'opt_to_delete', 'opt_value': None}].

Closes-Bug: #1228008

Change-Id: I75baeff91575cac6546fe2cc6fcf7a0d8e92853f
This commit is contained in:
dekehn 2013-09-10 10:13:29 -06:00
parent be3a7f5f89
commit 90534a6925
4 changed files with 97 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/api/v2/attributes.py
View File

@ -74,6 +74,11 @@ def _validate_values(data, valid_values=None):
return msg return msg
def _validate_string_or_none(data, max_len=None):
if data is not None:
return _validate_string(data, max_len=None)
def _validate_string(data, max_len=None): def _validate_string(data, max_len=None):
if not isinstance(data, basestring): if not isinstance(data, basestring):
msg = _("'%s' is not a valid string") % data msg = _("'%s' is not a valid string") % data
@ -521,6 +526,7 @@ validators = {'type:dict': _validate_dict,
'type:range': _validate_range, 'type:range': _validate_range,
'type:regex': _validate_regex, 'type:regex': _validate_regex,
'type:string': _validate_string, 'type:string': _validate_string,
'type:string_or_none': _validate_string_or_none,
'type:subnet': _validate_subnet, 'type:subnet': _validate_subnet,
'type:subnet_list': _validate_subnet_list, 'type:subnet_list': _validate_subnet_list,
'type:uuid': _validate_uuid, 'type:uuid': _validate_uuid,

41
neutron/db/extradhcpopt_db.py
View File

@ -62,11 +62,12 @@ class ExtraDhcpOptMixin(object):
return port return port
with context.session.begin(subtransactions=True): with context.session.begin(subtransactions=True):
for dopt in extra_dhcp_opts: for dopt in extra_dhcp_opts:
db = ExtraDhcpOpt( if dopt['opt_value']:
port_id=port['id'], db = ExtraDhcpOpt(
opt_name=dopt['opt_name'], port_id=port['id'],
opt_value=dopt['opt_value']) opt_name=dopt['opt_name'],
context.session.add(db) opt_value=dopt['opt_value'])
context.session.add(db)
return self._extend_port_extra_dhcp_opts_dict(context, port) return self._extend_port_extra_dhcp_opts_dict(context, port)
def _extend_port_extra_dhcp_opts_dict(self, context, port): def _extend_port_extra_dhcp_opts_dict(self, context, port):
@ -90,25 +91,19 @@ class ExtraDhcpOptMixin(object):
context, ExtraDhcpOpt).filter_by(port_id=id).all() context, ExtraDhcpOpt).filter_by(port_id=id).all()
# if there are currently no dhcp_options associated to # if there are currently no dhcp_options associated to
# this port, Then just insert the new ones and be done. # this port, Then just insert the new ones and be done.
if not opt_db: with context.session.begin(subtransactions=True):
with context.session.begin(subtransactions=True):
for dopt in dopts:
db = ExtraDhcpOpt(
port_id=id,
opt_name=dopt['opt_name'],
opt_value=dopt['opt_value'])
context.session.add(db)
else:
for upd_rec in dopts: for upd_rec in dopts:
with context.session.begin(subtransactions=True): for opt in opt_db:
for opt in opt_db: if opt['opt_name'] == upd_rec['opt_name']:
if opt['opt_name'] == upd_rec['opt_name']: # to handle deleting of a opt from the port.
if opt['opt_value'] != upd_rec['opt_value']: if upd_rec['opt_value'] is None:
opt.update( context.session.delete(opt)
{'opt_value': upd_rec['opt_value']}) elif opt['opt_value'] != upd_rec['opt_value']:
break opt.update(
# this handles the adding an option that didn't exist. {'opt_value': upd_rec['opt_value']})
else: break
else:
if upd_rec['opt_value'] is not None:
db = ExtraDhcpOpt( db = ExtraDhcpOpt(
port_id=id, port_id=id,
opt_name=upd_rec['opt_name'], opt_name=upd_rec['opt_name'],

3
neutron/extensions/extra_dhcp_opt.py
View File

@ -55,7 +55,8 @@ EXTENDED_ATTRIBUTES_2_0 = {
'type:list_of_dict_or_none': { 'type:list_of_dict_or_none': {
'id': {'type:uuid': None, 'required': False}, 'id': {'type:uuid': None, 'required': False},
'opt_name': {'type:string': None, 'required': True}, 'opt_name': {'type:string': None, 'required': True},
'opt_value': {'type:string': None, 'required': True}}}}}} 'opt_value': {'type:string_or_none': None,
'required': True}}}}}}
class Extra_dhcp_opt(extensions.ExtensionDescriptor): class Extra_dhcp_opt(extensions.ExtensionDescriptor):

87
neutron/tests/unit/test_extension_extradhcpopts.py
View File

@ -72,34 +72,53 @@ class TestExtraDhcpOpt(ExtraDhcpOptDBTestCase):
self.assertEqual(opt['opt_value'], val) self.assertEqual(opt['opt_value'], val)
def test_create_port_with_extradhcpopts(self): def test_create_port_with_extradhcpopts(self):
opt_dict = [{'opt_name': 'bootfile-name', opt_list = [{'opt_name': 'bootfile-name',
'opt_value': 'pxelinux.0'}, 'opt_value': 'pxelinux.0'},
{'opt_name': 'server-ip-address', {'opt_name': 'server-ip-address',
'opt_value': '123.123.123.456'}, 'opt_value': '123.123.123.456'},
{'opt_name': 'tftp-server', {'opt_name': 'tftp-server',
'opt_value': '123.123.123.123'}] 'opt_value': '123.123.123.123'}]
params = {edo_ext.EXTRADHCPOPTS: opt_dict, params = {edo_ext.EXTRADHCPOPTS: opt_list,
'arg_list': (edo_ext.EXTRADHCPOPTS,)} 'arg_list': (edo_ext.EXTRADHCPOPTS,)}
with self.port(**params) as port: with self.port(**params) as port:
self._check_opts(opt_dict, self._check_opts(opt_list,
port['port'][edo_ext.EXTRADHCPOPTS])
def test_create_port_with_none_extradhcpopts(self):
new_list = [{'opt_name': 'bootfile-name',
'opt_value': None},
{'opt_name': 'server-ip-address',
'opt_value': '123.123.123.456'},
{'opt_name': 'tftp-server',
'opt_value': '123.123.123.123'}]
new_dict = [{'opt_name': 'server-ip-address',
'opt_value': '123.123.123.456'},
{'opt_name': 'tftp-server',
'opt_value': '123.123.123.123'}]
params = {edo_ext.EXTRADHCPOPTS: new_list,
'arg_list': (edo_ext.EXTRADHCPOPTS,)}
with self.port(**params) as port:
self._check_opts(new_dict,
port['port'][edo_ext.EXTRADHCPOPTS]) port['port'][edo_ext.EXTRADHCPOPTS])
def test_update_port_with_extradhcpopts_with_same(self): def test_update_port_with_extradhcpopts_with_same(self):
opt_dict = [{'opt_name': 'bootfile-name', 'opt_value': 'pxelinux.0'}, opt_list = [{'opt_name': 'bootfile-name', 'opt_value': 'pxelinux.0'},
{'opt_name': 'tftp-server', {'opt_name': 'tftp-server',
'opt_value': '123.123.123.123'}, 'opt_value': '123.123.123.123'},
{'opt_name': 'server-ip-address', {'opt_name': 'server-ip-address',
'opt_value': '123.123.123.456'}] 'opt_value': '123.123.123.456'}]
upd_opts = [{'opt_name': 'bootfile-name', 'opt_value': 'changeme.0'}] upd_opts = [{'opt_name': 'bootfile-name', 'opt_value': 'changeme.0'}]
new_opts = opt_dict[:] new_opts = opt_list[:]
for i in new_opts: for i in new_opts:
if i['opt_name'] == upd_opts[0]['opt_name']: if i['opt_name'] == upd_opts[0]['opt_name']:
i['opt_value'] = upd_opts[0]['opt_value'] i['opt_value'] = upd_opts[0]['opt_value']
break break
params = {edo_ext.EXTRADHCPOPTS: opt_dict, params = {edo_ext.EXTRADHCPOPTS: opt_list,
'arg_list': (edo_ext.EXTRADHCPOPTS,)} 'arg_list': (edo_ext.EXTRADHCPOPTS,)}
with self.port(**params) as port: with self.port(**params) as port:
@ -112,19 +131,19 @@ class TestExtraDhcpOpt(ExtraDhcpOptDBTestCase):
port['port'][edo_ext.EXTRADHCPOPTS]) port['port'][edo_ext.EXTRADHCPOPTS])
def test_update_port_with_extradhcpopts(self): def test_update_port_with_extradhcpopts(self):
opt_dict = [{'opt_name': 'bootfile-name', 'opt_value': 'pxelinux.0'}, opt_list = [{'opt_name': 'bootfile-name', 'opt_value': 'pxelinux.0'},
{'opt_name': 'tftp-server', {'opt_name': 'tftp-server',
'opt_value': '123.123.123.123'}, 'opt_value': '123.123.123.123'},
{'opt_name': 'server-ip-address', {'opt_name': 'server-ip-address',
'opt_value': '123.123.123.456'}] 'opt_value': '123.123.123.456'}]
upd_opts = [{'opt_name': 'bootfile-name', 'opt_value': 'changeme.0'}] upd_opts = [{'opt_name': 'bootfile-name', 'opt_value': 'changeme.0'}]
new_opts = copy.deepcopy(opt_dict) new_opts = copy.deepcopy(opt_list)
for i in new_opts: for i in new_opts:
if i['opt_name'] == upd_opts[0]['opt_name']: if i['opt_name'] == upd_opts[0]['opt_name']:
i['opt_value'] = upd_opts[0]['opt_value'] i['opt_value'] = upd_opts[0]['opt_value']
break break
params = {edo_ext.EXTRADHCPOPTS: opt_dict, params = {edo_ext.EXTRADHCPOPTS: opt_list,
'arg_list': (edo_ext.EXTRADHCPOPTS,)} 'arg_list': (edo_ext.EXTRADHCPOPTS,)}
with self.port(**params) as port: with self.port(**params) as port:
@ -136,16 +155,16 @@ class TestExtraDhcpOpt(ExtraDhcpOptDBTestCase):
self._check_opts(new_opts, self._check_opts(new_opts,
port['port'][edo_ext.EXTRADHCPOPTS]) port['port'][edo_ext.EXTRADHCPOPTS])
def test_update_port_with_extradhcpopt1(self): def test_update_port_with_additional_extradhcpopt(self):
opt_dict = [{'opt_name': 'tftp-server', opt_list = [{'opt_name': 'tftp-server',
'opt_value': '123.123.123.123'}, 'opt_value': '123.123.123.123'},
{'opt_name': 'server-ip-address', {'opt_name': 'server-ip-address',
'opt_value': '123.123.123.456'}] 'opt_value': '123.123.123.456'}]
upd_opts = [{'opt_name': 'bootfile-name', 'opt_value': 'changeme.0'}] upd_opts = [{'opt_name': 'bootfile-name', 'opt_value': 'changeme.0'}]
new_opts = copy.deepcopy(opt_dict) new_opts = copy.deepcopy(opt_list)
new_opts.append(upd_opts[0]) new_opts.append(upd_opts[0])
params = {edo_ext.EXTRADHCPOPTS: opt_dict, params = {edo_ext.EXTRADHCPOPTS: opt_list,
'arg_list': (edo_ext.EXTRADHCPOPTS,)} 'arg_list': (edo_ext.EXTRADHCPOPTS,)}
with self.port(**params) as port: with self.port(**params) as port:
@ -157,17 +176,53 @@ class TestExtraDhcpOpt(ExtraDhcpOptDBTestCase):
self._check_opts(new_opts, self._check_opts(new_opts,
port['port'][edo_ext.EXTRADHCPOPTS]) port['port'][edo_ext.EXTRADHCPOPTS])
def test_update_port_with_extradhcpopt_delete(self):
opt_list = [{'opt_name': 'bootfile-name', 'opt_value': 'pxelinux.0'},
{'opt_name': 'tftp-server',
'opt_value': '123.123.123.123'},
{'opt_name': 'server-ip-address',
'opt_value': '123.123.123.456'}]
upd_opts = [{'opt_name': 'bootfile-name', 'opt_value': None}]
new_opts = []
new_opts = [opt for opt in opt_list
if opt['opt_name'] != 'bootfile-name']
params = {edo_ext.EXTRADHCPOPTS: opt_list,
'arg_list': (edo_ext.EXTRADHCPOPTS,)}
with self.port(**params) as port:
update_port = {'port': {edo_ext.EXTRADHCPOPTS: upd_opts}}
req = self.new_update_request('ports', update_port,
port['port']['id'])
port = self.deserialize('json', req.get_response(self.api))
self._check_opts(new_opts,
port['port'][edo_ext.EXTRADHCPOPTS])
def test_update_port_without_extradhcpopt_delete(self):
upd_opts = [{'opt_name': 'bootfile-name', 'opt_value': None}]
with self.port() as port:
update_port = {'port': {edo_ext.EXTRADHCPOPTS: upd_opts}}
req = self.new_update_request('ports', update_port,
port['port']['id'])
port = self.deserialize('json', req.get_response(self.api))
edo_attr = port['port'].get(edo_ext.EXTRADHCPOPTS)
self.assertEqual(edo_attr, [])
def test_update_port_adding_extradhcpopts(self): def test_update_port_adding_extradhcpopts(self):
opt_dict = [{'opt_name': 'bootfile-name', 'opt_value': 'pxelinux.0'}, opt_list = [{'opt_name': 'bootfile-name', 'opt_value': 'pxelinux.0'},
{'opt_name': 'tftp-server', {'opt_name': 'tftp-server',
'opt_value': '123.123.123.123'}, 'opt_value': '123.123.123.123'},
{'opt_name': 'server-ip-address', {'opt_name': 'server-ip-address',
'opt_value': '123.123.123.456'}] 'opt_value': '123.123.123.456'}]
with self.port() as port: with self.port() as port:
update_port = {'port': {edo_ext.EXTRADHCPOPTS: opt_dict}} update_port = {'port': {edo_ext.EXTRADHCPOPTS: opt_list}}
req = self.new_update_request('ports', update_port, req = self.new_update_request('ports', update_port,
port['port']['id']) port['port']['id'])
port = self.deserialize('json', req.get_response(self.api)) port = self.deserialize('json', req.get_response(self.api))
self._check_opts(opt_dict, self._check_opts(opt_list,
port['port'][edo_ext.EXTRADHCPOPTS]) port['port'][edo_ext.EXTRADHCPOPTS])