projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OSM LTS Support
[osm/N2VC.git]
/
n2vc
/
n2vc_juju_conn.py
diff --git
a/n2vc/n2vc_juju_conn.py
b/n2vc/n2vc_juju_conn.py
index
2c94328
..
c01c436
100644
(file)
--- a/
n2vc/n2vc_juju_conn.py
+++ b/
n2vc/n2vc_juju_conn.py
@@
-369,7
+369,7
@@
class N2VCJujuConnector(N2VCConnector):
# In case of native_charm is being deployed, if JujuApplicationExists error happens
# it will try to add_unit
# In case of native_charm is being deployed, if JujuApplicationExists error happens
# it will try to add_unit
- @retry(attempts=3, delay=5, retry_exceptions=(N2VCApplicationExists,))
+ @retry(attempts=3, delay=5, retry_exceptions=(N2VCApplicationExists,)
, timeout=None
)
async def install_configuration_sw(
self,
ee_id: str,
async def install_configuration_sw(
self,
ee_id: str,
@@
-453,7
+453,7
@@
class N2VCJujuConnector(N2VCConnector):
artifact_path = artifact_path.replace("//", "/")
# check charm path
artifact_path = artifact_path.replace("//", "/")
# check charm path
- if not self.fs.file_exists(artifact_path
, mode="dir"
):
+ if not self.fs.file_exists(artifact_path):
msg = "artifact path does not exist: {}".format(artifact_path)
raise N2VCBadArgumentsException(message=msg, bad_args=["artifact_path"])
msg = "artifact path does not exist: {}".format(artifact_path)
raise N2VCBadArgumentsException(message=msg, bad_args=["artifact_path"])
@@
-550,7
+550,7
@@
class N2VCJujuConnector(N2VCConnector):
artifact_path = artifact_path.replace("//", "/")
# check charm path
artifact_path = artifact_path.replace("//", "/")
# check charm path
- if not self.fs.file_exists(artifact_path
, mode="dir"
):
+ if not self.fs.file_exists(artifact_path):
msg = "artifact path does not exist: {}".format(artifact_path)
raise N2VCBadArgumentsException(message=msg, bad_args=["artifact_path"])
msg = "artifact path does not exist: {}".format(artifact_path)
raise N2VCBadArgumentsException(message=msg, bad_args=["artifact_path"])
@@
-886,7
+886,6
@@
class N2VCJujuConnector(N2VCConnector):
application_name=application_name,
model_name=model_name,
machine_id=machine_id,
application_name=application_name,
model_name=model_name,
machine_id=machine_id,
- db_dict=db_dict,
total_timeout=total_timeout,
)
else:
total_timeout=total_timeout,
)
else: