From d614b8a1119de1868b60a23ff653226a759d551a Mon Sep 17 00:00:00 2001
From: Krzysztof Gromadzki <krzysztof.gromadzki@codilime.com>
Date: Fri, 6 Jul 2018 12:54:58 +0200
Subject: [PATCH] Add UVE Support

Change-Id: Idb89539d50ea367b2e4485c80900da1347ce1f6d
Partial-Bug: #1780422
Depends-On: Ib7f21daa53e78264ed47f46cdf2fc953723f30ba
Depends-On: I6013a1f8ff2a219ee4fd5d948181cb178f846618
---
 config.yaml.template |  4 +++
 cvm/__main__.py      | 67 +++++++++++++++++++++++++++++++++-----------
 cvm/constants.py     |  2 --
 3 files changed, 55 insertions(+), 18 deletions(-)

diff --git a/config.yaml.template b/config.yaml.template
index 0c34d1d..d236785 100644
--- a/config.yaml.template
+++ b/config.yaml.template
@@ -22,3 +22,7 @@ vnc:
   username:
   password:
   tenant_name:
+sandesh:
+  collectors:
+  logging_level:
+  log_file:
\ No newline at end of file
diff --git a/cvm/__main__.py b/cvm/__main__.py
index 4de844b..a52e474 100644
--- a/cvm/__main__.py
+++ b/cvm/__main__.py
@@ -7,7 +7,13 @@
 
 import gevent
 import yaml
+from cfgm_common.uve.nodeinfo.ttypes import NodeStatus, NodeStatusUVE
+from pysandesh.connection_info import ConnectionState
 from pysandesh.sandesh_base import Sandesh
+from sandesh_common.vns.constants import (INSTANCE_ID_DEFAULT, Module2NodeType,
+                                          ModuleNames, NodeTypeNames,
+                                          ServiceHttpPortMap)
+from sandesh_common.vns.ttypes import Module
 
 import cvm.constants as const
 from cvm.clients import (ESXiAPIClient, VCenterAPIClient, VNCAPIClient,
@@ -29,15 +35,11 @@
 
 def load_config(config_file):
     with open(config_file, 'r') as ymlfile:
-        cfg = yaml.load(ymlfile)
-        esxi_cfg = cfg['esxi']
-        vcenter_cfg = cfg['vcenter']
-        vnc_cfg = cfg['vnc']
-    return esxi_cfg, vcenter_cfg, vnc_cfg
+        return yaml.load(ymlfile)
 
 
-def build_monitor(config_file, lock, database):
-    esxi_cfg, vcenter_cfg, vnc_cfg = load_config(config_file)
+def build_monitor(config, lock, database):
+    esxi_cfg, vcenter_cfg, vnc_cfg = config['esxi'], config['vcenter'], config['vnc']
 
     esxi_api_client = ESXiAPIClient(esxi_cfg)
     event_history_collector = esxi_api_client.create_event_history_collector(const.EVENTS_TO_OBSERVE)
@@ -94,23 +96,58 @@ def build_monitor(config_file, lock, database):
     return VMwareMonitor(esxi_api_client, vmware_controller)
 
 
-def run_introspect(args, database, lock):
+def run_introspect(cfg, database, lock):
+    sandesh_config = cfg['sandesh']
+    sandesh_config.update({
+        'id': Module.VCENTER_MANAGER,
+        'hostname': socket.gethostname(),
+        'table': 'ObjectContrailvCenterManagerNode',
+        'instance_id': INSTANCE_ID_DEFAULT,
+        'introspect_port': ServiceHttpPortMap['contrail-vcenter-manager'],
+    })
+    sandesh_config['name'] = ModuleNames[sandesh_config['id']]
+    sandesh_config['node_type'] = Module2NodeType[sandesh_config['id']]
+    sandesh_config['node_type_name'] = NodeTypeNames[sandesh_config['node_type']]
+
     sandesh = Sandesh()
     sandesh_handler = SandeshHandler(database, lock)
     sandesh_handler.bind_handlers()
-    sandesh.init_generator('cvm', socket.gethostname(),
-                           'contrail-vcenter-manager', '0', [],
-                           'cvm_context', args.introspect_port, ['cvm'])
+    sandesh.init_generator(
+        module='cvm',
+        source=sandesh_config['hostname'],
+        node_type=sandesh_config['node_type_name'],
+        instance_id=sandesh_config['instance_id'],
+        collectors=sandesh_config['collectors'],
+        client_context='cvm_context',
+        http_port=sandesh_config['introspect_port'],
+        sandesh_req_uve_pkg_list=['cfgm_common', 'cvm']
+    )
     sandesh.sandesh_logger().set_logger_params(
-        sandesh.logger(), True, 'SYS_INFO', const.LOG_FILE, False, None
+        logger=sandesh.logger(),
+        enable_local_log=True,
+        level=sandesh_config['logging_level'],
+        file=sandesh_config['log_file'],
+        enable_syslog=False,
+        syslog_facility=None
+    )
+    ConnectionState.init(
+        sandesh=sandesh,
+        hostname=sandesh_config['hostname'],
+        module_id=sandesh_config['name'],
+        instance_id=sandesh_config['instance_id'],
+        conn_status_cb=staticmethod(ConnectionState.get_conn_state_cb),
+        uve_type_cls=NodeStatusUVE,
+        uve_data_type_cls=NodeStatus,
+        table=sandesh_config['table']
     )
 
 
 def main(args):
     database = Database()
     lock = gevent.lock.BoundedSemaphore()
-    vmware_monitor = build_monitor(args.config_file, lock, database)
-    run_introspect(args, database, lock)
+    cfg = load_config(args.config_file)
+    vmware_monitor = build_monitor(cfg, lock, database)
+    run_introspect(cfg, database, lock)
     vmware_monitor.sync()
     greenlets = [
         gevent.spawn(vmware_monitor.start()),
@@ -122,8 +159,6 @@ def main(args):
     parser = argparse.ArgumentParser()
     parser.add_argument("-c", action="store", dest="config_file",
                         default='/etc/contrail/contrail-vcenter-manager/config.yaml')
-    parser.add_argument("-p", type=int, action="store", dest="introspect_port",
-                        default=9090)
     parsed_args = parser.parse_args()
     try:
         main(parsed_args)
diff --git a/cvm/constants.py b/cvm/constants.py
index a67bb9b..4c7cdbf 100644
--- a/cvm/constants.py
+++ b/cvm/constants.py
@@ -42,5 +42,3 @@
 VLAN_ID_RANGE_END = 4095
 
 ID_PERMS = IdPermsType(creator='vcenter-manager', enable=True)
-
-LOG_FILE = '/var/log/contrail/contrail-vcenter-manager.log'