X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fservice%2FDmaapService.java;h=8789ac4fed1e7acf2535567e1302202f32ea924d;hb=18eaae524174fac4f21d83c94bb8347a29d9f879;hp=de87b004b2841daffd38f2a07f6412c87b9364a0;hpb=9a73b27ac2fa5edc9cadf15c6af7262866c5312c;p=dmaap%2Fdbcapi.git

diff --git a/src/main/java/org/onap/dmaap/dbcapi/service/DmaapService.java b/src/main/java/org/onap/dmaap/dbcapi/service/DmaapService.java
index de87b00..8789ac4 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/service/DmaapService.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/service/DmaapService.java
@@ -3,6 +3,8 @@
  * org.onap.dmaap
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ *
+ * Modifications Copyright (C) 2019 IBM.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,17 +23,8 @@
 package org.onap.dmaap.dbcapi.service;
 
 import java.util.ArrayList;
-
-
-
-
-
-
-
-
-
-
 import org.onap.dmaap.dbcapi.aaf.AafService;
+import org.onap.dmaap.dbcapi.aaf.AafServiceFactory;
 import org.onap.dmaap.dbcapi.aaf.DmaapGrant;
 import org.onap.dmaap.dbcapi.aaf.DmaapPerm;
 import org.onap.dmaap.dbcapi.aaf.AafService.ServiceType;
