openstack/neutron
Code Issues Proposed changes

Remove the tenant_id/project_id parameter from QoS rule commands

Browse Source 
Removed the tenant_id/project_id parameter from any QoS rule command
in the fullstack framework.

Closes-Bug: #2074360
Related-Bug: #2022043
Change-Id: I18efb28ffc02323e82f6b116a3f713cb9e2a132e
This commit is contained in:
Rodolfo Alonso Hernandez 2024-07-24 03:46:56 +00:00
parent a1d39a2132
commit bfd32488a6
3 changed files with 23 additions and 27 deletions
neutron/tests/fullstack
resources
client.py
test_l3_agent.pytest_qos.py

22
neutron/tests/fullstack/resources/client.py

@ -266,9 +266,9 @@ class ClientFixture(fixtures.Fixture):
return policy['policy'] return policy['policy']
def create_bandwidth_limit_rule(self, tenant_id, qos_policy_id, limit=None, def create_bandwidth_limit_rule(self, qos_policy_id, limit=None,
burst=None, direction=None): burst=None, direction=None):
rule = {'tenant_id': tenant_id} rule = {}
if limit: if limit:
rule['max_kbps'] = limit rule['max_kbps'] = limit
if burst: if burst:
@ -285,10 +285,9 @@ class ClientFixture(fixtures.Fixture):
return rule['bandwidth_limit_rule'] return rule['bandwidth_limit_rule']
def create_packet_rate_limit_rule( def create_packet_rate_limit_rule(self, qos_policy_id, limit=None,
self, project_id, qos_policy_id, limit=None, burst=None, direction=None):
burst=None, direction=None): rule = {}
rule = {'project_id': project_id}
if limit: if limit:
rule['max_kpps'] = limit rule['max_kpps'] = limit
if burst: if burst:
@ -306,10 +305,9 @@ class ClientFixture(fixtures.Fixture):
return rule['packet_rate_limit_rule'] return rule['packet_rate_limit_rule']
def create_minimum_bandwidth_rule(self, tenant_id, qos_policy_id, def create_minimum_bandwidth_rule(self, qos_policy_id, min_bw,
min_bw, direction=None): direction=None):
rule = {'tenant_id': tenant_id, rule = {'min_kbps': min_bw}
'min_kbps': min_bw}
if direction: if direction:
rule['direction'] = direction rule['direction'] = direction
rule = self.client.create_minimum_bandwidth_rule( rule = self.client.create_minimum_bandwidth_rule(
@ -322,8 +320,8 @@ class ClientFixture(fixtures.Fixture):
return rule['minimum_bandwidth_rule'] return rule['minimum_bandwidth_rule']
def create_dscp_marking_rule(self, tenant_id, qos_policy_id, dscp_mark=0): def create_dscp_marking_rule(self, qos_policy_id, dscp_mark=0):
rule = {'tenant_id': tenant_id} rule = {}
if dscp_mark: if dscp_mark:
rule['dscp_mark'] = dscp_mark rule['dscp_mark'] = dscp_mark
rule = self.client.create_dscp_marking_rule( rule = self.client.create_dscp_marking_rule(

6
neutron/tests/fullstack/test_l3_agent.py

@ -212,11 +212,9 @@ class TestL3Agent(base.BaseFullStackTestCase):
tenant_id, 'fs_policy', 'Fullstack testing policy', tenant_id, 'fs_policy', 'Fullstack testing policy',
shared='False', is_default='False') shared='False', is_default='False')
self.safe_client.create_bandwidth_limit_rule( self.safe_client.create_bandwidth_limit_rule(
tenant_id, qos_policy['id'], 1111, 2222, qos_policy['id'], 1111, 2222, constants.INGRESS_DIRECTION)
constants.INGRESS_DIRECTION)
self.safe_client.create_bandwidth_limit_rule( self.safe_client.create_bandwidth_limit_rule(
tenant_id, qos_policy['id'], 3333, 4444, qos_policy['id'], 3333, 4444, constants.EGRESS_DIRECTION)
constants.EGRESS_DIRECTION)
fip = self.safe_client.create_floatingip( fip = self.safe_client.create_floatingip(
tenant_id, ext_net['id'], vm.ip, vm.neutron_port['id'], tenant_id, ext_net['id'], vm.ip, vm.neutron_port['id'],

22
neutron/tests/fullstack/test_qos.py

@ -129,7 +129,7 @@ class _TestBwLimitQoS(BaseQoSRuleTestCase):
def _add_bw_limit_rule(self, limit, burst, direction, qos_policy): def _add_bw_limit_rule(self, limit, burst, direction, qos_policy):
qos_policy_id = qos_policy['id'] qos_policy_id = qos_policy['id']
rule = self.safe_client.create_bandwidth_limit_rule( rule = self.safe_client.create_bandwidth_limit_rule(
self.tenant_id, qos_policy_id, limit, burst, direction) qos_policy_id, limit, burst, direction)
# Make it consistent with GET reply # Make it consistent with GET reply
rule['type'] = qos_consts.RULE_TYPE_BANDWIDTH_LIMIT rule['type'] = qos_consts.RULE_TYPE_BANDWIDTH_LIMIT
rule['qos_policy_id'] = qos_policy_id rule['qos_policy_id'] = qos_policy_id
@ -175,8 +175,8 @@ class _TestBwLimitQoS(BaseQoSRuleTestCase):
for rule in add_rules: for rule in add_rules:
self.safe_client.create_bandwidth_limit_rule( self.safe_client.create_bandwidth_limit_rule(
self.tenant_id, policy_id, policy_id, rule.get('limit'), rule.get('burst'),
rule.get('limit'), rule.get('burst'), rule['direction']) rule['direction'])
for rule in update_rules: for rule in update_rules:
self.client.update_bandwidth_limit_rule( self.client.update_bandwidth_limit_rule(
@ -366,7 +366,7 @@ class _TestDscpMarkingQoS(BaseQoSRuleTestCase):
def _add_dscp_rule(self, dscp_mark, qos_policy): def _add_dscp_rule(self, dscp_mark, qos_policy):
qos_policy_id = qos_policy['id'] qos_policy_id = qos_policy['id']
rule = self.safe_client.create_dscp_marking_rule( rule = self.safe_client.create_dscp_marking_rule(
self.tenant_id, qos_policy_id, dscp_mark) qos_policy_id, dscp_mark)
# Make it consistent with GET reply # Make it consistent with GET reply
rule['type'] = qos_consts.RULE_TYPE_DSCP_MARKING rule['type'] = qos_consts.RULE_TYPE_DSCP_MARKING
rule['qos_policy_id'] = qos_policy_id rule['qos_policy_id'] = qos_policy_id
@ -388,7 +388,7 @@ class _TestDscpMarkingQoS(BaseQoSRuleTestCase):
# Create new rule # Create new rule
new_rule = self.safe_client.create_dscp_marking_rule( new_rule = self.safe_client.create_dscp_marking_rule(
self.tenant_id, qos_policy_id, new_dscp_mark) qos_policy_id, new_dscp_mark)
self._wait_for_dscp_marking_rule_applied(vm, new_dscp_mark) self._wait_for_dscp_marking_rule_applied(vm, new_dscp_mark)
# Update qos policy rule id # Update qos policy rule id
@ -468,7 +468,7 @@ class _TestPacketRateLimitQoS(BaseQoSRuleTestCase):
def _add_packet_rate_limit_rule(self, limit, burst, direction, qos_policy): def _add_packet_rate_limit_rule(self, limit, burst, direction, qos_policy):
qos_policy_id = qos_policy['id'] qos_policy_id = qos_policy['id']
rule = self.safe_client.create_packet_rate_limit_rule( rule = self.safe_client.create_packet_rate_limit_rule(
self.tenant_id, qos_policy_id, limit, burst, direction) qos_policy_id, limit, burst, direction)
rule['type'] = qos_consts.RULE_TYPE_PACKET_RATE_LIMIT rule['type'] = qos_consts.RULE_TYPE_PACKET_RATE_LIMIT
rule['qos_policy_id'] = qos_policy_id rule['qos_policy_id'] = qos_policy_id
qos_policy['rules'].append(rule) qos_policy['rules'].append(rule)
@ -513,7 +513,7 @@ class _TestPacketRateLimitQoS(BaseQoSRuleTestCase):
self._wait_for_packet_rate_limit_rule_removed(vm, self.direction) self._wait_for_packet_rate_limit_rule_removed(vm, self.direction)
new_rule = self.safe_client.create_packet_rate_limit_rule( new_rule = self.safe_client.create_packet_rate_limit_rule(
self.tenant_id, qos_policy_id, new_limit, direction=self.direction) qos_policy_id, new_limit, direction=self.direction)
self._wait_for_packet_rate_limit_rule_applied( self._wait_for_packet_rate_limit_rule_applied(
vm, self.direction) vm, self.direction)
@ -605,7 +605,7 @@ class _TestMinBwQoS(BaseQoSRuleTestCase):
def _add_min_bw_rule(self, min_bw, direction, qos_policy): def _add_min_bw_rule(self, min_bw, direction, qos_policy):
qos_policy_id = qos_policy['id'] qos_policy_id = qos_policy['id']
rule = self.safe_client.create_minimum_bandwidth_rule( rule = self.safe_client.create_minimum_bandwidth_rule(
self.tenant_id, qos_policy_id, min_bw, direction) qos_policy_id, min_bw, direction)
# Make it consistent with GET reply # Make it consistent with GET reply
rule['type'] = qos_consts.RULE_TYPE_MINIMUM_BANDWIDTH rule['type'] = qos_consts.RULE_TYPE_MINIMUM_BANDWIDTH
rule['qos_policy_id'] = qos_policy_id rule['qos_policy_id'] = qos_policy_id
@ -627,7 +627,7 @@ class _TestMinBwQoS(BaseQoSRuleTestCase):
self._wait_for_min_bw_rule_removed(vm, self.direction) self._wait_for_min_bw_rule_removed(vm, self.direction)
new_rule = self.safe_client.create_minimum_bandwidth_rule( new_rule = self.safe_client.create_minimum_bandwidth_rule(
self.tenant_id, qos_policy_id, new_limit, direction=self.direction) qos_policy_id, new_limit, direction=self.direction)
self._wait_for_min_bw_rule_applied(vm, new_limit, self.direction) self._wait_for_min_bw_rule_applied(vm, new_limit, self.direction)
# Update qos policy rule id # Update qos policy rule id
@ -702,7 +702,7 @@ class TestMinBwQoSOvs(_TestMinBwQoS, base.BaseFullStackTestCase):
qos_policy = self._create_qos_policy() qos_policy = self._create_qos_policy()
qos_policy_id = qos_policy['id'] qos_policy_id = qos_policy['id']
self.safe_client.create_minimum_bandwidth_rule( self.safe_client.create_minimum_bandwidth_rule(
self.tenant_id, qos_policy_id, MIN_BANDWIDTH, self.direction) qos_policy_id, MIN_BANDWIDTH, self.direction)
network_args = {'network_type': 'vxlan', network_args = {'network_type': 'vxlan',
'qos_policy_id': qos_policy_id} 'qos_policy_id': qos_policy_id}
net = self.safe_client.create_network( net = self.safe_client.create_network(
@ -713,7 +713,7 @@ class TestMinBwQoSOvs(_TestMinBwQoS, base.BaseFullStackTestCase):
qos_policy = self._create_qos_policy() qos_policy = self._create_qos_policy()
qos_policy_id = qos_policy['id'] qos_policy_id = qos_policy['id']
self.safe_client.create_minimum_bandwidth_rule( self.safe_client.create_minimum_bandwidth_rule(
self.tenant_id, qos_policy_id, MIN_BANDWIDTH, self.direction) qos_policy_id, MIN_BANDWIDTH, self.direction)
network_args = {'network_type': 'vxlan', network_args = {'network_type': 'vxlan',
'qos_policy_id': qos_policy_id} 'qos_policy_id': qos_policy_id}
network = self.safe_client.create_network( network = self.safe_client.create_network(