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

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

diff --cc requirements-dev.in
index 87d042b,87d042b..2e25c46
--- 1/requirements-dev.in
--- 2/requirements-dev.in
+++ b/requirements-dev.in
@@@ -14,5 -14,5 +14,5 @@@
  # limitations under the License.
  ##
  
--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
++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

diff --cc requirements-dev.txt
index ed7864e,dc58b6a..0304e4f
--- 1/requirements-dev.txt
--- 2/requirements-dev.txt
+++ b/requirements-dev.txt
@@@ -14,19 -14,31 +14,31 @@@
  # See the License for the specific language governing permissions and
  # limitations under the License.
  #######################################################################################
- 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==4.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
  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
  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
 -    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
 -osm-common @ git+https://osm.etsi.org/gerrit/osm/common.git@master
+ motor==1.3.1
++    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=paas
 +osm-common @ git+https://osm.etsi.org/gerrit/osm/common.git@paas
      # via -r requirements-dev.in
- pycrypto==2.6.1
-     # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=paas
- pymongo==3.12.3
+ 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
+ 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
+ pymongo==3.13.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
+     #   motor
  pyyaml==5.4.1
 -    # 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

diff --cc requirements.txt
index 3f146d0,149d533..e722b78
--- 1/requirements.txt
--- 2/requirements.txt
+++ b/requirements.txt
@@@ -32,7 -32,7 +32,7 @@@ azure-common==1.1.2
      #   azure-mgmt-compute
      #   azure-mgmt-network
      #   azure-mgmt-resource
--azure-core==1.26.2
++azure-core==1.26.3
      # via
      #   azure-identity
      #   azure-mgmt-core
@@@ -75,9 -75,9 +75,9 @@@ cliff==4.1.
      #   osc-lib
      #   python-neutronclient
      #   python-openstackclient
--cmd2==2.4.2
++cmd2==2.4.3
      # via cliff
--cryptography==39.0.0
++cryptography==39.0.1
      # via
      #   -r NG-RO/requirements.in
      #   adal
@@@ -107,7 -107,7 +107,7 @@@ flufl-enum==5.0.
      # via pyvcloud
  google-api-core==2.11.0
      # via google-api-python-client
- google-api-python-client==2.72.0
 -google-api-python-client==2.74.0
++google-api-python-client==2.77.0
      # via -r RO-VIM-gcp/requirements.in
  google-auth==2.16.0
      # via
@@@ -181,7 -183,7 +183,7 @@@ more-itertools==9.0.
      #   cheroot
      #   cherrypy
      #   jaraco-functools
--msal==1.20.0
++msal==1.21.0
      # via
      #   azure-identity
      #   msal-extensions
@@@ -198,8 -200,8 +200,6 @@@ msrest==0.7.
      #   msrestazure
  msrestazure==0.6.4
      # via -r RO-VIM-azure/requirements.in
--munch==2.5.0
--    # via openstacksdk
  netaddr==0.8.0
      # via
      #   -r RO-VIM-aws/requirements.in
@@@ -218,7 -220,7 +218,7 @@@ netifaces==0.11.
      #   oslo-utils
  oauthlib==3.2.2
      # via requests-oauthlib
--openstacksdk==0.103.0
++openstacksdk==1.0.0
      # via
      #   os-client-config
      #   osc-lib
@@@ -431,7 -433,7 +431,7 @@@ rfc3986==2.0.
      # via oslo-config
  rsa==4.9
      # via google-auth
--simplejson==3.18.1
++simplejson==3.18.3
      # via
      #   osc-lib
      #   python-cinderclient
@@@ -446,8 -448,7 +446,6 @@@ six==1.16.
      #   isodate
      #   keystoneauth1
      #   msrestazure
--    #   munch
-     #   paramiko
      #   python-dateutil
      #   python-keystoneclient
      #   pyvmomi
@@@ -486,7 -487,7 +484,7 @@@ wrapt==1.14.
      #   python-glanceclient
  zc-lockfile==2.0
      # via cherrypy
--zipp==3.11.0
++zipp==3.13.0
      # via
      #   importlib-metadata
      #   importlib-resources