X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2common%2Fviews%2Froute.py;h=c6fc56e974c40612cbbca4c1e78069aa6491aaf2;hb=356dc5488966c011e8a49fc87a8b824fba39b18b;hp=832e38c8ac10ef6dcf09ebd9b49af94a914daf80;hpb=5e0dacb10819977ef6a452257346f72592cff374;p=pti%2Fo2.git

diff --git a/o2common/views/route.py b/o2common/views/route.py
index 832e38c..c6fc56e 100644
--- a/o2common/views/route.py
+++ b/o2common/views/route.py
@@ -29,7 +29,8 @@ from flask_restx.mask import Mask  # , apply as apply_mask
 from flask_restx.model import Model
 from flask_restx.fields import List, Nested, String
 from flask_restx.utils import unpack
-from o2common.domain.base import Serializer
+
+from o2common.views.route_exception import BadRequestException
 
 from o2common.helper import o2logging
 logger = o2logging.get_logger(__name__)
@@ -97,8 +98,8 @@ class o2_marshal_with(marshal_with):
 
             req_args = request.args
             mask = self._gen_mask_from_selector(**req_args)
-
-            # mask = self.mask
+            if mask == '':
+                mask = self.mask
 
             # if has_request_context():
             # mask_header = current_app.config["RESTX_MASK_HEADER"]
@@ -129,9 +130,13 @@ class o2_marshal_with(marshal_with):
         mask_val = ''
         if 'all_fields' in kwargs:
             all_fields_without_space = kwargs['all_fields'].replace(" ", "")
-            all_fields = all_fields_without_space.lower()
-            if 'true' == all_fields:
-                mask_val = ''
+            logger.debug('all_fields selector value is {}'.format(
+                all_fields_without_space))
+            # all_fields = all_fields_without_space.lower()
+            # if 'true' == all_fields:
+            selector = self.__gen_selector_from_model_with_value(
+                self.fields)
+            mask_val = self.__gen_mask_from_selector(selector)
 
         elif 'fields' in kwargs and kwargs['fields'] != '':
             fields_without_space = kwargs['fields'].replace(" ", "")
@@ -149,6 +154,7 @@ class o2_marshal_with(marshal_with):
             selector = {}
 
             self.__update_selector_value(selector, fields_without_space, True)
+            self.__set_default_mask(selector)
 
             mask_val = self.__gen_mask_from_selector(selector)
 
@@ -161,6 +167,7 @@ class o2_marshal_with(marshal_with):
 
             self.__update_selector_value(
                 selector, exclude_fields_without_space, False)
+            self.__set_default_mask(selector)
 
             mask_val = self.__gen_mask_from_selector(selector)
         elif 'exclude_default' in kwargs and kwargs['exclude_default'] != '':
@@ -201,14 +208,17 @@ class o2_marshal_with(marshal_with):
             selector[i] = default_val
         return selector
 
-    def __update_selector_value(self, default_selector: dict, filter: str,
+    def __update_selector_value(self, selector: dict, filter: str,
                                 val: bool):
         fields = filter.split(',')
         for f in fields:
             if '/' in f:
-                self.__update_selector_tree_value(default_selector, f, val)
+                self.__update_selector_tree_value(selector, f, val)
                 continue
-            default_selector[f] = val
+            if f not in self.fields:
+                raise BadRequestException(
+                    'Selector attribute {} not found'.format(f))
+            selector[f] = val
 
     def __update_selector_tree_value(self, m: dict, filter: str, val: bool):
         filter_list = filter.split('/', 1)
@@ -232,30 +242,6 @@ class o2_marshal_with(marshal_with):
 
         return '{%s}' % ','.join(mask_li)
 
-
-class ProblemDetails(Serializer):
-    def __init__(self, namespace: O2Namespace, code: int, detail: str,
-                 title=None, instance=None
-                 ) -> None:
-        self.ns = namespace
-        self.status = code
-        self.detail = detail
-        self.type = request.path
-        self.title = title if title is not None else self.getTitle(code)
-        self.instance = instance if instance is not None else []
-
-    def getTitle(self, code):
-        return HTTPStatus(code).phrase
-
-    def abort(self):
-        self.ns.abort(self.status, self.detail, **self.serialize())
-
-    def serialize(self):
-        details = {}
-        for key in dir(self):
-            if key == 'ns' or key.startswith('__') or\
-                    callable(getattr(self, key)):
-                continue
-            else:
-                details[key] = getattr(self, key)
-        return details
+    def __set_default_mask(self, selector: dict, val: bool = True):
+        default_selector = str(getattr(self.fields, "__mask__"))[1:-1]
+        self.__update_selector_value(selector, default_selector, val)