openstack
/
neutron
Code Issues Proposed changes

Merge "NSX: Correct allowed_address_pair return value on create_port"

This commit is contained in:
Jenkins 2014-09-11 15:34:26 +00:00 committed by Gerrit Code Review
parent 18caf626b2 1361ad9996
commit 0fb78ec9ec
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/plugins/vmware/plugins/base.py
View File

@ -1105,7 +1105,7 @@ class NsxPluginV2(addr_pair_db.AllowedAddressPairsMixin,
port_data[addr_pair.ADDRESS_PAIRS])
else:
# remove ATTR_NOT_SPECIFIED
port_data[addr_pair.ADDRESS_PAIRS] = None
port_data[addr_pair.ADDRESS_PAIRS] = []
# security group extension checks
if port_security and has_ip:

11
neutron/tests/unit/vmware/extensions/test_addresspairs.py
View File

@ -13,10 +13,19 @@
# License for the specific language governing permissions and limitations
# under the License.
from neutron.extensions import allowedaddresspairs as addr_pair
from neutron.tests.unit import test_extension_allowedaddresspairs as ext_pairs
from neutron.tests.unit.vmware import test_nsx_plugin
class TestAllowedAddressPairs(test_nsx_plugin.NsxPluginV2TestCase,
ext_pairs.TestAllowedAddressPairs):
pass
# TODO(arosen): move to ext_pairs.TestAllowedAddressPairs once all
# plugins do this correctly.
def test_create_port_no_allowed_address_pairs(self):
with self.network() as net:
res = self._create_port(self.fmt, net['network']['id'])
port = self.deserialize(self.fmt, res)
self.assertEqual(port['port'][addr_pair.ADDRESS_PAIRS], [])
self._delete('ports', port['port']['id'])