projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix cross-model relation condition
[osm/N2VC.git]
/
n2vc
/
k8s_juju_conn.py
diff --git
a/n2vc/k8s_juju_conn.py
b/n2vc/k8s_juju_conn.py
index
396d79b
..
eabc619
100644
(file)
--- a/
n2vc/k8s_juju_conn.py
+++ b/
n2vc/k8s_juju_conn.py
@@
-64,12
+64,7
@@
class K8sJujuConnector(K8sConnector):
"""
# parent class
"""
# parent class
- K8sConnector.__init__(
- self,
- db,
- log=log,
- on_update_db=on_update_db,
- )
+ K8sConnector.__init__(self, db, log=log, on_update_db=on_update_db)
self.fs = fs
self.loop = loop or asyncio.get_event_loop()
self.fs = fs
self.loop = loop or asyncio.get_event_loop()
@@
-125,44
+120,27
@@
class K8sJujuConnector(K8sConnector):
cleanup_data = []
try:
self.log.debug("Initializing K8s cluster for juju")
cleanup_data = []
try:
self.log.debug("Initializing K8s cluster for juju")
- kubectl.create_cluster_role(
- name=metadata_name,
- labels=labels,
- )
+ kubectl.create_cluster_role(name=metadata_name, labels=labels)
self.log.debug("Cluster role created")
cleanup_data.append(
self.log.debug("Cluster role created")
cleanup_data.append(
- {
- "delete": kubectl.delete_cluster_role,
- "args": (metadata_name,),
- }
+ {"delete": kubectl.delete_cluster_role, "args": (metadata_name,)}
)
)
- kubectl.create_service_account(
- name=metadata_name,
- labels=labels,
- )
+ kubectl.create_service_account(name=metadata_name, labels=labels)
self.log.debug("Service account created")
cleanup_data.append(
self.log.debug("Service account created")
cleanup_data.append(
- {
- "delete": kubectl.delete_service_account,
- "args": (metadata_name,),
- }
+ {"delete": kubectl.delete_service_account, "args": (metadata_name,)}
)
)
- kubectl.create_cluster_role_binding(
- name=metadata_name,
- labels=labels,
- )
+ kubectl.create_cluster_role_binding(name=metadata_name, labels=labels)
self.log.debug("Role binding created")
cleanup_data.append(
{
self.log.debug("Role binding created")
cleanup_data.append(
{
- "delete": kubectl.delete_
service_account
,
+ "delete": kubectl.delete_
cluster_role_binding
,
"args": (metadata_name,),
}
)
"args": (metadata_name,),
}
)
- token, client_cert_data = await kubectl.get_secret_data(
- metadata_name,
- )
+ token, client_cert_data = await kubectl.get_secret_data(metadata_name)
default_storage_class = kubectl.get_default_storage_class()
self.log.debug("Default storage class: {}".format(default_storage_class))
default_storage_class = kubectl.get_default_storage_class()
self.log.debug("Default storage class: {}".format(default_storage_class))
@@
-204,10
+182,7
@@
class K8sJujuConnector(K8sConnector):
async def repo_list(self):
raise MethodNotImplemented()
async def repo_list(self):
raise MethodNotImplemented()
- async def repo_remove(
- self,
- name: str,
- ):
+ async def repo_remove(self, name: str):
raise MethodNotImplemented()
async def synchronize_repos(self, cluster_uuid: str, name: str):
raise MethodNotImplemented()
async def synchronize_repos(self, cluster_uuid: str, name: str):
@@
-418,11
+393,7
@@
class K8sJujuConnector(K8sConnector):
return True
async def get_scale_count(
return True
async def get_scale_count(
- self,
- resource_name: str,
- kdu_instance: str,
- namespace: str = None,
- **kwargs,
+ self, resource_name: str, kdu_instance: str, namespace: str = None, **kwargs
) -> int:
"""Get an application scale count
) -> int:
"""Get an application scale count
@@
-494,10
+465,7
@@
class K8sJujuConnector(K8sConnector):
"""Rollback"""
async def rollback(
"""Rollback"""
async def rollback(
- self,
- cluster_uuid: str,
- kdu_instance: str,
- revision: int = 0,
+ self, cluster_uuid: str, kdu_instance: str, revision: int = 0
) -> str:
"""Rollback a model
) -> str:
"""Rollback a model
@@
-514,11
+482,7
@@
class K8sJujuConnector(K8sConnector):
"""Deletion"""
async def uninstall(
"""Deletion"""
async def uninstall(
- self,
- cluster_uuid: str,
- kdu_instance: str,
- namespace: str = None,
- **kwargs,
+ self, cluster_uuid: str, kdu_instance: str, namespace: str = None, **kwargs
) -> bool:
"""Uninstall a KDU instance
) -> bool:
"""Uninstall a KDU instance
@@
-658,10
+622,7
@@
class K8sJujuConnector(K8sConnector):
"""Introspection"""
"""Introspection"""
- async def inspect_kdu(
- self,
- kdu_model: str,
- ) -> dict:
+ async def inspect_kdu(self, kdu_model: str) -> dict:
"""Inspect a KDU
Inspects a bundle and returns a dictionary of config parameters and
"""Inspect a KDU
Inspects a bundle and returns a dictionary of config parameters and
@@
-703,10
+664,7
@@
class K8sJujuConnector(K8sConnector):
return kdu
return kdu
- async def help_kdu(
- self,
- kdu_model: str,
- ) -> str:
+ async def help_kdu(self, kdu_model: str) -> str:
"""View the README
If available, returns the README of the bundle.
"""View the README
If available, returns the README of the bundle.
@@
-772,9
+730,7
@@
class K8sJujuConnector(K8sConnector):
return status
async def add_relation(
return status
async def add_relation(
- self,
- provider: RelationEndpoint,
- requirer: RelationEndpoint,
+ self, provider: RelationEndpoint, requirer: RelationEndpoint
):
"""
Add relation between two charmed endpoints
):
"""
Add relation between two charmed endpoints
@@
-785,7
+741,7
@@
class K8sJujuConnector(K8sConnector):
self.log.debug(f"adding new relation between {provider} and {requirer}")
cross_model_relation = (
provider.model_name != requirer.model_name
self.log.debug(f"adding new relation between {provider} and {requirer}")
cross_model_relation = (
provider.model_name != requirer.model_name
- or
requir
er.vca_id != requirer.vca_id
+ or
provid
er.vca_id != requirer.vca_id
)
try:
if cross_model_relation:
)
try:
if cross_model_relation:
@@
-798,9
+754,7
@@
class K8sJujuConnector(K8sConnector):
requirer.model_name, offer, provider_libjuju
)
await requirer_libjuju.add_relation(
requirer.model_name, offer, provider_libjuju
)
await requirer_libjuju.add_relation(
- requirer.model_name,
- requirer.endpoint,
- saas_name,
+ requirer.model_name, requirer.endpoint, saas_name
)
else:
# Standard relation
)
else:
# Standard relation
@@
-921,10
+875,7
@@
class K8sJujuConnector(K8sConnector):
"""
return "cred-{}".format(cluster_uuid)
"""
return "cred-{}".format(cluster_uuid)
- def get_namespace(
- self,
- cluster_uuid: str,
- ) -> str:
+ def get_namespace(self, cluster_uuid: str) -> str:
"""Get the namespace UUID
Gets the namespace's unique name
"""Get the namespace UUID
Gets the namespace's unique name
@@
-961,12
+912,7
@@
class K8sJujuConnector(K8sConnector):
return self.libjuju
else:
vca_connection = await get_connection(self._store, vca_id)
return self.libjuju
else:
vca_connection = await get_connection(self._store, vca_id)
- return Libjuju(
- vca_connection,
- loop=self.loop,
- log=self.log,
- n2vc=self,
- )
+ return Libjuju(vca_connection, loop=self.loop, log=self.log, n2vc=self)
def _get_kubectl(self, credentials: str) -> Kubectl:
"""
def _get_kubectl(self, credentials: str) -> Kubectl:
"""