osm/N2VC.git
3 years ago"Remove unused lines of code" 42/9342/3
David Garcia [Tue, 7 Jul 2020 08:34:33 +0000 (10:34 +0200)]
"Remove unused lines of code"

Change-Id: I02be0efe4918083d95a4017c898bfabaf269e779
Signed-off-by: David Garcia <david.garcia@canonical.com>
3 years agoAdd consume to libjuju.py 00/9700/1
David Garcia [Fri, 11 Sep 2020 13:05:00 +0000 (15:05 +0200)]
Add consume to libjuju.py

This function allows to consume an offered endpoint in another model

Change-Id: I320978aac654fbb8199fdfbf4e928b0e2ba5458b
Signed-off-by: David Garcia <david.garcia@canonical.com>
3 years agoChange add_relation function in libjuju.py to accept saas 39/9639/4
David Garcia [Tue, 25 Aug 2020 14:10:07 +0000 (16:10 +0200)]
Change add_relation function in libjuju.py to accept saas

Before, app_1, endpoint1, app_2, endpoint2 parameters were needed.
Now we directly pass the endpoint names of the relation with the right format.
If "app:endpoint", it is understood that the endpoint it of a charm in the current model.
If "name", it is understood that the endpoint is a consumed endpoint from another model.

This function allows to cross-model-relate charms to external models

Change-Id: I84ab45ba735a1960ab742d9ec731c357ec1042c6
Signed-off-by: David Garcia <david.garcia@canonical.com>
3 years agoAdd list_offers function to libjuju.py 38/9638/5
David Garcia [Tue, 25 Aug 2020 13:22:30 +0000 (15:22 +0200)]
Add list_offers function to libjuju.py

This function return the list of offers available in a model

Change-Id: Iebc9f55c79f27caab5b2f5a2874e1d2d93dc9bc4
Signed-off-by: David Garcia <david.garcia@canonical.com>
3 years agoAdd models_exist function to libjuju.py 37/9637/4
David Garcia [Tue, 25 Aug 2020 13:03:01 +0000 (15:03 +0200)]
Add models_exist function to libjuju.py

This function checks if a gives list of model names exist in the controller.
Additionally, it returns the list of unexisting models from the given list.

Change-Id: I2a9290ef1a4ee1308626f3a31dba0a83127fdd8c
Signed-off-by: David Garcia <david.garcia@canonical.com>
3 years agoAdd entries in .gitignore to ignore the files created by venv 36/9636/1
David Garcia [Tue, 25 Aug 2020 12:38:59 +0000 (14:38 +0200)]
Add entries in .gitignore to ignore the files created by venv

Change-Id: I303847624dfb3f8f3a7ce37621f9f72b9344c0a2
Signed-off-by: David Garcia <david.garcia@canonical.com>
3 years agoStore k8s controller information in Mongo, and remove controller attribute from K8sJu... 12/9612/1
David Garcia [Thu, 23 Jul 2020 13:04:19 +0000 (15:04 +0200)]
Store k8s controller information in Mongo, and remove controller attribute from K8sJujuConnector

- Storing the k8s controller information in Mongo let us connect to that controller from different LCM units
- The cacert and secret keys are encrypted
- The controller attribute in K8sJujuConnector was preventing to have more than 1 connection to different controllers at the same time

Change-Id: Icf96e1eedf84e283dd6b0016cae3695a074b7d24
Signed-off-by: David Garcia <david.garcia@canonical.com>
3 years agoGet the kubeconfig credentials from MongoDB 11/9611/1
David Garcia [Wed, 22 Jul 2020 15:56:12 +0000 (17:56 +0200)]
Get the kubeconfig credentials from MongoDB

This the previous approach, the kubeconfig was gotten from the filesystem,
which has issues scaling the LCM, because the kubeconfig was only present
in the pod that had initialized the environment.

The kubeconfig is stored in Mongo, and this commit basically gets the config from there, so it doesn't matter which LCM needs access to it.

Change-Id: I80458db5124122a4b7b3eb3a9b00cb4a4add11ff
Signed-off-by: David Garcia <david.garcia@canonical.com>
3 years agoFix bug 1167 10/9610/1
David Garcia [Wed, 22 Jul 2020 11:17:56 +0000 (13:17 +0200)]
Fix bug 1167

Change-Id: Id0ea5f19d57d2214219eec8f59f13a378d61c870
Signed-off-by: David Garcia <david.garcia@canonical.com>
3 years ago1156 fix path obtained for k8s_helm_conn cluster 09/9609/1
tierno [Fri, 17 Jul 2020 11:47:32 +0000 (11:47 +0000)]
1156 fix path obtained for k8s_helm_conn cluster

minor change at /k8s_juju_conn.py

Change-Id: I1e7f4910bc726d5a693ce50f45798a2fc8363a96
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
3 years agoFix an issue with the service ports in Kubectl.py 08/9608/1
David Garcia [Thu, 16 Jul 2020 15:53:20 +0000 (17:53 +0200)]
Fix an issue with the service ports in Kubectl.py

The ports were retrieved as V1ServicePort classes, and LCM cannot store that in the database

Change-Id: I451ab65478f36c5cb7f33594b4454bd315c22878
Signed-off-by: David Garcia <david.garcia@canonical.com>
3 years agoMake API Proxy optional and avoid replacing existing SSH Keys in the provisioner 07/9607/1
David Garcia [Thu, 16 Jul 2020 10:37:13 +0000 (12:37 +0200)]
Make API Proxy optional and avoid replacing existing SSH Keys in the provisioner

