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

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

diff --cc osm_pla/test/test_nsPlacementDataFactory.py
index dbb8572,dbb8572..b7075c3
--- 1/osm_pla/test/test_nsPlacementDataFactory.py
--- 2/osm_pla/test/test_nsPlacementDataFactory.py
+++ b/osm_pla/test/test_nsPlacementDataFactory.py
@@@ -319,7 -319,7 +319,8 @@@ class TestNsPlacementDataFactory(TestCa
  
      def _adjust_path(self, file):
          """In case we are not running from test directory,
--        then assume we are in top level directory (e.g. running from tox) and adjust file path accordingly"""
++        then assume we are in top level directory (e.g. running from tox) and adjust file path accordingly
++        """
          path_component = "/osm_pla/test/"
          real_path = os.path.realpath(file)
          if path_component not in real_path:
@@@ -747,7 -747,7 +748,6 @@@
          )
  
      def test__produce_vld_desc_w_instantiate_override(self):
--
          vld_desc_expected = [
              {"cp_refs": ["one", "two"], "latency": 150, "jitter": 30},
              {"cp_refs": ["two", "three"], "latency": 90, "jitter": 30},

diff --cc osm_pla/test/test_server.py
index 3ba2979,3ba2979..127b4d1
--- 1/osm_pla/test/test_server.py
--- 2/osm_pla/test/test_server.py
+++ b/osm_pla/test/test_server.py
@@@ -487,7 -487,7 +487,8 @@@ class TestServer(TestCase)
  
      def _adjust_path(self, file):
          """In case we are not running from test directory,
--        then assume we are in top level directory (e.g. running from tox) and adjust file path accordingly"""
++        then assume we are in top level directory (e.g. running from tox) and adjust file path accordingly
++        """
          path_component = "/osm_pla/test/"
          real_path = os.path.realpath(file)
          if path_component not in real_path:

diff --cc requirements-dev.in
index c113bba,c113bba..64c9462
--- 1/requirements-dev.in
--- 2/requirements-dev.in
+++ b/requirements-dev.in
@@@ -13,5 -13,5 +13,5 @@@
  # See the License for the specific language governing permissions and
  # 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,fc55bcb..0304e4f
--- 1/requirements-dev.txt
--- 2/requirements-dev.txt
+++ b/requirements-dev.txt
@@@ -14,19 -14,27 +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
 -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
 -pycrypto==2.6.1
 -    # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
++pycryptodome==3.17
 +    # 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
++    # via
++    #   -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