X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Fvnf.py;h=87d5df409fc5bf1afe1d3a3c0ac720f54be81e5b;hp=04ad3016ebf6c6829a299f6ca4c9d36696e7b7d6;hb=38bf16409f00241925f7d09eb14fab49a3096e80;hpb=ce31bc3e331c7050d1d74e9b0821dbf99c12fc96 diff --git a/n2vc/vnf.py b/n2vc/vnf.py index 04ad301..87d5df4 100644 --- a/n2vc/vnf.py +++ b/n2vc/vnf.py @@ -339,6 +339,7 @@ class N2VC: # Loop through relations for cfg in configs: if 'juju' in cfg: + juju = cfg['juju'] if 'relation' in juju: for rel in juju['relation']: try: @@ -502,10 +503,19 @@ class N2VC: # Where to deploy the charm to. to=to, ) - - # Map the vdu id<->app name, - # - await self.Relate(model_name, vnfd) + ############################# + # Map the vdu id<->app name # + ############################# + try: + await self.Relate(model_name, vnfd) + except KeyError as ex: + # We don't currently support relations between NS and VNF/VDU charms + self.log.warn("[N2VC] Relations not supported: {}".format(ex)) + except Exception as ex: + # This may happen if not all of the charms needed by the relation + # are ready. We can safely ignore this, because Relate will be + # retried when the endpoint of the relation is deployed. + self.log.warn("[N2VC] Relations not ready") # ####################################### # # Execute initial config primitive(s) #