@@ -52,11 +45,12 @@ public class DmaapService  extends BaseLoggingClass  {
 
 	
 	private Singleton<Dmaap> dmaapholder = DatabaseClass.getDmaap();
+	private static String noEnvironmentPrefix;
 	
 	
 	String topicFactory; // = "org.openecomp.dcae.dmaap.topicFactory";
 	String topicMgrRole; // = "org.openecomp.dmaapBC.TopicMgr";
-	String dcaeTopicNs; // = "org.openecomp.dcae.dmaap";
+	
 	private boolean multiSite;
 	
 	
@@ -64,8 +58,24 @@ public class DmaapService  extends BaseLoggingClass  {
 		DmaapConfig p = (DmaapConfig)DmaapConfig.getConfig();
 		topicFactory = p.getProperty("MR.TopicFactoryNS", "MR.topicFactoryNS.not.set");
 		topicMgrRole = p.getProperty("MR.TopicMgrRole", "MR.TopicMgrRole.not.set" );
-		dcaeTopicNs = dmaapholder.get().getTopicNsRoot();
+
 		multiSite = "true".equalsIgnoreCase(p.getProperty("MR.multisite", "true"));
+		noEnvironmentPrefix = p.getProperty( "AAF.NoEnvironmentPrefix", "org.onap");
+		
+		logger.info( "DmaapService settings: " + 
+				" topicFactory=" + topicFactory +
+				" topicMgrRole=" + topicMgrRole +
+				
+				" multisite=" + multiSite +
+				" noEnvironmentPrefix=" + noEnvironmentPrefix
+				);
+
+		Dmaap dmaap = dmaapholder.get();
+		logger.info( "DmaapService object values: " +
+				" dmaapName=" + dmaap.getDmaapName() +
+				" drProvURL=" + dmaap.getDrProvUrl() +
+				" version="+ dmaap.getVersion()
+				);
 		
 	}
 	
@@ -82,10 +92,10 @@ public class DmaapService  extends BaseLoggingClass  {
 
 			nd.setLastMod();
 			dmaapholder.update(nd);
-
-			AafService aaf = new AafService( ServiceType.AAF_Admin);
+			
+			AafService aaf = new AafServiceFactory().initAafService(ServiceType.AAF_Admin);
 			ApiPolicy apiPolicy = new ApiPolicy();
-			if ( apiPolicy.getUseAuthClass() ) {
+			if ( apiPolicy.isPermissionClassSet() ) {
 				ApiPerms p = new ApiPerms();
 				p.setEnvMap();
 			}
@@ -126,12 +136,13 @@ public class DmaapService  extends BaseLoggingClass  {
 		if ( ! dmaap.isStatusValid()  || ! nd.getDmaapName().equals(dmaap.getDmaapName()) || dmaap.getVersion().equals( "0") ) {
 			nd.setLastMod();
 			dmaapholder.update(nd);  //need to set this so the following perms will pick up any new vals.
+			//dcaeTopicNs = dmaapholder.get().getTopicNsRoot();
 			ApiPolicy apiPolicy = new ApiPolicy();
-			if ( apiPolicy.getUseAuthClass()) {
+			if ( apiPolicy.isPermissionClassSet()) {
 				ApiPerms p = new ApiPerms();
 				p.setEnvMap();
 			}
-			AafService aaf = new AafService( ServiceType.AAF_Admin);
+			AafService aaf = new AafServiceFactory().initAafService(ServiceType.AAF_Admin);
 			if ( multiSite ) {
 				anythingWrong = setTopicMgtPerms(  nd,  aaf ) || createMmaTopic();
 			}
@@ -155,7 +166,17 @@ public class DmaapService  extends BaseLoggingClass  {
 	}
 	public String getTopicPerm( String val ) {
 		Dmaap dmaap = dmaapholder.get();
-		return dmaap.getTopicNsRoot() + "." + val + ".mr.topic";
+		String nsRoot = dmaap.getTopicNsRoot();
+		if ( nsRoot == null ) { return null; }
+		
+		String t;
+		// in ONAP Casablanca, we assume no distinction of environments reflected in topic namespace
+		if ( nsRoot.startsWith(noEnvironmentPrefix) ) {
+			t = nsRoot +  ".mr.topic";
+		} else {
+			t = nsRoot + "." + val + ".mr.topic";
+		}
+		return t;
 	}
 	
 	public String getBridgeAdminFqtn(){
@@ -172,7 +193,7 @@ public class DmaapService  extends BaseLoggingClass  {
 
 	private boolean setTopicMgtPerms( Dmaap nd, AafService aaf ){
 		String[] actions = { "create", "destroy" };
-		String instance = ":" + dcaeTopicNs + "." + nd.getDmaapName() + ".mr.topic:" + dcaeTopicNs + "." + nd.getDmaapName();
+		String instance = ":" + nd.getTopicNsRoot() + "." + nd.getDmaapName() + ".mr.topic:" + nd.getTopicNsRoot() + "." + nd.getDmaapName();
 		
 		for( String action : actions ) {
 
@@ -192,7 +213,7 @@ public class DmaapService  extends BaseLoggingClass  {
 			}
 		}
 		
-		String t = dcaeTopicNs +"." + nd.getDmaapName() + ".mr.topic";
+		String t = nd.getTopicNsRoot() +"." + nd.getDmaapName() + ".mr.topic";
 		String[] s = { "view", "pub", "sub" };
 		actions = s;
 		instance = "*";
@@ -261,18 +282,20 @@ public class DmaapService  extends BaseLoggingClass  {
 		clients.add( nClient );
 	
 		// initialize Topic
-		Topic mmaTopic = new Topic();
+		Topic mmaTopic = new Topic().init();
 		mmaTopic.setTopicName(dmaap.getBridgeAdminTopic());
 		mmaTopic.setClients(clients);
 		mmaTopic.setOwner("BusController");
 		mmaTopic.setTopicDescription("topic reserved for MirrorMaker Administration");
 		mmaTopic.setTnxEnabled("false");
+		mmaTopic.setPartitionCount("1");  // a single partition should guarantee message order
+		
 		
 		ApiError err = new ApiError();
 		TopicService svc = new TopicService();
 		try {
 			@SuppressWarnings("unused")
-			Topic nTopic = svc.addTopic(mmaTopic, err);
+			Topic nTopic = svc.addTopic(mmaTopic, err, true);
 			if ( err.is2xx() || err.getCode() == 409 ) {
 				return false;
 			}