- Fixes bug 1154
- Fixes bug 1083
Change-Id: I0ee5e092f5ff205089c2b80ece9f4262572d58d2
Signed-off-by: David Garcia <david.garcia@canonical.com>
3 years agoAdd unit tests for K8s Proxy Charm Feature 06/9606/1
Dominik Fleischmann [Wed, 15 Jul 2020 12:44:45 +0000 (14:44 +0200)]
Add unit tests for K8s Proxy Charm Feature

This commit also makes an initial template for
future test in n2vc_juju_conn.py

Change-Id: I34cb0f52bc2e6ce6b514ea4f99658f109e21875f
Signed-off-by: Dominik Fleischmann <dominik.fleischmann@canonical.com>
3 years agoPin libjuju version to 2.8.2 05/9605/1
David Garcia [Wed, 15 Jul 2020 14:01:17 +0000 (16:01 +0200)]
Pin libjuju version to 2.8.2

This fixes bug 1144

Change-Id: I72580c2a2c4614bad2847b436d376ad9b4636031
Signed-off-by: David Garcia <david.garcia@canonical.com>
3 years agoImplement get_service and get_services methods for K8sJujuConnector 89/9289/8
David Garcia [Thu, 2 Jul 2020 11:56:58 +0000 (13:56 +0200)]
Implement get_service and get_services methods for K8sJujuConnector

- Add a new class (n2vc.kubectl.Kubectl) for managing the Kubectl commands
  - Add unit tests
- Add get_config_file() method for getting the path of the kubeconfig in K8sJujuConnector
- Implement get_service() and get_services() methods in K8sJujuConnector

Change-Id: I883ec21dad519c2dc65cb9bd601e539685336756
Signed-off-by: David Garcia <david.garcia@canonical.com>
3 years agoAdd unit tests to N2VC refactor 52/9352/8
Dominik Fleischmann [Tue, 7 Jul 2020 11:11:19 +0000 (13:11 +0200)]
Add unit tests to N2VC refactor

This commit adds unit tests for the following
modules:
juju_watcher.py 96% coverage
libjuju.py 72% coverage
utils.py 100% coverage

Minor libjuju.py fixes found with unit testing
Fix testing with tox

Change-Id: I9f23ce2f18aac6765edfa955ed200802c27d9047
Signed-off-by: Dominik Fleischmann <dominik.fleischmann@canonical.com>
3 years agofix bugs 1117 and 1142 at deleting k8scluster helm-chart 04/9604/1
tierno [Tue, 14 Jul 2020 10:29:00 +0000 (10:29 +0000)]
fix bugs 1117 and 1142 at deleting k8scluster helm-chart

bug 1142: When helm is not going to be uninstalled, do not check for kdu releases

bug 1117: When helm is going to be unistalled with kdu releases, just warn and
skip uninstall helm. This happens because kdu release has been installed
outside the scope of OSM. NBI already checks that there is not OSM kdu
deployments upon k8scluster deletion, denying the operation if any.

Change-Id: Icee2125b790c562130e13dd8c619d1c94c64c0fe
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
3 years agoAdded new functionaliyty to obtain services data 17/9217/7
lloretgalleg [Mon, 29 Jun 2020 14:18:30 +0000 (14:18 +0000)]
Added new functionaliyty  to obtain services data

Change-Id: I140dafb29f7636e4b8e481b865faa414d7fb1136
Signed-off-by: lloretgalleg <illoret@indra.es>
3 years agoallow starts N2VCJujuConnector without the parameter api_proxy 04/9204/4
tierno [Wed, 24 Jun 2020 13:57:10 +0000 (13:57 +0000)]
allow starts N2VCJujuConnector without the parameter api_proxy

Change-Id: I7506f10b89c6837ce019e6db447748de3c811d61
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
3 years agofix 1108 enhancement in helm installation and removing 03/9203/4
tierno [Thu, 25 Jun 2020 15:48:52 +0000 (15:48 +0000)]
fix 1108 enhancement in helm installation and removing

it allows old versions of k8s by creating a serviceaccount

In addition it stores the namespace used for helm instalation,
to use it at deletion. For that a 'namespace.cluster_id' is used

Change-Id: I8333cbd02bc681908c4341b592746b144f8a0acd
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
3 years agoUpdate database with api_endpoints of VCA on initialization 60/9260/1
David Garcia [Wed, 1 Jul 2020 18:25:30 +0000 (20:25 +0200)]
Update database with api_endpoints of VCA on initialization

Change-Id: Id5666d8c93d357632efde93e8e60abafdad56e35
Signed-off-by: David Garcia <david.garcia@canonical.com>
3 years agoFix missing await 22/9222/2
David Garcia [Tue, 30 Jun 2020 06:39:26 +0000 (08:39 +0200)]
Fix missing await

Change-Id: I64babbb51193d47122e34498f11b6d380b44a174
Signed-off-by: David Garcia <david.garcia@canonical.com>
3 years agoFix model deletion 82/9182/6
David Garcia [Thu, 25 Jun 2020 15:18:31 +0000 (17:18 +0200)]
Fix model deletion

- Model deletion is failing with Juju 2.8

