+#!/usr/bin/env python
# -*- coding: utf-8 -*-
##
__author__ = "Alfonso Tierno, Leonardo Mirabal"
__date__ = "$06-Feb-2017 12:07:15$"
-__version__ = "0.5.8-r524"
-version_date = "March 2017"
-database_version = "0.15" #expected database schema version
+__version__ = "0.5.10-r526"
+version_date = "Apr 2017"
+database_version = "0.17" #expected database schema version
import threading
import vim_db
import logging
-import threading
import imp
import host_thread as ht
import dhcp_thread as dt
import openflow_thread as oft
from netaddr import IPNetwork
from jsonschema import validate as js_v, exceptions as js_e
+import openflow_conn
+import argparse
HTTP_Bad_Request = 400
HTTP_Unauthorized = 401
def __init__(self, configuration):
self.config = configuration
- self.logger = logging.getLogger(configuration["logger_name"])
+ self.logger_name = configuration.get("logger_name", "openvim")
+ self.logger = logging.getLogger(self.logger_name)
self.db = None
- self.db = self._create_database_connection()
+ self.db = self._create_database_connection()
self.db_lock = None
self.db_of = None
self.of_test_mode = False
def _create_database_connection(self):
db = vim_db.vim_db((self.config["network_vlan_range_start"], self.config["network_vlan_range_end"]),
- self.config['log_level_db']);
+ self.logger_name + ".db", self.config.get('log_level_db'))
if db.connect(self.config['db_host'], self.config['db_user'], self.config['db_passwd'],
self.config['db_name']) == -1:
# self.logger.error("Cannot connect to database %s at %s@%s", self.config['db_name'], self.config['db_user'],
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], database_version) )
-
+ self.logger.critical("Starting ovim server version: '{} {}' database version '{}'".format(
+ self.get_version(), self.get_version_date(), self.get_database_version()))
# create database connection for openflow threads
self.db_of = self._create_database_connection()
self.config["db"] = self.db_of
dhcp_params = self.config.get("dhcp_server")
if dhcp_params:
thread = dt.dhcp_thread(dhcp_params=dhcp_params, test=host_test_mode, dhcp_nets=self.config["dhcp_nets"],
- db=self.db_of, db_lock=self.db_lock, debug=self.config['log_level_of'])
+ db=self.db_of, db_lock=self.db_lock, logger_name=self.logger_name + ".dhcp",
+ debug=self.config.get('log_level_of'))
thread.start()
self.config['dhcp_thread'] = thread
try:
if self.of_test_mode:
- return oft.of_test_connector({"name": db_config['type'], "dpid": db_config['dpid'],
- "of_debug": self.config['log_level_of']})
+ return openflow_conn.OfTestConnector({"name": db_config['type'],
+ "dpid": db_config['dpid'],
+ "of_debug": self.config['log_level_of']})
temp_dict = {}
if db_config:
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_user'] = db_config.get('user')
+ temp_dict['of_password'] = db_config.get('password')
temp_dict['of_debug'] = self.config['log_level_of']
"""
# create openflow thread
- if 'of_controller_nets_with_same_vlan' in self.config:
- ofc_net_same_vlan = self.config['of_controller_nets_with_same_vlan']
- else:
- ofc_net_same_vlan = False
+ #if 'of_controller_nets_with_same_vlan' in self.config:
+ # ofc_net_same_vlan = self.config['of_controller_nets_with_same_vlan']
+ #else:
+ # ofc_net_same_vlan = False
+ ofc_net_same_vlan = False
thread = oft.openflow_thread(ofc_uuid, of_conn, of_test=self.of_test_mode, db=self.db_of, db_lock=self.db_lock,
pmp_with_same_vlan=ofc_net_same_vlan, debug=self.config['log_level_of'])
controller_host.create_dhcp_interfaces(vlan, first_ip, dhcp_netmask)
controller_host.launch_dhcp_server(vlan, ip_range, dhcp_netmask, dhcp_path, gateway)
+if __name__ == "__main__":
+
+ parser = argparse.ArgumentParser()
+ parser.add_argument("-v","--version", help="show ovim library version", action="store_true")
+ parser.add_argument("--database-version", help="show required database version", action="store_true")
+ args = parser.parse_args()
+ if args.version:
+ print ('openvimd version {} {}'.format(ovim.get_version(), ovim.get_version_date()))
+ print ('(c) Copyright Telefonica')
+ elif args.database_version:
+ print ('required database version: {}'.format(ovim.get_database_version()))