Merge remote-tracking branch 'origin/master' into paas

Change-Id: I4119ff153d589955c7726f194df6f90450f83569
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>

diff --cc requirements-dev.in
index 733a1b3,733a1b3..591279b
--- 1/requirements-dev.in
--- 2/requirements-dev.in
+++ b/requirements-dev.in
@@@ -13,8 -13,8 +13,8 @@@
  # See the License for the specific language governing permissions and
  # limitations under the License.
  
---e git+https://osm.etsi.org/gerrit/osm/common.git@master#egg=osm-common
---r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
++-e git+https://osm.etsi.org/gerrit/osm/common.git@paas#egg=osm-common
++-r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=paas
  
---e git+https://osm.etsi.org/gerrit/osm/N2VC.git@master#egg=n2vc
---r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
++-e git+https://osm.etsi.org/gerrit/osm/N2VC.git@paas#egg=n2vc
++-r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas

diff --cc requirements-dev.txt
index 706822c,b0d6e97..f43dac4
--- 1/requirements-dev.txt
--- 2/requirements-dev.txt
+++ b/requirements-dev.txt
@@@ -14,27 -14,29 +14,29 @@@
  # See the License for the specific language governing permissions and
  # limitations under the License.
  #######################################################################################
 --e git+https://osm.etsi.org/gerrit/osm/N2VC.git@master#egg=n2vc
 +-e git+https://osm.etsi.org/gerrit/osm/N2VC.git@paas#egg=n2vc
      # via -r requirements-dev.in
 --e git+https://osm.etsi.org/gerrit/osm/common.git@master#egg=osm-common
 +-e git+https://osm.etsi.org/gerrit/osm/common.git@paas#egg=osm-common
      # via -r requirements-dev.in
- aiokafka==0.7.2
+ aiokafka==0.8.0
 -    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
 +    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=paas
- async-timeout==3.0.1
+ async-timeout==4.0.2
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas
++    #   -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=paas
+     #   aiokafka
      #   retrying-async
  bcrypt==4.0.1
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas
      #   paramiko
- cachetools==5.2.0
+ cachetools==5.3.0
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas
      #   google-auth
- certifi==2022.9.24
+ certifi==2022.12.7
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas
      #   kubernetes
      #   requests
  cffi==1.15.1
@@@ -44,17 -46,17 +46,17 @@@
      #   pynacl
  charset-normalizer==2.1.1
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas
      #   requests
- cryptography==38.0.1
+ cryptography==39.0.0
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas
      #   paramiko
  dataclasses==0.6
 -    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
 +    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=paas
- google-auth==2.12.0
+ google-auth==2.16.0
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas
      #   kubernetes
  idna==3.4
      # via
@@@ -68,11 -70,11 +70,11 @@@ jujubundlelib==0.5.
      #   theblues
  kafka-python==2.0.2
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=paas
      #   aiokafka
- kubernetes==24.2.0
+ kubernetes==25.3.0
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas
      #   juju
  macaroonbakery==1.3.1
      # via
@@@ -80,18 -82,24 +82,24 @@@
      #   juju
      #   theblues
  motor==1.3.1
-     # via -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas
+     # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
++    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas
++    #   -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=paas
  mypy-extensions==0.4.3
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas
      #   typing-inspect
- oauthlib==3.2.1
+ oauthlib==3.2.2
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas
      #   requests-oauthlib
- paramiko==2.11.0
+ packaging==23.0
+     # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
++    #   -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=paas
+     #   aiokafka
+ paramiko==2.12.0
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas
      #   juju
  protobuf==3.20.3
      # via
@@@ -109,18 -117,18 +117,18 @@@ pyasn1-modules==0.2.
      #   google-auth
  pycparser==2.21
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas
      #   cffi
- pycrypto==2.6.1
+ pycryptodome==3.17
 -    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
 +    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=paas
  pymacaroons==0.13.0
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas
      #   macaroonbakery
- pymongo==3.12.3
+ pymongo==3.13.0
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=paas
      #   motor
  pynacl==1.5.0
      # via
@@@ -135,11 -143,11 +143,11 @@@ pyrfc3339==1.
      #   macaroonbakery
  python-dateutil==2.8.2
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas
      #   kubernetes
- pytz==2022.4
+ pytz==2022.7.1
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas
      #   pyrfc3339
  pyyaml==5.4.1
      # via
@@@ -148,9 -156,9 +156,9 @@@
      #   juju
      #   jujubundlelib
      #   kubernetes
- requests==2.28.1
+ requests==2.28.2
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas
      #   kubernetes
      #   macaroonbakery
      #   requests-oauthlib
@@@ -176,11 -184,11 +184,11 @@@ six==1.16.
      #   python-dateutil
  theblues==0.5.2
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas
      #   juju
- toposort==1.7
+ toposort==1.9
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas
      #   juju
  typing-extensions==4.4.0
      # via
@@@ -188,16 -196,16 +196,16 @@@
      #   typing-inspect
  typing-inspect==0.8.0
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas
      #   juju
- urllib3==1.26.12
+ urllib3==1.26.14
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas
      #   kubernetes
      #   requests
- websocket-client==1.4.1
+ websocket-client==1.5.0
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=paas
      #   kubernetes
  websockets==7.0
      # via