Make code compliant with ONAP requirement