Change-Id: I6d7fc85ac9166a4eb7ff5851c231490400d64787
Signed-off-by: David Garcia <david.garcia@canonical.com>
3 years agoWrite to DB when creating K8s Proxy Charm 16/9216/1
Dominik Fleischmann [Mon, 29 Jun 2020 14:16:28 +0000 (16:16 +0200)]
Write to DB when creating K8s Proxy Charm

This commit adds a call to _write_ee_id_db so
that the DB is updated the same way as in LXD
Proxy Charms.

Change-Id: I7ecd815b1a5fbbb0b0222300da39ca99cb6ae584
Signed-off-by: Dominik Fleischmann <dominik.fleischmann@canonical.com>
3 years ago8716 - K8s Proxy Charms 72/9072/8
Dominik Fleischmann [Tue, 9 Jun 2020 09:57:14 +0000 (11:57 +0200)]
8716 - K8s Proxy Charms

This commit enables the possibility to deploy
Proxy Charms on Kubernetes.

It depends on a new LCM environment variable
called `k8s_cloud` which will state the k8s name
in VCA that will be used for deploying the proxy
charms.

It will also check the k8s model for status
and delete the k8s model if it exists.

Finally it will now retry the verify ssh
credential action when the action fails, instead
of only retrying when a excpetion is launched.

Change-Id: I09510dcec00f747da945f88d54c2e25c1402d56c
Signed-off-by: Dominik Fleischmann <dominik.fleischmann@canonical.com>
3 years agoFeature 8720: Add scale support 25/8725/20
David Garcia [Wed, 25 Mar 2020 17:19:02 +0000 (18:19 +0100)]
Feature 8720: Add scale support

Change-Id: Ie94521fb6a1ce0a765f9558de749f4f438cf8b93
Signed-off-by: David Garcia <david.garcia@canonical.com>
3 years agoFeature 8681: Add VCA HA capabilities 19/9119/57
David Garcia [Fri, 19 Jun 2020 09:40:18 +0000 (11:40 +0200)]
Feature 8681: Add VCA HA capabilities

- juju watcher: fix exception handling when websocket is closed
- libjuju.py:
  - Get vca endpoints from database (if exists)
  - Update vca endpoints in database
  - Get controller per operation (remove controller from class attribute)
  - Add health check: Every 5 minutes the connection to the controller will be tested.
- Dockerfile: update it to 18.04

Change-Id: Ifa0a3a705d48fd736a9634b0722bdc914003b497
Signed-off-by: David Garcia <david.garcia@canonical.com>
3 years agoRevert "Tox doesn't like -" 57/9157/2
beierlm [Wed, 24 Jun 2020 20:21:29 +0000 (22:21 +0200)]
Revert "Tox doesn't like -"

This reverts commit d87303d18767a9c1d9d44357d1be392f41c3b723.

Reason for revert: This does not fix the problem.  Underlying root cause still unknown.

Change-Id: I1f012bcf03c63cd12c24e1ede18620834a81c0a5
Signed-off-by: beierlm <mark.beierl@canonical.com>
3 years agoAdding python3-pip stage2 dependency 58/9158/3
Felipe Vicens [Thu, 25 Jun 2020 06:24:19 +0000 (08:24 +0200)]
Adding python3-pip stage2 dependency

Change-Id: I39e5e196fb598570ddd7376a0b280379546fa271
Signed-off-by: Felipe Vicens <felipe.vicens@atos.net>
3 years agoTox doesn't like - 53/9153/1
beierlm [Wed, 24 Jun 2020 17:27:39 +0000 (13:27 -0400)]
Tox doesn't like -

Removing the - character from the pylinttests environment as the
version of tox available via the build process does not work with
that character.

Change-Id: I46cffef33f07b474598b2c0badf508ee3ea7fd45
Signed-off-by: beierlm <mark.beierl@canonical.com>
3 years agoUse default Previous Work Dir if there is none 51/9151/1 release-v8.0-start v8.0.0rc1
Dominik Fleischmann [Thu, 28 May 2020 12:33:22 +0000 (14:33 +0200)]
Use default Previous Work Dir if there is none

When the folder where the working dir was is deleted
an Exception is thrown. In that case a new default
directory is defined.

Change-Id: Ic0b3eb63625fc6cf6e90e9a77891c9958b6a9aee
Signed-off-by: Dominik Fleischmann <dominik.fleischmann@canonical.com>
(cherry picked from commit cbf4b78798f1c6535fa7a7caaaa9235fb9dc8e8a)

3 years agofix issue storing status of k8s_helm_conn 07/8807/7
tierno [Tue, 21 Apr 2020 13:22:26 +0000 (13:22 +0000)]
fix issue  storing status of k8s_helm_conn

Change-Id: Iab7d4b7d1cc944fe4d23fb1455823d0eb6798b33
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
3 years agoInitial refactor of N2VC 09/8909/46
David Garcia [Wed, 13 May 2020 10:18:38 +0000 (12:18 +0200)]
Initial refactor of N2VC

- Add libjuju.py to encapsulate all code related with the communication using libjuju
- Replace juju_observer with juju_watcher
- Add utils with some utilities like EntityType, FinalStatus, and JujuStatusToOSM

Change-Id: I5d46ad65d6ed37b49bf2504209bfdd46d1b5a7e4
Signed-off-by: David Garcia <david.garcia@canonical.com>
3 years agoInstall iptables-persistent if it doesn't exist 50/9050/1
David Garcia [Tue, 26 May 2020 17:27:03 +0000 (19:27 +0200)]
Install iptables-persistent if it doesn't exist

