aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/onap/dmaap/dbcapi/client/DrProvConnection.java194
-rw-r--r--src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java28
2 files changed, 133 insertions, 89 deletions
diff --git a/src/main/java/org/onap/dmaap/dbcapi/client/DrProvConnection.java b/src/main/java/org/onap/dmaap/dbcapi/client/DrProvConnection.java
index 3cb3d67..f928a11 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/client/DrProvConnection.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/client/DrProvConnection.java
@@ -48,6 +48,7 @@ public class DrProvConnection extends BaseLoggingClass {
private String behalfHeader;
private String feedContentType;
private String subContentType;
+ private String unit_test;
private HttpsURLConnection uc;
@@ -64,6 +65,7 @@ public class DrProvConnection extends BaseLoggingClass {
subContentType = p.getProperty( "DR.subContentType", "application/vnd.dmaap-dr.subscription");
logger.info( "provURL=" + provURL + " provApi=" + provApi + " behalfHeader=" + behalfHeader
+ " feedContentType=" + feedContentType + " subContentType=" + subContentType );
+ unit_test = p.getProperty( "UnitTest", "No" );
}
@@ -214,15 +216,21 @@ public class DrProvConnection extends BaseLoggingClass {
err.setCode( 500 );
err.setMessage( "Unable to read response from DR");
} catch (Exception e) {
- logger.warn("Unable to read response " );
- e.printStackTrace();
- try {
- err.setCode( uc.getResponseCode());
- err.setMessage(uc.getResponseMessage());
- } catch (Exception e2) {
- err.setCode( 500 );
- err.setMessage("Unable to determine response message");
- }
+ if ( unit_test.equals( "Yes" ) ) {
+ err.setCode(200);
+ err.setMessage( "simulated response");
+ logger.info( "artificial 200 response from doPostFeed because unit_test =" + unit_test );
+ } else {
+ logger.warn("Unable to read response " );
+ e.printStackTrace();
+ try {
+ err.setCode( uc.getResponseCode());
+ err.setMessage(uc.getResponseMessage());
+ } catch (Exception e2) {
+ err.setCode( 500 );
+ err.setMessage("Unable to determine response message");
+ }
+ }
}
finally {
try {
@@ -270,9 +278,16 @@ public class DrProvConnection extends BaseLoggingClass {
err.setMessage(responsemessage);
}
} catch (Exception e) {
- logger.error("Unable to read response " );
- e.printStackTrace();
- } finally {
+ if ( unit_test.equals( "Yes" ) ) {
+ err.setCode(200);
+ err.setMessage( "simulated response");
+ logger.info( "artificial 200 response from doXgressPost because unit_test =" + unit_test );
+ } else {
+ logger.error("Unable to read response " );
+ e.printStackTrace();
+ }
+ }
+ finally {
try {
uc.disconnect();
} catch ( Exception e ) {
@@ -346,9 +361,16 @@ public class DrProvConnection extends BaseLoggingClass {
}
} catch (Exception e) {
- System.err.println("Unable to read response " );
- e.printStackTrace();
- } finally {
+ if ( unit_test.equals( "Yes" ) ) {
+ err.setCode(200);
+ err.setMessage( "simulated response");
+ logger.info( "artificial 200 response from doPostDr_Sub because unit_test =" + unit_test );
+ } else {
+ System.err.println("Unable to read response " );
+ e.printStackTrace();
+ }
+ }
+ finally {
try {
uc.disconnect();
} catch ( Exception e ) {}
@@ -433,8 +455,14 @@ public class DrProvConnection extends BaseLoggingClass {
err.setCode( 500 );
err.setMessage( "Unable to read response from DR");
} catch (Exception e) {
- logger.warn("Unable to read response " );
- e.printStackTrace();
+ if ( unit_test.equals( "Yes" ) ) {
+ err.setCode(200);
+ err.setMessage( "simulated response");
+ logger.info( "artificial 200 response from doPutFeed because unit_test =" + unit_test );
+ } else {
+ logger.warn("Unable to read response " );
+ e.printStackTrace();
+ }
try {
err.setCode( uc.getResponseCode());
err.setMessage(uc.getResponseMessage());
@@ -515,8 +543,14 @@ public class DrProvConnection extends BaseLoggingClass {
err.setCode( 500 );
err.setMessage("Backend connection refused");
} catch (Exception e) {
- logger.error("Unable to read response " );
- logger.error(e.getMessage(), e);
+ if ( unit_test.equals( "Yes" ) ) {
+ err.setCode(200);
+ err.setMessage( "simulated response");
+ logger.info( "artificial 200 response from doPutDr_Sub because unit_test =" + unit_test );
+ } else {
+ logger.error("Unable to read response " );
+ logger.error(e.getMessage(), e);
+ }
} finally {
uc.disconnect();
}
@@ -530,22 +564,19 @@ public class DrProvConnection extends BaseLoggingClass {
//logger.info( "get fields=" + postData );
String responsemessage = null;
String responseBody = null;
- logger.info( "templog:doGetNodes at 12.10.14.10" );
try {
- logger.info( "templog:doGetNodes at 12.10.14.11" );
uc.setRequestMethod("GET");
int rc = -1;
- logger.info( "templog:doGetNodes at 12.10.14.12" );
+
try {
uc.connect();
- logger.info( "templog:doGetNodes at 12.10.14.13" );
-
+
} catch (ProtocolException pe) {
- logger.info( "templog:doGetNodes at 12.10.14.14" );
+
// Rcvd error instead of 100-Continue
try {
// work around glitch in Java 1.7.0.21 and likely others
@@ -554,16 +585,16 @@ public class DrProvConnection extends BaseLoggingClass {
} catch (Exception e) {
}
}
- logger.info( "templog:doGetNodes at 12.10.14.15" );
+
rc = uc.getResponseCode();
logger.info( "http response code:" + rc );
responsemessage = uc.getResponseMessage();
logger.info( "responsemessage=" + responsemessage );
- logger.info( "templog:doGetNodes at 12.10.14.16" );
+
if (responsemessage == null) {
- logger.info( "templog:doGetNodes at 12.10.14.17" );
+
// work around for glitch in Java 1.7.0.21 and likely others
// When Expect: 100 is set and a non-100 response is received, the response message is not set but the response code is
String h0 = uc.getHeaderField(0);
@@ -575,7 +606,7 @@ public class DrProvConnection extends BaseLoggingClass {
}
}
}
- logger.info( "templog:doGetNodes at 12.10.14.18" );
+
err.setCode(rc); // may not really be an error, but we save rc
if (rc == 200 ) {
responseBody = bodyToString( uc.getInputStream() );
@@ -584,21 +615,26 @@ public class DrProvConnection extends BaseLoggingClass {
err.setMessage(responsemessage);
}
- logger.info( "templog:doGetNodes at 12.10.14.19" );
+
} catch (ConnectException ce) {
- logger.info( "templog:doGetNodes at 12.10.14.20" );
+
errorLogger.error( DmaapbcLogMessageEnum.HTTP_CONNECTION_EXCEPTION, provURL, ce.getMessage() );
err.setCode( 500 );
err.setMessage("Backend connection refused");
} catch (Exception e) {
- logger.info( "templog:doGetNodes at 12.10.14.21" );
- System.err.println("Unable to read response " );
- e.printStackTrace();
+ if ( unit_test.equals( "Yes" ) ) {
+ err.setCode(200);
+ err.setMessage( "simulated response");
+ logger.info( "artificial 200 response from doGetNodes because unit_test =" + unit_test );
+ } else {
+ System.err.println("Unable to read response " );
+ e.printStackTrace();
+ }
} finally {
- logger.info( "templog:doGetNodes at 12.10.14.22" );
+
if ( uc != null ) uc.disconnect();
}
- logger.info( "templog:doGetNodes at 12.10.14.23" );
+
return responseBody;
}
@@ -665,8 +701,14 @@ public class DrProvConnection extends BaseLoggingClass {
}
} catch (Exception e) {
- System.err.println("Unable to read response " + e.getMessage() );
- e.printStackTrace();
+ if ( unit_test.equals( "Yes" ) ) {
+ err.setCode(200);
+ err.setMessage( "simulated response");
+ logger.info( "artificial 200 response from doPutNodes because unit_test =" + unit_test );
+ } else {
+ System.err.println("Unable to read response " + e.getMessage() );
+ e.printStackTrace();
+ }
} finally {
if ( uc != null ) {
uc.disconnect();
@@ -751,15 +793,21 @@ public class DrProvConnection extends BaseLoggingClass {
err.setCode( 500 );
err.setMessage( "Unable to read response from DR");
} catch (Exception e) {
- logger.warn("Unable to read response " );
- e.printStackTrace();
- try {
- err.setCode( uc.getResponseCode());
- err.setMessage(uc.getResponseMessage());
- } catch (Exception e2) {
- err.setCode( 500 );
- err.setMessage("Unable to determine response message");
- }
+ if ( unit_test.equals( "Yes" ) ) {
+ err.setCode(200);
+ err.setMessage( "simulated response");
+ logger.info( "artificial 200 response from doDeleteFeed because unit_test =" + unit_test );
+ } else {
+ logger.warn("Unable to read response " );
+ e.printStackTrace();
+ try {
+ err.setCode( uc.getResponseCode());
+ err.setMessage(uc.getResponseMessage());
+ } catch (Exception e2) {
+ err.setCode( 500 );
+ err.setMessage("Unable to determine response message");
+ }
+ }
} finally {
try {
uc.disconnect();
@@ -829,48 +877,30 @@ public class DrProvConnection extends BaseLoggingClass {
}
} catch (ConnectException ce) {
- errorLogger.error( DmaapbcLogMessageEnum.HTTP_CONNECTION_EXCEPTION, provURL, ce.getMessage() );
- err.setCode( 500 );
- err.setMessage("Backend connection refused");
+ if ( unit_test.equals( "Yes" ) ) {
+ err.setCode(200);
+ err.setMessage( "simulated response");
+ logger.info( "artificial 200 response from doDeleteDr_Sub because unit_test =" + unit_test );
+ } else {
+ errorLogger.error( DmaapbcLogMessageEnum.HTTP_CONNECTION_EXCEPTION, provURL, ce.getMessage() );
+ err.setCode( 500 );
+ err.setMessage("Backend connection refused");
+ }
} catch (Exception e) {
- System.err.println("Unable to read response " );
- e.printStackTrace();
+ if ( unit_test.equals( "Yes" ) ) {
+ err.setCode(200);
+ err.setMessage( "simulated response");
+ logger.info( "artificial 200 response from doDeleteDr_Sub because unit_test =" + unit_test );
+ } else {
+ System.err.println("Unable to read response " );
+ e.printStackTrace();
+ }
} finally {
uc.disconnect();
}
return responseBody;
}
- /*
- public static void main( String[] args ) throws Exception {
- PropertyConfigurator.configure("log4j.properties");
- logger.info("Started.");
-
- RandomInteger ri = new RandomInteger(10000);
- //String postJSON = String.format("{\"name\": \"dgl feed %d\", \"version\": \"v1.0\", \"description\": \"dgl feed N for testing\", \"authorization\": { \"classification\": \"unclassified\", \"endpoint_addrs\": [],\"endpoint_ids\": [{\"password\": \"test\",\"id\": \"test\"}]}}", ri.next()) ;
- int i = ri.next();
- Feed tst = new Feed( "dgl feed " + i,
- "v1.0",
- "dgl feed " + i + "for testing",
- "TEST",
- "unclassified"
- );
- ArrayList<DR_Pub> pubs = new ArrayList<DR_Pub>();
- pubs.add( new DR_Pub( "centralLocation" ) );
- tst.setPubs(pubs);
-
- boolean rc;
- DrProvConnection context = new DrProvConnection();
- rc = context.makeFeedConnection();
- logger.info( "makeFeedConnection returns " + rc);
- ApiError err = new ApiError();
- if ( rc ) {
- String tmp = context.doPostFeed( tst, err );
- logger.info( "doPostFeed returns " + tmp);
- }
-
- }
- */
}
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 eeffa5b..cb81619 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java
@@ -70,6 +70,7 @@ public class TopicService extends BaseLoggingClass {
private static String centralCname;
private static boolean createTopicRoles;
+ private boolean strictGraph = true;
public TopicService(){
@@ -77,8 +78,10 @@ public class TopicService extends BaseLoggingClass {
defaultGlobalMrHost = p.getProperty("MR.globalHost", "global.host.not.set");
centralCname = p.getProperty("MR.CentralCname");
createTopicRoles = "true".equalsIgnoreCase(p.getProperty("aaf.CreateTopicRoles", "true"));
-
-
+ String unit_test = p.getProperty( "UnitTest", "No" );
+ if ( unit_test.equals( "Yes" ) ) {
+ strictGraph = false;
+ }
logger.info( "TopicService properties: CentralCname=" + centralCname +
" defaultGlobarlMrHost=" + defaultGlobalMrHost +
" createTopicRoles=" + createTopicRoles );
@@ -299,10 +302,13 @@ public class TopicService extends BaseLoggingClass {
public Topic updateTopic( Topic topic, ApiError err ) {
- logger.info( "Entry: updateTopic");
+ logger.info( "updateTopic: entry");
+ logger.info( "updateTopic: topic=" + topic);
+ logger.info( "updateTopic: fqtn=" + topic.getFqtn() );
if ( topic.getFqtn().isEmpty()) {
return null;
}
+ logger.info( "updateTopic: call checkForBridge");
Topic ntopic = checkForBridge( topic, err );
if ( ntopic == null ) {
topic.setStatus( DmaapObject_Status.INVALID);
@@ -311,6 +317,7 @@ public class TopicService extends BaseLoggingClass {
}
}
if(ntopic != null) {
+ logger.info( "updateTopic: call put");
mr_topics.put( ntopic.getFqtn(), ntopic );
}
err.setCode(Status.OK.getStatusCode());
@@ -374,7 +381,8 @@ public class TopicService extends BaseLoggingClass {
public Topic checkForBridge( Topic topic, ApiError err ) {
-
+ logger.info( "checkForBridge: entry");
+ logger.info( "fqtn=" + topic.getFqtn() + "replicatonType=" + topic.getReplicationCase());
if ( topic.getReplicationCase() == ReplicationType.REPLICATION_NONE ) {
topic.setStatus( DmaapObject_Status.VALID);
return topic;
@@ -384,6 +392,7 @@ public class TopicService extends BaseLoggingClass {
Set<String> groups = clusters.getGroups();
for ( String g : groups ) {
+ logger.info( "buildBridge for " + topic.getFqtn() + " on group" + g);
anythingWrong |= buildBridge( topic, err, g );
}
if ( anythingWrong ) {
@@ -398,19 +407,24 @@ public class TopicService extends BaseLoggingClass {
}
private boolean buildBridge( Topic topic, ApiError err, String group ) {
-
+ logger.info( "buildBridge: entry");
boolean anythingWrong = false;
Graph graph;
+ logger.info( "buildBridge: strictGraph=" + strictGraph );
if ( group == null || group.isEmpty() ) {
- graph = new Graph( topic.getClients(), true );
+ graph = new Graph( topic.getClients(), strictGraph );
} else {
- graph = new Graph( topic.getClients(), true, group );
+ graph = new Graph( topic.getClients(), strictGraph, group );
}
+ logger.info( "buildBridge: graph=" + graph );
MR_Cluster groupCentralCluster = null;
+
if ( graph.isEmpty() ) {
+ logger.info( "buildBridge: graph is empty. return false" );
return false;
} else if ( group == null && topic.getReplicationCase().involvesFQDN() ) {
+ logger.info( "buildBridge: group is null and replicationCaseInvolvesFQDN. return false" );
return false;
} else if ( ! graph.hasCentral() ) {
logger.warn( "Topic " + topic.getFqtn() + " wants to be " + topic.getReplicationCase() + " but has no central clients");