From bcd65c7ff17d30c3370bed9b5f28e40dd38b26f8 Mon Sep 17 00:00:00 2001
From: aktas <emin.aktas@ulakhaberlesme.com.tr>
Date: Tue, 19 Oct 2021 20:03:23 +0300
Subject: [PATCH] Fix bug 1718

In sometimes, it cannot catch that if the application is in the model.
Jenkinks report: https://osm.etsi.org/jenkins/view/Robot%20tests/job/osm-stage_3-merge/job/v10.0/169/robot/report/report.html#tags?basic_20

Change-Id: I8121d57923d93b7af9ad60e07b87b4616060a916
Signed-off-by: aktas <emin.aktas@ulakhaberlesme.com.tr>
(cherry picked from commit 42e51cfd7f807a2281ea3285d752b7142175da78)
---
 n2vc/libjuju.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/n2vc/libjuju.py b/n2vc/libjuju.py
index 6ece5d0..6aa31cc 100644
--- a/n2vc/libjuju.py
+++ b/n2vc/libjuju.py
@@ -791,6 +791,13 @@ class Libjuju:
                 raise JujuApplicationExists(
                     "Application {} exists".format(application_name)
                 )
+        except juju.errors.JujuError as e:
+            if "already exists" in e.message:
+                raise JujuApplicationExists(
+                    "Application {} exists".format(application_name)
+                )
+            else:
+                raise e
         finally:
             await self.disconnect_model(model)
             await self.disconnect_controller(controller)
-- 
2.25.1