From bfd32488a6795dde178b43126b41a9b80a08750f Mon Sep 17 00:00:00 2001
From: Rodolfo Alonso Hernandez <ralonsoh@redhat.com>
Date: Wed, 24 Jul 2024 03:46:56 +0000
Subject: [PATCH] Remove the tenant_id/project_id parameter from QoS rule
commands
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
---
neutron/tests/fullstack/resources/client.py | 22 ++++++++++-----------
neutron/tests/fullstack/test_l3_agent.py | 6 ++----
neutron/tests/fullstack/test_qos.py | 22 ++++++++++-----------
3 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/neutron/tests/fullstack/resources/client.py b/neutron/tests/fullstack/resources/client.py
index 938fdd46eb9..5be5833f9ee 100644
--- a/neutron/tests/fullstack/resources/client.py
+++ b/neutron/tests/fullstack/resources/client.py
@@ -266,9 +266,9 @@ class ClientFixture(fixtures.Fixture):
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):
- rule = {'tenant_id': tenant_id}
+ rule = {}
if limit:
rule['max_kbps'] = limit
if burst:
@@ -285,10 +285,9 @@ class ClientFixture(fixtures.Fixture):
return rule['bandwidth_limit_rule']
- def create_packet_rate_limit_rule(
- self, project_id, qos_policy_id, limit=None,
- burst=None, direction=None):
- rule = {'project_id': project_id}
+ def create_packet_rate_limit_rule(self, qos_policy_id, limit=None,
+ burst=None, direction=None):
+ rule = {}
if limit:
rule['max_kpps'] = limit
if burst:
@@ -306,10 +305,9 @@ class ClientFixture(fixtures.Fixture):
return rule['packet_rate_limit_rule']
- def create_minimum_bandwidth_rule(self, tenant_id, qos_policy_id,
- min_bw, direction=None):
- rule = {'tenant_id': tenant_id,
- 'min_kbps': min_bw}
+ def create_minimum_bandwidth_rule(self, qos_policy_id, min_bw,
+ direction=None):
+ rule = {'min_kbps': min_bw}
if direction:
rule['direction'] = direction
rule = self.client.create_minimum_bandwidth_rule(
@@ -322,8 +320,8 @@ class ClientFixture(fixtures.Fixture):
return rule['minimum_bandwidth_rule']
- def create_dscp_marking_rule(self, tenant_id, qos_policy_id, dscp_mark=0):
- rule = {'tenant_id': tenant_id}
+ def create_dscp_marking_rule(self, qos_policy_id, dscp_mark=0):
+ rule = {}
if dscp_mark:
rule['dscp_mark'] = dscp_mark
rule = self.client.create_dscp_marking_rule(
diff --git a/neutron/tests/fullstack/test_l3_agent.py b/neutron/tests/fullstack/test_l3_agent.py
index c392f0ecd02..28f24d7d275 100644
--- a/neutron/tests/fullstack/test_l3_agent.py
+++ b/neutron/tests/fullstack/test_l3_agent.py
@@ -212,11 +212,9 @@ class TestL3Agent(base.BaseFullStackTestCase):
tenant_id, 'fs_policy', 'Fullstack testing policy',
shared='False', is_default='False')
self.safe_client.create_bandwidth_limit_rule(
- tenant_id, qos_policy['id'], 1111, 2222,
- constants.INGRESS_DIRECTION)
+ qos_policy['id'], 1111, 2222, constants.INGRESS_DIRECTION)
self.safe_client.create_bandwidth_limit_rule(
- tenant_id, qos_policy['id'], 3333, 4444,
- constants.EGRESS_DIRECTION)
+ qos_policy['id'], 3333, 4444, constants.EGRESS_DIRECTION)
fip = self.safe_client.create_floatingip(
tenant_id, ext_net['id'], vm.ip, vm.neutron_port['id'],
diff --git a/neutron/tests/fullstack/test_qos.py b/neutron/tests/fullstack/test_qos.py
index e7a47ec9eaa..3f7014d7536 100644
--- a/neutron/tests/fullstack/test_qos.py
+++ b/neutron/tests/fullstack/test_qos.py
@@ -129,7 +129,7 @@ class _TestBwLimitQoS(BaseQoSRuleTestCase):
def _add_bw_limit_rule(self, limit, burst, direction, qos_policy):
qos_policy_id = qos_policy['id']
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
rule['type'] = qos_consts.RULE_TYPE_BANDWIDTH_LIMIT
rule['qos_policy_id'] = qos_policy_id
@@ -175,8 +175,8 @@ class _TestBwLimitQoS(BaseQoSRuleTestCase):
for rule in add_rules:
self.safe_client.create_bandwidth_limit_rule(
- self.tenant_id, policy_id,
- rule.get('limit'), rule.get('burst'), rule['direction'])
+ policy_id, rule.get('limit'), rule.get('burst'),
+ rule['direction'])
for rule in update_rules:
self.client.update_bandwidth_limit_rule(
@@ -366,7 +366,7 @@ class _TestDscpMarkingQoS(BaseQoSRuleTestCase):
def _add_dscp_rule(self, dscp_mark, qos_policy):
qos_policy_id = qos_policy['id']
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
rule['type'] = qos_consts.RULE_TYPE_DSCP_MARKING
rule['qos_policy_id'] = qos_policy_id
@@ -388,7 +388,7 @@ class _TestDscpMarkingQoS(BaseQoSRuleTestCase):
# Create new 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)
# Update qos policy rule id
@@ -468,7 +468,7 @@ class _TestPacketRateLimitQoS(BaseQoSRuleTestCase):
def _add_packet_rate_limit_rule(self, limit, burst, direction, qos_policy):
qos_policy_id = qos_policy['id']
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['qos_policy_id'] = qos_policy_id
qos_policy['rules'].append(rule)
@@ -513,7 +513,7 @@ class _TestPacketRateLimitQoS(BaseQoSRuleTestCase):
self._wait_for_packet_rate_limit_rule_removed(vm, self.direction)
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(
vm, self.direction)
@@ -605,7 +605,7 @@ class _TestMinBwQoS(BaseQoSRuleTestCase):
def _add_min_bw_rule(self, min_bw, direction, qos_policy):
qos_policy_id = qos_policy['id']
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
rule['type'] = qos_consts.RULE_TYPE_MINIMUM_BANDWIDTH
rule['qos_policy_id'] = qos_policy_id
@@ -627,7 +627,7 @@ class _TestMinBwQoS(BaseQoSRuleTestCase):
self._wait_for_min_bw_rule_removed(vm, self.direction)
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)
# Update qos policy rule id
@@ -702,7 +702,7 @@ class TestMinBwQoSOvs(_TestMinBwQoS, base.BaseFullStackTestCase):
qos_policy = self._create_qos_policy()
qos_policy_id = qos_policy['id']
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',
'qos_policy_id': qos_policy_id}
net = self.safe_client.create_network(
@@ -713,7 +713,7 @@ class TestMinBwQoSOvs(_TestMinBwQoS, base.BaseFullStackTestCase):
qos_policy = self._create_qos_policy()
qos_policy_id = qos_policy['id']
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',
'qos_policy_id': qos_policy_id}
network = self.safe_client.create_network(