From 13ebdedb5a8a01eea73cbea1edcf44709dcf5eb1 Mon Sep 17 00:00:00 2001 From: Volodymyr Litovka Date: Thu, 28 Mar 2019 14:47:50 +0000 Subject: [PATCH] Added 'direction' prop to QoSBandwidthLimitRule Change-Id: I8455760dd4d43a2fdeaff3c66707bf19eaa75014 Task: 29852 --- heat/engine/resources/openstack/neutron/qos.py | 14 ++++++++++++-- heat/tests/openstack/neutron/test_qos.py | 5 ++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/heat/engine/resources/openstack/neutron/qos.py b/heat/engine/resources/openstack/neutron/qos.py index df1c7bfdba..2a75428b1b 100644 --- a/heat/engine/resources/openstack/neutron/qos.py +++ b/heat/engine/resources/openstack/neutron/qos.py @@ -156,9 +156,9 @@ class QoSBandwidthLimitRule(QoSRule): entity = 'bandwidth_limit_rule' PROPERTIES = ( - MAX_BANDWIDTH, MAX_BURST_BANDWIDTH, + MAX_BANDWIDTH, MAX_BURST_BANDWIDTH, DIRECTION ) = ( - 'max_kbps', 'max_burst_kbps', + 'max_kbps', 'max_burst_kbps', 'direction' ) properties_schema = { @@ -179,6 +179,16 @@ class QoSBandwidthLimitRule(QoSRule): constraints.Range(min=0) ], default=0 + ), + DIRECTION: properties.Schema( + properties.Schema.STRING, + _('Traffic direction from the point of view of the port.'), + update_allowed=True, + constraints=[ + constraints.AllowedValues(['egress', 'ingress']), + ], + default='egress', + support_status=support.SupportStatus(version='13.0.0') ) } diff --git a/heat/tests/openstack/neutron/test_qos.py b/heat/tests/openstack/neutron/test_qos.py index a5da3785da..f740d586bf 100644 --- a/heat/tests/openstack/neutron/test_qos.py +++ b/heat/tests/openstack/neutron/test_qos.py @@ -207,12 +207,14 @@ class NeutronQoSBandwidthLimitRuleTest(common.HeatTestCase): 'id': 'cf0eab12-ef8b-4a62-98d0-70576583c17a', 'max_kbps': 1000, 'max_burst_kbps': 1000, + 'direction': 'egress', 'tenant_id': 'd66c74c01d6c41b9846088c1ad9634d0' } } create_props = {'max_kbps': 1000, 'max_burst_kbps': 1000, + 'direction': 'egress', 'tenant_id': 'd66c74c01d6c41b9846088c1ad9634d0'} self.neutronclient.create_bandwidth_limit_rule.return_value = rule @@ -260,7 +262,7 @@ class NeutronQoSBandwidthLimitRuleTest(common.HeatTestCase): self.bandwidth_limit_rule.handle_update( json_snippet={}, tmpl_diff={}, - prop_diff=prop_diff) + prop_diff=prop_diff.copy()) self.neutronclient.update_bandwidth_limit_rule.assert_called_once_with( rule_id, @@ -274,6 +276,7 @@ class NeutronQoSBandwidthLimitRuleTest(common.HeatTestCase): 'id': 'cf0eab12-ef8b-4a62-98d0-70576583c17a', 'max_kbps': 1000, 'max_burst_kbps': 1000, + 'direction': 'egress', 'tenant_id': 'd66c74c01d6c41b9846088c1ad9634d0' } }