|
28 | 28 | from oslo_serialization import jsonutils |
29 | 29 | from oslo_utils import timeutils |
30 | 30 | from oslo_utils import uuidutils |
31 | | -from sqlalchemy.orm import noload |
| 31 | +from sqlalchemy.orm import raiseload |
32 | 32 | from sqlalchemy.orm import Session |
33 | 33 | from sqlalchemy.orm import subqueryload |
34 | 34 | from sqlalchemy import select |
@@ -262,7 +262,7 @@ def get_all_deleted_expiring(self, session, exp_age): |
262 | 262 | else: |
263 | 263 | query = query.filter_by(provisioning_status=consts.DELETED) |
264 | 264 | # Do not load any relationship |
265 | | - query = query.options(noload('*')) |
| 265 | + query = query.options(raiseload('*')) |
266 | 266 | model_list = query.all() |
267 | 267 |
|
268 | 268 | id_list = [model.id for model in model_list] |
@@ -785,7 +785,7 @@ def get_all_API_list(self, session, pagination_helper=None, **filters): |
785 | 785 | subqueryload(models.LoadBalancer.pools), |
786 | 786 | subqueryload(models.LoadBalancer.listeners), |
787 | 787 | subqueryload(models.LoadBalancer._tags), |
788 | | - noload('*')) |
| 788 | + raiseload('*')) |
789 | 789 |
|
790 | 790 | return super().get_all_orm( |
791 | 791 | session, pagination_helper=pagination_helper, |
@@ -911,7 +911,7 @@ def get_all_API_list(self, session, pagination_helper=None, **filters): |
911 | 911 | query_options = ( |
912 | 912 | subqueryload(models.HealthMonitor.pool), |
913 | 913 | subqueryload(models.HealthMonitor._tags), |
914 | | - noload('*')) |
| 914 | + raiseload('*')) |
915 | 915 |
|
916 | 916 | return super().get_all_orm( |
917 | 917 | session, pagination_helper=pagination_helper, |
@@ -977,7 +977,7 @@ def get_all_API_list(self, session, pagination_helper=None, **filters): |
977 | 977 | subqueryload(models.Pool.members), |
978 | 978 | subqueryload(models.Pool.session_persistence), |
979 | 979 | subqueryload(models.Pool._tags), |
980 | | - noload('*')) |
| 980 | + raiseload('*')) |
981 | 981 |
|
982 | 982 | return super().get_all_orm( |
983 | 983 | session, pagination_helper=pagination_helper, |
@@ -1013,7 +1013,7 @@ def get_all_API_list(self, session, pagination_helper=None, **filters): |
1013 | 1013 | query_options = ( |
1014 | 1014 | subqueryload(models.Member.pool), |
1015 | 1015 | subqueryload(models.Member._tags), |
1016 | | - noload('*')) |
| 1016 | + raiseload('*')) |
1017 | 1017 |
|
1018 | 1018 | return super().get_all_orm( |
1019 | 1019 | session, pagination_helper=pagination_helper, |
@@ -1057,7 +1057,7 @@ def get_all_API_list(self, session, pagination_helper=None, **filters): |
1057 | 1057 | subqueryload(models.Listener.sni_containers), |
1058 | 1058 | subqueryload(models.Listener._tags), |
1059 | 1059 | subqueryload(models.Listener.allowed_cidrs), |
1060 | | - noload('*')) |
| 1060 | + raiseload('*')) |
1061 | 1061 |
|
1062 | 1062 | return super().get_all_orm( |
1063 | 1063 | session, pagination_helper=pagination_helper, |
@@ -1268,7 +1268,7 @@ def get_all_API_list(self, session, pagination_helper=None, **filters): |
1268 | 1268 | # no-load (blank) the tables we don't need |
1269 | 1269 | query_options = ( |
1270 | 1270 | subqueryload(models.Amphora.load_balancer), |
1271 | | - noload('*')) |
| 1271 | + raiseload('*')) |
1272 | 1272 |
|
1273 | 1273 | return super().get_all_orm( |
1274 | 1274 | session, pagination_helper=pagination_helper, |
@@ -1747,7 +1747,7 @@ def get_all_API_list(self, session, pagination_helper=None, **filters): |
1747 | 1747 | query_options = ( |
1748 | 1748 | subqueryload(models.L7Rule.l7policy), |
1749 | 1749 | subqueryload(models.L7Rule._tags), |
1750 | | - noload('*')) |
| 1750 | + raiseload('*')) |
1751 | 1751 |
|
1752 | 1752 | return super().get_all_orm( |
1753 | 1753 | session, pagination_helper=pagination_helper, |
@@ -1836,30 +1836,16 @@ def get_all(self, session, pagination_helper=None, **filters): |
1836 | 1836 | return data_model_list, links |
1837 | 1837 |
|
1838 | 1838 | def get_all_API_list(self, session, pagination_helper=None, **filters): |
1839 | | - deleted = filters.pop('show_deleted', True) |
1840 | | - query = session.query(self.model_class).filter_by( |
1841 | | - **filters) |
1842 | | - |
1843 | | - query = query.options( |
| 1839 | + query_options = ( |
1844 | 1840 | subqueryload(models.L7Policy.l7rules), |
1845 | 1841 | subqueryload(models.L7Policy.listener), |
1846 | 1842 | subqueryload(models.L7Policy.redirect_pool), |
1847 | 1843 | subqueryload(models.L7Policy._tags), |
1848 | | - noload('*')) |
| 1844 | + raiseload('*')) |
1849 | 1845 |
|
1850 | | - if not deleted: |
1851 | | - query = query.filter( |
1852 | | - self.model_class.provisioning_status != consts.DELETED) |
1853 | | - |
1854 | | - if pagination_helper: |
1855 | | - model_list, links = pagination_helper.apply( |
1856 | | - query, self.model_class) |
1857 | | - else: |
1858 | | - links = None |
1859 | | - model_list = query.order_by(self.model_class.position).all() |
1860 | | - |
1861 | | - data_model_list = [model.to_data_model() for model in model_list] |
1862 | | - return data_model_list, links |
| 1846 | + return super().get_all_orm( |
| 1847 | + session, pagination_helper=pagination_helper, |
| 1848 | + query_options=query_options, **filters) |
1863 | 1849 |
|
1864 | 1850 | def update(self, session, id, **model_kwargs): |
1865 | 1851 | l7policy_db = session.query(self.model_class).filter_by( |
|
0 commit comments