Change-Id: I7535e7ff3b74236cd3c7e752244252481582d557
Signed-off-by: David Garcia <david.garcia@canonical.com>
3 years agoPin juju version to 2.8.1 49/9049/1
David Garcia [Tue, 26 May 2020 15:28:59 +0000 (17:28 +0200)]
Pin juju version to 2.8.1

Change-Id: Id40b3eeb698939131faf56fe008be335e6398cef
Signed-off-by: David Garcia <david.garcia@canonical.com>
3 years agoGet series from machine 48/9048/1
David Garcia [Mon, 25 May 2020 14:23:20 +0000 (16:23 +0200)]
Get series from machine

Currently the series when deploying a charm is hardcoded to xenial, when it should be retrieved from the machine.

Change-Id: I2784290dde803e276a77775ee57879897b1c523c
Signed-off-by: David Garcia <david.garcia@canonical.com>
3 years agoOmmit public_key argument if None 47/9047/2
Dominik Fleischmann [Thu, 21 May 2020 11:55:19 +0000 (13:55 +0200)]
Ommit public_key argument if None

With newer Juju versions the authorized-keys
argument is expected to not be None, therefore it
now has to be ommited as an argument if thats the
case.

Change-Id: I0adeda2ce71df5505cfaaab98ec237611918d9e7
Signed-off-by: Dominik Fleischmann <dominik.fleischmann@canonical.com>
3 years agoChange to sane default timeout 05/8905/4
beierlm [Tue, 12 May 2020 19:26:37 +0000 (15:26 -0400)]
Change to sane default timeout

Changes the default timeout from ~28 hours to 1 hour.
Fixed syntax errors in two log messages.
Adds unit tests for timeouts.
Adds nose config to create Junit style output.

Fixes bug 1014

Change-Id: I7d1c2d28b397adc3ac638aa2366925dc744eade3
Signed-off-by: beierlm <mark.beierl@canonical.com>
3 years agoFix credential_name 77/8877/2
David Garcia [Thu, 7 May 2020 10:28:05 +0000 (12:28 +0200)]
Fix credential_name

Change-Id: I7eeed36b2f4d4cc47e8b2de56abcecaee24706f3
Signed-off-by: David Garcia <david.garcia@canonical.com>
3 years agoAdds skipdist back 57/8857/2
beierlm [Wed, 6 May 2020 16:05:16 +0000 (12:05 -0400)]
Adds skipdist back

The merge has been failing, probably due to unmaintained distribution
code for debian packages that are no longer needed.  This patch
reinstates the skipdist step to tox.ini

Change-Id: Ia4134222f85075fda9e9a535493eb77ceabb855f
Signed-off-by: beierlm <mark.beierl@canonical.com>
3 years agoFix bug 1050: Make provisioner asynchronous 59/8759/21
David Garcia [Mon, 6 Apr 2020 10:42:26 +0000 (12:42 +0200)]
Fix bug 1050: Make provisioner asynchronous

Change-Id: I19a47abbea81deff64698a16715f5fd7c9e6e8e4
Signed-off-by: David Garcia <david.garcia@canonical.com>
3 years agoFix missing import 51/8851/1
beierlm [Tue, 5 May 2020 18:55:19 +0000 (14:55 -0400)]
Fix missing import

Import was removed for flake8 compliance, but it was
needed at runtime.

Change-Id: I2c1fce7b681582382c3c8f74267c3010bfcd97d6
Signed-off-by: beierlm <mark.beierl@canonical.com>
3 years agoEnable lint, flake8 and unit tests 10/8810/8
beierlm [Tue, 21 Apr 2020 20:36:35 +0000 (16:36 -0400)]
Enable lint, flake8 and unit tests

Cleans up non pep compliant code.
Adds a simple unit test.
Formats according to black.

Tox automatically runs lint, flake8 and unit test suite
with coverage.  To run each individually, execute:

tox -e pylint
tox -e black
tox -e flake8
tox -e cover

Note that these are all run for each patch via Jenkins.  The full
tox suite should be run locally before any commit to ensure it
will not fail in Jenkins.

Change-Id: I2f87abe3d5086d6d65ac33a27780c498fc7b1cd3
Signed-off-by: beierlm <mark.beierl@canonical.com>
3 years agoCheck if cloud is built-in cloud when adding a model 33/8833/3
David Garcia [Wed, 29 Apr 2020 10:34:23 +0000 (12:34 +0200)]
Check if cloud is built-in cloud when adding a model

Change-Id: Iad5f8e8f614898b2be38c6c40f97d6bbe97964cd
Signed-off-by: David Garcia <david.garcia@canonical.com>
4 years agoK8s action support 61/8761/8
Dominik Fleischmann [Mon, 6 Apr 2020 12:51:00 +0000 (14:51 +0200)]
K8s action support

This commit enables k8s actions by executing them the
same way as any other ns-action. It needs a mandatory
parameter which is application-name.

This commit depends on another commit in LCM.
https://osm.etsi.org/gerrit/#/c/osm/LCM/+/8767/

Change-Id: I375fb93d55f1255d425f229fe1a88968b19ae3d0
Signed-off-by: Dominik Fleischmann <dominik.fleischmann@canonical.com>
4 years agoadding optional namespace to K8s install 69/8769/3
tierno [Tue, 7 Apr 2020 11:08:16 +0000 (11:08 +0000)]
adding optional namespace to K8s install

