Commit 7a09d1f4 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'feat/96-cttc-multiple-bug-fixes-affecting-common-code' into 'develop' 

Resolve "(CTTC) Multiple Bug Fixes affecting `common` code"

Closes #96

See merge request !181
parents 1cdafbad 1d98c9bb

src/common/tests/InMemoryObjectDatabase.py

+3 −1
Original line number Diff line number Diff line
@@ -37,7 +37,9 @@ class InMemoryObjectDatabase: 
        LOGGER.debug('[get_entry] BEFORE database={:s}'.format(str(self._database)))

        container = self._get_container(container_name)

        if entry_uuid not in container:

            context.abort(grpc.StatusCode.NOT_FOUND, str('{:s}({:s}) not found'.format(container_name, entry_uuid)))

            MSG = '{:s}({:s}) not found; available({:s})'

            msg = str(MSG.format(container_name, entry_uuid, str(container.keys())))

            context.abort(grpc.StatusCode.NOT_FOUND, msg)

        return container[entry_uuid]



    def set_entry(self, container_name : str, entry_uuid : str, entry : Any) -> Any:

src/common/tools/descriptor/Tools.py

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ def format_custom_config_rules(config_rules : List[Dict]) -> List[Dict]: 
        if isinstance(custom_resource_value, (dict, list)):

            custom_resource_value = json.dumps(custom_resource_value, sort_keys=True, indent=0)

            config_rule['custom']['resource_value'] = custom_resource_value

        elif not isinstance(custom_resource_value, str):

            config_rule['custom']['resource_value'] = str(custom_resource_value)

    return config_rules



def format_device_custom_config_rules(device : Dict) -> Dict:

src/common/tools/service/GenericRestServer.py

+2 −1
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ class GenericRestServer(threading.Thread): 
        self.bind_port = bind_port

        self.base_url = base_url

        self.bind_address = get_http_bind_address() if bind_address is None else bind_address

        self.endpoint = 'http://{:s}:{:s}{:s}'.format(str(self.bind_address), str(self.bind_port), str(self.base_url))

        self.endpoint = 'http://{:s}:{:s}'.format(str(self.bind_address), str(self.bind_port))

        if self.base_url is not None: self.endpoint += str(self.base_url)

        self.srv = None

        self.ctx = None

        self.app = Flask(__name__)