Added MirrorMaker unit tests

Change-Id: I580d350c663f06754a38ae58941de6e812f8cb03
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-1095

2 files changed, 51 insertions, 9 deletions

diff --git a/src/main/java/org/onap/dmaap/dbcapi/service/MirrorMakerService.java b/src/main/java/org/onap/dmaap/dbcapi/service/MirrorMakerService.java
index 5d695f4..7c4b2ce 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/service/MirrorMakerService.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/service/MirrorMakerService.java
@@ -51,6 +51,14 @@ public class MirrorMakerService extends BaseLoggingClass {
 	private static MrTopicConnection prov;
 	private static AafDecrypt decryptor;
 	
+	static final String PROV_USER_PROPERTY = "MM.ProvUserMechId";
+	static final String PROV_PWD_PROPERTY = "MM.ProvUserPwd";
+	static final String PROV_PWD_DEFAULT = "pwdNotSet";
+	static final String SOURCE_REPLICATION_PORT_PROPERTY = "MR.SourceReplicationPort";
+	static final String SOURCE_REPLICATION_PORT_DEFAULT = "9092";
+	static final String TARGET_REPLICATION_PORT_PROPERTY = "MR.TargetReplicationPort";
+	static final String TARGET_REPLICATION_PORT_DEFAULT = "2181";
+	
 	private static String provUser;
 	private static String provUserPwd;
 	private static String defaultProducerPort;
@@ -63,10 +71,10 @@ public class MirrorMakerService extends BaseLoggingClass {
 		super();
 		decryptor = new AafDecrypt();
 		DmaapConfig p = (DmaapConfig)DmaapConfig.getConfig();
-		provUser = p.getProperty("MM.ProvUserMechId");
-		provUserPwd = decryptor.decrypt(p.getProperty( "MM.ProvUserPwd", "notSet" ));
-		defaultProducerPort = p.getProperty( "MR.SourceReplicationPort", "9092");
-		defaultConsumerPort = p.getProperty( "MR.TargetReplicationPort", "2181");	
+		provUser = p.getProperty(PROV_USER_PROPERTY);
+		provUserPwd = decryptor.decrypt(p.getProperty( PROV_PWD_PROPERTY, PROV_PWD_DEFAULT ));
+		defaultProducerPort = p.getProperty( SOURCE_REPLICATION_PORT_PROPERTY, SOURCE_REPLICATION_PORT_DEFAULT );
+		defaultConsumerPort = p.getProperty( TARGET_REPLICATION_PORT_PROPERTY, TARGET_REPLICATION_PORT_DEFAULT );	
 		centralFqdn = p.getProperty("MR.CentralCname", "notSet");
 		maxTopicsPerMM = Integer.valueOf( p.getProperty( "MaxTopicsPerMM", "5"));
 		mmPerMR = "true".equalsIgnoreCase(p.getProperty("MirrorMakerPerMR", "true"));
@@ -166,7 +174,7 @@ public class MirrorMakerService extends BaseLoggingClass {
 		return ret;
 	}
 	
-	public MirrorMaker getNextMM( String source, String target, String fqtn ) {
+	public MirrorMaker findNextMM( String source, String target, String fqtn ) {
 		int i = 0;
 		MirrorMaker mm = null;
 		while( mm == null ) {
@@ -201,7 +209,7 @@ public class MirrorMakerService extends BaseLoggingClass {
 			int last = whitelist.size() - 1;
 			String topic = whitelist.get(last);
 			whitelist.remove(last);
-			MirrorMaker mm = this.getNextMM( source, target, "aValueThatShouldNotMatchAnything" );
+			MirrorMaker mm = this.findNextMM( source, target, "aValueThatShouldNotMatchAnything" );
 			mm.addTopic(topic);	
 			this.updateMirrorMaker(mm);
 		}
@@ -211,5 +219,37 @@ public class MirrorMakerService extends BaseLoggingClass {
 		return orig;
 		
 	}
+	
+	public static String getProvUser() {
+		return provUser;
+	}
+
+	public static void setProvUser(String provUser) {
+		MirrorMakerService.provUser = provUser;
+	}
+
+	public static String getProvUserPwd() {
+		return provUserPwd;
+	}
+
+	public static void setProvUserPwd(String provUserPwd) {
+		MirrorMakerService.provUserPwd = provUserPwd;
+	}
+
+	public static String getDefaultProducerPort() {
+		return defaultProducerPort;
+	}
+
+	public static void setDefaultProducerPort(String defaultProducerPort) {
+		MirrorMakerService.defaultProducerPort = defaultProducerPort;
+	}
+
+	public static String getDefaultConsumerPort() {
+		return defaultConsumerPort;
+	}
+
+	public static void setDefaultConsumerPort(String defaultConsumerPort) {
+		MirrorMakerService.defaultConsumerPort = defaultConsumerPort;
+	}
 
 }
diff --git a/src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java b/src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java
index a7991e8..68dfd51 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java
@@ -384,7 +384,7 @@ public class TopicService extends BaseLoggingClass {
 	
 	public Topic checkForBridge( Topic topic, ApiError err ) {
 		logger.info( "checkForBridge: entry");
-		logger.info( "fqtn=" + topic.getFqtn() + "replicatonType=" + topic.getReplicationCase());
+		logger.info( "fqtn=" + topic.getFqtn() + " replicatonType=" + topic.getReplicationCase());
 		if ( topic.getReplicationCase() == ReplicationType.REPLICATION_NONE ) {
 			topic.setStatus( DmaapObject_Status.VALID);
 			return topic;	
@@ -439,7 +439,8 @@ public class TopicService extends BaseLoggingClass {
 			logger.info( "loc=" + loc );
 			DcaeLocation location = locations.getDcaeLocation(loc);
 			MR_Cluster cluster = clusters.getMr_ClusterByLoc(loc);
-			logger.info( "cluster=" + cluster );
+			logger.info( "cluster=" + cluster + " at "+ cluster.getDcaeLocationName() );
+			logger.info( "location.isCentral()="+location.isCentral() + " getCentralLoc()=" + graph.getCentralLoc() );
 
 			
 				
@@ -455,6 +456,7 @@ public class TopicService extends BaseLoggingClass {
 				case REPLICATION_EDGE_TO_CENTRAL_TO_GLOBAL:  // NOTE: this is for E2C portion only
 					source = cluster.getFqdn();
 					target = (mmPerMR)? groupCentralCluster.getFqdn() : centralCname;
+					logger.info( "REPLICATION_EDGE_TO_CENTRAL: source=" + source + " target=" +target );
 					break;
 				case REPLICATION_CENTRAL_TO_EDGE:
 				case REPLICATION_GLOBAL_TO_CENTRAL_TO_EDGE:  // NOTE: this is for C2E portion only
@@ -543,7 +545,7 @@ public class TopicService extends BaseLoggingClass {
 			if ( source != null && target != null ) {
 				try { 
 					logger.info( "Create a MM from " + source + " to " + target );
-					MirrorMaker mm = bridge.getNextMM( source, target, topic.getFqtn());
+					MirrorMaker mm = bridge.findNextMM( source, target, topic.getFqtn());
 					mm.addTopic(topic.getFqtn());
 					bridge.updateMirrorMaker(mm);
 				} catch ( Exception ex ) {