summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-08-17 17:40:46 +0000
committerGerrit Code Review <review@openstack.org>2020-08-17 17:40:46 +0000
commit9b7bc30a7de0ef8980e90e09ceec9663f5f4f602 (patch)
treeb90b10cecbea844a9b4868144ede97c93a34d87c
parent4d7fc1115222855ed90ca3fde6a08a874d4b2206 (diff)
parent56a663c2d9b9ccf62e8780cf5f9250d4cf13785b (diff)
downloadheat-9b7bc30a7de0ef8980e90e09ceec9663f5f4f602.tar.gz
Merge "Add 'smart-nic' vnic type support for OS::Neutron::Port"
-rw-r--r--heat/engine/resources/openstack/neutron/port.py2
-rw-r--r--heat/tests/openstack/neutron/test_neutron_port.py5
2 files changed, 6 insertions, 1 deletions
diff --git a/heat/engine/resources/openstack/neutron/port.py b/heat/engine/resources/openstack/neutron/port.py
index de2c1db0e..b7a01d40b 100644
--- a/heat/engine/resources/openstack/neutron/port.py
+++ b/heat/engine/resources/openstack/neutron/port.py
@@ -284,7 +284,7 @@ class Port(neutron.NeutronResource):
constraints=[
constraints.AllowedValues(['normal', 'direct', 'macvtap',
'direct-physical', 'baremetal',
- 'virtio-forwarder']),
+ 'virtio-forwarder', 'smart-nic']),
],
support_status=support.SupportStatus(version='2015.1'),
update_allowed=True,
diff --git a/heat/tests/openstack/neutron/test_neutron_port.py b/heat/tests/openstack/neutron/test_neutron_port.py
index 78485c988..4e022e1ed 100644
--- a/heat/tests/openstack/neutron/test_neutron_port.py
+++ b/heat/tests/openstack/neutron/test_neutron_port.py
@@ -1026,6 +1026,11 @@ class UpdatePortTest(common.HeatTestCase):
fixed_ips=None,
addr_pair=None,
vnic_type='virtio-forwarder')),
+ ('smart_nic_vnic', dict(secgrp=None,
+ value_specs={},
+ fixed_ips=None,
+ addr_pair=None,
+ vnic_type='smart-nic')),
('with_all', dict(secgrp=['8a2f582a-e1cd-480f-b85d-b02631c10656'],
value_specs={},
fixed_ips=[