diff options
Diffstat (limited to 'aai-traversal/src')
6 files changed, 119 insertions, 136 deletions
diff --git a/aai-traversal/src/main/java/org/openecomp/aai/ajsc_aai/JaxrsErrorMessageLookupService.java b/aai-traversal/src/main/java/org/openecomp/aai/ajsc_aai/JaxrsErrorMessageLookupService.java index ca78bac..04a7a09 100644 --- a/aai-traversal/src/main/java/org/openecomp/aai/ajsc_aai/JaxrsErrorMessageLookupService.java +++ b/aai-traversal/src/main/java/org/openecomp/aai/ajsc_aai/JaxrsErrorMessageLookupService.java @@ -20,79 +20,79 @@ package org.openecomp.aai.ajsc_aai; -import java.util.HashMap; -import java.util.Map; +//import java.util.HashMap; +//import java.util.Map; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; +//import javax.ws.rs.GET; +//import javax.ws.rs.HeaderParam; +//import javax.ws.rs.Path; +//import javax.ws.rs.PathParam; +//import javax.ws.rs.Produces; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.web.context.ContextLoader; -import org.springframework.web.context.WebApplicationContext; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +//import org.springframework.web.context.ContextLoader; +//import org.springframework.web.context.WebApplicationContext; -import ajsc.ErrorMessageLookupService; +//import ajsc.ErrorMessageLookupService; -@Path("/errormessage") -public class JaxrsErrorMessageLookupService { +//@Path("/errormessage") +//public class JaxrsErrorMessageLookupService { - private final static Logger logger = LoggerFactory - .getLogger(ErrorMessageLookupService.class); + //private final static Logger logger = LoggerFactory + //.getLogger(ErrorMessageLookupService.class); - /** - * Gets the message. - * - * @param input the input - * @param errorCode the error code - * @param appId the app id - * @param operation the operation - * @param messageText the message text - * @param isRESTService the is REST service - * @param faultEntity the fault entity - * @param ConvID the conv ID - * @return the message - */ - @GET - @Path("/emls") - @Produces("text/plain") - public String getMessage(@PathParam("input") String input, - @HeaderParam("errorCode") String errorCode, - @HeaderParam("appId") String appId, - @HeaderParam("operation") String operation, - @HeaderParam("messageText") String messageText, - @HeaderParam("isRESTService") String isRESTService, - @HeaderParam("faultEntity") String faultEntity, - @HeaderParam("ConvID") String ConvID) { + //* + //Gets the message. + + //@param input the input + //@param errorCode the error code + //@param appId the app id + //@param operation the operation + //@param messageText the message text + //@param isRESTService the is REST service + //@param faultEntity the fault entity + //@param ConvID the conv ID + //@return the message + //@GET + //@Path("/emls") + //@Produces("text/plain") + //public String getMessage(@PathParam("input") String input, + //@HeaderParam("errorCode") String errorCode, + //@HeaderParam("appId") String appId, + //@HeaderParam("operation") String operation, + //@HeaderParam("messageText") String messageText, + //@HeaderParam("isRESTService") String isRESTService, + //@HeaderParam("faultEntity") String faultEntity, + //@HeaderParam("ConvID") String ConvID) { - Map<String, String> headers = new HashMap<String, String>(); - headers.put(errorCode, errorCode); - headers.put(appId, appId); - headers.put(operation, operation); - headers.put(messageText, messageText); - headers.put(isRESTService, isRESTService); - headers.put(faultEntity, faultEntity); - headers.put(ConvID, ConvID); + //Map<String, String> headers = new HashMap<String, String>(); + //headers.put(errorCode, errorCode); + //headers.put(appId, appId); + //headers.put(operation, operation); + //headers.put(messageText, messageText); + //headers.put(isRESTService, isRESTService); + //headers.put(faultEntity, faultEntity); + //headers.put(ConvID, ConvID); - WebApplicationContext applicationContext = ContextLoader - .getCurrentWebApplicationContext(); + //WebApplicationContext applicationContext = ContextLoader + //.getCurrentWebApplicationContext(); - ErrorMessageLookupService e = (ErrorMessageLookupService) applicationContext - .getBean("errorMessageLookupService"); + //ErrorMessageLookupService e = (ErrorMessageLookupService) applicationContext + //.getBean("errorMessageLookupService"); - String message = e.getExceptionDetails(appId, operation, errorCode, - messageText,isRESTService, faultEntity, ConvID); + //String message = e.getExceptionDetails(appId, operation, errorCode, + //messageText,isRESTService, faultEntity, ConvID); - System.out.println("Error code = " + errorCode); - System.out.println("appId = " + appId); - System.out.println("operation = " + operation); - System.out.println("messageText = " + messageText); - System.out.println("isRESTService = " + isRESTService); - System.out.println("faultEntity = " + faultEntity); - System.out.println("ConvID = " + ConvID); - return "The exception message is:\n " + message; - } + //System.out.println("Error code = " + errorCode); + //System.out.println("appId = " + appId); + //System.out.println("operation = " + operation); + //System.out.println("messageText = " + messageText); + //System.out.println("isRESTService = " + isRESTService); + //System.out.println("faultEntity = " + faultEntity); + //System.out.println("ConvID = " + ConvID); + //return "The exception message is:\n " + message; + //} + +//} -} diff --git a/aai-traversal/src/main/java/org/openecomp/aai/dbgraphgen/ModelBasedProcessing.java b/aai-traversal/src/main/java/org/openecomp/aai/dbgraphgen/ModelBasedProcessing.java index f51e67b..6d9a277 100644 --- a/aai-traversal/src/main/java/org/openecomp/aai/dbgraphgen/ModelBasedProcessing.java +++ b/aai-traversal/src/main/java/org/openecomp/aai/dbgraphgen/ModelBasedProcessing.java @@ -2140,7 +2140,7 @@ public class ModelBasedProcessing{ // processing for how we join to that model and will not try to go any "deeper". List<String> linkagePtList = new ArrayList<>(); Iterator <VertexProperty<Object>> vpI = thisLevelElemVtx.properties("linkage-points"); - //DEBUG -- AAI-8002 + // I am not sure why, but since "linkage-points" is an xml-element-wrapper in the OXM definition, // we get back the whole array of Strings in one String - but still use the "vtx.properties()" to // get it - but only look at the first thing returned by the iterator. @@ -2505,7 +2505,7 @@ public class ModelBasedProcessing{ List<String> linkagePtList = new ArrayList <String>(); Iterator <VertexProperty<Object>> vpI = elVert.properties("linkage-points"); - //DEBUG -- AAI-8002 + // I am not sure why, but since "linkage-points" is an xml-element-wrapper in the OXM definition, // we get back the whole array of Strings in one String - but still use the "vtx.properties()" to // get it - but only look at the first thing returned by the iterator. @@ -2624,7 +2624,7 @@ public class ModelBasedProcessing{ // but that after that, we connect to a p-interface followed by a pserver. // It might have been more clear to define it in the other direction, but for now, that is it. (16-07) String linkagePointStr = linkagePointStrVal; - // --- DEBUG For AAI-8002 + // We are getting these with more than linkage thing in one string. // Ie. "pserver|lag-interface|l-interface, pserver|p-interface|l-interface, vlan|l-interface" linkagePointStr = linkagePointStr.replace("[", ""); diff --git a/aai-traversal/src/main/java/org/openecomp/aai/util/AAIAppServletContextListener.java b/aai-traversal/src/main/java/org/openecomp/aai/util/AAIAppServletContextListener.java index 97b7edb..8c5a4aa 100644 --- a/aai-traversal/src/main/java/org/openecomp/aai/util/AAIAppServletContextListener.java +++ b/aai-traversal/src/main/java/org/openecomp/aai/util/AAIAppServletContextListener.java @@ -25,7 +25,7 @@ import java.io.IOException; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import org.apache.activemq.broker.BrokerService; +//import org.apache.activemq.broker.BrokerService; import org.openecomp.aai.dbmap.AAIGraph; import org.openecomp.aai.exceptions.AAIException; @@ -38,7 +38,7 @@ public class AAIAppServletContextListener implements ServletContextListener { private static final EELFLogger LOGGER = EELFManager.getInstance().getLogger(AAIAppServletContextListener.class.getName()); - private BrokerService broker = new BrokerService(); + //private BrokerService broker = new BrokerService(); /** * Destroys Context @@ -50,12 +50,12 @@ public class AAIAppServletContextListener implements ServletContextListener { AAIGraph.getInstance().graphShutdown(); LOGGER.info("AAIGraph shutdown"); - try { - broker.stop(); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + //try { + ////broker.stop(); + //} catch (Exception e) { + //// TODO Auto-generated catch block + //e.printStackTrace(); + //} } /** @@ -80,25 +80,25 @@ public class AAIAppServletContextListener implements ServletContextListener { ModelInjestor.getInstance(); // Jsm internal broker for aai events - broker = new BrokerService(); - broker.addConnector("tcp://localhost:61446"); - broker.setPersistent(false); - broker.setUseJmx(false); - broker.setSchedulerSupport(false); - broker.start(); - - LOGGER.info("A&AI Server initialization succcessful."); + //broker = new BrokerService(); + //broker.addConnector("tcp://localhost:61446"); + //broker.setPersistent(false); + //broker.setUseJmx(false); + //broker.setSchedulerSupport(false); + //broker.start(); + + LOGGER.info("AAI Server initialization succcessful."); System.setProperty("org.openecomp.aai.serverStarted", "true"); } catch (AAIException e) { ErrorLogHelper.logException(e); - throw new RuntimeException("AAIException caught while initializing A&AI server", e); + throw new RuntimeException("AAIException caught while initializing AAI server", e); } catch (IOException e) { ErrorLogHelper.logError("AAI_4000", e.getMessage()); - throw new RuntimeException("IOException caught while initializing A&AI server", e); + throw new RuntimeException("IOException caught while initializing AAI server", e); } catch (Exception e) { - LOGGER.error("Unknown failure while initializing A&AI Server", e); - throw new RuntimeException("Unknown failure while initializing A&AI server", e); + LOGGER.error("Unknown failure while initializing AAI Server", e); + throw new RuntimeException("Unknown failure while initializing AAI server", e); } } } diff --git a/aai-traversal/src/main/resources/docker/Dockerfile b/aai-traversal/src/main/resources/docker/Dockerfile index 66cf412..ef0854e 100644 --- a/aai-traversal/src/main/resources/docker/Dockerfile +++ b/aai-traversal/src/main/resources/docker/Dockerfile @@ -20,7 +20,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 RUN if [ ! -z ${HTTP_PROXY} ]; then echo "Acquire::http::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; fi && \ if [ ! -z ${HTTP_PROXY} ]; then echo "Acquire::https::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; fi && \ apt-get update && \ - apt-get install -y software-properties-common && \ + apt-get install -y software-properties-common uuid-runtime && \ apt-get install --reinstall ca-certificates && \ sudo -E add-apt-repository ppa:openjdk-r/ppa && \ apt-get update && \ diff --git a/aai-traversal/src/main/resources/docker/docker-entrypoint.sh b/aai-traversal/src/main/resources/docker/docker-entrypoint.sh index d776343..0f14860 100644 --- a/aai-traversal/src/main/resources/docker/docker-entrypoint.sh +++ b/aai-traversal/src/main/resources/docker/docker-entrypoint.sh @@ -18,17 +18,39 @@ # ============LICENSE_END========================================================= ### -cd /opt/app/aai-traversal; +cd /var/chef; -TITAN_CACHED="/opt/app/aai-traversal/bundleconfig/etc/appprops/titan-cached.properties"; -TITAN_REALTIME="/opt/app/aai-traversal/bundleconfig/etc/appprops/titan-realtime.properties"; -SERVER_HOST=${SERVER_HOST:-localhost}; -SERVER_TABLE=${SERVER_TABLE:-aaigraph-dev02}; +CHEF_CONFIG_REPO=${CHEF_CONFIG_REPO:-aai-config}; -sed -i 's/^storage.backend=inmemory/storage.backend=hbase/g' $TITAN_CACHED $TITAN_REALTIME; -sed -i "s/^storage.hostname=.*$/storage.hostname=${SERVER_HOST}/g" $TITAN_CACHED $TITAN_REALTIME; -sed -i "s/^storage.hbase.table=.*$/storage.hbase.table=${SERVER_TABLE}/g" $TITAN_CACHED $TITAN_REALTIME; +CHEF_GIT_URL=${CHEF_GIT_URL:-http://nexus.onap.org/r/aai}; -/opt/app/aai-traversal/bin/createDBSchema.sh; +CHEF_CONFIG_GIT_URL=${CHEF_CONFIG_GIT_URL:-$CHEF_GIT_URL}; +CHEF_DATA_GIT_URL=${CHEF_DATA_GIT_URL:-$CHEF_GIT_URL}; + +if [ ! -d "aai-config" ]; then + + git clone --depth 1 -b ${CHEF_BRANCH} --single-branch ${CHEF_CONFIG_GIT_URL}/${CHEF_CONFIG_REPO}.git aai-config || { + echo "Error: Unable to clone the aai-config repo with url: ${CHEF_GIT_URL}/${CHEF_CONFIG_REPO}.git"; + exit; + } + + (cd aai-config/cookbooks/${project.artifactId}/ && \ + for f in $(ls); do mv $f ../; done && \ + cd ../ && rmdir ${project.artifactId}); +fi + +if [ ! -d "aai-data" ]; then + + git clone --depth 1 -b ${CHEF_BRANCH} --single-branch ${CHEF_DATA_GIT_URL}/aai-data.git aai-data || { + echo "Error: Unable to clone the aai-data repo with url: ${CHEF_GIT_URL}"; + exit; + } + +fi + +chef-solo \ + -c /var/chef/aai-data/chef-config/dev/.knife/solo.rb \ + -j /var/chef/aai-config/cookbooks/runlist-${project.artifactId}.json \ + -E ${AAI_CHEF_ENV}; java -cp ${CLASSPATH}:/opt/app/commonLibs/*:/opt/app/aai-traversal/etc:/opt/app/aai-traversal/lib/*:/opt/app/aai-traversal/extJars/logback-access-1.1.7.jar:/opt/app/aai-traversal/extJars/logback-core-1.1.7.jar:/opt/app/aai-traversal/extJars/aai-core-${AAI_CORE_VERSION}.jar -server -XX:NewSize=512m -XX:MaxNewSize=512m -XX:SurvivorRatio=8 -XX:+DisableExplicitGC -verbose:gc -XX:+UseParNewGC -XX:+CMSParallelRemarkEnabled -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseBiasedLocking -XX:ParallelGCThreads=4 -XX:LargePageSizeInBytes=128m -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Dsun.net.inetaddr.ttl=180 -XX:+HeapDumpOnOutOfMemoryError -Dhttps.protocols=TLSv1.1,TLSv1.2 -DSOACLOUD_SERVICE_VERSION=1.0.1 -DAJSC_HOME=/opt/app/aai-traversal/ -DAJSC_CONF_HOME=/opt/app/aai-traversal/bundleconfig -DAJSC_SHARED_CONFIG=/opt/app/aai-traversal/bundleconfig -DAFT_HOME=/opt/app/aai-traversal -DAAI_CORE_VERSION=${AAI_CORE_VERSION} -Daai-core.version=${AAI_CORE_VERSION} -Dlogback.configurationFile=/opt/app/aai-traversal/bundleconfig/etc/logback.xml -Xloggc:/opt/app/aai-traversal/logs/ajsc-jetty/gc/graph-query_gc.log com.att.ajsc.runner.Runner context=/ port=8086 sslport=8446 diff --git a/aai-traversal/src/test/resources/logback.xml b/aai-traversal/src/test/resources/logback.xml index 735e70d..042f052 100644 --- a/aai-traversal/src/test/resources/logback.xml +++ b/aai-traversal/src/test/resources/logback.xml @@ -204,45 +204,6 @@ <logger name="ch.qos.logback.classic" level="INFO" /> <logger name="ch.qos.logback.core" level="INFO" /> - <!-- logback jms appenders & loggers definition starts here --> - - <if condition='property("JMS_BROKER").contains("WMQ")'> - <then> - <appender name="Audit-Record-Queue" class="ajsc.JMSQueueAppender"> - <param name="InitialContextFactoryName" value="${JMS_WMQ_INITIAL_CONNECTION_FACTORY_NAME}" /> - <param name="ProviderURL" value="${JMS_WMQ_PROVIDER_URL}" /> - <param name="DestinationName" value="${JMS_WMQ_AUDIT_DESTINATION_NAME}" /> - <param name="ConnectionFactoryName" value="${JMS_WMQ_CONNECTION_FACTORY_NAME}" /> - </appender> - <appender name="Performance-Tracker-Queue" class="ajsc.JMSQueueAppender"> - <param name="InitialContextFactoryName" value="${JMS_WMQ_INITIAL_CONNECTION_FACTORY_NAME}" /> - <param name="ProviderURL" value="${JMS_WMQ_PROVIDER_URL}" /> - <param name="DestinationName" value="${JMS_WMQ_PERF_DESTINATION_NAME}" /> - <param name="ConnectionFactoryName" value="${JMS_WMQ_CONNECTION_FACTORY_NAME}" /> - </appender> - </then> - <else> <!-- logback jms appenders definition starts here --> - <appender name="Audit-Record-Queue" class="ajsc.JMSQueueAppender"> - <param name="InitialContextFactoryName" - value="com.tibco.tibjms.naming.TibjmsInitialContextFactory" /> - <param name="ProviderURL" value="${JMS_TIBCO_PROVIDER_URL}" /> - <param name="userName" value="${JMS_LOGGER_USER_NAME}" /> - <param name="password" value="${JMS_LOGGER_PASSWORD}" /> - <QueueBindingName>${JMS_LOGGER_AUDIT_QUEUE_BINDING} - </QueueBindingName> - </appender> - <appender name="Performance-Tracker-Queue" class="ajsc.JMSQueueAppender"> - <param name="InitialContextFactoryName" - value="com.tibco.tibjms.naming.TibjmsInitialContextFactory" /> - <param name="ProviderURL" value="${JMS_TIBCO_PROVIDER_URL}" /> - <param name="userName" value="${JMS_LOGGER_USER_NAME}" /> - <param name="password" value="${JMS_LOGGER_PASSWORD}" /> - <QueueBindingName>${JMS_LOGGER_PERF_QUEUE_BINDING} - </QueueBindingName> - </appender> - </else> - </if> - <appender name="ASYNC-audit" class="ch.qos.logback.classic.AsyncAppender"> <queueSize>1000</queueSize> <discardingThreshold>0</discardingThreshold> |