From: Jim Hahn <jrh3@att.com>
Date: Thu, 19 Apr 2018 20:08:20 +0000 (-0400)
Subject: Set default consumer instance to hostname
X-Git-Tag: v1.2.1~12
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ad73d3c3e46b2de77ee0a97788c51896a3fd36de;hp=dbdef1e3e3803b5848a1fad746c652f9359d4313;p=policy%2Fdrools-pdp.git

Set default consumer instance to hostname

Modified the code to generate a consumer instance via UUID,
when no consumer instance is provided.
Removed DEFAULT_CONSUMER_INSTANCE.
Set the consumer instance to the hostname instead of a UUID.

Change-Id: I143eb6d2ec51a7913536a46041de761d51222006
Issue-ID: POLICY-749
Signed-off-by: Jim Hahn <jrh3@att.com>
---

diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/BusTopicSource.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/BusTopicSource.java
index 4ef8e2d6..83d4e72c 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/BusTopicSource.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/BusTopicSource.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * policy-endpoints
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,11 +28,6 @@ import org.onap.policy.drools.event.comm.TopicSource;
  */
 public interface BusTopicSource extends ApiKeyEnabled, TopicSource {
 	
-	/**
-	 * Default Consumer Instance Value
-	 */
-	public static String DEFAULT_CONSUMER_INSTANCE = "0";
-	
 	/**
 	 * Default Timeout fetching in milliseconds
 	 */
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedBusTopicSource.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedBusTopicSource.java
index 9b2be6a9..5e8cf489 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedBusTopicSource.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedBusTopicSource.java
@@ -31,6 +31,7 @@ import org.onap.policy.drools.event.comm.FilterableTopicSource;
 import org.onap.policy.drools.event.comm.TopicListener;
 import org.onap.policy.drools.event.comm.bus.BusTopicSource;
 import org.onap.policy.drools.event.comm.bus.internal.BusConsumer.FilterableBusConsumer;
+import org.onap.policy.drools.utils.NetworkUtil;
 
 /**
  * This topic source implementation specializes in reading messages
@@ -126,7 +127,7 @@ public abstract class SingleThreadedBusTopicSource
 		}
 		
 		if (consumerInstance == null || consumerInstance.isEmpty()) {
-			this.consumerInstance = DEFAULT_CONSUMER_INSTANCE;
+            this.consumerInstance = NetworkUtil.getHostname();
 		} else {
 			this.consumerInstance = consumerInstance;
 		}