projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert ""Remove unused lines of code""
[osm/N2VC.git]
/
n2vc
/
n2vc_juju_conn.py
diff --git
a/n2vc/n2vc_juju_conn.py
b/n2vc/n2vc_juju_conn.py
index
07c3903
..
31bdd6e
100644
(file)
--- a/
n2vc/n2vc_juju_conn.py
+++ b/
n2vc/n2vc_juju_conn.py
@@
-166,15
+166,16
@@
class N2VCJujuConnector(N2VCConnector):
if self.ca_cert:
self.ca_cert = base64_to_cacert(vca_config["ca_cert"])
if self.ca_cert:
self.ca_cert = base64_to_cacert(vca_config["ca_cert"])
- if "api_proxy" in vca_config:
+ if "api_proxy" in vca_config
and vca_config["api_proxy"] != ""
:
self.api_proxy = vca_config["api_proxy"]
self.log.debug(
"api_proxy for native charms configured: {}".format(self.api_proxy)
)
else:
self.warning(
self.api_proxy = vca_config["api_proxy"]
self.log.debug(
"api_proxy for native charms configured: {}".format(self.api_proxy)
)
else:
self.warning(
- "api_proxy is not configured
. Support for native charms is disabled
"
+ "api_proxy is not configured"
)
)
+ self.api_proxy = None
if "enable_os_upgrade" in vca_config:
self.enable_os_upgrade = vca_config["enable_os_upgrade"]
if "enable_os_upgrade" in vca_config:
self.enable_os_upgrade = vca_config["enable_os_upgrade"]
@@
-241,7
+242,7
@@
class N2VCJujuConnector(N2VCConnector):
models = await self.libjuju.list_models(contains=ns_id)
for m in models:
models = await self.libjuju.list_models(contains=ns_id)
for m in models:
- status[m] = self.libjuju.get_model_status(m)
+ status[m] =
await
self.libjuju.get_model_status(m)
if yaml_format:
return obj_to_yaml(status)
if yaml_format:
return obj_to_yaml(status)
@@
-376,10
+377,6
@@
class N2VCJujuConnector(N2VCConnector):
# register machine on juju
try:
# register machine on juju
try:
- if not self.api_proxy:
- msg = "Cannot provision machine: api_proxy is not defined"
- self.log.error(msg=msg)
- raise N2VCException(message=msg)
if not await self.libjuju.model_exists(model_name):
await self.libjuju.add_model(model_name, cloud_name=self.cloud)
machine_id = await self.libjuju.provision_machine(
if not await self.libjuju.model_exists(model_name):
await self.libjuju.add_model(model_name, cloud_name=self.cloud)
machine_id = await self.libjuju.provision_machine(
@@
-712,10
+709,8
@@
class N2VCJujuConnector(N2VCConnector):
try:
await self.libjuju.add_relation(
model_name=model_1,
try:
await self.libjuju.add_relation(
model_name=model_1,
- application_name_1=app_1,
- application_name_2=app_2,
- relation_1=endpoint_1,
- relation_2=endpoint_2,
+ endpoint_1="{}:{}".format(app_1, endpoint_1),
+ endpoint_2="{}:{}".format(app_2, endpoint_2),
)
except Exception as e:
message = "Error adding relation between {} and {}: {}".format(
)
except Exception as e:
message = "Error adding relation between {} and {}: {}".format(
@@
-1187,7
+1182,7
@@
class N2VCJujuConnector(N2VCConnector):
connection=connection,
nonce=params.nonce,
machine_id=machine_id,
connection=connection,
nonce=params.nonce,
machine_id=machine_id,
-
api
=self.api_proxy,
+
proxy
=self.api_proxy,
)
)
)
)