X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=osm_mon%2Fcore%2Fmessage_bus%2Fcommon_consumer;h=efbb12218cc36062c7ba6058a03d667daefc74ba;hb=0e57d11ebb85637f38dd92a791abd6fe4889a565;hp=0255965492c3d2d763bcc0dbe8232a8afa5c3423;hpb=582a1a03bc2b0917c4c0ad8c276c17f2599174b2;p=osm%2FMON.git

diff --git a/osm_mon/core/message_bus/common_consumer b/osm_mon/core/message_bus/common_consumer
index 0255965..efbb122 100755
--- a/osm_mon/core/message_bus/common_consumer
+++ b/osm_mon/core/message_bus/common_consumer
@@ -41,11 +41,18 @@ 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'}
+if "BROKER_URI" in os.environ:
+    server = {'server': os.getenv("BROKER_URI")}
+else:
+    server = {'server': 'localhost:9092'}
+
+
 
 # Initialize consumers for alarms and metrics
 common_consumer = KafkaConsumer(bootstrap_servers=server['server'])
@@ -59,6 +66,8 @@ 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()
@@ -89,8 +98,9 @@ try:
                     message, openstack_auth, auth_token)
 
             elif vim_type == "aws":
-                cloudwatch_metrics.metric_calls(message)
                 log.info("This message is for the CloudWatch plugin.")
+                aws_conn = aws_connection.setEnvironment()
+                cloudwatch_metrics.metric_calls(message,aws_conn)
 
             elif vim_type == "vmware":
                 log.info("This metric_request message is for the vROPs plugin.")
@@ -108,8 +118,9 @@ try:
                 openstack_alarms.alarming(message, openstack_auth, auth_token)
 
             elif vim_type == "aws":
-                cloudwatch_alarms.alarm_calls(message)
                 log.info("This message is for the CloudWatch plugin.")
+                aws_conn = aws_connection.setEnvironment()
+                cloudwatch_alarms.alarm_calls(message, aws_conn)
 
             elif vim_type == "vmware":
                 log.info("This alarm_request message is for the vROPs plugin.")
@@ -127,8 +138,8 @@ try:
                 auth_token = openstack_auth._authenticate(message=message)
 
             elif vim_type == "aws":
-                #TODO Access credentials later
                 log.info("This message is for the CloudWatch plugin.")
+                aws_access_credentials.access_credential_calls(message) 
 
             elif vim_type == "vmware":
                 log.info("This access_credentials message is for the vROPs plugin.")