Change-Id: Ib433aff72f68f56359917a8a3716e6b798ea330b
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
4 years agofix 1040 report error on failing delete_namespace 29/8729/8
tierno [Thu, 26 Mar 2020 09:51:11 +0000 (09:51 +0000)]
fix 1040 report error on failing delete_namespace
Do not capture asyncio.CancelledError
remove unneeded loging. e.g. certificates

Change-Id: Ia4f8c19bf693b689aeaaaeb76b006cd25c7295e1
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
4 years agoRaise N2VCNotFound exception in delete_namespace 73/8773/1
David Garcia [Wed, 8 Apr 2020 11:23:07 +0000 (13:23 +0200)]
Raise N2VCNotFound exception in delete_namespace

Change-Id: I57d8ab115b4efdee65af2ca1e951463359ef81de
Signed-off-by: David Garcia <david.garcia@canonical.com>
4 years agoAdd N2VCNotFound exception 72/8772/2
David Garcia [Wed, 8 Apr 2020 07:48:21 +0000 (09:48 +0200)]
Add N2VCNotFound exception

Change-Id: I83702862086996adaefbfb9721f08f40bc943a44
Signed-off-by: David Garcia <david.garcia@canonical.com>
4 years agoFix bug 1039: Add config to install_configuration_sw 45/8745/2
David Garcia [Wed, 1 Apr 2020 14:06:39 +0000 (16:06 +0200)]
Fix bug 1039: Add config to install_configuration_sw

Change-Id: I6545d0d425f6cd0f20c0cba049b6c828128ab66a
Signed-off-by: David Garcia <david.garcia@canonical.com>
4 years agoFix bug 1049: Raise exception if model does not exist when destroying a model 60/8760/2
David Garcia [Mon, 6 Apr 2020 10:55:23 +0000 (12:55 +0200)]
Fix bug 1049: Raise exception if model does not exist when destroying a model

Change-Id: I7bc64f296d6cff695511be77a5445241a1175d8a
Signed-off-by: David Garcia <david.garcia@canonical.com>
4 years agoFix bug 1018 58/8758/1
David Garcia [Mon, 6 Apr 2020 09:02:42 +0000 (11:02 +0200)]
Fix bug 1018

- Only destroy manually provisioned machines
- Fix in the observer: check if entity is not dead
- Destroy applications

Change-Id: I2b79585775572ed99aaa7ad7fe053bb33424163f
Signed-off-by: David Garcia <david.garcia@canonical.com>
4 years agoAdd local k8s charms support 27/8727/6
Dominik Fleischmann [Thu, 26 Mar 2020 11:21:42 +0000 (12:21 +0100)]
Add local k8s charms support

This adds the support to deploy Kuberentes Charm
Bundles that are available locally (directly
inside the vnf descriptor).

Change-Id: Ib2e191df5f905ba909f935f2005347d2cf83da74
Signed-off-by: Dominik Fleischmann <dominik.fleischmann@canonical.com>
4 years agoFeature 8720: Get leader unit to execute action 23/8723/2
David Garcia [Wed, 25 Mar 2020 15:23:14 +0000 (16:23 +0100)]
Feature 8720: Get leader unit to execute action

Change-Id: I745bdadd96e7af0c4ef00fc5c0b41e71708cb489
Signed-off-by: David Garcia <david.garcia@canonical.com>
4 years agoAdd multicloud controller support 03/8703/2
Dominik Fleischmann [Thu, 19 Mar 2020 09:32:55 +0000 (10:32 +0100)]
Add multicloud controller support

This commit depends on 8702. As it needs
the cloud VCA config variable.
https://osm.etsi.org/gerrit/#/c/osm/LCM/+/8702/

Change-Id: If55cebd90ad69f0c09a4e6f27e63c1c5aff5d34f
Signed-off-by: Dominik Fleischmann <dominik.fleischmann@canonical.com>
4 years agoFix logging in Juju K8s code 38/8638/3
Dominik Fleischmann [Wed, 26 Feb 2020 13:37:16 +0000 (14:37 +0100)]
Fix logging in Juju K8s code

This fixes the logging in the juju k8s code base
which wasn't showing up in the LCM logs.
This logging follows the same standard as the rest
of LCM code base.

Change-Id: I569d2bc1e3c50e73ac9af129f1d59775b89cb3ca
Signed-off-by: Dominik Fleischmann <dominik.fleischmann@canonical.com>
4 years agoStandardize logging 47/8647/2
Dominik Fleischmann [Thu, 27 Feb 2020 09:04:34 +0000 (10:04 +0100)]
Standardize logging

This commit will standardize logging for all the code,
so that it follows the same format as LCM. The logging
for k8s_juju_conn.py is in commit 8638.

Change-Id: I0ea199018e96b167ecbf8fd1ab16e5065a2e2bdf
Signed-off-by: Dominik Fleischmann <dominik.fleischmann@canonical.com>
4 years agoFix machine deletion when delete execution environment 27/8627/3
calvinosanch [Fri, 21 Feb 2020 08:25:21 +0000 (09:25 +0100)]
Fix machine deletion when delete execution environment

