Skip to content

Commit 7f2a91b

Browse files
authored
Merge pull request #1053 from jikui/bwc-remove
remove the tenant level of qos feature from driver
2 parents 2c50ac4 + 80f7388 commit 7f2a91b

1 file changed

Lines changed: 0 additions & 19 deletions

File tree

f5lbaasdriver/v2/bigip/service_builder.py

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import datetime
1818
import json
1919

20-
from neutron_lbaas.common import keystone
2120
from oslo_config import cfg
2221
from oslo_log import helpers as log_helpers
2322
from oslo_log import log as logging
@@ -26,7 +25,6 @@
2625
from f5lbaasdriver.v2.bigip.disconnected_service import DisconnectedService
2726
from f5lbaasdriver.v2.bigip import exceptions as f5_exc
2827
from f5lbaasdriver.v2.bigip import neutron_client as q_client
29-
from keystoneclient.v3 import client
3028

3129
LOG = logging.getLogger(__name__)
3230

@@ -74,11 +72,6 @@ def build(self, context, loadbalancer, agent, **kwargs):
7472
loadbalancer
7573
)
7674

77-
service['qos'] = self._get_extended_qos(
78-
context,
79-
loadbalancer
80-
)
81-
8275
# Get the subnet network associated with the VIP.
8376
subnet_map = {}
8477
subnet_id = loadbalancer.vip_subnet_id
@@ -248,18 +241,6 @@ def _get_extended_member(self, context, member):
248241

249242
return (member_dict, subnet, network)
250243

251-
@log_helpers.log_method_call
252-
def _get_extended_qos(self, context, loadbalancer):
253-
try:
254-
sess = keystone.get_session()
255-
client_sess = client.Client(session=sess)
256-
project = client_sess.projects.get(project=loadbalancer.tenant_id)
257-
return project.qos
258-
259-
except Exception as e:
260-
LOG.warning('Exception: Get keystone project: %s', e.message)
261-
return ''
262-
263244
@log_helpers.log_method_call
264245
def _get_extended_loadbalancer(self, context, loadbalancer):
265246
"""Get loadbalancer dictionary and add extended data(e.g. VIP)."""

0 commit comments

Comments
 (0)