- self.n2vc = N2VC(server=config.get('vca', 'host'), user=config.get('vca', 'user'),
- secret=config.get('vca', 'secret'))
+ host = config.get("vca", "host")
+ port = config.get("vca", "port") if "port" in config.conf["vca"] else 17070
+
+ # Backwards compatibility
+ if "cacert" in config.conf["vca"]:
+ ca_cert = config.conf["vca"].pop("cacert")
+ config.set("vca", "ca_cert", ca_cert)
+
+ if "pubkey" in config.conf["vca"]:
+ public_key = config.conf["vca"].pop("pubkey")
+ config.set("vca", "public_key", public_key)
+
+ if "apiproxy" in config.conf["vca"]:
+ api_proxy = config.conf["vca"].pop("apiproxy")
+ config.set("vca", "api_proxy", api_proxy)
+
+ self.n2vc = N2VCJujuConnector(
+ db=self.common_db.common_db,
+ fs=object(),
+ log=log,
+ loop=self.loop,
+ url="{}:{}".format(host, port),
+ username=config.get("vca", "user"),
+ vca_config=config.conf["vca"],
+ on_update_db=None,
+ )