Change-Id: If389f267e996af3b93ef0ba59444733ab4c7ed7e
Signed-off-by: calvinosanch <guillermo.calvinosanchez@altran.com>
4 years agoSynchronize helm repos on ns instantiation instead of creation 25/8625/4
lloretgalleg [Thu, 20 Feb 2020 11:01:17 +0000 (12:01 +0100)]
Synchronize helm repos on ns instantiation instead of creation

Change-Id: Ia4f35283399d2777ff3df1fb2824a68cbaec4804
Signed-off-by: lloretgalleg <illoret@indra.es>
4 years ago1000: Fix authentication when deleting service 44/8644/1
Dominik Fleischmann [Wed, 26 Feb 2020 18:58:25 +0000 (19:58 +0100)]
1000: Fix authentication when deleting service

This fixes 1000 where the creation of k8sclusters
was failing once a k8scluster had been deleted. This
was due to N2VC not logging out correctly from the
juju controller. Error handling was added to the
add_model funciton.

https://osm.etsi.org/bugzilla/show_bug.cgi?id=1000

Change-Id: I144ddf7ed16a3aa65e145459e49f41b9fd936353
Signed-off-by: Dominik Fleischmann <dominik.fleischmann@canonical.com>
4 years agoMerge "Revert "Bug 1000: Fix authentication when deleting service""
israelad [Wed, 26 Feb 2020 18:48:38 +0000 (19:48 +0100)]
Merge "Revert "Bug 1000: Fix authentication when deleting service""

4 years agoRevert "Bug 1000: Fix authentication when deleting service" 43/8643/1
israelad [Wed, 26 Feb 2020 18:46:43 +0000 (19:46 +0100)]
Revert "Bug 1000: Fix authentication when deleting service"

This reverts commit 4d193dc97be946877fc9b033e5d267b103a7cc45.

Change-Id: I231f152421c839d1604710bd0707a91c634fd0bc
Signed-off-by: Adam Israel <adam.israel@canonical.com>
4 years agoMerge "Bug 1000: Fix authentication when deleting service"
israelad [Wed, 26 Feb 2020 18:45:53 +0000 (19:45 +0100)]
Merge "Bug 1000: Fix authentication when deleting service"

4 years agoBug 1000: Fix authentication when deleting service 37/8637/1
Dominik Fleischmann [Wed, 26 Feb 2020 12:25:00 +0000 (13:25 +0100)]
Bug 1000: Fix authentication when deleting service

This fixes bug 1000 where the creation of k8sclusters
was failing once a k8scluster had been deleted. This
was due to N2VC not logging out correctly from the
juju controller. Error handling was added to the
add_model funciton.

https://osm.etsi.org/bugzilla/show_bug.cgi?id=1000

Change-Id: I46f9a89e004c918b4f0104489ca4edfa7e386c95
Signed-off-by: Dominik Fleischmann <dominik.fleischmann@canonical.com>
4 years agoFixed issue canceling status task 35/8635/1
lloretgalleg [Wed, 26 Feb 2020 09:00:16 +0000 (10:00 +0100)]
Fixed issue canceling status task

Change-Id: I29d842351f23f0464bc230e8b97dacf24edff0bd
Signed-off-by: lloretgalleg <illoret@indra.es>
4 years agoFix 1015. Remove non used paramiko dependencies at k8s_helm_conn 76/8576/1
tierno [Tue, 11 Feb 2020 10:22:12 +0000 (10:22 +0000)]
Fix 1015. Remove non used paramiko dependencies at k8s_helm_conn

Change-Id: Id5c6333fb7feac8dce85f87641676771f346d062
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
4 years ago1007 Use KDU name and NS id for model names 56/8556/7
Dominik Fleischmann [Tue, 4 Feb 2020 14:32:42 +0000 (15:32 +0100)]
1007 Use KDU name and NS id for model names

This commit is part of the fix for Bug 1007. Previously
The wrong naming was used in the uninstall function and
it was deleting each application one by one. Now the whole
model will be deleted automatically.
This commit is dependent on this one in LCM:
https://osm.etsi.org/gerrit/#/c/osm/LCM/+/8555/

Additionally the naming for models has changes so that
each KDU gets is own model with the following naming:
<kdu-name>-<ns-id> . This will fix multi KDU support.

Change-Id: I912105417d67d5f3d95b997b91d7a5b7388bdf0d
Signed-off-by: Dominik Fleischmann <dominik.fleischmann@canonical.com>
4 years agofix 1010. Proper exception handling when looking for used kdu name 57/8557/1
tierno [Tue, 4 Feb 2020 15:26:25 +0000 (15:26 +0000)]
fix 1010. Proper exception handling when looking for used kdu name

Change-Id: Ieaa07ddd0dcd3901a242665ef8306e6f08b23c3a
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
4 years agok8s_juju_conn.py: fix cloud name for k8s 99/8399/6
garciadeblas [Fri, 13 Dec 2019 12:39:03 +0000 (13:39 +0100)]
k8s_juju_conn.py: fix cloud name for k8s

Change-Id: Id0e605f010306bd71728e1335636340674bbfb2d
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
4 years agoFix bug 996. Error status when cluster is not ready 21/8521/2
quilesj [Thu, 23 Jan 2020 16:30:04 +0000 (16:30 +0000)]
Fix bug 996. Error status when cluster is not ready

Change-Id: I194932ac67aa9a04a1fd4a7e4789103b13477e6e
Signed-off-by: quilesj <e.nvi001.tid@telefonica.com>
4 years agoGenerate names for K8s pods when file or url 19/8519/2
quilesj [Thu, 23 Jan 2020 09:28:26 +0000 (09:28 +0000)]
Generate names for K8s pods when file or url

