From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Thu, 7 May 2020 14:15:22 +0000 (+0000)
Subject: Merge 'master' into v7.0 for v7.1.0
X-Git-Tag: v7.1.0rc1~1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F79%2F8879%2F2;hp=-c;p=osm%2FRO.git

Merge 'master' into v7.0 for v7.1.0

Change-Id: Icf8af24c306a5714dbbaa2d71a06cf6f0fd0ca91
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
---

b57ab5c6efefcf4389af2f58a50908e26a3b3759
diff --combined RO/osm_ro/openmanod.py
index 81ea96f1,93aca893..3ba3db9b
--- a/RO/osm_ro/openmanod.py
+++ b/RO/osm_ro/openmanod.py
@@@ -53,8 -53,8 +53,8 @@@ import osm_r
  
  __author__ = "Alfonso Tierno, Gerardo Garcia, Pablo Montes"
  __date__ = "$26-aug-2014 11:09:29$"
- __version__ = "7.0.0.post13"
- version_date = "Jan 2019"
 -__version__ = "7.0.1.post26"
++__version__ = "7.1.0.post1"
+ version_date = "May 2020"
  database_version = 40      # expected database schema version
  
  global global_config
@@@ -292,7 -292,7 +292,7 @@@ if __name__ == "__main__"
          logger.critical("Starting openmano server version: '%s %s' command: '%s'",
                          ro_version, version_date, " ".join(sys.argv))
  
-         for log_module in ("nfvo", "http", "vim", "wim", "db", "console", "ovim","sdn"):
+         for log_module in ("nfvo", "http", "vim", "wim", "db", "console", "ovim", "sdn", "sdnconn"):
              log_level_module = "log_level_" + log_module
              log_file_module = "log_file_" + log_module
              logger_module = logging.getLogger('openmano.' + log_module)
diff --combined RO/osm_ro/wim/persistence.py
index d395bfc7,f4945bb9..f5217fc5
--- a/RO/osm_ro/wim/persistence.py
+++ b/RO/osm_ro/wim/persistence.py
@@@ -40,6 -40,7 +40,7 @@@ No domain logic/architectural concern s
  """
  import json
  import logging
+ import string
  from contextlib import contextmanager
  from hashlib import sha1
  from itertools import groupby
@@@ -307,6 -308,11 +308,11 @@@ class WimPersistence(object)
          if "config" in wim_descriptor:
              wim_descriptor["config"] = _serialize(wim_descriptor["config"])
  
+         url = wim_descriptor["wim_url"]
+         wim_descriptor["wim_url"] = url.strip(string.whitespace + "/")
+         # ^  This avoid the common problem caused by trailing spaces/slashes in
+         #    the URL (due to CTRL+C/CTRL+V)
+ 
          return self.db.new_row(
              "wims", wim_descriptor, add_uuid=True, confidential_data=True)
  
@@@ -864,7 -870,9 +870,7 @@@ def _preprocess_wim_account(wim_account
      """
      wim_account = preprocess_record(wim_account)
  
 -    created = wim_account.get('created')
 -    wim_account['created'] = (
 -        'true' if created is True or created == 'true' else 'false')
 +    wim_account['sdn'] = False
  
      return wim_account