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

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

diff --cc osm_nbi/admin_topics.py
index b695693,fa75853..9f6f6d7
--- 1/osm_nbi/admin_topics.py
--- 2/osm_nbi/admin_topics.py
+++ b/osm_nbi/admin_topics.py
@@@ -345,7 -345,7 +345,6 @@@ class CommonVimWimSdn(BaseTopic)
                  schema_version
              ) or self.config_to_encrypt.get("default")
              if edit_content.get("config") and config_to_encrypt_keys:
--
                  for p in config_to_encrypt_keys:
                      if edit_content["config"].get(p):
                          final_content["config"][p] = self.db.encrypt(
@@@ -1097,7 -1074,7 +1073,6 @@@ class UserTopicAuth(UserTopic)
                          mapping["role"],
                          mapping["role_name"],
                      ):
--
                          if mapping in mappings_to_remove:  # do not remove
                              mappings_to_remove.remove(mapping)
                          break  # do not add, it is already at user

diff --cc osm_nbi/authconn_keystone.py
index 5e34485,5e34485..a84b3d9
--- 1/osm_nbi/authconn_keystone.py
--- 2/osm_nbi/authconn_keystone.py
+++ b/osm_nbi/authconn_keystone.py
@@@ -328,7 -328,7 +328,6 @@@ class AuthconnKeystone(Authconn)
          :return: returns the id of the user in keystone.
          """
          try:
--
              if (
                  user_info.get("domain_name")
                  and user_info["domain_name"] in self.user_domain_ro_list

diff --cc osm_nbi/descriptor_topics.py
index 50182fd,2814653..fc85b43
--- 1/osm_nbi/descriptor_topics.py
--- 2/osm_nbi/descriptor_topics.py
+++ b/osm_nbi/descriptor_topics.py
@@@ -1327,11 -1323,11 +1323,9 @@@ class VnfdTopic(DescriptorTopic)
              with self.fs.file_open(
                  (old_descriptor_directory.rstrip("/"), descriptor_file_name), "r"
              ) as old_descriptor_file:
--
                  with self.fs.file_open(
                      (new_descriptor_directory.rstrip("/"), descriptor_file_name), "r"
                  ) as new_descriptor_file:
--
                      old_content = yaml.safe_load(old_descriptor_file.read())
                      new_content = yaml.safe_load(new_descriptor_file.read())
  
@@@ -1723,11 -1719,11 +1717,9 @@@ class NsdTopic(DescriptorTopic)
              with self.fs.file_open(
                  (old_descriptor_directory.rstrip("/"), descriptor_file_name), "r"
              ) as old_descriptor_file:
--
                  with self.fs.file_open(
                      (new_descriptor_directory.rstrip("/"), descriptor_file_name), "r"
                  ) as new_descriptor_file:
--
                      old_content = yaml.safe_load(old_descriptor_file.read())
                      new_content = yaml.safe_load(new_descriptor_file.read())
  

diff --cc osm_nbi/instance_topics.py
index 8cc7106,2eefb96..f9539dd
--- 1/osm_nbi/instance_topics.py
--- 2/osm_nbi/instance_topics.py
+++ b/osm_nbi/instance_topics.py
@@@ -1338,7 -1313,7 +1313,6 @@@ class NsLcmOpTopic(BaseTopic)
                  vnfd_id_2update = indata["changeVnfPackageData"]["vnfdId"]
  
                  if vnf_instance_id not in nsr["constituent-vnfr-ref"]:
--
                      raise EngineException(
                          f"Error in validating ns-update request: vnf {vnf_instance_id} does not "
                          f"belong to NS {ns_instance_id}",
@@@ -1358,7 -1333,7 +1332,6 @@@
  
                  # Check the given vnfd-id belongs to given vnf instance
                  if constituent_vnfd_id and (vnfd_id_2update != constituent_vnfd_id):
--
                      raise EngineException(
                          f"Error in validating ns-update request: vnfd-id {vnfd_id_2update} does not "
                          f"match with the vnfd-id: {constituent_vnfd_id} of VNF instance: {vnf_instance_id}",

diff --cc osm_nbi/notifications.py
index 47a24ba,bcaa0d0..a62670b
--- 1/osm_nbi/notifications.py
--- 2/osm_nbi/notifications.py
+++ b/osm_nbi/notifications.py
@@@ -41,7 -41,7 +41,6 @@@ class NotificationException(Exception)
  
  
  class NotificationBase:
--
      response_models = None
      # Common HTTP payload header for all notifications.
      payload_header = {"Content-Type": "application/json", "Accept": "application/json"}
@@@ -239,7 -239,7 +238,6 @@@
  
  
  class NsLcmNotification(NotificationBase):
--
      # SOL005 response model for nslcm notifications
      response_models = {
          "NsLcmOperationOccurrenceNotification": {

diff --cc osm_nbi/osm_vnfm/vnf_instances.py
index a6a57fc,aab528a..d65f1e0
--- 1/osm_nbi/osm_vnfm/vnf_instances.py
--- 2/osm_nbi/osm_vnfm/vnf_instances.py
+++ b/osm_nbi/osm_vnfm/vnf_instances.py
@@@ -81,7 -80,7 +80,6 @@@ class VnfInstances2NsInstances
  
  
  class NewVnfInstance(BaseMethod):
--
      # sample ns descriptor
      sample_nsd = {
          "nsd": {

diff --cc osm_nbi/subscriptions.py
index 1f172dd,91d2f2d..b178e5b
--- 1/osm_nbi/subscriptions.py
--- 2/osm_nbi/subscriptions.py
+++ b/osm_nbi/subscriptions.py
@@@ -187,7 -187,7 +187,6 @@@ class SubscriptionThread(threading.Thre
          self.logger.debug("Starting")
          while not self.to_terminate:
              try:
--
                  self.loop.run_until_complete(
                      asyncio.ensure_future(self.start_kafka(), loop=self.loop)
                  )

diff --cc osm_nbi/tests/run_test.py
index 079b129,b7eb986..02141f5
--- 1/osm_nbi/tests/run_test.py
--- 2/osm_nbi/tests/run_test.py
+++ b/osm_nbi/tests/run_test.py
@@@ -2002,7 -2003,7 +2003,6 @@@ class TestFakeVim
          ]
  
      def run(self, engine, test_osm, manual_check, test_params=None):
--
          vim_bad = self.vim.copy()
          vim_bad.pop("name")
  
@@@ -2621,7 -2622,7 +2621,6 @@@ class TestDeploy
          keys=None,
          timeout=0,
      ):
--
          r = engine.test(
              "GET VNFR IDs",
              "GET",
@@@ -5046,7 -5045,7 +5043,6 @@@ class TestNbiQuotas
          test_user_id = engine.last_id if res else None
  
          if test_project_id and test_user_id:
--
              # Get user access
              engine.token = None
              engine.user = test_username
@@@ -5114,7 -5113,7 +5110,6 @@@
              test_vim_ids += [engine.last_id if res else None]
  
              if test_vim_ids[0]:
--
                  # Download descriptor files (if required)
                  test_dir = "/tmp/" + test_username + "/"
                  test_url = "https://osm-download.etsi.org/ftp/osm-6.0-six/7th-hackfest/packages/"
@@@ -5141,7 -5140,7 +5136,6 @@@
                                  file.write(res.content)
  
                  if all([os.path.exists(test_dir + p) for p in desc_filenames]):
--
                      # Test VNFD Quotas
                      res = engine.test(
                          "Create test VNFD #1",
@@@ -5207,7 -5206,7 +5201,6 @@@
                                  test_vnfd_ids[i] = None
  
                      if test_vnfd_ids[0] and test_vnfd_ids[1]:
--
                          # Test NSD Quotas
                          res = engine.test(
                              "Create test NSD #1",
@@@ -5273,7 -5272,7 +5266,6 @@@
                                      test_nsd_ids[i] = None
  
                          if test_nsd_ids[0] and test_nsd_ids[1]:
--
                              # Test NSR Quotas
                              res = engine.test(
                                  "Create test NSR #1",

diff --cc requirements-dev.in
index 33a3ab6,33a3ab6..fda0dc5
--- 1/requirements-dev.in
--- 2/requirements-dev.in
+++ b/requirements-dev.in
@@@ -10,8 -10,8 +10,8 @@@
  # 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
  
--git+https://osm.etsi.org/gerrit/osm/IM.git@master#egg=osm-im
---r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master
++git+https://osm.etsi.org/gerrit/osm/IM.git@paas#egg=osm-im
++-r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=paas

diff --cc requirements-dev.txt
index e2d03a2,9ef75e0..7a60a53
--- 1/requirements-dev.txt
--- 2/requirements-dev.txt
+++ b/requirements-dev.txt
@@@ -14,48 -14,60 +14,60 @@@
  # 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
- bitarray==2.5.1
+ 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
+ bitarray==2.6.2
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=paas
      #   pyangbind
  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
  enum34==1.1.10
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=paas
      #   pyangbind
  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
- lxml==4.9.0
+ lxml==4.9.2
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=paas
      #   pyang
      #   pyangbind
 -    # 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
 -osm-im @ git+https://osm.etsi.org/gerrit/osm/IM.git@master
 +osm-im @ git+https://osm.etsi.org/gerrit/osm/IM.git@paas
      # via -r requirements-dev.in
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master
+ packaging==23.0
+     # via
++    #   -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=paas
+     #   aiokafka
  pyang==2.5.3
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=paas
      #   pyangbind
  pyangbind==0.8.1
 -    # via -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master
 +    # via -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=paas
- 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
+ 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/IM.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/IM.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
- regex==2022.6.2
+ regex==2022.10.31
      # via
 -    #   -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master
 +    #   -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=paas
      #   pyangbind
  six==1.16.0
      # via

diff --cc requirements-test.txt
index 24cfd87,0c59b6e..afdadbd
--- 1/requirements-test.txt
--- 2/requirements-test.txt
+++ b/requirements-test.txt
@@@ -52,13 -46,7 +46,7 @@@ nose2==0.12.
      # via -r requirements-test.in
  ordered-set==4.1.0
      # via deepdiff
- pyang==2.5.3
-     # via -r requirements-test.in
- requests==2.28.0
-     # via -r requirements-test.in
- six==1.16.0
-     # via nose2
- urllib3==1.26.9
-     # via requests
- yarl==1.7.2
 -orjson==3.8.5
++orjson==3.8.6
+     # via deepdiff
+ yarl==1.8.2
      # via aiohttp

diff --cc requirements.txt
index 8b1f3b4,941e6aa..f2d287f
--- 1/requirements.txt
--- 2/requirements.txt
+++ b/requirements.txt
@@@ -62,13 -72,13 +72,13 @@@ jaraco-functools==3.5.
      #   cheroot
      #   jaraco-text
      #   tempora
- jaraco-text==3.8.0
 -jaraco-text==3.11.0
++jaraco-text==3.11.1
      # via jaraco-collections
- jsonschema==4.6.0
+ jsonschema==4.17.3
      # via -r requirements.in
- keystoneauth1==4.6.0
+ keystoneauth1==5.1.1
      # via python-keystoneclient
- more-itertools==8.13.0
+ more-itertools==9.0.0
      # via
      #   cheroot
      #   cherrypy
@@@ -88,9 -99,11 +99,11 @@@ netifaces==0.11.
      # via oslo-utils
  ordered-set==4.1.0
      # via deepdiff
 -orjson==3.8.5
++orjson==3.8.6
+     # via deepdiff
  os-service-types==1.7.0
      # via keystoneauth1
- oslo-config==8.8.0
+ oslo-config==9.1.0
      # via python-keystoneclient
  oslo-i18n==5.1.0
      # via
@@@ -165,7 -182,7 +182,7 @@@ yarl==1.8.
      # via aiohttp
  zc-lockfile==2.0
      # via cherrypy
- zipp==3.8.0
 -zipp==3.11.0
++zipp==3.13.0
      # via importlib-resources
  
  # The following packages are considered to be unsafe in a requirements file: