X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Fn2vc_juju_conn.py;fp=n2vc%2Fn2vc_juju_conn.py;h=c6d00a8df5e7e3bf74643cfc99667625d395f6f6;hp=f0569b18b0fd0b81f86a9aa8ee7929382a6e6ec9;hb=015abee87f591b8e28f6b982ae4fb9c67e8791bb;hpb=4c856b3bae4f30d9e1bdd429884c1ae84bc629f0 diff --git a/n2vc/n2vc_juju_conn.py b/n2vc/n2vc_juju_conn.py index f0569b1..c6d00a8 100644 --- a/n2vc/n2vc_juju_conn.py +++ b/n2vc/n2vc_juju_conn.py @@ -1061,15 +1061,17 @@ class N2VCJujuConnector(N2VCConnector): if status == "completed": return output else: - raise Exception("status is not completed: {}".format(status)) + if "output" in output: + raise Exception(f'{status}: {output["output"]}') + else: + raise Exception( + f"{status}: No further information received from action" + ) + except Exception as e: - self.log.error( - "Error executing primitive {}: {}".format(primitive_name, e) - ) + self.log.error(f"Error executing primitive {primitive_name}: {e}") raise N2VCExecutionException( - message="Error executing primitive {} into ee={} : {}".format( - primitive_name, ee_id, e - ), + message=f"Error executing primitive {primitive_name} in ee={ee_id}: {e}", primitive_name=primitive_name, )