Change-Id: I99e50cda65df2462c90775eb84a096232428ffc4
Signed-off-by: quilesj <e.nvi001.tid@telefonica.com>
4 years agojuju relations implementation 62/8462/3
quilesj [Thu, 9 Jan 2020 08:49:10 +0000 (08:49 +0000)]
juju relations implementation

Change-Id: I1ed4744e5d616a7674fb8232041aa64820a322f0
Signed-off-by: quilesj <e.nvi001.tid@telefonica.com>
4 years agoFix bug 1002 34/8534/7
Adam Israel [Wed, 29 Jan 2020 14:35:35 +0000 (09:35 -0500)]
Fix bug 1002

This patch fixes bug 1002 by using the async-friendly `asyncio.create_subprocess_exec` instead of `subprocess.run`.

Change-Id: Ie290e3f879ee83345c0b783116ef2f1e8982e537
Signed-off-by: Adam Israel <adam.israel@canonical.com>
4 years agoDestroy machines before destroying the model 81/8481/2
quilesj [Wed, 15 Jan 2020 12:30:09 +0000 (12:30 +0000)]
Destroy machines before destroying the model

Change-Id: If42c99ac9ec88a492d89a201f12a93872a476783
Signed-off-by: quilesj <e.nvi001.tid@telefonica.com>
4 years agoMerge "Add check for local k8s"
israelad [Tue, 21 Jan 2020 13:54:39 +0000 (14:54 +0100)]
Merge "Add check for local k8s"

4 years agoAdd check for local k8s 81/8381/7
David Garcia [Wed, 11 Dec 2019 14:25:15 +0000 (15:25 +0100)]
Add check for local k8s

Change-Id: Ib408bb3d2412c064cb8ad14c3ff16fd537d84a49
Signed-off-by: David Garcia <david.garcia@canonical.com>
4 years agoQuick deployment of charms: added apt_mirror and enable_os_upgrade model config options 15/8415/4
garciadeblas [Tue, 17 Dec 2019 14:02:11 +0000 (15:02 +0100)]
Quick deployment of charms: added apt_mirror and enable_os_upgrade model config options

Change-Id: Ied84a77d43aa02314c6e24a17148af1b19d76993
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
4 years agoChanges in NS and operation status 94/8394/3
quilesj [Thu, 12 Dec 2019 16:10:54 +0000 (16:10 +0000)]
Changes in NS and operation status

Change-Id: I649c19f13e2679163f5ea993f91368cc1c433208
Signed-off-by: quilesj <e.nvi001.tid@telefonica.com>
4 years agoUse NS uuid when creating a juju k8s model 96/8396/1 sol006
Dominik Fleischmann [Thu, 12 Dec 2019 16:35:38 +0000 (17:35 +0100)]
Use NS uuid when creating a juju k8s model

This commit fixes bug 972, previously it was using the namespace
value that was always assigned to kube-system. This caused an error
in Juju due to kube-system already existing.
https://osm.etsi.org/bugzilla/show_bug.cgi?id=972

Change-Id: I840d65ef9991f64eba42a205900d42cb0a9bbeef
Signed-off-by: Dominik Fleischmann <dominik.fleischmann@canonical.com>
4 years agoFix bug 957: Return pubkey properly 57/8357/1 v7.0.0 v7.0.0rc1
David Garcia [Mon, 9 Dec 2019 17:50:03 +0000 (18:50 +0100)]
Fix bug 957: Return pubkey properly

Change-Id: I1265e972ee0a085733c5597dc2c793021713ee62
Signed-off-by: David Garcia <david.garcia@canonical.com>
4 years agoWorkaround bug 936 54/8354/2
Adam Israel [Mon, 9 Dec 2019 02:44:29 +0000 (21:44 -0500)]
Workaround bug 936

Apply a workaround for bug 936 that shortens the vnf and vdu id to no more than 12 characters, to keep the application name under the juju limit of 50 characters

Change-Id: I2bb49032f9f3432d304139b6e6b5ae0f62dc2a2a
Signed-off-by: Adam Israel <adam.israel@canonical.com>
4 years agoFix flake8 09/8309/1
quilesj [Fri, 29 Nov 2019 11:19:14 +0000 (11:19 +0000)]
Fix flake8

Change-Id: Ia81b37958ab03630cf9f3c65ab1ec59a95f82d68
Signed-off-by: quilesj <e.nvi001.tid@telefonica.com>
4 years agoFix rjust error. Adding K8sException 08/8308/1
quilesj [Wed, 4 Dec 2019 07:51:26 +0000 (07:51 +0000)]
Fix rjust error. Adding K8sException

Change-Id: I778f74d0f059954225deb0371edf191f134cfed1
Signed-off-by: quilesj <e.nvi001.tid@telefonica.com>
4 years agoMerge "Add missing argument in notify_callback"
israelad [Tue, 3 Dec 2019 20:51:18 +0000 (21:51 +0100)]
Merge "Add missing argument in notify_callback"

4 years agoJuju/k8s fixes 91/8291/1
Adam Israel [Mon, 2 Dec 2019 21:33:05 +0000 (16:33 -0500)]
Juju/k8s fixes

Fix how non-microk8s clusters are bootstrapped

