X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Fk8s_helm_conn.py;h=417604ad98f3f52e8c1138ae30e34eb75fc885c3;hp=f7ff85305439820ce8162eb9bc7b7248cd2fbfb6;hb=8d780a9e0414686f0c91be6dc460275fb0155f89;hpb=a6748412b421c7abd8eae504ae6205da2e113cba

diff --git a/n2vc/k8s_helm_conn.py b/n2vc/k8s_helm_conn.py
index f7ff853..417604a 100644
--- a/n2vc/k8s_helm_conn.py
+++ b/n2vc/k8s_helm_conn.py
@@ -770,6 +770,15 @@ class K8sHelmConnector(K8sConnector):
     def _generate_release_name(
             chart_name: str
     ):
+        # check embeded chart (file or dir)
+        if chart_name.startswith('/'):
+            # extract file or directory name
+            chart_name = chart_name[chart_name.rfind('/')+1:]
+        # check URL
+        elif '://' in chart_name:
+            # extract last portion of URL
+            chart_name = chart_name[chart_name.rfind('/')+1:]
+
         name = ''
         for c in chart_name:
             if c.isalpha() or c.isnumeric():
@@ -1105,7 +1114,10 @@ class K8sHelmConnector(K8sConnector):
             msg = 'Exception executing command: {} -> {}'.format(command, e)
             if show_error_log:
                 self.error(msg)
-            return '', -1
+            if raise_exception_on_error:
+                raise e
+            else:
+                return '', -1
 
     def _remote_exec(
             self,