Merge "Included a documentation directory"

[osm/MON.git] / plugins / vRealiseOps / vROPs_Webservice / vrops_webservice

diff --git a/plugins/vRealiseOps/vROPs_Webservice/vrops_webservice b/plugins/vRealiseOps/vROPs_Webservice/vrops_webservice
index 806733c..98533f1 100755 (executable)
--- a/plugins/vRealiseOps/vROPs_Webservice/vrops_webservice
+++ b/plugins/vRealiseOps/vROPs_Webservice/vrops_webservice
@@ -33,15 +33,17 @@ __version__ = '0.1'
 
 from bottle import (ServerAdapter, route, run, server_names, redirect, default_app,
                      request, response, template, debug, TEMPLATE_PATH , static_file)
-from socket import gethostname
+from socket import getfqdn
 from datetime import datetime
 from xml.etree import ElementTree as ET
 import logging
 import os
 import json
+import sys
 import requests
-
-from core.message_bus.producer import KafkaProducer
+sys.path.append("../../../core/message_bus")
+from producer import KafkaProducer
+#from core.message_bus.producer import KafkaProducer
 
 try:
     from cheroot.wsgi import Server as WSGIServer
@@ -53,8 +55,12 @@ except ImportError:
 #Set Constants
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 CERT_DIR = os.path.join(BASE_DIR, "SSL_certificate")
-CERTIFICATE = os.path.join(CERT_DIR, "www.vrops_webservice.com.cert")
-KEY = os.path.join(CERT_DIR, "www.vrops_webservice.com.key")
+certificate_name = getfqdn() + ".cert"
+key_name = getfqdn() + ".key"
+CERTIFICATE = os.path.join(CERT_DIR, certificate_name)
+KEY = os.path.join(CERT_DIR, key_name)
+#CERTIFICATE = os.path.join(CERT_DIR, "www.vrops_webservice.com.cert")
+#KEY = os.path.join(CERT_DIR, "www.vrops_webservice.com.key")
 CONFIG_FILE = os.path.join(BASE_DIR, '../vrops_config.xml')
 #Severity Mapping from vROPs to OSM
 VROPS_SEVERITY_TO_OSM_MAPPING = {
@@ -219,16 +225,18 @@ class SSLWebServer(ServerAdapter):
 
         try:
             server.start()
-            logger.info("Started vROPs Web Serverice")
+            logger.info("Started vROPs Web Service")
         except Exception as exp:
             server.stop()
-            logger.error("Exception: {} Stopped vROPs Web Serverice".format(exp))
+            logger.error("Exception: {} Stopped vROPs Web Service".format(exp))
 
 
 if __name__ == "__main__":
     #Start SSL Web Service
-    logger.info("Start vROPs Web Serverice")
+    logger.info("Start vROPs Web Service")
     app = default_app()
     server_names['sslwebserver'] = SSLWebServer
-    run(app=app,host=gethostname(), port=8080, server='sslwebserver')
+    run(app=app,host=getfqdn(), port=8080, server='sslwebserver')
+
+