Merge "Add Juju/k8s support"

diff --combined osm_lcm/ns.py
index 763d239,67926c4..21c3d57
--- 1/osm_lcm/ns.py
--- 2/osm_lcm/ns.py
+++ b/osm_lcm/ns.py
@@@ -26,6 -26,7 +26,7 @@@ from jinja2 import Environment, Templat
  from osm_lcm import ROclient
  from osm_lcm.lcm_utils import LcmException, LcmExceptionNoMgmtIP, LcmBase, deep_get
  from n2vc.k8s_helm_conn import K8sHelmConnector
+ from n2vc.k8s_juju_conn import K8sJujuConnector
  
  from osm_common.dbbase import DbException
  from osm_common.fsbase import FsException
@@@ -125,6 -126,15 +126,15 @@@ class NsLcm(LcmBase)
              on_update_db=None,
          )
  
+         self.k8sclusterjuju = K8sJujuConnector(
+             kubectl_command=self.vca_config.get("kubectlpath"),
+             juju_command=self.vca_config.get("jujupath"),
+             fs=self.fs,
+             log=self.logger,
+             db=self.db,
+             on_update_db=None,
+         )
+ 
          # create RO client
          self.RO = ROclient.ROClient(self.loop, **self.ro_config)
  
@@@ -871,14 -881,9 +881,14 @@@
          ip_address = None
          nb_tries = 0
          target_vdu_id = None
 +        ro_retries = 0
  
          while True:
  
 +            ro_retries += 1
 +            if ro_retries >= 360:  # 1 hour
 +                raise LcmException("Not found _admin.deployed.RO.nsr_id for nsr_id: {}".format(nsr_id))
 +
              await asyncio.sleep(10, loop=self.loop)
              # wait until NS is deployed at RO
              if not ro_nsr_id:
@@@ -890,29 -895,23 +900,29 @@@
              # get ip address
              if not target_vdu_id:
                  db_vnfr = self.db.get_one("vnfrs", {"_id": vnfr_id})
 -                if not vdu_id:
 +
 +                if not vdu_id:  # for the VNF case
                      ip_address = db_vnfr.get("ip-address")
                      if not ip_address:
                          continue
 -                for vdur in get_iterable(db_vnfr, "vdur"):
 -                    if (vdur["vdu-id-ref"] == vdu_id and vdur["count-index"] == vdu_index) or \
 -                            (ip_address and vdur.get("ip-address") == ip_address):
 -                        if vdur.get("status") == "ACTIVE":
 -                            target_vdu_id = vdur["vdu-id-ref"]
 -                        elif vdur.get("status") == "ERROR":
 -                            raise LcmException("Cannot inject ssh-key because target VM is in error state")
 -                        break
 -                else:
 +                    vdur = next((x for x in get_iterable(db_vnfr, "vdur") if x.get("ip-address") == ip_address), None)
 +                else:  # VDU case
 +                    vdur = next((x for x in get_iterable(db_vnfr, "vdur")
 +                                 if x.get("vdu-id-ref") == vdu_id and x.get("count-index") == vdu_index), None)
 +
 +                if not vdur:
                      raise LcmException("Not found vnfr_id={}, vdu_index={}, vdu_index={}".format(
                          vnfr_id, vdu_id, vdu_index
                      ))
  
 +                if vdur.get("status") == "ACTIVE":
 +                    ip_address = vdur.get("ip-address")
 +                    if not ip_address:
 +                        continue
 +                    target_vdu_id = vdur["vdu-id-ref"]
 +                elif vdur.get("status") == "ERROR":
 +                    raise LcmException("Cannot inject ssh-key because target VM is in error state")
 +
              if not target_vdu_id:
                  continue
  
@@@ -1551,8 -1550,10 +1561,10 @@@
                                                          params=desc_params, db_dict=db_dict, timeout=3600)
                          )
                      else:
-                         # TODO juju-bundle connector in place
-                         pass
+                         task = self.k8sclusterjuju.install(cluster_uuid=cluster_uuid, kdu_model=kdumodel,
+                                                            atomic=True, params=desc_params,
+                                                            db_dict=db_dict, timeout=600)
+ 
                      pending_tasks[task] = "_admin.deployed.K8s.{}.".format(index)
                      index += 1
              if not pending_tasks:
@@@ -1995,8 -1996,9 +2007,9 @@@
                                  self.k8sclusterhelm.uninstall(cluster_uuid=kdu.get("k8scluster-uuid"),
                                                                kdu_instance=kdu_instance))
                          elif kdu.get("k8scluster-type") == "juju":
-                             # TODO Juju connector needed
-                             continue
+                             task_delete_kdu_instance = asyncio.ensure_future(
+                                 self.k8sclusterjuju.uninstall(cluster_uuid=kdu.get("k8scluster-uuid"),
+                                                               kdu_instance=kdu_instance))
                          else:
                              self.error(logging_text + "Unknown k8s deployment type {}".
                                         format(kdu.get("k8scluster-type")))
@@@ -2377,8 -2379,12 +2390,12 @@@
                                                                             params=desc_params, db_dict=db_dict,
                                                                             timeout=300)
                              elif kdu.get("k8scluster-type") == "juju":
-                                 # TODO Juju connector needed
-                                 pass
+                                 output = await self.k8sclusterjuju.upgrade(cluster_uuid=kdu.get("k8scluster-uuid"),
+                                                                            kdu_instance=kdu.get("kdu-instance"),
+                                                                            atomic=True, kdu_model=kdu_model,
+                                                                            params=desc_params, db_dict=db_dict,
+                                                                            timeout=300)
+ 
                              else:
                                  msg = "k8scluster-type not defined"
                                  raise LcmException(msg)
@@@ -2391,8 -2397,9 +2408,9 @@@
                                                                              kdu_instance=kdu.get("kdu-instance"),
                                                                              db_dict=db_dict)
                              elif kdu.get("k8scluster-type") == "juju":
-                                 # TODO Juju connector needed
-                                 pass
+                                 output = await self.k8sclusterjuju.rollback(cluster_uuid=kdu.get("k8scluster-uuid"),
+                                                                             kdu_instance=kdu.get("kdu-instance"),
+                                                                             db_dict=db_dict)
                              else:
                                  msg = "k8scluster-type not defined"
                                  raise LcmException(msg)
@@@ -2402,8 -2409,8 +2420,8 @@@
                                  output = await self.k8sclusterhelm.status_kdu(cluster_uuid=kdu.get("k8scluster-uuid"),
                                                                                kdu_instance=kdu.get("kdu-instance"))
                              elif kdu.get("k8scluster-type") == "juju":
-                                 # TODO Juju connector needed
-                                 pass
+                                 output = await self.k8sclusterjuju.status_kdu(cluster_uuid=kdu.get("k8scluster-uuid"),
+                                                                               kdu_instance=kdu.get("kdu-instance"))
                              else:
                                  msg = "k8scluster-type not defined"
                                  raise LcmException(msg)