Change-Id: Idf771fdd4d14f2876e0107f1d636eabc5169e170
Signed-off-by: Adam Israel <adam.israel@canonical.com>
4 years agoAdd NotImplemented exception 84/8284/1
Adam Israel [Sun, 1 Dec 2019 17:55:09 +0000 (12:55 -0500)]
Add NotImplemented exception

Change-Id: I5b94d60c9ce166163d5320cbbdef2cc0a549468f
Signed-off-by: Adam Israel <adam.israel@canonical.com>
4 years agoSync with k8s api 56/8256/2
Adam Israel [Thu, 28 Nov 2019 21:27:46 +0000 (16:27 -0500)]
Sync with k8s api

Updates to sync with changes to the underlying k8s API

Change-Id: I8c4022c9783a1c87c7c61a36074a614d211d0c81
Signed-off-by: Adam Israel <adam.israel@canonical.com>
4 years agoAdding inspect methods for K8s 59/8259/2
quilesj [Fri, 29 Nov 2019 11:17:11 +0000 (11:17 +0000)]
Adding inspect methods for K8s

Change-Id: I45fba22073e7dfdfab2f3a1d1cca1f0705145e0c
Signed-off-by: quilesj <e.nvi001.tid@telefonica.com>
4 years agoFix native charms for feature 7928 48/8248/3
quilesj [Wed, 27 Nov 2019 16:12:02 +0000 (16:12 +0000)]
Fix native charms for feature 7928

Change-Id: Iba37a42152b2674c80bd887b2761827ffa19e4a8
Signed-off-by: quilesj <e.nvi001.tid@telefonica.com>
4 years agoAdd missing argument in notify_callback 53/8253/1
Dominik Fleischmann [Thu, 28 Nov 2019 15:27:36 +0000 (16:27 +0100)]
Add missing argument in notify_callback

This fix is related to bug 866 and caused an exception when
the charm was not found. Nonetheless it did not fix the bug.
https://osm.etsi.org/bugzilla/show_bug.cgi?id=866

Change-Id: I641834461ac508eac131c32a4c4ef3557e192b1a
Signed-off-by: Dominik Fleischmann <dominik.fleischmann@canonical.com>
4 years agoAdd License headers to all code files 46/8246/1
Dominik Fleischmann [Wed, 27 Nov 2019 15:38:18 +0000 (16:38 +0100)]
Add License headers to all code files

This was related to bug 547
https://osm.etsi.org/bugzilla/show_bug.cgi?id=547

Change-Id: Ief72f6e3b3de828be033729298ae905d163c6988
Signed-off-by: Dominik Fleischmann <dominik.fleischmann@canonical.com>
4 years agoMerge "Update deprecated use of yaml.load"
israelad [Tue, 26 Nov 2019 14:58:02 +0000 (15:58 +0100)]
Merge "Update deprecated use of yaml.load"

4 years agoUpdate deprecated use of yaml.load 38/8238/1
Adam Israel [Tue, 26 Nov 2019 14:23:52 +0000 (09:23 -0500)]
Update deprecated use of yaml.load

Update the deprecated use of `yaml.load` without a loader, replacing it with a call to the sugar method `yaml.safe_load`. See also: https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation

Change-Id: Ia5b591349ba6da4260545335315d3d07191f76cf
Signed-off-by: Adam Israel <adam.israel@canonical.com>
4 years agoUpdate to use safe_load 37/8237/1
Adam Israel [Tue, 26 Nov 2019 14:20:41 +0000 (09:20 -0500)]
Update to use safe_load

The use of a bare yaml.load with no Loader is deprecated. Use the sugar shortcut safe_load per https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation

Change-Id: I856d4263fcf20453157f9d3835289e665d1664bf
Signed-off-by: Adam Israel <adam.israel@canonical.com>
4 years agoRevert change 8b1bcf0 29/8229/1
tierno [Mon, 25 Nov 2019 09:23:16 +0000 (09:23 +0000)]
Revert change 8b1bcf0

Change-Id: I85fd9a038aa123eaf9b216e9d15f709cef7a808a
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
4 years agominor fix in yaml load with Loader 26/8226/1
tierno [Sat, 23 Nov 2019 22:41:22 +0000 (22:41 +0000)]
minor fix in yaml load with Loader

Change-Id: I1bc0e7197f6057c942490b710fbaf25013202ecb
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
4 years agoMerge "Added description to package"
israelad [Fri, 22 Nov 2019 17:03:32 +0000 (18:03 +0100)]
Merge "Added description to package"

4 years agoMerge branch 'feature7928' 14/8214/1
garciadeblas [Fri, 22 Nov 2019 12:39:20 +0000 (13:39 +0100)]
Merge branch 'feature7928'

Change-Id: Iccb5e5fa854394da873b9c8c3bade3358f9db6f0
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
4 years agoMerge branch 'feature5837' 12/8212/3
garciadeblas [Fri, 22 Nov 2019 11:07:49 +0000 (12:07 +0100)]
Merge branch 'feature5837'

Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
Change-Id: I31abc0d7de97c1dd3fb45fd7798fbab5d1bad5b4

4 years agoMerge "Revert "Revert "Remove vendored libjuju"" Major code clean-up, approved by...
garciadeblas [Fri, 22 Nov 2019 10:02:18 +0000 (11:02 +0100)]
Merge "Revert "Revert "Remove vendored libjuju"" Major code clean-up, approved by TSC"