| commit | c3e7044ae9f1b6127570187c20a8db60f378bde3 | [log] [tgz] |
|---|---|---|
| author | Dario Faccin <dario.faccin@canonical.com> | Tue May 23 17:21:38 2023 +0200 |
| committer | Dario Faccin <dario.faccin@canonical.com> | Thu May 25 10:43:23 2023 +0200 |
| tree | 863562cae7170228d2e68c83eb65bd894e090b55 | |
| parent | 258a9a6b60242783ce8f6eb61cb5718371c5aa1e [diff] |
Update from master
Squashed commit of the following:
commit fb79786bd154505ea9c7578e6247dea565ea9c41
Author: Mark Beierl <mark.beierl@canonical.com>
Date: Thu May 18 22:21:06 2023 -0400
Wrapping Retry for Py3.10
The retrying_async library is not Python 3.10 ready, so we are providing
a 3.10 compatible callback for it to use instead of the default one
Change-Id: I15e9b64c70d4d294c9ff0c6c7048cd257f6e1b61
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>
commit 714d8874783b507cd66a37d1dcd2f1d3ac980257
Author: Mark Beierl <mark.beierl@canonical.com>
Date: Thu May 18 15:08:06 2023 -0400
Wrapping Retry for Py3.10
The retrying_async library is not Python 3.10 ready, so we are providing
a 3.10 compatible callback for it to use instead of the default one
Change-Id: I6e98f6d7ebc2fe134b0e3fe37d180e383044b30b
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>
commit 2c3c146360fe5ce949a81e0e55e0e62e7f805d0b
Author: Mark Beierl <mark.beierl@canonical.com>
Date: Mon May 15 16:17:02 2023 -0400
Python3.10/Ubuntu 22.04 part 2
Removal of loop from all methods
Change-Id: I05bfe90f82b8c8acba3172de89c7d8e0ee08402b
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>
commit fcbd881700fec0522c81e8b32e3a982fb3ccbd80
Author: Gabriel Cuba <gcuba@whitestack.com>
Date: Thu May 11 02:04:17 2023 -0500
Remove charset-normalizer version constraint
Change-Id: I46311f74e949270278f685c50576f5884ba96227
Signed-off-by: Gabriel Cuba <gcuba@whitestack.com>
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>
commit 474fd958ac88b5d2275d3acbc2fabe22e5e9344f
Author: Guillermo Calvino <guillermo.calvino@canonical.com>
Date: Fri Apr 28 11:51:43 2023 +0200
Ubuntu 22.04 and Python 3.10 preparation
Change-Id: I57a4ee39c101bdab610a6964de58eaa2653d37a3
Signed-off-by: Guillermo Calvino <guillermo.calvino@canonical.com>
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>
commit 806cd5cf9456e69a849f4231e163da4f72379c1b
Author: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Fri Mar 24 14:03:17 2023 +0100
Fix black errors
Change-Id: I58c380853485995e2c37163a958b06072cbe24ca
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
(cherry picked from commit 9831d7e8205bce462a669a8cc2b3dc1a611c924c)
Change-Id: I0c9356df8f245b68f72f4d64ba90c9811f2e5ec7
Signed-off-by: Dario Faccin <dario.faccin@canonical.com>
The N2VC library provides an OSM-centric interface to the VCA. This enables any OSM module (SO, LCM, osmclient) to use a standard pattern for communicating with Juju and the charms responsible for configuring a VNF.
N2VC relies on the IM module, enforcing compliance with the OSM Information Model.
This library is in active development for OSM Release FOUR. The interface is subject to change prior to release.
Because this is still in heavy development, there are a few manual steps required to use this library.
# This list is incomplete apt install python3-nose
In order to run the test(s) included in N2VC, you'll need to install Juju locally.
Note: It's not necessary to install the juju library via pip3; N2VC uses a version bundled within the modules/ directory.
snap install lxd snap install juju --classic
There are currently a few limitations with regard to metrics in Juju.
GetMetrics method more often, and discard duplicate values.A basic test has been written to exercise the functionality of the library, and to serve as a demonstration of how to use it.
Export a few environment variables so the test knows where to find the VCA, and the compiled pingpong charm from the devops repository.
# The directory where the Juju configuration is stored export VCA_PATH=~/.local/share/juju # You can find the ip of the VCA by running `juju status -m controller` and looking for the DNS for Machine 0 export VCA_HOST=`juju show-controller --format=json | jq -r '.osm["details"]["api-endpoints"][0]'|awk -F: '{print $1}'` export VCA_PORT=17070 # You can find these variables in ~/.local/share/juju/accounts.yaml export VCA_USER=admin export VCA_SECRET=PASSWORD export LXD_HOST=`ifconfig lxdbr0 | grep 'inet '| cut -d: -f2 | awk '{ print $2}'` export LXD_SECRET=
Note: There is a bug in the cleanup of the N2VC/Juju that will throw an exception after the test has finished. This is on the list of things to fix for R4 and should not impact your tests or integration.
nosetests3 --nocapture tests/test_python.py
Many. This is still in active development for Release FOUR.
Exception ignored in: <generator object WebSocketCommonProtocol.close_connection at 0x7f29a3b3f780>
Traceback (most recent call last):
File "/home/stone/.local/lib/python3.6/site-packages/websockets/protocol.py", line 743, in close_connection
if (yield from self.wait_for_connection_lost()):
File "/home/stone/.local/lib/python3.6/site-packages/websockets/protocol.py", line 768, in wait_for_connection_lost
self.timeout, loop=self.loop)
File "/usr/lib/python3.6/asyncio/tasks.py", line 342, in wait_for
timeout_handle = loop.call_later(timeout, _release_waiter, waiter)
File "/usr/lib/python3.6/asyncio/base_events.py", line 543, in call_later
timer = self.call_at(self.time() + delay, callback, *args)
File "/usr/lib/python3.6/asyncio/base_events.py", line 553, in call_at
self._check_closed()
File "/usr/lib/python3.6/asyncio/base_events.py", line 357, in _check_closed
raise RuntimeError('Event loop is closed')
RuntimeError: Event loop is closed
Exception ignored in: <generator object Queue.get at 0x7f29a2ac6938>
Traceback (most recent call last):
File "/usr/lib/python3.6/asyncio/queues.py", line 169, in get
getter.cancel() # Just in case getter is not done yet.
File "/usr/lib/python3.6/asyncio/base_events.py", line 574, in call_soon
self._check_closed()
File "/usr/lib/python3.6/asyncio/base_events.py", line 357, in _check_closed
raise RuntimeError('Event loop is closed')
RuntimeError: Event loop is closed
Exception ignored in: <coroutine object AllWatcherFacade.Next at 0x7f29a3bd9990>
Traceback (most recent call last):
File "/home/stone/src/osm/N2VC/modules/libjuju/juju/client/facade.py", line 412, in wrapper
reply = await f(*args, **kwargs)
File "/home/stone/src/osm/N2VC/modules/libjuju/juju/client/_client1.py", line 59, in Next
reply = await self.rpc(msg)
File "/home/stone/src/osm/N2VC/modules/libjuju/juju/client/overrides.py", line 104, in rpc
result = await self.connection.rpc(msg, encoder=TypeEncoder)
File "/home/stone/src/osm/N2VC/modules/libjuju/juju/client/connection.py", line 306, in rpc
result = await self._recv(msg['request-id'])
File "/home/stone/src/osm/N2VC/modules/libjuju/juju/client/connection.py", line 208, in _recv
return await self.messages.get(request_id)
File "/home/stone/src/osm/N2VC/modules/libjuju/juju/utils.py", line 61, in get
value = await self._queues[id].get()
File "/usr/lib/python3.6/asyncio/queues.py", line 169, in get
getter.cancel() # Just in case getter is not done yet.
File "/usr/lib/python3.6/asyncio/base_events.py", line 574, in call_soon
self._check_closed()
File "/usr/lib/python3.6/asyncio/base_events.py", line 357, in _check_closed
raise RuntimeError('Event loop is closed')
RuntimeError: Event loop is closed
To update the libjuju module:
Needs to be fully tested:
git checkout master git subtree pull --prefix=modules/libjuju/ --squash libjuju master <resolve any merge conflicts> git merge --continue