X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcore%2Fmessage_bus%2Fcommon_consumer;h=709c07e507fcbc83bfaf89790f34348ddf6e77b9;hb=1e75545fdded3a1eb0bb64bc3353c52bbf7f42a8;hp=9f261b78898dc0ccb88426b2c96ade7a3caab8a1;hpb=c7397b95dbaeebd7d872779eec809daed9e487cc;p=osm%2FMON.git

diff --git a/osm_mon/core/message_bus/common_consumer b/osm_mon/core/message_bus/common_consumer
index 9f261b7..709c07e 100755
--- a/osm_mon/core/message_bus/common_consumer
+++ b/osm_mon/core/message_bus/common_consumer
@@ -22,6 +22,7 @@
 import json
 import logging
 import sys
+import os
 
 sys.path.append("/root/MON")
 
@@ -34,17 +35,22 @@ log = logging.getLogger(__name__)
 from kafka import KafkaConsumer
 from kafka.errors import KafkaError
 
-from plugins.OpenStack.Aodh import alarming
-from plugins.OpenStack.common import Common
-from plugins.OpenStack.Gnocchi import metrics
+from osm_mon.plugins.OpenStack.Aodh import alarming
+from osm_mon.plugins.OpenStack.common import Common
+from osm_mon.plugins.OpenStack.Gnocchi import metrics
 
+from osm_mon.plugins.CloudWatch.plugin_alarm import plugin_alarms
+from osm_mon.plugins.CloudWatch.plugin_metric import plugin_metrics
+from osm_mon.plugins.CloudWatch.connection import Connection
+from osm_mon.plugins.CloudWatch.access_credentials import AccessCredentials
+
+from osm_mon.plugins.vRealiseOps import plugin_receiver
 
 # Initialize servers
 server = {'server': 'localhost:9092'}
 
 # Initialize consumers for alarms and metrics
-common_consumer = KafkaConsumer(group_id='osm_mon',
-                                bootstrap_servers=server['server'])
+common_consumer = KafkaConsumer(bootstrap_servers=server['server'])
 
 # Create OpenStack alarming and metric instances
 auth_token = None
@@ -52,6 +58,14 @@ openstack_auth = Common()
 openstack_metrics = metrics.Metrics()
 openstack_alarms = alarming.Alarming()
 
+# Create CloudWatch alarm and metric instances
+cloudwatch_alarms = plugin_alarms()
+cloudwatch_metrics = plugin_metrics()
+aws_connection = Connection()
+aws_access_credentials = AccessCredentials()
+
+#Create vROps plugin_receiver class instance
+vrops_rcvr = plugin_receiver.PluginReceiver()
 
 def get_vim_type(message):
     """Get the vim type that is required by the message."""
@@ -72,16 +86,20 @@ try:
         if message.topic == "metric_request":
             # Check the vim desired by the message
             vim_type = get_vim_type(message)
+
             if vim_type == "openstack":
                 log.info("This message is for the OpenStack plugin.")
                 openstack_metrics.metric_calls(
                     message, openstack_auth, auth_token)
 
-            elif vim_type == "cloudwatch":
+            elif vim_type == "aws":
                 log.info("This message is for the CloudWatch plugin.")
+                aws_conn = aws_connection.setEnvironment()
+                cloudwatch_metrics.metric_calls(message,aws_conn)
 
-            elif vim_type == "vrops":
-                log.info("This message is for the vROPs plugin.")
+            elif vim_type == "vmware":
+                log.info("This metric_request message is for the vROPs plugin.")
+                vrops_rcvr.consume(message)
 
             else:
                 log.debug("vim_type is misconfigured or unsupported; %s",
@@ -94,11 +112,14 @@ try:
                 log.info("This message is for the OpenStack plugin.")
                 openstack_alarms.alarming(message, openstack_auth, auth_token)
 
-            elif vim_type == "cloudwatch":
+            elif vim_type == "aws":
                 log.info("This message is for the CloudWatch plugin.")
+                aws_conn = aws_connection.setEnvironment()
+                cloudwatch_alarms.alarm_calls(message, aws_conn)
 
-            elif vim_type == "vrops":
-                log.info("This message is for the vROPs plugin.")
+            elif vim_type == "vmware":
+                log.info("This alarm_request message is for the vROPs plugin.")
+                vrops_rcvr.consume(message)
 
             else:
                 log.debug("vim_type is misconfigured or unsupported; %s",
@@ -111,11 +132,13 @@ try:
                 log.info("This message is for the OpenStack plugin.")
                 auth_token = openstack_auth._authenticate(message=message)
 
-            elif vim_type == "cloudwatch":
+            elif vim_type == "aws":
                 log.info("This message is for the CloudWatch plugin.")
+                aws_access_credentials.access_credential_calls(message) 
 
-            elif vim_type == "vrops":
-                log.info("This message is for the vROPs plugin.")
+            elif vim_type == "vmware":
+                log.info("This access_credentials message is for the vROPs plugin.")
+                vrops_rcvr.consume(message)
 
             else:
                 log.debug("vim_type is misconfigured or unsupported; %s",