X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ovim.py;h=965cf30919047bc196186d4250eb7431c2a4329c;hb=a8776d1e6fd339cb9bcd0bfe16267bea45467f22;hp=edd0b4caf3cf89db5ea6bcd37fa261cfd9455e67;hpb=50a052f5e3c1202e5c787851e8b2dd69d8f20629;p=osm%2Fopenvim.git

diff --git a/ovim.py b/ovim.py
index edd0b4c..965cf30 100644
--- a/ovim.py
+++ b/ovim.py
@@ -164,15 +164,16 @@ class ovim():
         Start ovim services
         :return:
         """
+        global database_version
         # if self.running_info:
         #    return  #TODO service can be checked and rebuild broken threads
         r = self.db.get_db_version()
         if r[0] < 0:
             raise ovimException("DATABASE is not a VIM one or it is a '0.0' version. Try to upgrade to version '{}' with "\
-                                "'./database_utils/migrate_vim_db.sh'".format(self.config["database_version"]) )
-        elif r[1] != self.config["database_version"]:
+                                "'./database_utils/migrate_vim_db.sh'".format(database_version) )
+        elif r[1] != database_version:
             raise ovimException("DATABASE wrong version '{}'. Try to upgrade/downgrade to version '{}' with "\
-                                "'./database_utils/migrate_vim_db.sh'".format(r[1], self.config["database_version"]) )
+                                "'./database_utils/migrate_vim_db.sh'".format(r[1], database_version) )
 
         # create database connection for openflow threads
         self.db_of = self._create_database_connection()
@@ -350,6 +351,8 @@ class ovim():
                 temp_dict['of_port'] = db_config['port']
                 temp_dict['of_dpid'] = db_config['dpid']
                 temp_dict['of_controller'] = db_config['type']
+                temp_dict['of_user'] = db_config['user']
+                temp_dict['of_password'] = db_config['password']
 
             temp_dict['of_debug'] = self.config['log_level_of']
 
@@ -899,9 +902,12 @@ class ovim():
         port_data['switch_mac'] = port_mapping_data[0]['switch_mac']
 
         # remove from compute_node, region and pci of_port_data to adapt to 'ports' structure
-        del port_data['compute_node']
-        del port_data['region']
-        del port_data['pci']
+        if 'region' in port_data:
+            del port_data['region']
+        if 'pci' in port_data:
+            del port_data['pci']
+        if 'compute_node' in port_data:
+            del port_data['compute_node']
 
         result, uuid = self.db.new_row('ports', port_data, True, True)
         if result > 0: