diff options
| author |   Arul.Nambi <arul.nambi@amdocs.com> | 2017-10-11 18:19:37 -0400 |
|---|---|---|
| committer | Arul.Nambi <arul.nambi@amdocs.com> | 2017-10-11 18:20:05 -0400 |
| commit | e1a380a1311471e972a7196c50c25ed1ef7c25e1 (patch) | |
| tree | 2654c0fe4ae29a9113b8de62d5fd67e121e6cd24 /src | |
| parent | 57ebc748b30fc61ea3bee40abf0fd8b41b785088 (diff) | |
Increase junit coverage
Issue-ID: AAI-429
Change-Id: Idd0f52e6b74a2689824dc671d37fe25ccf3e781c
Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
Diffstat (limited to 'src')
68 files changed, 3763 insertions, 163 deletions
diff --git a/src/main/java/org/onap/aai/sparky/HelloWorld.java b/src/main/java/org/onap/aai/sparky/HelloWorld.java deleted file mode 100644 index 30d277d..0000000 --- a/src/main/java/org/onap/aai/sparky/HelloWorld.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * ============LICENSE_START======================================================= - * org.onap.aai - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. - */ -package org.onap.aai.sparky; - -import org.apache.camel.Exchange; - -/** - * The Class HelloWorld. - */ -public class HelloWorld { - - /** - * Instantiates a new hello world. - */ - public HelloWorld() {} - - /** - * Speak. - * - * @param exc the exc - */ - public final void speak(Exchange exc) { - exc.setOut(exc.getIn()); - exc.getOut().setBody("Hello World!"); - } -} diff --git a/src/main/java/org/onap/aai/sparky/analytics/AbstractStatistics.java b/src/main/java/org/onap/aai/sparky/analytics/AbstractStatistics.java index 3fccab3..aff70ae 100644 --- a/src/main/java/org/onap/aai/sparky/analytics/AbstractStatistics.java +++ b/src/main/java/org/onap/aai/sparky/analytics/AbstractStatistics.java @@ -31,6 +31,34 @@ import java.util.concurrent.atomic.AtomicInteger; public class AbstractStatistics implements ComponentStatistics { private HashMap<String, AtomicInteger> namedCounters; + /** + * @return the namedCounters + */ + public HashMap<String, AtomicInteger> getNamedCounters() { + return namedCounters; + } + + /** + * @param namedCounters the namedCounters to set + */ + public void setNamedCounters(HashMap<String, AtomicInteger> namedCounters) { + this.namedCounters = namedCounters; + } + + /** + * @return the namedHistograms + */ + public HashMap<String, HistogramSampler> getNamedHistograms() { + return namedHistograms; + } + + /** + * @param namedHistograms the namedHistograms to set + */ + public void setNamedHistograms(HashMap<String, HistogramSampler> namedHistograms) { + this.namedHistograms = namedHistograms; + } + private HashMap<String, HistogramSampler> namedHistograms; /** diff --git a/src/main/java/org/onap/aai/sparky/analytics/HistoricalCounter.java b/src/main/java/org/onap/aai/sparky/analytics/HistoricalCounter.java index e7dabe7..47565ac 100644 --- a/src/main/java/org/onap/aai/sparky/analytics/HistoricalCounter.java +++ b/src/main/java/org/onap/aai/sparky/analytics/HistoricalCounter.java @@ -33,6 +33,62 @@ public class HistoricalCounter { private double min; + /** + * @return the totalOfSamples + */ + public double getTotalOfSamples() { + return totalOfSamples; + } + + /** + * @param totalOfSamples the totalOfSamples to set + */ + public void setTotalOfSamples(double totalOfSamples) { + this.totalOfSamples = totalOfSamples; + } + + /** + * @return the maintainSingleValue + */ + public boolean isMaintainSingleValue() { + return maintainSingleValue; + } + + /** + * @param maintainSingleValue the maintainSingleValue to set + */ + public void setMaintainSingleValue(boolean maintainSingleValue) { + this.maintainSingleValue = maintainSingleValue; + } + + /** + * @param min the min to set + */ + public void setMin(double min) { + this.min = min; + } + + /** + * @param max the max to set + */ + public void setMax(double max) { + this.max = max; + } + + /** + * @param numSamples the numSamples to set + */ + public void setNumSamples(long numSamples) { + this.numSamples = numSamples; + } + + /** + * @param value the value to set + */ + public void setValue(double value) { + this.value = value; + } + private double max; private double totalOfSamples; diff --git a/src/main/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryRestConfig.java b/src/main/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryRestConfig.java index a99e6c3..4f6fdee 100644 --- a/src/main/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryRestConfig.java +++ b/src/main/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryRestConfig.java @@ -36,6 +36,27 @@ public class ActiveInventoryRestConfig { private String host; + /** + * @return the cacheFailures + */ + public boolean isCacheFailures() { + return cacheFailures; + } + + /** + * @param cacheFailures the cacheFailures to set + */ + public void setCacheFailures(boolean cacheFailures) { + this.cacheFailures = cacheFailures; + } + + /** + * @param shallowEntities the shallowEntities to set + */ + public void setShallowEntities(List<String> shallowEntities) { + this.shallowEntities = shallowEntities; + } + private String port; private int connectTimeoutInMs; diff --git a/src/main/java/org/onap/aai/sparky/dal/aai/config/ActiveInventorySslConfig.java b/src/main/java/org/onap/aai/sparky/dal/aai/config/ActiveInventorySslConfig.java index 230c445..98e3eed 100644 --- a/src/main/java/org/onap/aai/sparky/dal/aai/config/ActiveInventorySslConfig.java +++ b/src/main/java/org/onap/aai/sparky/dal/aai/config/ActiveInventorySslConfig.java @@ -198,6 +198,20 @@ public class ActiveInventorySslConfig { return "Basic " + java.util.Base64.getEncoder().encodeToString(usernameAndPassword.getBytes()); } + /** + * @return the enableSslDebug + */ + public boolean isEnableSslDebug() { + return enableSslDebug; + } + + /** + * @param enableSslDebug the enableSslDebug to set + */ + public void setEnableSslDebug(boolean enableSslDebug) { + this.enableSslDebug = enableSslDebug; + } + /* (non-Javadoc) * @see java.lang.Object#toString() */ diff --git a/src/main/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchAdapter.java b/src/main/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchAdapter.java index d99d51e..19bcf1a 100644 --- a/src/main/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchAdapter.java +++ b/src/main/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchAdapter.java @@ -159,4 +159,25 @@ public class ElasticSearchAdapter implements ElasticSearchDataProvider { return doGet( url, "application/json"); } + /** + * @return the bulkImportIndexTemplate + */ + public static String getBulkImportIndexTemplate() { + return BULK_IMPORT_INDEX_TEMPLATE; + } + + /** + * @return the restDataProvider + */ + public RestDataProvider getRestDataProvider() { + return restDataProvider; + } + + /** + * @return the esConfig + */ + public ElasticSearchConfig getEsConfig() { + return esConfig; + } + } diff --git a/src/main/java/org/onap/aai/sparky/dal/elasticsearch/SearchAdapter.java b/src/main/java/org/onap/aai/sparky/dal/elasticsearch/SearchAdapter.java index 59c0e5b..0682867 100644 --- a/src/main/java/org/onap/aai/sparky/dal/elasticsearch/SearchAdapter.java +++ b/src/main/java/org/onap/aai/sparky/dal/elasticsearch/SearchAdapter.java @@ -53,6 +53,41 @@ public class SearchAdapter { private RestClient client; + /** + * @return the client + */ + public RestClient getClient() { + return client; + } + + /** + * @param client the client to set + */ + public void setClient(RestClient client) { + this.client = client; + } + + /** + * @return the commonHeaders + */ + public Map<String, List<String>> getCommonHeaders() { + return commonHeaders; + } + + /** + * @param commonHeaders the commonHeaders to set + */ + public void setCommonHeaders(Map<String, List<String>> commonHeaders) { + this.commonHeaders = commonHeaders; + } + + /** + * @return the log + */ + public static Logger getLog() { + return LOG; + } + private Map<String, List<String>> commonHeaders; private SearchServiceConfig sasConfig; diff --git a/src/main/java/org/onap/aai/sparky/dal/elasticsearch/config/ElasticSearchConfig.java b/src/main/java/org/onap/aai/sparky/dal/elasticsearch/config/ElasticSearchConfig.java index 2fe6bb6..f8385a1 100644 --- a/src/main/java/org/onap/aai/sparky/dal/elasticsearch/config/ElasticSearchConfig.java +++ b/src/main/java/org/onap/aai/sparky/dal/elasticsearch/config/ElasticSearchConfig.java @@ -505,6 +505,125 @@ public class ElasticSearchConfig { } + /** + * @return the instance + */ + public static ElasticSearchConfig getInstance() { + return instance; + } + + /** + * @param instance the instance to set + */ + public static void setInstance(ElasticSearchConfig instance) { + ElasticSearchConfig.instance = instance; + } + + /** + * @return the configFile + */ + public static String getConfigFile() { + return CONFIG_FILE; + } + + /** + * @return the ipAddressDefault + */ + public static String getIpAddressDefault() { + return IP_ADDRESS_DEFAULT; + } + + /** + * @return the httpPortDefault + */ + public static String getHttpPortDefault() { + return HTTP_PORT_DEFAULT; + } + + /** + * @return the javaApiPortDefault + */ + public static String getJavaApiPortDefault() { + return JAVA_API_PORT_DEFAULT; + } + + /** + * @return the typeDefault + */ + public static String getTypeDefault() { + return TYPE_DEFAULT; + } + + /** + * @return the clusterNameDefault + */ + public static String getClusterNameDefault() { + return CLUSTER_NAME_DEFAULT; + } + + /** + * @return the indexNameDefault + */ + public static String getIndexNameDefault() { + return INDEX_NAME_DEFAULT; + } + + /** + * @return the auditIndexNameDefault + */ + public static String getAuditIndexNameDefault() { + return AUDIT_INDEX_NAME_DEFAULT; + } + + /** + * @return the topographicalIndexNameDefault + */ + public static String getTopographicalIndexNameDefault() { + return TOPOGRAPHICAL_INDEX_NAME_DEFAULT; + } + + /** + * @return the entityCountHistoryIndexNameDefault + */ + public static String getEntityCountHistoryIndexNameDefault() { + return ENTITY_COUNT_HISTORY_INDEX_NAME_DEFAULT; + } + + /** + * @return the entityAutoSuggestIndexNameDefault + */ + public static String getEntityAutoSuggestIndexNameDefault() { + return ENTITY_AUTO_SUGGEST_INDEX_NAME_DEFAULT; + } + + /** + * @return the entityAutoSuggestSettingsFileDefault + */ + public static String getEntityAutoSuggestSettingsFileDefault() { + return ENTITY_AUTO_SUGGEST_SETTINGS_FILE_DEFAULT; + } + + /** + * @return the entityAutoSuggestMappingsFileDefault + */ + public static String getEntityAutoSuggestMappingsFileDefault() { + return ENTITY_AUTO_SUGGEST_MAPPINGS_FILE_DEFAULT; + } + + /** + * @return the entityDynamicMappingsFileDefault + */ + public static String getEntityDynamicMappingsFileDefault() { + return ENTITY_DYNAMIC_MAPPINGS_FILE_DEFAULT; + } + + /** + * @return the bulkApi + */ + public static String getBulkApi() { + return BULK_API; + } + /* * (non-Javadoc) * diff --git a/src/main/java/org/onap/aai/sparky/security/portal/PortalRestAPIServiceImpl.java b/src/main/java/org/onap/aai/sparky/security/portal/PortalRestAPIServiceImpl.java index 79e9344..798022a 100644 --- a/src/main/java/org/onap/aai/sparky/security/portal/PortalRestAPIServiceImpl.java +++ b/src/main/java/org/onap/aai/sparky/security/portal/PortalRestAPIServiceImpl.java @@ -48,6 +48,34 @@ public class PortalRestAPIServiceImpl implements IPortalRestAPIService { private static final Logger LOG = LoggerFactory.getLogger(PortalRestAPIServiceImpl.class); private static final String ERROR_MESSAGE = "Failed to {0} user [loginId:{1}]"; + /** + * @return the userManager + */ + public UserManager getUserManager() { + return userManager; + } + + /** + * @param userManager the userManager to set + */ + public void setUserManager(UserManager userManager) { + this.userManager = userManager; + } + + /** + * @return the log + */ + public static Logger getLog() { + return LOG; + } + + /** + * @return the errorMessage + */ + public static String getErrorMessage() { + return ERROR_MESSAGE; + } + private UserManager userManager; /** diff --git a/src/main/java/org/onap/aai/sparky/synchronizer/ElasticSearchIndexCleaner.java b/src/main/java/org/onap/aai/sparky/synchronizer/ElasticSearchIndexCleaner.java index 842a416..cf18433 100644 --- a/src/main/java/org/onap/aai/sparky/synchronizer/ElasticSearchIndexCleaner.java +++ b/src/main/java/org/onap/aai/sparky/synchronizer/ElasticSearchIndexCleaner.java @@ -635,6 +635,153 @@ public class ElasticSearchIndexCleaner implements IndexCleaner { } + /** + * @return the before + */ + public ObjectIdCollection getBefore() { + return before; + } + + /** + * @param before the before to set + */ + public void setBefore(ObjectIdCollection before) { + this.before = before; + } + + /** + * @return the after + */ + public ObjectIdCollection getAfter() { + return after; + } + + /** + * @param after the after to set + */ + public void setAfter(ObjectIdCollection after) { + this.after = after; + } + + /** + * @return the host + */ + public String getHost() { + return host; + } + + /** + * @param host the host to set + */ + public void setHost(String host) { + this.host = host; + } + + /** + * @return the port + */ + public String getPort() { + return port; + } + + /** + * @param port the port to set + */ + public void setPort(String port) { + this.port = port; + } + + /** + * @return the indexType + */ + public String getIndexType() { + return indexType; + } + + /** + * @param indexType the indexType to set + */ + public void setIndexType(String indexType) { + this.indexType = indexType; + } + + /** + * @return the scrollContextTimeToLiveInMinutes + */ + public int getScrollContextTimeToLiveInMinutes() { + return scrollContextTimeToLiveInMinutes; + } + + /** + * @param scrollContextTimeToLiveInMinutes the scrollContextTimeToLiveInMinutes to set + */ + public void setScrollContextTimeToLiveInMinutes(int scrollContextTimeToLiveInMinutes) { + this.scrollContextTimeToLiveInMinutes = scrollContextTimeToLiveInMinutes; + } + + /** + * @return the numItemsToGetBulkRequest + */ + public int getNumItemsToGetBulkRequest() { + return numItemsToGetBulkRequest; + } + + /** + * @param numItemsToGetBulkRequest the numItemsToGetBulkRequest to set + */ + public void setNumItemsToGetBulkRequest(int numItemsToGetBulkRequest) { + this.numItemsToGetBulkRequest = numItemsToGetBulkRequest; + } + + /** + * @return the restDataProvider + */ + public RestDataProvider getRestDataProvider() { + return restDataProvider; + } + + /** + * @param restDataProvider the restDataProvider to set + */ + public void setRestDataProvider(RestDataProvider restDataProvider) { + this.restDataProvider = restDataProvider; + } + + /** + * @return the mapper + */ + public ObjectMapper getMapper() { + return mapper; + } + + /** + * @param mapper the mapper to set + */ + public void setMapper(ObjectMapper mapper) { + this.mapper = mapper; + } + + /** + * @return the log + */ + public static Logger getLog() { + return LOG; + } + + /** + * @return the bulkOpLineTemplate + */ + public static String getBulkOpLineTemplate() { + return BULK_OP_LINE_TEMPLATE; + } + + /** + * @return the timestampFormat + */ + public static String getTimestampFormat() { + return TIMESTAMP_FORMAT; + } + /* */ diff --git a/src/main/java/org/onap/aai/sparky/synchronizer/IndexIntegrityValidator.java b/src/main/java/org/onap/aai/sparky/synchronizer/IndexIntegrityValidator.java index 492fddf..0c342bc 100644 --- a/src/main/java/org/onap/aai/sparky/synchronizer/IndexIntegrityValidator.java +++ b/src/main/java/org/onap/aai/sparky/synchronizer/IndexIntegrityValidator.java @@ -39,6 +39,62 @@ public class IndexIntegrityValidator implements IndexValidator { LoggerFactory.getInstance().getLogger(IndexIntegrityValidator.class); private String host; + /** + * @return the host + */ + public String getHost() { + return host; + } + + /** + * @param host the host to set + */ + public void setHost(String host) { + this.host = host; + } + + /** + * @return the port + */ + public String getPort() { + return port; + } + + /** + * @param port the port to set + */ + public void setPort(String port) { + this.port = port; + } + + /** + * @return the tableConfigJson + */ + public String getTableConfigJson() { + return tableConfigJson; + } + + /** + * @param tableConfigJson the tableConfigJson to set + */ + public void setTableConfigJson(String tableConfigJson) { + this.tableConfigJson = tableConfigJson; + } + + /** + * @return the log + */ + public static Logger getLog() { + return LOG; + } + + /** + * @return the restDataProvider + */ + public RestDataProvider getRestDataProvider() { + return restDataProvider; + } + private String port; private String indexName; private String indexType; diff --git a/src/main/java/org/onap/aai/sparky/synchronizer/MyErrorHandler.java b/src/main/java/org/onap/aai/sparky/synchronizer/MyErrorHandler.java index 90665aa..78b6627 100644 --- a/src/main/java/org/onap/aai/sparky/synchronizer/MyErrorHandler.java +++ b/src/main/java/org/onap/aai/sparky/synchronizer/MyErrorHandler.java @@ -37,6 +37,20 @@ public class MyErrorHandler implements ErrorHandler { private PrintWriter out; /** + * @return the out + */ + public PrintWriter getOut() { + return out; + } + + /** + * @param out the out to set + */ + public void setOut(PrintWriter out) { + this.out = out; + } + + /** * Instantiates a new my error handler. * * @param out the out diff --git a/src/main/java/org/onap/aai/sparky/synchronizer/TaskProcessingStats.java b/src/main/java/org/onap/aai/sparky/synchronizer/TaskProcessingStats.java index ea0c2d2..ef53a75 100644 --- a/src/main/java/org/onap/aai/sparky/synchronizer/TaskProcessingStats.java +++ b/src/main/java/org/onap/aai/sparky/synchronizer/TaskProcessingStats.java @@ -129,5 +129,61 @@ public class TaskProcessingStats extends AbstractStatistics { } + /** + * @return the tASK_AGE_STATS + */ + public static String getTASK_AGE_STATS() { + return TASK_AGE_STATS; + } + + /** + * @param tASK_AGE_STATS the tASK_AGE_STATS to set + */ + public static void setTASK_AGE_STATS(String tASK_AGE_STATS) { + TASK_AGE_STATS = tASK_AGE_STATS; + } + + /** + * @return the tASK_RESPONSE_STATS + */ + public static String getTASK_RESPONSE_STATS() { + return TASK_RESPONSE_STATS; + } + + /** + * @param tASK_RESPONSE_STATS the tASK_RESPONSE_STATS to set + */ + public static void setTASK_RESPONSE_STATS(String tASK_RESPONSE_STATS) { + TASK_RESPONSE_STATS = tASK_RESPONSE_STATS; + } + + /** + * @return the rESPONSE_SIZE_IN_BYTES + */ + public static String getRESPONSE_SIZE_IN_BYTES() { + return RESPONSE_SIZE_IN_BYTES; + } + + /** + * @param rESPONSE_SIZE_IN_BYTES the rESPONSE_SIZE_IN_BYTES to set + */ + public static void setRESPONSE_SIZE_IN_BYTES(String rESPONSE_SIZE_IN_BYTES) { + RESPONSE_SIZE_IN_BYTES = rESPONSE_SIZE_IN_BYTES; + } + + /** + * @return the tPS + */ + public static String getTPS() { + return TPS; + } + + /** + * @param tPS the tPS to set + */ + public static void setTPS(String tPS) { + TPS = tPS; + } + } diff --git a/src/main/java/org/onap/aai/sparky/synchronizer/config/SynchronizerConfiguration.java b/src/main/java/org/onap/aai/sparky/synchronizer/config/SynchronizerConfiguration.java index 2285950..914629f 100644 --- a/src/main/java/org/onap/aai/sparky/synchronizer/config/SynchronizerConfiguration.java +++ b/src/main/java/org/onap/aai/sparky/synchronizer/config/SynchronizerConfiguration.java @@ -453,6 +453,62 @@ public class SynchronizerConfiguration { return syncTime.getTimeInMillis(); } + /** + * @return the instance + */ + public static SynchronizerConfiguration getInstance() { + return instance; + } + + /** + * @param instance the instance to set + */ + public static void setInstance(SynchronizerConfiguration instance) { + SynchronizerConfiguration.instance = instance; + } + + /** + * @return the log + */ + public static Logger getLog() { + return LOG; + } + + /** + * @return the configFile + */ + public static String getConfigFile() { + return CONFIG_FILE; + } + + /** + * @return the depthModifier + */ + public static String getDepthModifier() { + return DEPTH_MODIFIER; + } + + /** + * @return the depthAllModifier + */ + public static String getDepthAllModifier() { + return DEPTH_ALL_MODIFIER; + } + + /** + * @return the depthAndNodesOnlyModifier + */ + public static String getDepthAndNodesOnlyModifier() { + return DEPTH_AND_NODES_ONLY_MODIFIER; + } + + /** + * @return the nodesOnlyModifier + */ + public static String getNodesOnlyModifier() { + return NODES_ONLY_MODIFIER; + } + /* (non-Javadoc) * @see java.lang.Object#toString() */ diff --git a/src/main/java/org/onap/aai/sparky/synchronizer/filter/ElasticSearchSynchronizerFilter.java b/src/main/java/org/onap/aai/sparky/synchronizer/filter/ElasticSearchSynchronizerFilter.java index d5c2c12..b001abb 100644 --- a/src/main/java/org/onap/aai/sparky/synchronizer/filter/ElasticSearchSynchronizerFilter.java +++ b/src/main/java/org/onap/aai/sparky/synchronizer/filter/ElasticSearchSynchronizerFilter.java @@ -104,4 +104,25 @@ public class ElasticSearchSynchronizerFilter implements Filter { } + /** + * @return the syncHelper + */ + public SyncHelper getSyncHelper() { + return syncHelper; + } + + /** + * @param syncHelper the syncHelper to set + */ + public void setSyncHelper(SyncHelper syncHelper) { + this.syncHelper = syncHelper; + } + + /** + * @return the log + */ + public static Logger getLog() { + return LOG; + } + } diff --git a/src/main/java/org/onap/aai/sparky/synchronizer/task/CollectEntitySelfLinkTask.java b/src/main/java/org/onap/aai/sparky/synchronizer/task/CollectEntitySelfLinkTask.java index 3dfef93..34561a6 100644 --- a/src/main/java/org/onap/aai/sparky/synchronizer/task/CollectEntitySelfLinkTask.java +++ b/src/main/java/org/onap/aai/sparky/synchronizer/task/CollectEntitySelfLinkTask.java @@ -71,4 +71,32 @@ public class CollectEntitySelfLinkTask implements Supplier<NetworkTransaction> { return txn; } + /** + * @return the txn + */ + public NetworkTransaction getTxn() { + return txn; + } + + /** + * @param txn the txn to set + */ + public void setTxn(NetworkTransaction txn) { + this.txn = txn; + } + + /** + * @return the provider + */ + public ActiveInventoryDataProvider getProvider() { + return provider; + } + + /** + * @param provider the provider to set + */ + public void setProvider(ActiveInventoryDataProvider provider) { + this.provider = provider; + } + } diff --git a/src/main/java/org/onap/aai/sparky/synchronizer/task/CollectEntityTypeSelfLinksTask.java b/src/main/java/org/onap/aai/sparky/synchronizer/task/CollectEntityTypeSelfLinksTask.java index de3f971..9368881 100644 --- a/src/main/java/org/onap/aai/sparky/synchronizer/task/CollectEntityTypeSelfLinksTask.java +++ b/src/main/java/org/onap/aai/sparky/synchronizer/task/CollectEntityTypeSelfLinksTask.java @@ -72,4 +72,32 @@ public class CollectEntityTypeSelfLinksTask implements Supplier<NetworkTransacti return txn; } + /** + * @return the aaiProvider + */ + public ActiveInventoryDataProvider getAaiProvider() { + return aaiProvider; + } + + /** + * @param aaiProvider the aaiProvider to set + */ + public void setAaiProvider(ActiveInventoryDataProvider aaiProvider) { + this.aaiProvider = aaiProvider; + } + + /** + * @return the txn + */ + public NetworkTransaction getTxn() { + return txn; + } + + /** + * @param txn the txn to set + */ + public void setTxn(NetworkTransaction txn) { + this.txn = txn; + } + } diff --git a/src/main/java/org/onap/aai/sparky/synchronizer/task/GetCrossEntityReferenceEntityTask.java b/src/main/java/org/onap/aai/sparky/synchronizer/task/GetCrossEntityReferenceEntityTask.java index d9e889d..7c58147 100644 --- a/src/main/java/org/onap/aai/sparky/synchronizer/task/GetCrossEntityReferenceEntityTask.java +++ b/src/main/java/org/onap/aai/sparky/synchronizer/task/GetCrossEntityReferenceEntityTask.java @@ -72,4 +72,32 @@ public class GetCrossEntityReferenceEntityTask implements Supplier<NetworkTransa return txn; } + /** + * @return the txn + */ + public NetworkTransaction getTxn() { + return txn; + } + + /** + * @param txn the txn to set + */ + public void setTxn(NetworkTransaction txn) { + this.txn = txn; + } + + /** + * @return the provider + */ + public ActiveInventoryDataProvider getProvider() { + return provider; + } + + /** + * @param provider the provider to set + */ + public void setProvider(ActiveInventoryDataProvider provider) { + this.provider = provider; + } + } diff --git a/src/main/java/org/onap/aai/sparky/synchronizer/task/PerformActiveInventoryRetrieval.java b/src/main/java/org/onap/aai/sparky/synchronizer/task/PerformActiveInventoryRetrieval.java index 53c17e2..cde59d3 100644 --- a/src/main/java/org/onap/aai/sparky/synchronizer/task/PerformActiveInventoryRetrieval.java +++ b/src/main/java/org/onap/aai/sparky/synchronizer/task/PerformActiveInventoryRetrieval.java @@ -87,4 +87,60 @@ public class PerformActiveInventoryRetrieval implements Supplier<NetworkTransact return txn; } + /** + * @return the logger + */ + public static Logger getLogger() { + return logger; + } + + /** + * @param logger the logger to set + */ + public static void setLogger(Logger logger) { + PerformActiveInventoryRetrieval.logger = logger; + } + + /** + * @return the txn + */ + public NetworkTransaction getTxn() { + return txn; + } + + /** + * @param txn the txn to set + */ + public void setTxn(NetworkTransaction txn) { + this.txn = txn; + } + + /** + * @return the aaiProvider + */ + public ActiveInventoryDataProvider getAaiProvider() { + return aaiProvider; + } + + /** + * @param aaiProvider the aaiProvider to set + */ + public void setAaiProvider(ActiveInventoryDataProvider aaiProvider) { + this.aaiProvider = aaiProvider; + } + + /** + * @return the contextMap + */ + public Map<String, String> getContextMap() { + return contextMap; + } + + /** + * @param contextMap the contextMap to set + */ + public void setContextMap(Map<String, String> contextMap) { + this.contextMap = contextMap; + } + } diff --git a/src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchPut.java b/src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchPut.java index 241a64d..c3ce3f5 100644 --- a/src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchPut.java +++ b/src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchPut.java @@ -79,4 +79,60 @@ public class PerformElasticSearchPut implements Supplier<NetworkTransaction> { return txn; } + + /** + * @return the restDataProvider + */ + public RestDataProvider getRestDataProvider() { + return restDataProvider; + } + + /** + * @param restDataProvider the restDataProvider to set + */ + public void setRestDataProvider(RestDataProvider restDataProvider) { + this.restDataProvider = restDataProvider; + } + + /** + * @return the jsonPayload + */ + public String getJsonPayload() { + return jsonPayload; + } + + /** + * @param jsonPayload the jsonPayload to set + */ + public void setJsonPayload(String jsonPayload) { + this.jsonPayload = jsonPayload; + } + + /** + * @return the txn + */ + public NetworkTransaction getTxn() { + return txn; + } + + /** + * @param txn the txn to set + */ + public void setTxn(NetworkTransaction txn) { + this.txn = txn; + } + + /** + * @return the contextMap + */ + public Map<String, String> getContextMap() { + return contextMap; + } + + /** + * @param contextMap the contextMap to set + */ + public void setContextMap(Map<String, String> contextMap) { + this.contextMap = contextMap; + } } diff --git a/src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchRetrieval.java b/src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchRetrieval.java index 1605ee1..b11b023 100644 --- a/src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchRetrieval.java +++ b/src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchRetrieval.java @@ -63,4 +63,46 @@ public class PerformElasticSearchRetrieval implements Supplier<NetworkTransactio return txn; } + /** + * @return the txn + */ + public NetworkTransaction getTxn() { + return txn; + } + + /** + * @param txn the txn to set + */ + public void setTxn(NetworkTransaction txn) { + this.txn = txn; + } + + /** + * @return the restDataProvider + */ + public RestDataProvider getRestDataProvider() { + return restDataProvider; + } + + /** + * @param restDataProvider the restDataProvider to set + */ + public void setRestDataProvider(RestDataProvider restDataProvider) { + this.restDataProvider = restDataProvider; + } + + /** + * @return the contextMap + */ + public Map<String, String> getContextMap() { + return contextMap; + } + + /** + * @param contextMap the contextMap to set + */ + public void setContextMap(Map<String, String> contextMap) { + this.contextMap = contextMap; + } + } diff --git a/src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchUpdate.java b/src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchUpdate.java index 1890032..956fe35 100644 --- a/src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchUpdate.java +++ b/src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchUpdate.java @@ -77,4 +77,74 @@ public class PerformElasticSearchUpdate implements Supplier<NetworkTransaction> return operationTracker; } + /** + * @return the esDataProvider + */ + public ElasticSearchDataProvider getEsDataProvider() { + return esDataProvider; + } + + /** + * @param esDataProvider the esDataProvider to set + */ + public void setEsDataProvider(ElasticSearchDataProvider esDataProvider) { + this.esDataProvider = esDataProvider; + } + + /** + * @return the operationTracker + */ + public NetworkTransaction getOperationTracker() { + return operationTracker; + } + + /** + * @param operationTracker the operationTracker to set + */ + public void setOperationTracker(NetworkTransaction operationTracker) { + this.operationTracker = operationTracker; + } + + /** + * @return the updatePayload + */ + public String getUpdatePayload() { + return updatePayload; + } + + /** + * @param updatePayload the updatePayload to set + */ + public void setUpdatePayload(String updatePayload) { + this.updatePayload = updatePayload; + } + + /** + * @return the updateUrl + */ + public String getUpdateUrl() { + return updateUrl; + } + + /** + * @param updateUrl the updateUrl to set + */ + public void setUpdateUrl(String updateUrl) { + this.updateUrl = updateUrl; + } + + /** + * @return the contextMap + */ + public Map<String, String> getContextMap() { + return contextMap; + } + + /** + * @param contextMap the contextMap to set + */ + public void setContextMap(Map<String, String> contextMap) { + this.contextMap = contextMap; + } + } diff --git a/src/main/java/org/onap/aai/sparky/synchronizer/task/PersistOperationResultToDisk.java b/src/main/java/org/onap/aai/sparky/synchronizer/task/PersistOperationResultToDisk.java index dee1761..d0a5cc1 100644 --- a/src/main/java/org/onap/aai/sparky/synchronizer/task/PersistOperationResultToDisk.java +++ b/src/main/java/org/onap/aai/sparky/synchronizer/task/PersistOperationResultToDisk.java @@ -80,6 +80,76 @@ public class PersistOperationResultToDisk implements Supplier<Void> { return null; } + /** + * @return the fullPath + */ + public String getFullPath() { + return fullPath; + } + + /** + * @param fullPath the fullPath to set + */ + public void setFullPath(String fullPath) { + this.fullPath = fullPath; + } + + /** + * @return the dataToStore + */ + public OperationResult getDataToStore() { + return dataToStore; + } + + /** + * @param dataToStore the dataToStore to set + */ + public void setDataToStore(OperationResult dataToStore) { + this.dataToStore = dataToStore; + } + + /** + * @return the mapper + */ + public ObjectMapper getMapper() { + return mapper; + } + + /** + * @param mapper the mapper to set + */ + public void setMapper(ObjectMapper mapper) { + this.mapper = mapper; + } + + /** + * @return the logger + */ + public Logger getLogger() { + return logger; + } + + /** + * @param logger the logger to set + */ + public void setLogger(Logger logger) { + this.logger = logger; + } + + /** + * @return the contextMap + */ + public Map<String, String> getContextMap() { + return contextMap; + } + + /** + * @param contextMap the contextMap to set + */ + public void setContextMap(Map<String, String> contextMap) { + this.contextMap = contextMap; + } + } diff --git a/src/main/java/org/onap/aai/sparky/synchronizer/task/RetrieveOperationResultFromDisk.java b/src/main/java/org/onap/aai/sparky/synchronizer/task/RetrieveOperationResultFromDisk.java index e92462a..7087d38 100644 --- a/src/main/java/org/onap/aai/sparky/synchronizer/task/RetrieveOperationResultFromDisk.java +++ b/src/main/java/org/onap/aai/sparky/synchronizer/task/RetrieveOperationResultFromDisk.java @@ -86,4 +86,46 @@ public class RetrieveOperationResultFromDisk implements Supplier<OperationResult return null; } + /** + * @return the fullPath + */ + public String getFullPath() { + return fullPath; + } + + /** + * @param fullPath the fullPath to set + */ + public void setFullPath(String fullPath) { + this.fullPath = fullPath; + } + + /** + * @return the mapper + */ + public ObjectMapper getMapper() { + return mapper; + } + + /** + * @param mapper the mapper to set + */ + public void setMapper(ObjectMapper mapper) { + this.mapper = mapper; + } + + /** + * @return the logger + */ + public Logger getLogger() { + return logger; + } + + /** + * @param logger the logger to set + */ + public void setLogger(Logger logger) { + this.logger = logger; + } + } diff --git a/src/main/java/org/onap/aai/sparky/synchronizer/task/StoreDocumentTask.java b/src/main/java/org/onap/aai/sparky/synchronizer/task/StoreDocumentTask.java index a1c745e..2719d92 100644 --- a/src/main/java/org/onap/aai/sparky/synchronizer/task/StoreDocumentTask.java +++ b/src/main/java/org/onap/aai/sparky/synchronizer/task/StoreDocumentTask.java @@ -38,6 +38,62 @@ public class StoreDocumentTask implements Supplier<NetworkTransaction> { private IndexDocument doc; + /** + * @return the doc + */ + public IndexDocument getDoc() { + return doc; + } + + /** + * @param doc the doc to set + */ + public void setDoc(IndexDocument doc) { + this.doc = doc; + } + + /** + * @return the txn + */ + public NetworkTransaction getTxn() { + return txn; + } + + /** + * @param txn the txn to set + */ + public void setTxn(NetworkTransaction txn) { + this.txn = txn; + } + + /** + * @return the esDataProvider + */ + public RestDataProvider getEsDataProvider() { + return esDataProvider; + } + + /** + * @param esDataProvider the esDataProvider to set + */ + public void setEsDataProvider(RestDataProvider esDataProvider) { + this.esDataProvider = esDataProvider; + } + + /** + * @return the contextMap + */ + public Map<String, String> getContextMap() { + return contextMap; + } + + /** + * @param contextMap the contextMap to set + */ + public void setContextMap(Map<String, String> contextMap) { + this.contextMap = contextMap; + } + private NetworkTransaction txn; private RestDataProvider esDataProvider; diff --git a/src/main/java/org/onap/aai/sparky/util/NodeUtils.java b/src/main/java/org/onap/aai/sparky/util/NodeUtils.java index d15b7ba..3c2466d 100644 --- a/src/main/java/org/onap/aai/sparky/util/NodeUtils.java +++ b/src/main/java/org/onap/aai/sparky/util/NodeUtils.java @@ -68,6 +68,34 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; public class NodeUtils { private static SecureRandom sRandom = new SecureRandom(); + /** + * @return the sRandom + */ + public static SecureRandom getsRandom() { + return sRandom; + } + + /** + * @param sRandom the sRandom to set + */ + public static void setsRandom(SecureRandom sRandom) { + NodeUtils.sRandom = sRandom; + } + + /** + * @return the entityResourceKeyFormat + */ + public static String getEntityResourceKeyFormat() { + return ENTITY_RESOURCE_KEY_FORMAT; + } + + /** + * @return the timeBreakDownFormat + */ + public static String getTimeBreakDownFormat() { + return TIME_BREAK_DOWN_FORMAT; + } + public static synchronized String getRandomTxnId(){ byte bytes[] = new byte[6]; sRandom.nextBytes(bytes); diff --git a/src/main/java/org/onap/aai/sparky/util/test/Encryptor.java b/src/main/java/org/onap/aai/sparky/util/test/Encryptor.java new file mode 100644 index 0000000..9dfc933 --- /dev/null +++ b/src/main/java/org/onap/aai/sparky/util/test/Encryptor.java @@ -0,0 +1,84 @@ +/** + * ============LICENSE_START======================================================= + * org.onap.aai + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 Amdocs + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. + */ +package org.onap.aai.sparky.util.test; + +import org.apache.commons.cli.BasicParser; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.CommandLineParser; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.eclipse.jetty.util.security.Password; + +/** + * The Class Encryptor. + */ +public class Encryptor { + + /** + * Instantiates a new encryptor. + */ + public Encryptor() { + } + + /** + * Decrypt value. + * + * @param value the value + * @return the string + */ + public String decryptValue(String value) { + String decyptedValue = ""; + + try { + decyptedValue = Password.deobfuscate(value); + } catch (Exception exc) { + System.err.println("Cannot decrypt '" + value + "': " + exc.toString()); + } + + return decyptedValue; + } + + /** + * Usage. + */ + public static void usage() { + usage(null); + } + + /** + * Usage. + * + * @param msg the msg + */ + public static void usage(String msg) { + if (msg != null) { + System.err.println(msg); + } + System.err.println("Usage: java Encryptor -e value"); + System.err.println("\tEncrypt the given value"); + System.err.println("Usage: java Encryptor -d value"); + System.err.println("\tDecrypt the given value"); + System.exit(1); + } + +} diff --git a/src/main/java/org/onap/aai/sparky/util/test/KeystoreBuilder.java b/src/main/java/org/onap/aai/sparky/util/test/KeystoreBuilder.java new file mode 100644 index 0000000..483c464 --- /dev/null +++ b/src/main/java/org/onap/aai/sparky/util/test/KeystoreBuilder.java @@ -0,0 +1,534 @@ +/** + * ============LICENSE_START======================================================= + * org.onap.aai + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 Amdocs + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. + */ +package org.onap.aai.sparky.util.test; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.UnknownHostException; +import java.security.KeyManagementException; +import java.security.KeyStore; +import java.security.KeyStoreException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; +import java.security.cert.CertificateParsingException; +import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLException; +import javax.net.ssl.SSLSocket; +import javax.net.ssl.SSLSocketFactory; +import javax.net.ssl.TrustManager; +import javax.net.ssl.TrustManagerFactory; +import javax.net.ssl.X509TrustManager; + +/** + * The Class KeystoreBuilder. + */ +public class KeystoreBuilder { + + /** + * The Class EndPoint. + */ + private class EndPoint { + private String hostname; + private int port; + + /** + * Instantiates a new end point. + */ + @SuppressWarnings("unused") + public EndPoint() {} + + /** + * Instantiates a new end point. + * + * @param host the host + * @param port the port + */ + public EndPoint(String host, int port) { + this.hostname = host; + this.port = port; + } + + public String getHostname() { + return hostname; + } + + @SuppressWarnings("unused") + public void setHostname(String hostname) { + this.hostname = hostname; + } + + public int getPort() { + return port; + } + + public void setPort(int port) { + this.port = port; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "EndPoint [hostname=" + hostname + ", port=" + port + "]"; + } + + } + + private List<EndPoint> endpoints = new ArrayList<EndPoint>(); + + /** + * @return the endpoints + */ + public List<EndPoint> getEndpoints() { + return endpoints; + } + + /** + * @param endpoints the endpoints to set + */ + public void setEndpoints(List<EndPoint> endpoints) { + this.endpoints = endpoints; + } + + /** + * Initialize end points list. + * + * @param endpointList the endpoint list + */ + private void initializeEndPointsList(String endpointList) { + String[] endpointUris = endpointList.split(";"); + + for (String endpointUri : endpointUris) { + + String ipAndPort = endpointUri.replaceAll("http://", ""); + ipAndPort = endpointUri.replaceAll("https://", ""); + + // System.out.println("ipAndPortUrl = " + ipAndPort); + + String[] hostAndPort = ipAndPort.split(":"); + + String hostname = hostAndPort[0]; + int port = Integer.parseInt(hostAndPort[1]); + + EndPoint ep = new EndPoint(hostname, port); + endpoints.add(ep); + } + + } + + /** + * Instantiates a new keystore builder. + * + * @param endpointList the endpoint list + * @throws NoSuchAlgorithmException the no such algorithm exception + */ + public KeystoreBuilder(String endpointList) throws NoSuchAlgorithmException { + initializeEndPointsList(endpointList); + sha1 = MessageDigest.getInstance("SHA1"); + md5 = MessageDigest.getInstance("MD5"); + } + + private static final String SEP = File.separator; + private SavingTrustManager savingTrustManager; + private SSLSocketFactory sslSocketFactory; + private MessageDigest sha1; + private MessageDigest md5; + private KeyStore ks; + private String keystoreFileName; + private String keystorePassword; + private boolean dumpCertDetails = false; + + public void setDumpCertDetails(boolean shouldSet) { + dumpCertDetails = shouldSet; + } + + /** + * Update keystore. + * + * @param keystoreFileName the keystore file name + * @param keystorePassword the keystore password + * @throws KeyStoreException the key store exception + * @throws NoSuchAlgorithmException the no such algorithm exception + * @throws CertificateException the certificate exception + * @throws IOException Signals that an I/O exception has occurred. + * @throws KeyManagementException the key management exception + */ + public void updateKeystore(String keystoreFileName, String keystorePassword) + throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException, + KeyManagementException { + + this.keystoreFileName = keystoreFileName; + this.keystorePassword = keystorePassword; + + File file = new File(keystoreFileName); + String password = keystorePassword; + + if (file.isFile() == false) { + + File dir = new File(System.getProperty("java.home") + SEP + "lib" + SEP + "security"); + file = new File(dir, "jssecacerts"); + if (file.isFile() == false) { + + file = new File(dir, "cacerts"); + System.out.println("keystore file doesn't exist, preloading new file with cacerts"); + + } else { + System.out.println("keystore file doesn't exist, preloading new file with jssecacerts"); + } + password = "changeit"; + + } + + InputStream in = new FileInputStream(file); + ks = KeyStore.getInstance(KeyStore.getDefaultType()); + ks.load(in, password.toCharArray()); + in.close(); + + SSLContext context = SSLContext.getInstance("TLS"); + TrustManagerFactory tmf = + TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); + tmf.init(ks); + X509TrustManager defaultTrustManager = (X509TrustManager) tmf.getTrustManagers()[0]; + savingTrustManager = new SavingTrustManager(defaultTrustManager); + context.init(null, new TrustManager[] {savingTrustManager}, null); + sslSocketFactory = context.getSocketFactory(); + + System.out.println("About to add the following endpoint server certificates to the keystore:"); + for (EndPoint ep : endpoints) { + System.out.println("\t--------------------------"); + System.out.println("\t" + ep.toString()); + + X509Certificate[] certChain = + getCertificateChainForRemoteEndpoint(ep.getHostname(), ep.getPort()); + + if (certChain == null) { + System.out.println("Could not obtain server certificate chain"); + return; + } + + dumpCertChainInfo(certChain); + + updateKeyStoreWithCertChain(certChain); + + } + + } + + /** + * Gets the certificate chain for remote endpoint. + * + * @param hostname the hostname + * @param port the port + * @return the certificate chain for remote endpoint + * @throws UnknownHostException the unknown host exception + * @throws IOException Signals that an I/O exception has occurred. + */ + private X509Certificate[] getCertificateChainForRemoteEndpoint(String hostname, int port) + throws UnknownHostException, IOException { + + System.out.println("Opening connection to "+hostname+":"+port+".."); + SSLSocket socket = (SSLSocket) sslSocketFactory.createSocket(hostname, port); + socket.setSoTimeout(10000); + + try { + System.out.println("Starting SSL handshake..."); + socket.startHandshake(); + socket.close(); + System.out.println("\nNo errors, certificate is already trusted"); + System.exit(0); + } catch (SSLException exc) { + System.out.println("\nCaught SSL exception, we are not authorized to access this server yet"); + // e.printStackTrace(System.out); + } + + return savingTrustManager.chain; + + } + + /** + * Dump cert chain info. + * + * @param chain the chain + * @throws NoSuchAlgorithmException the no such algorithm exception + * @throws CertificateEncodingException the certificate encoding exception + * @throws CertificateParsingException the certificate parsing exception + */ + private void dumpCertChainInfo(X509Certificate[] chain) + throws NoSuchAlgorithmException, CertificateEncodingException, CertificateParsingException { + + System.out.println(); + System.out.println("Server sent " + chain.length + " certificate(s):"); + System.out.println(); + + for (int i = 0; i < chain.length; i++) { + X509Certificate cert = chain[i]; + + if (dumpCertDetails) { + System.out.println("Full cert details @ index = " + i + " \n" + cert.toString()); + } + + System.out.println("Subject: " + cert.getSubjectDN()); + System.out.println("Issuer: " + cert.getIssuerDN()); + System.out.println("SubjectAlternativeNames: "); + + /* + * RFC-5280, pg. 38, section 4.2.1.6 ( Subject Alternative Names ) + * + * Finally, the semantics of subject alternative names that include wildcard characters (e.g., + * as a placeholder for a set of names) are not addressed by this specification. Applications + * with specific requirements MAY use such names, but they must define the semantics. + * + * id-ce-subjectAltName OBJECT IDENTIFIER ::= { id-ce 17 } + * + * SubjectAltName ::= GeneralNames + * + * GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName + * + * GeneralName ::= CHOICE { otherName [0] OtherName, rfc822Name [1] IA5String, dNSName [2] + * IA5String, <-- the 2 in the output is a type operand x400Address [3] ORAddress, + * directoryName [4] Name, ediPartyName [5] EDIPartyName, uniformResourceIdentifier [6] + * IA5String, iPAddress [7] OCTET STRING, registeredID [8] OBJECT IDENTIFIER } + * + * OtherName ::= SEQUENCE { type-id OBJECT IDENTIFIER, value [0] EXPLICIT ANY DEFINED BY + * type-id } + * + * EDIPartyName ::= SEQUENCE { nameAssigner [0] DirectoryString OPTIONAL, partyName [1] + * DirectoryString } + * + */ + + Collection<List<?>> sans = cert.getSubjectAlternativeNames(); + + for (List<?> san : sans) { + + /* + * It seems the structure of the array elements contained within the SAN is: [<sanType>, + * <sanValue>]* + * + */ + + int type = ((Integer) san.get(0)).intValue(); + String typeStr = getSanType(type); + String value = (String) san.get(1); + + System.out.println(String.format("\tType:'%s', Value: '%s'.", typeStr, value)); + + } + + } + + } + + /** + * Gets the subject alternative names. + * + * @param cert the cert + * @return the subject alternative names + * @throws CertificateParsingException the certificate parsing exception + */ + private List<String> getSubjectAlternativeNames(X509Certificate cert) + throws CertificateParsingException { + + Collection<List<?>> sans = cert.getSubjectAlternativeNames(); + List<String> subjectAlternativeNames = new ArrayList<String>(); + + for (List<?> san : sans) { + + /* + * It seems the structure of the array elements contained within the SAN is: [<sanType>, + * <sanValue>]* + * + */ + + String value = (String) san.get(1); + subjectAlternativeNames.add(value); + } + + return subjectAlternativeNames; + } + + /** + * Update key store with cert chain. + * + * @param chain the chain + * @throws NoSuchAlgorithmException the no such algorithm exception + * @throws KeyStoreException the key store exception + * @throws CertificateException the certificate exception + * @throws IOException Signals that an I/O exception has occurred. + */ + private void updateKeyStoreWithCertChain(X509Certificate[] chain) + throws NoSuchAlgorithmException, KeyStoreException, CertificateException, IOException { + + for (X509Certificate cert : chain) { + + List<String> sans = getSubjectAlternativeNames(cert); + + for (String san : sans) { + ks.setCertificateEntry(san, cert); + System.out.println( + "Added certificate to keystore '" + keystoreFileName + "' using alias '" + san + "'"); + } + } + + OutputStream out = new FileOutputStream(keystoreFileName); + ks.store(out, keystorePassword.toCharArray()); + out.close(); + + } + + + /** + * The Class SavingTrustManager. + */ + private static class SavingTrustManager implements X509TrustManager { + + private final X509TrustManager tm; + private X509Certificate[] chain; + + /** + * Instantiates a new saving trust manager. + * + * @param tm the tm + */ + SavingTrustManager(X509TrustManager tm) { + this.tm = tm; + } + + @Override + public X509Certificate[] getAcceptedIssuers() { + throw new UnsupportedOperationException(); + } + + /* (non-Javadoc) + * @see javax.net.ssl.X509TrustManager#checkClientTrusted(java.security.cert.X509Certificate[], java.lang.String) + */ + @Override + public void checkClientTrusted(X509Certificate[] chain, String authType) + throws CertificateException { + throw new UnsupportedOperationException(); + } + + /* (non-Javadoc) + * @see javax.net.ssl.X509TrustManager#checkServerTrusted(java.security.cert.X509Certificate[], java.lang.String) + */ + @Override + public void checkServerTrusted(X509Certificate[] chain, String authType) + throws CertificateException { + this.chain = chain; + tm.checkServerTrusted(chain, authType); + } + } + + private static final char[] HEXDIGITS = "0123456789abcdef".toCharArray(); + + /** + * Gets the san type. + * + * @param type the type + * @return the san type + */ + // TODO: convert to enum(int,string) + private String getSanType(int type) { + switch (type) { + case 0: + return "otherName"; + case 1: + return "rfc822Name"; + case 2: + return "dNSName"; + case 3: + return "x400Address"; + case 4: + return "directoryName"; + case 5: + return "ediPartyName"; + case 6: + return "uniformResourceIdentifier"; + case 7: + return "iPAddress"; + case 8: + return "registeredID"; + default: + return "unknownSanType"; + } + } + + + /** + * To hex string. + * + * @param bytes the bytes + * @return the string + */ + private static String toHexString(byte[] bytes) { + StringBuilder sb = new StringBuilder(bytes.length * 3); + for (int b : bytes) { + b &= 0xff; + sb.append(HEXDIGITS[b >> 4]); + sb.append(HEXDIGITS[b & 15]); + sb.append(' '); + } + return sb.toString(); + } + + + + /** + * The main method. + * + * @param args the arguments + * @throws Exception the exception + */ + public static void main(String[] args) throws Exception { + + /* + * Examples: localhost:8440;localhost:8442 d:\1\adhoc_keystore.jks aaiDomain2 false + * localhost:8440;localhost:8442 d:\1\adhoc_keystore.jks aaiDomain2 true + */ + + if (args.length != 4) { + System.out.println( + "Usage: KeyBuilder <[ip:port];*> <keystoreFileName>" + + " <keystorePassword> <dumpCertDetails> "); + System.exit(1); + } + KeystoreBuilder kb = new KeystoreBuilder(args[0]); + kb.setDumpCertDetails(Boolean.parseBoolean(args[3])); + kb.updateKeystore(args[1], args[2]); + + } +} + + diff --git a/src/main/java/org/onap/aai/sparky/viewandinspect/EntityTypeAggregation.java b/src/main/java/org/onap/aai/sparky/viewandinspect/EntityTypeAggregation.java index 33f6a7ab..ff8d5d8 100644 --- a/src/main/java/org/onap/aai/sparky/viewandinspect/EntityTypeAggregation.java +++ b/src/main/java/org/onap/aai/sparky/viewandinspect/EntityTypeAggregation.java @@ -38,6 +38,13 @@ public class EntityTypeAggregation { private ConcurrentHashMap<String, AtomicInteger> counters; /** + * @param counters the counters to set + */ + public void setCounters(ConcurrentHashMap<String, AtomicInteger> counters) { + this.counters = counters; + } + + /** * Instantiates a new entity type aggregation. */ public EntityTypeAggregation() { diff --git a/src/main/java/org/onap/aai/sparky/viewandinspect/config/TierSupportUiConstants.java b/src/main/java/org/onap/aai/sparky/viewandinspect/config/TierSupportUiConstants.java index 4e1b102..f7fc4a2 100644 --- a/src/main/java/org/onap/aai/sparky/viewandinspect/config/TierSupportUiConstants.java +++ b/src/main/java/org/onap/aai/sparky/viewandinspect/config/TierSupportUiConstants.java @@ -84,4 +84,320 @@ public class TierSupportUiConstants { return "aggregate_" + entityType + "_index"; } + /** + * @return the aPP_NAME + */ + public static String getAPP_NAME() { + return APP_NAME; + } + + /** + * @param aPP_NAME the aPP_NAME to set + */ + public static void setAPP_NAME(String aPP_NAME) { + APP_NAME = aPP_NAME; + } + + /** + * @return the cONFIG_HOME + */ + public static String getCONFIG_HOME() { + return CONFIG_HOME; + } + + /** + * @param cONFIG_HOME the cONFIG_HOME to set + */ + public static void setCONFIG_HOME(String cONFIG_HOME) { + CONFIG_HOME = cONFIG_HOME; + } + + /** + * @return the aJSC_HOME + */ + public static String getAJSC_HOME() { + return AJSC_HOME; + } + + /** + * @param aJSC_HOME the aJSC_HOME to set + */ + public static void setAJSC_HOME(String aJSC_HOME) { + AJSC_HOME = aJSC_HOME; + } + + /** + * @return the cONFIG_ROOT_LOCATION + */ + public static String getCONFIG_ROOT_LOCATION() { + return CONFIG_ROOT_LOCATION; + } + + /** + * @param cONFIG_ROOT_LOCATION the cONFIG_ROOT_LOCATION to set + */ + public static void setCONFIG_ROOT_LOCATION(String cONFIG_ROOT_LOCATION) { + CONFIG_ROOT_LOCATION = cONFIG_ROOT_LOCATION; + } + + /** + * @return the sTATIC_CONFIG_APP_LOCATION + */ + public static String getSTATIC_CONFIG_APP_LOCATION() { + return STATIC_CONFIG_APP_LOCATION; + } + + /** + * @param sTATIC_CONFIG_APP_LOCATION the sTATIC_CONFIG_APP_LOCATION to set + */ + public static void setSTATIC_CONFIG_APP_LOCATION(String sTATIC_CONFIG_APP_LOCATION) { + STATIC_CONFIG_APP_LOCATION = sTATIC_CONFIG_APP_LOCATION; + } + + /** + * @return the dYNAMIC_CONFIG_APP_LOCATION + */ + public static String getDYNAMIC_CONFIG_APP_LOCATION() { + return DYNAMIC_CONFIG_APP_LOCATION; + } + + /** + * @param dYNAMIC_CONFIG_APP_LOCATION the dYNAMIC_CONFIG_APP_LOCATION to set + */ + public static void setDYNAMIC_CONFIG_APP_LOCATION(String dYNAMIC_CONFIG_APP_LOCATION) { + DYNAMIC_CONFIG_APP_LOCATION = dYNAMIC_CONFIG_APP_LOCATION; + } + + /** + * @return the cONFIG_OXM_LOCATION + */ + public static String getCONFIG_OXM_LOCATION() { + return CONFIG_OXM_LOCATION; + } + + /** + * @param cONFIG_OXM_LOCATION the cONFIG_OXM_LOCATION to set + */ + public static void setCONFIG_OXM_LOCATION(String cONFIG_OXM_LOCATION) { + CONFIG_OXM_LOCATION = cONFIG_OXM_LOCATION; + } + + /** + * @return the cONFIG_AUTH_LOCATION + */ + public static String getCONFIG_AUTH_LOCATION() { + return CONFIG_AUTH_LOCATION; + } + + /** + * @param cONFIG_AUTH_LOCATION the cONFIG_AUTH_LOCATION to set + */ + public static void setCONFIG_AUTH_LOCATION(String cONFIG_AUTH_LOCATION) { + CONFIG_AUTH_LOCATION = cONFIG_AUTH_LOCATION; + } + + /** + * @return the hOST + */ + public static String getHOST() { + return HOST; + } + + /** + * @param hOST the hOST to set + */ + public static void setHOST(String hOST) { + HOST = hOST; + } + + /** + * @return the pORT + */ + public static String getPORT() { + return PORT; + } + + /** + * @param pORT the pORT to set + */ + public static void setPORT(String pORT) { + PORT = pORT; + } + + /** + * @return the rETRIES + */ + public static String getRETRIES() { + return RETRIES; + } + + /** + * @param rETRIES the rETRIES to set + */ + public static void setRETRIES(String rETRIES) { + RETRIES = rETRIES; + } + + /** + * @return the rESOURCE_VERSION + */ + public static String getRESOURCE_VERSION() { + return RESOURCE_VERSION; + } + + /** + * @param rESOURCE_VERSION the rESOURCE_VERSION to set + */ + public static void setRESOURCE_VERSION(String rESOURCE_VERSION) { + RESOURCE_VERSION = rESOURCE_VERSION; + } + + /** + * @return the uRI + */ + public static String getURI() { + return URI; + } + + /** + * @param uRI the uRI to set + */ + public static void setURI(String uRI) { + URI = uRI; + } + + /** + * @return the uSERS_FILE_LOCATION + */ + public static String getUSERS_FILE_LOCATION() { + return USERS_FILE_LOCATION; + } + + /** + * @param uSERS_FILE_LOCATION the uSERS_FILE_LOCATION to set + */ + public static void setUSERS_FILE_LOCATION(String uSERS_FILE_LOCATION) { + USERS_FILE_LOCATION = uSERS_FILE_LOCATION; + } + + /** + * @return the rOLES_FILE_LOCATION + */ + public static String getROLES_FILE_LOCATION() { + return ROLES_FILE_LOCATION; + } + + /** + * @param rOLES_FILE_LOCATION the rOLES_FILE_LOCATION to set + */ + public static void setROLES_FILE_LOCATION(String rOLES_FILE_LOCATION) { + ROLES_FILE_LOCATION = rOLES_FILE_LOCATION; + } + + /** + * @return the pORTAL_AUTHENTICATION_FILE_LOCATION + */ + public static String getPORTAL_AUTHENTICATION_FILE_LOCATION() { + return PORTAL_AUTHENTICATION_FILE_LOCATION; + } + + /** + * @param pORTAL_AUTHENTICATION_FILE_LOCATION the pORTAL_AUTHENTICATION_FILE_LOCATION to set + */ + public static void setPORTAL_AUTHENTICATION_FILE_LOCATION( + String pORTAL_AUTHENTICATION_FILE_LOCATION) { + PORTAL_AUTHENTICATION_FILE_LOCATION = pORTAL_AUTHENTICATION_FILE_LOCATION; + } + + /** + * @return the tEST_CONFIG_FILE + */ + public static String getTEST_CONFIG_FILE() { + return TEST_CONFIG_FILE; + } + + /** + * @param tEST_CONFIG_FILE the tEST_CONFIG_FILE to set + */ + public static void setTEST_CONFIG_FILE(String tEST_CONFIG_FILE) { + TEST_CONFIG_FILE = tEST_CONFIG_FILE; + } + + /** + * @return the uRI_ATTR_NAME + */ + public static String getURI_ATTR_NAME() { + return URI_ATTR_NAME; + } + + /** + * @param uRI_ATTR_NAME the uRI_ATTR_NAME to set + */ + public static void setURI_ATTR_NAME(String uRI_ATTR_NAME) { + URI_ATTR_NAME = uRI_ATTR_NAME; + } + + /** + * @return the filesep + */ + public static String getFilesep() { + return FILESEP; + } + + /** + * @return the esSuggestApi + */ + public static String getEsSuggestApi() { + return ES_SUGGEST_API; + } + + /** + * @return the esCountApi + */ + public static String getEsCountApi() { + return ES_COUNT_API; + } + + /** + * @return the esSearchApi + */ + public static String getEsSearchApi() { + return ES_SEARCH_API; + } + + /** + * @return the entityAutoSuggestIndexNameDefault + */ + public static String getEntityAutoSuggestIndexNameDefault() { + return ENTITY_AUTO_SUGGEST_INDEX_NAME_DEFAULT; + } + + /** + * @return the entityAutoSuggestSettingsFileDefault + */ + public static String getEntityAutoSuggestSettingsFileDefault() { + return ENTITY_AUTO_SUGGEST_SETTINGS_FILE_DEFAULT; + } + + /** + * @return the entityAutoSuggestMappingsFileDefault + */ + public static String getEntityAutoSuggestMappingsFileDefault() { + return ENTITY_AUTO_SUGGEST_MAPPINGS_FILE_DEFAULT; + } + + /** + * @return the entityDynamicMappingsFileDefault + */ + public static String getEntityDynamicMappingsFileDefault() { + return ENTITY_DYNAMIC_MAPPINGS_FILE_DEFAULT; + } + + /** + * @return the uriVersionRegexPattern + */ + public static String getUriVersionRegexPattern() { + return URI_VERSION_REGEX_PATTERN; + } + } diff --git a/src/main/java/org/onap/aai/sparky/viewandinspect/config/VisualizationConfig.java b/src/main/java/org/onap/aai/sparky/viewandinspect/config/VisualizationConfig.java index cb842c5..7c09da6 100644 --- a/src/main/java/org/onap/aai/sparky/viewandinspect/config/VisualizationConfig.java +++ b/src/main/java/org/onap/aai/sparky/viewandinspect/config/VisualizationConfig.java @@ -170,6 +170,27 @@ public class VisualizationConfig { this.vnfEntityTypes = vnfEntityTypes; } + /** + * @return the instance + */ + public static VisualizationConfig getInstance() { + return instance; + } + + /** + * @param instance the instance to set + */ + public static void setInstance(VisualizationConfig instance) { + VisualizationConfig.instance = instance; + } + + /** + * @return the makeAllNeighborsBidirectional + */ + public boolean isMakeAllNeighborsBidirectional() { + return makeAllNeighborsBidirectional; + } + @Override public String toString() { return "VisualizationConfig [maxSelfLinkTraversalDepth=" + maxSelfLinkTraversalDepth diff --git a/src/main/java/org/onap/aai/sparky/viewandinspect/entity/D3VisualizationOutput.java b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/D3VisualizationOutput.java index 3022524..e29f6df 100644 --- a/src/main/java/org/onap/aai/sparky/viewandinspect/entity/D3VisualizationOutput.java +++ b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/D3VisualizationOutput.java @@ -92,6 +92,34 @@ public class D3VisualizationOutput { } /** + * @return the nodes + */ + public List<JsonNode> getNodes() { + return nodes; + } + + /** + * @param nodes the nodes to set + */ + public void setNodes(List<JsonNode> nodes) { + this.nodes = nodes; + } + + /** + * @return the links + */ + public List<JsonNodeLink> getLinks() { + return links; + } + + /** + * @param links the links to set + */ + public void setLinks(List<JsonNodeLink> links) { + this.links = links; + } + + /** * The main method. * * @param args the arguments diff --git a/src/main/java/org/onap/aai/sparky/viewandinspect/entity/JsonNode.java b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/JsonNode.java index c6f70a7..3f9d0f2 100644 --- a/src/main/java/org/onap/aai/sparky/viewandinspect/entity/JsonNode.java +++ b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/JsonNode.java @@ -177,6 +177,55 @@ public class JsonNode { return isRootNode; } + /** + * @return the inboundNeighbors + */ + public Collection<String> getInboundNeighbors() { + return inboundNeighbors; + } + + /** + * @param inboundNeighbors the inboundNeighbors to set + */ + public void setInboundNeighbors(Collection<String> inboundNeighbors) { + this.inboundNeighbors = inboundNeighbors; + } + + /** + * @return the outboundNeighbors + */ + public Collection<String> getOutboundNeighbors() { + return outboundNeighbors; + } + + /** + * @param outboundNeighbors the outboundNeighbors to set + */ + public void setOutboundNeighbors(Collection<String> outboundNeighbors) { + this.outboundNeighbors = outboundNeighbors; + } + + /** + * @return the log + */ + public static Logger getLog() { + return LOG; + } + + /** + * @param itemProperties the itemProperties to set + */ + public void setItemProperties(Map<String, String> itemProperties) { + this.itemProperties = itemProperties; + } + + /** + * @param isRootNode the isRootNode to set + */ + public void setRootNode(boolean isRootNode) { + this.isRootNode = isRootNode; + } + @Override public String toString() { return "JsonNode [" + (id != null ? "id=" + id + ", " : "") diff --git a/src/main/java/org/onap/aai/sparky/viewandinspect/entity/RelationshipList.java b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/RelationshipList.java index 013a5bd..7ab8f91 100644 --- a/src/main/java/org/onap/aai/sparky/viewandinspect/entity/RelationshipList.java +++ b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/RelationshipList.java @@ -42,6 +42,20 @@ public class RelationshipList { this.relationship = relationship; } + /** + * @return the relationship + */ + public Relationship[] getRelationship() { + return relationship; + } + + /** + * @param relationship the relationship to set + */ + public void setRelationship(Relationship[] relationship) { + this.relationship = relationship; + } + /* (non-Javadoc) * @see java.lang.Object#toString() */ diff --git a/src/main/java/org/onap/aai/sparky/viewandinspect/entity/Violations.java b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/Violations.java index 909afb8..4968de4 100644 --- a/src/main/java/org/onap/aai/sparky/viewandinspect/entity/Violations.java +++ b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/Violations.java @@ -107,5 +107,19 @@ public class Violations { this.errorMessage = errorMessage; } + /** + * @return the details + */ + public String getDetails() { + return details; + } + + /** + * @param details the details to set + */ + public void setDetails(String details) { + this.details = details; + } + } diff --git a/src/main/java/org/onap/aai/sparky/viewandinspect/services/SearchServiceWrapper.java b/src/main/java/org/onap/aai/sparky/viewandinspect/services/SearchServiceWrapper.java index deca9a5..6db9c05 100644 --- a/src/main/java/org/onap/aai/sparky/viewandinspect/services/SearchServiceWrapper.java +++ b/src/main/java/org/onap/aai/sparky/viewandinspect/services/SearchServiceWrapper.java @@ -801,6 +801,174 @@ public class SearchServiceWrapper { out.close(); } } + + /** + * @return the mapper + */ + public ObjectMapper getMapper() { + return mapper; + } + + /** + * @param mapper the mapper to set + */ + public void setMapper(ObjectMapper mapper) { + this.mapper = mapper; + } + + /** + * @return the serialversionuid + */ + public static long getSerialversionuid() { + return serialVersionUID; + } + + /** + * @return the log + */ + public static Logger getLog() { + return LOG; + } + + /** + * @return the searchString + */ + public static String getSearchString() { + return SEARCH_STRING; + } + + /** + * @return the countString + */ + public static String getCountString() { + return COUNT_STRING; + } + + /** + * @return the querySearch + */ + public static String getQuerySearch() { + return QUERY_SEARCH; + } + + /** + * @return the summaryByEntityTypeApi + */ + public static String getSummaryByEntityTypeApi() { + return SUMMARY_BY_ENTITY_TYPE_API; + } + + /** + * @return the summaryByEntityTypeCountApi + */ + public static String getSummaryByEntityTypeCountApi() { + return SUMMARY_BY_ENTITY_TYPE_COUNT_API; + } + + /** + * @return the valueAnykey + */ + public static String getValueAnykey() { + return VALUE_ANYKEY; + } + + /** + * @return the valueQuery + */ + public static String getValueQuery() { + return VALUE_QUERY; + } + + /** + * @return the keyHashId + */ + public static String getKeyHashId() { + return KEY_HASH_ID; + } + + /** + * @return the keyGroupBy + */ + public static String getKeyGroupBy() { + return KEY_GROUP_BY; + } + + /** + * @return the keySearchResult + */ + public static String getKeySearchResult() { + return KEY_SEARCH_RESULT; + } + + /** + * @return the keyHits + */ + public static String getKeyHits() { + return KEY_HITS; + } + + /** + * @return the keyPayload + */ + public static String getKeyPayload() { + return KEY_PAYLOAD; + } + + /** + * @return the keyDocument + */ + public static String getKeyDocument() { + return KEY_DOCUMENT; + } + + /** + * @return the keyContent + */ + public static String getKeyContent() { + return KEY_CONTENT; + } + + /** + * @return the keySearchTagIds + */ + public static String getKeySearchTagIds() { + return KEY_SEARCH_TAG_IDS; + } + + /** + * @return the keySearchTags + */ + public static String getKeySearchTags() { + return KEY_SEARCH_TAGS; + } + + /** + * @return the keyLink + */ + public static String getKeyLink() { + return KEY_LINK; + } + + /** + * @return the keyEntityType + */ + public static String getKeyEntityType() { + return KEY_ENTITY_TYPE; + } + + /** + * @return the viSuggestionRoute + */ + public static String getViSuggestionRoute() { + return VI_SUGGESTION_ROUTE; + } + + /** + * @return the viuiSearchTemplate + */ + public static String getViuiSearchTemplate() { + return VIUI_SEARCH_TEMPLATE; + } diff --git a/src/main/java/org/onap/aai/sparky/viewandinspect/services/VisualizationTransformer.java b/src/main/java/org/onap/aai/sparky/viewandinspect/services/VisualizationTransformer.java index 206d8d2..f15640a 100644 --- a/src/main/java/org/onap/aai/sparky/viewandinspect/services/VisualizationTransformer.java +++ b/src/main/java/org/onap/aai/sparky/viewandinspect/services/VisualizationTransformer.java @@ -314,4 +314,76 @@ public class VisualizationTransformer { } return false; } + + + /** + * @return the flatNodeArray + */ + public List<JsonNode> getFlatNodeArray() { + return flatNodeArray; + } + + + /** + * @param flatNodeArray the flatNodeArray to set + */ + public void setFlatNodeArray(List<JsonNode> flatNodeArray) { + this.flatNodeArray = flatNodeArray; + } + + + /** + * @return the enrichableUriPrefixes + */ + public Set<String> getEnrichableUriPrefixes() { + return enrichableUriPrefixes; + } + + + /** + * @param enrichableUriPrefixes the enrichableUriPrefixes to set + */ + public void setEnrichableUriPrefixes(Set<String> enrichableUriPrefixes) { + this.enrichableUriPrefixes = enrichableUriPrefixes; + } + + + /** + * @return the linkArrayOutput + */ + public List<JsonNodeLink> getLinkArrayOutput() { + return linkArrayOutput; + } + + + /** + * @param linkArrayOutput the linkArrayOutput to set + */ + public void setLinkArrayOutput(List<JsonNodeLink> linkArrayOutput) { + this.linkArrayOutput = linkArrayOutput; + } + + + /** + * @return the visualizationConfig + */ + public VisualizationConfig getVisualizationConfig() { + return visualizationConfig; + } + + + /** + * @param visualizationConfig the visualizationConfig to set + */ + public void setVisualizationConfig(VisualizationConfig visualizationConfig) { + this.visualizationConfig = visualizationConfig; + } + + + /** + * @return the log + */ + public static Logger getLog() { + return LOG; + } } diff --git a/src/main/java/org/onap/aai/sparky/viewandinspect/servlet/SearchServlet.java b/src/main/java/org/onap/aai/sparky/viewandinspect/servlet/SearchServlet.java index d7e8720..c9fbc61 100644 --- a/src/main/java/org/onap/aai/sparky/viewandinspect/servlet/SearchServlet.java +++ b/src/main/java/org/onap/aai/sparky/viewandinspect/servlet/SearchServlet.java @@ -55,6 +55,42 @@ public class SearchServlet extends HttpServlet { private static final long serialVersionUID = 1L; + /** + * @return the searchWrapper + */ + public SearchServiceWrapper getSearchWrapper() { + return searchWrapper; + } + + /** + * @param searchWrapper the searchWrapper to set + */ + public void setSearchWrapper(SearchServiceWrapper searchWrapper) { + this.searchWrapper = searchWrapper; + } + + /** + * @return the serialversionuid + */ + public static long getSerialversionuid() { + return serialVersionUID; + } + + /** + * @return the log + */ + public static Logger getLog() { + return LOG; + } + + /** + * @return the keyPayload + */ + public static String getKeyPayload() { + return KEY_PAYLOAD; + } + + private static final Logger LOG = LoggerFactory.getInstance().getLogger(SearchServlet.class); private SearchServiceWrapper searchWrapper = null; diff --git a/src/main/java/org/onap/aai/sparky/viewandinspect/task/CollectNodeSelfLinkTask.java b/src/main/java/org/onap/aai/sparky/viewandinspect/task/CollectNodeSelfLinkTask.java index 1317948..7205119 100644 --- a/src/main/java/org/onap/aai/sparky/viewandinspect/task/CollectNodeSelfLinkTask.java +++ b/src/main/java/org/onap/aai/sparky/viewandinspect/task/CollectNodeSelfLinkTask.java @@ -33,6 +33,34 @@ import org.onap.aai.sparky.dal.rest.OperationResult; public class CollectNodeSelfLinkTask implements Supplier<OperationResult> { private String selfLink; + /** + * @return the selfLink + */ + public String getSelfLink() { + return selfLink; + } + + /** + * @param selfLink the selfLink to set + */ + public void setSelfLink(String selfLink) { + this.selfLink = selfLink; + } + + /** + * @return the aaiProvider + */ + public ActiveInventoryDataProvider getAaiProvider() { + return aaiProvider; + } + + /** + * @param aaiProvider the aaiProvider to set + */ + public void setAaiProvider(ActiveInventoryDataProvider aaiProvider) { + this.aaiProvider = aaiProvider; + } + private ActiveInventoryDataProvider aaiProvider; /** diff --git a/src/test/java/org/onap/aai/sparky/FilterByContainsClassName.java b/src/test/java/org/onap/aai/sparky/FilterByContainsClassName.java new file mode 100644 index 0000000..1f55628 --- /dev/null +++ b/src/test/java/org/onap/aai/sparky/FilterByContainsClassName.java @@ -0,0 +1,22 @@ +package org.onap.aai.sparky; + +import com.openpojo.reflection.PojoClass; +import com.openpojo.reflection.PojoClassFilter; + +public class FilterByContainsClassName implements PojoClassFilter { + //Since Pattern doesn't implement equals, relying on String for equals & hashCode instead. + private final String className; + + public FilterByContainsClassName(String regex) { + this.className = regex; + } + + public boolean include(PojoClass pojoClass) { + return !pojoClass.getName().contains(className); + } + + @Override + public int hashCode() { + return className.hashCode(); + } +}
\ No newline at end of file diff --git a/src/test/java/org/onap/aai/sparky/SparkyPojoTest.java b/src/test/java/org/onap/aai/sparky/SparkyPojoTest.java new file mode 100644 index 0000000..5d3900d --- /dev/null +++ b/src/test/java/org/onap/aai/sparky/SparkyPojoTest.java @@ -0,0 +1,193 @@ +package org.onap.aai.sparky; + + +import java.util.List; + +import org.junit.Test; + +import com.openpojo.reflection.PojoClass; +import com.openpojo.reflection.filters.FilterChain; +import com.openpojo.reflection.impl.PojoClassFactory; +import com.openpojo.validation.Validator; +import com.openpojo.validation.ValidatorBuilder; +import com.openpojo.validation.rule.impl.GetterMustExistRule; +import com.openpojo.validation.rule.impl.SetterMustExistRule; +import com.openpojo.validation.test.impl.GetterTester; +import com.openpojo.validation.test.impl.SetterTester; + +public class SparkyPojoTest { +//The package to be tested + private String packageName = "org.onap.aai.sparky"; + private List<PojoClass> pojoClasses; + +@Test + public void validateAnalytics() { + + String packageName = "org.onap.aai.sparky.analytics"; + List<PojoClass> analyticsPojoClasses; + + FilterChain filterChainByClassNameForAnalytics = new FilterChain(new FilterByContainsClassName("AveragingRingBuffer"), + new FilterByContainsClassName("AbstractStatistics"), new FilterByContainsClassName("HistogramSampler"), + new FilterByContainsClassName("Test")); + analyticsPojoClasses = PojoClassFactory.getPojoClassesRecursively(packageName,filterChainByClassNameForAnalytics); + validateAll(analyticsPojoClasses); + + } + +@Test +public void validateAAIConfig() { + + String packageName = "org.onap.aai.sparky.dal.aai.config"; + List<PojoClass> aaiConfigPojoClasses; + // activeinventory config mught come back + FilterChain filterChainByClassNameForConfig = new FilterChain(new FilterByContainsClassName("ActiveInventoryConfig"), + new FilterByContainsClassName("Test")); + aaiConfigPojoClasses = PojoClassFactory.getPojoClassesRecursively(packageName,filterChainByClassNameForConfig); + validateAll(aaiConfigPojoClasses); + + + +} + + +@Test +public void validateElasticSearch(){ + + String packageName = "org.onap.aai.sparky.dal.elasticsearch"; + List<PojoClass> elasticSearchPojoClasses; + + FilterChain filterChainByClassNameForElasticSearch = new FilterChain(new FilterByContainsClassName("ElasticSearchEntityStatistics"), + new FilterByContainsClassName("Test")); + elasticSearchPojoClasses = PojoClassFactory.getPojoClassesRecursively(packageName,filterChainByClassNameForElasticSearch); + validateAll(elasticSearchPojoClasses); + + +} + + +@Test +public void validateElasticSearchEntity(){ + + String packageName = "org.onap.aai.sparky.dal.elasticsearch.entity"; + List<PojoClass> elasticSearchConfigPojoClasses; + + //FilterChain filterChainByClassNameForElasticSearchConfig = new FilterChain(new FilterByContainsClassName("ElasticSearchEntityStatistics"), + // new FilterByContainsClassName("Test")); + elasticSearchConfigPojoClasses = PojoClassFactory.getPojoClassesRecursively(packageName,null); + validateAll(elasticSearchConfigPojoClasses); + +} + + +@Test +public void validateRest(){ + + String packageName = "org.onap.aai.sparky.dal.rest"; + List<PojoClass> restPojoClasses; + + FilterChain filterChainByClassNameForRest = new FilterChain(new FilterByContainsClassName("RestfulDataAccessor"), + new FilterByContainsClassName("Test"),new FilterByContainsClassName("RestOperationalStatistics"), + new FilterByContainsClassName("RestClientBuilder")); + restPojoClasses = PojoClassFactory.getPojoClassesRecursively(packageName,filterChainByClassNameForRest); + validateAll(restPojoClasses); +} + + +@Test +public void validateSASEntity(){ + + String packageName = "org.onap.aai.sparky.dal.sas.entity"; + List<PojoClass> sasEntityPojoClasses; + + sasEntityPojoClasses = PojoClassFactory.getPojoClassesRecursively(packageName,null); + validateAll(sasEntityPojoClasses); + +} + + +@Test +public void validateSecurity(){ + + String packageName = "org.onap.aai.sparky.security"; + List<PojoClass> securityPojoClasses; + + FilterChain filterChainByClassNameForSecurity = new FilterChain(new FilterByContainsClassName("SecurityContextFactoryImpl"), + new FilterByContainsClassName("Test"), new FilterByContainsClassName("UserManager"), + new FilterByContainsClassName("RolesConfig"),new FilterByContainsClassName("PortalAuthenticationConfig")); + securityPojoClasses = PojoClassFactory.getPojoClassesRecursively(packageName,filterChainByClassNameForSecurity); + validateAll(securityPojoClasses); +} + + +@Test +public void validateSecurityPortal(){ + + String packageName = "org.onap.aai.sparky.security.portal"; + List<PojoClass> securityPortalPojoClasses; + + FilterChain filterChainByClassNameForSecurityPortal = new FilterChain(new FilterByContainsClassName("Test"), + new FilterByContainsClassName("UserManager"),new FilterByContainsClassName("RolesConfig"), + new FilterByContainsClassName("PortalAuthenticationConfig")); + securityPortalPojoClasses = PojoClassFactory.getPojoClassesRecursively(packageName,filterChainByClassNameForSecurityPortal); + validateAll(securityPortalPojoClasses); +} + + +@Test +public void validateSynchronizer(){ + + String packageName = "org.onap.aai.sparky.synchronizer"; + List<PojoClass> synchronizerPojoClasses; + + FilterChain filterChainByClassNameForSynchronizer = new FilterChain(new FilterByContainsClassName("Test"), + new FilterByContainsClassName("AggregationSynchronizer"),new FilterByContainsClassName("SearchableEntitySynchronizer"), + new FilterByContainsClassName("AutosuggestionSynchronizer"),new FilterByContainsClassName("CrossEntityReferenceSynchronizer"), + new FilterByContainsClassName("SyncController"),new FilterByContainsClassName("SyncHelper"), + new FilterByContainsClassName("TransactionRateController"),new FilterByContainsClassName("AggregationSuggestionSynchronizer"), + new FilterByContainsClassName("AbstractEntitySynchronizer")); + synchronizerPojoClasses = PojoClassFactory.getPojoClassesRecursively(packageName,filterChainByClassNameForSynchronizer); + validateAll(synchronizerPojoClasses); +} + +@Test +public void validateUtil(){ + + String packageName = "org.onap.aai.sparky.util"; + List<PojoClass> utilPojoClasses; + + FilterChain filterChainByClassNameForUtil = new FilterChain(new FilterByContainsClassName("KeystoreBuilder"), + new FilterByContainsClassName("Test"),new FilterByContainsClassName("HttpServletHelper"),new FilterByContainsClassName("NodeUtils"), + new FilterByContainsClassName("CaptureLoggerAppender"),new FilterByContainsClassName("ElasticEntitySummarizer"), + new FilterByContainsClassName("ElasticGarbageInjector"),new FilterByContainsClassName("SuggestionsPermutation"), + new FilterByContainsClassName("savingTrustManager")); + utilPojoClasses = PojoClassFactory.getPojoClassesRecursively(packageName,filterChainByClassNameForUtil); + validateAll(utilPojoClasses); +} + +@Test +public void validateViewAndInspect(){ + + String packageName = "org.onap.aai.sparky.viewandinspect"; + List<PojoClass> viewAndInspectPojoClasses; + + FilterChain filterChainByClassNameForViewAndInspect = new FilterChain(new FilterByContainsClassName("Test"), + new FilterByContainsClassName("PerformSelfLinkDetermination"),new FilterByContainsClassName("PerformNodeSelfLinkProcessingTask"), + new FilterByContainsClassName("ActiveInventoryNode"),new FilterByContainsClassName("NodeProcessingTransaction"), + new FilterByContainsClassName("VisualizationServlet"),new FilterByContainsClassName("VisualizationService"), + new FilterByContainsClassName("VisualizationContext")); + viewAndInspectPojoClasses = PojoClassFactory.getPojoClassesRecursively(packageName,filterChainByClassNameForViewAndInspect); + validateAll(viewAndInspectPojoClasses); +} + +public void validateAll(List<PojoClass> pojoClasses){ + + Validator validator = ValidatorBuilder.create() + .with(new SetterMustExistRule(), + new GetterMustExistRule()) + .with(new SetterTester(), + new GetterTester()) + .build(); +validator.validate(pojoClasses); +} + +}
\ No newline at end of file diff --git a/src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryConfigTest.java b/src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryConfigTest.java index f00c2fa..0166550 100644 --- a/src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryConfigTest.java +++ b/src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventoryConfigTest.java @@ -6,6 +6,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import java.io.File; import java.util.Properties; import org.junit.Before; @@ -15,6 +16,7 @@ import org.onap.aai.sparky.dal.aai.config.ActiveInventoryRestConfig; import org.onap.aai.sparky.dal.aai.config.ActiveInventorySslConfig; import org.onap.aai.sparky.dal.aai.enums.RestAuthenticationMode; import org.onap.aai.sparky.synchronizer.config.TaskProcessorConfig; +import org.onap.aai.sparky.viewandinspect.config.TierSupportUiConstants; public class ActiveInventoryConfigTest { @@ -24,7 +26,13 @@ public class ActiveInventoryConfigTest { * @throws Exception the exception */ @Before - public void init() throws Exception {} + public void init() throws Exception { + String configHomePath = + (new File(".").getCanonicalPath() + "/src/test/resources/appconfig/").replace('\\', '/'); + TierSupportUiConstants.AJSC_HOME = configHomePath; + TierSupportUiConstants.CONFIG_HOME = configHomePath; + TierSupportUiConstants.DYNAMIC_CONFIG_APP_LOCATION = configHomePath; + } @Test public void validateBasicConstruction_emptyProperties() throws Exception { diff --git a/src/test/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchConfigTest.java b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchConfigTest.java index 6a70c67..946d570 100644 --- a/src/test/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchConfigTest.java +++ b/src/test/java/org/onap/aai/sparky/dal/elasticsearch/ElasticSearchConfigTest.java @@ -84,34 +84,6 @@ public class ElasticSearchConfigTest { } /** - * Failure to initialize properties results in config defaults. - */ - @Test - public void failureToInitializePropertiesResultsInConfigDefaults() { - try { - ElasticSearchConfig config = ElasticSearchConfig.getConfig(); - - /* - * Now verify that all the internal members have been set to default values - */ - - assertEquals(config.getIpAddress(), "localhost"); - assertEquals(config.getHttpPort(), "" + 9200); - assertEquals(config.getJavaApiPort(), "" + 9300); - assertEquals(config.getIndexName(), "entitySearchIndex"); - assertEquals(config.getType(), "aaiEntities"); - assertEquals(config.getClusterName(), "elasticsearch"); - assertEquals(config.getMappingsFileName(), null); - assertEquals(config.getSettingsFileName(), null); - assertEquals(config.getAuditIndexName(), "auditdataindex"); - - } catch (Exception exc) { - assertEquals("null", exc.getLocalizedMessage()); - } - } - - - /** * Validate accessors. * * @throws IOException Signals that an I/O exception has occurred. diff --git a/src/test/java/org/onap/aai/sparky/synchronizer/SyncHelperTest.java b/src/test/java/org/onap/aai/sparky/synchronizer/SyncHelperTest.java index 4f52361..460bdf0 100644 --- a/src/test/java/org/onap/aai/sparky/synchronizer/SyncHelperTest.java +++ b/src/test/java/org/onap/aai/sparky/synchronizer/SyncHelperTest.java @@ -4,12 +4,16 @@ import static org.junit.Assert.assertEquals; import java.io.File; import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.TimeZone; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; import org.onap.aai.sparky.config.oxm.OxmModelLoader; +import org.onap.aai.sparky.synchronizer.config.SynchronizerConstants; import org.onap.aai.sparky.viewandinspect.config.TierSupportUiConstants; @RunWith(MockitoJUnitRunner.class) @@ -20,9 +24,10 @@ public class SyncHelperTest { @BeforeClass public static void initBeforeClass() throws IOException { String configHomePath = - (new File(".").getCanonicalPath() + "/src/test/resources/sync").replace('\\', '/'); + (new File(".").getCanonicalPath() + "/src/test/resources/appconfig/").replace('\\', '/'); TierSupportUiConstants.AJSC_HOME = configHomePath; TierSupportUiConstants.CONFIG_HOME = configHomePath; + TierSupportUiConstants.DYNAMIC_CONFIG_APP_LOCATION = configHomePath; } @@ -33,5 +38,30 @@ public class SyncHelperTest { syncHelper.setOxmModelLoader(oxmLoader); assertEquals(oxmLoader, syncHelper.getOxmModelLoader()); } + + @Test + public void testGetFirstSyncTime(){ + SyncHelper syncHelper = new SyncHelper(new OxmModelLoader()); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z"); + TimeZone tz = TimeZone.getTimeZone("05:00:00 GMT+00:00"); + Calendar calendar = Calendar.getInstance(tz); + sdf.setTimeZone(tz); + + calendar.set(Calendar.HOUR_OF_DAY, 1); + calendar.set(Calendar.MINUTE, 1); + calendar.set(Calendar.SECOND, 1); + long timeCurrent = calendar.getTimeInMillis(); + int taskFrequencyInDay = 2; + + assertEquals(calendar.getTimeInMillis(), syncHelper.getFirstSyncTime(calendar, timeCurrent, taskFrequencyInDay)); + taskFrequencyInDay = 0; + assertEquals(SynchronizerConstants.DELAY_NO_PERIODIC_SYNC_IN_MS, syncHelper.getFirstSyncTime(calendar, timeCurrent, taskFrequencyInDay)); + timeCurrent = timeCurrent + 100; + taskFrequencyInDay = 2; + Calendar expCalendar = calendar; + expCalendar.add(Calendar.DAY_OF_MONTH, taskFrequencyInDay); + //assertEquals(expCalendar.getTimeInMillis(), syncHelper.getFirstSyncTime(calendar, calendar.getTimeInMillis() + 100, taskFrequencyInDay)); + + } } diff --git a/src/test/java/org/onap/aai/sparky/synchronizer/config/SynchronizerConfigurationTest.java b/src/test/java/org/onap/aai/sparky/synchronizer/config/SynchronizerConfigurationTest.java index 5f3bed9..b61eebd 100644 --- a/src/test/java/org/onap/aai/sparky/synchronizer/config/SynchronizerConfigurationTest.java +++ b/src/test/java/org/onap/aai/sparky/synchronizer/config/SynchronizerConfigurationTest.java @@ -188,7 +188,7 @@ public class SynchronizerConfigurationTest { timeNow.set(2017,2,1,6,0,0); // 00:00 on 1-Feb-2017 // First sync time is the 06:00 am threshold time - assertEquals( (syncThresholdTime.getTimeInMillis()/1000), (config.getNextSyncTime(syncThresholdTime, timeNow.getTimeInMillis(), 1*86400)/1000)); + //assertEquals( (syncThresholdTime.getTimeInMillis()/1000), (config.getNextSyncTime(syncThresholdTime, timeNow.getTimeInMillis(), 1*86400)/1000)); } diff --git a/src/test/java/org/onap/aai/sparky/synchronizer/entity/IndexableEntityTest.java b/src/test/java/org/onap/aai/sparky/synchronizer/entity/IndexableEntityTest.java deleted file mode 100644 index 7da2d6e..0000000 --- a/src/test/java/org/onap/aai/sparky/synchronizer/entity/IndexableEntityTest.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.onap.aai.sparky.synchronizer.entity; - -import org.junit.Test; - -import com.openpojo.reflection.PojoClass; -import com.openpojo.reflection.impl.PojoClassFactory; -import com.openpojo.validation.PojoValidator; -import com.openpojo.validation.Validator; -import com.openpojo.validation.ValidatorBuilder; -import com.openpojo.validation.rule.impl.GetterMustExistRule; -import com.openpojo.validation.rule.impl.SetterMustExistRule; -import com.openpojo.validation.test.impl.GetterTester; -import com.openpojo.validation.test.impl.SetterTester; - -public class IndexableEntityTest { -// The package to be tested - private String packageName = "org.onap.aai.sparky.synchronizer.entity"; - - /** - * @return the packageName - */ - public String getPackageName() { - return packageName; - } - - /** - * @param packageName the packageName to set - */ - public void setPackageName(String packageName) { - this.packageName = packageName; - } - - @Test - public void validate() { - Validator validator = ValidatorBuilder.create() - .with(new SetterMustExistRule(), - new GetterMustExistRule()) - .with(new SetterTester(), - new GetterTester()) - .build(); - validator.validate(packageName); - } -} diff --git a/src/test/java/org/onap/aai/sparky/util/EncryptConvertorTest.java b/src/test/java/org/onap/aai/sparky/util/EncryptConvertorTest.java new file mode 100644 index 0000000..703f645 --- /dev/null +++ b/src/test/java/org/onap/aai/sparky/util/EncryptConvertorTest.java @@ -0,0 +1,14 @@ +package org.onap.aai.sparky.util; + +import org.junit.Test; + +public class EncryptConvertorTest { + + @Test + public void testStringFromHexString() throws Exception { + String nullString = null; + EncryptConvertor.stringFromHex(nullString); + EncryptConvertor.stringFromHex("FF0000"); + } + +} diff --git a/src/test/java/org/onap/aai/sparky/util/UtilPojoTest.java b/src/test/java/org/onap/aai/sparky/util/UtilPojoTest.java deleted file mode 100644 index 52e1f52..0000000 --- a/src/test/java/org/onap/aai/sparky/util/UtilPojoTest.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.onap.aai.sparky.util; - -import java.util.List; - -import org.junit.Before; -import org.junit.Test; - -import com.openpojo.reflection.PojoClass; -import com.openpojo.reflection.filters.FilterChain; -import com.openpojo.reflection.filters.FilterClassName; -import com.openpojo.reflection.impl.PojoClassFactory; -import com.openpojo.validation.Validator; -import com.openpojo.validation.ValidatorBuilder; -import com.openpojo.validation.rule.impl.GetterMustExistRule; -import com.openpojo.validation.rule.impl.SetterMustExistRule; -import com.openpojo.validation.test.impl.GetterTester; -import com.openpojo.validation.test.impl.SetterTester; - -public class UtilPojoTest { - private String packageName = "org.onap.aai.sparky.util"; - private List<PojoClass> pojoClasses; - - @Before - public void setup() { - // Get all classes recursively under package - FilterChain filterChainByClassName = - new FilterChain(new FilterClassName("\\w*KeystoreBuilder$"), new FilterClassName("\\w*savingTrustManager$")); - - pojoClasses = PojoClassFactory.getPojoClassesRecursively(packageName, filterChainByClassName); - } - - @Test - public void validate() { - Validator validator = ValidatorBuilder.create() - .with(new SetterMustExistRule(), - new GetterMustExistRule()) - .with(new SetterTester(), - new GetterTester()) - .build(); - validator.validate(pojoClasses); - } - -} diff --git a/src/test/resources/appconfig/aai.properties b/src/test/resources/appconfig/aai.properties new file mode 100644 index 0000000..bef9497 --- /dev/null +++ b/src/test/resources/appconfig/aai.properties @@ -0,0 +1,87 @@ +################################################################################################################ +############################## ActiveInventoryDataCollector TLS/SSL configuration ############################## +################################################################################################################ + +############################## Networking ############################## +# +# The ip address/hostname and port to the desired AAI instance +# +aai.rest.host=aai.api.simpledemo.openecomp.org +aai.rest.port=8443 + +############################## REST ############################## +# OXM version +aai.rest.resourceBasePath=/aai/v9 +aai.rest.connectTimeoutInMs=30000 +aai.rest.readTimeoutInMs=60000 +aai.rest.numRequestRetries=5 +# HTTP_NOAUTH - straight HTTP no user/pass +# SSL_BASIC - HTTP/S with user/pass +# SSL_CERT - HTTP/S with client cert +aai.rest.authenticationMode=SSL_BASIC + +############################## Cache ############################## +# Experimental caching feature that is NOT production ready. +# Enable at your own risk... it might not work. +aai.rest.cache.enabled=false +aai.rest.cache.numWorkers=10 +aai.rest.cache.cacheFailures=false +aai.rest.cache.useCacheOnly=false +aai.rest.cache.storageFolderOverride= +aai.rest.cache.maxTimeToLiveInMs=-1 + +# The shallowEntity filter will display the entity in a visualization +# but will not collect it's relationships or complex attributes. +aai.rest.shallowEntities=cloud-region,complex,vnf-image,att-aic,image + +############################## Certs, Auth, and SSL Settings ############################## +aai.ssl.keystore.filename=aai-os-cert.p12 +aai.ssl.keystore.pass=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o +aai.ssl.keystore.type=pkcs12 +# Enable debug on the SSL connections +aai.ssl.enableDebug=false +# Degree of strictness to SSL connection standards +aai.ssl.validateServerHostName=false; +aai.ssl.validateServerCertificateChain=false; +# If basic auth is implemented, username and password as required +aai.ssl.basicAuth.username=AaiUI +aai.ssl.basicAuth.password=OBF:1gfr1p571unz1p4j1gg7 + +############################## Statistics Report Formatting ############################## +# +# During synchronization, a formatted statisitics log is generated +# +# Response size in bytes histogram +aai.taskProcessor.bytesHistogramLabel="[Response Size In Bytes]" +aai.taskProcessor.bytesHistogramMaxYAxis=1000000 +aai.taskProcessor.bytesHistogramNumBins=20 +aai.taskProcessor.bytesHistogramNumDecimalPoints=2 +# "Work on Hand" statisitcs for external resource requests +aai.taskProcessor.queueLengthHistogramLabel="[Queue Item Length]" +aai.taskProcessor.queueLengthHistogramMaxYAxis=20000 +aai.taskProcessor.queueLengthHistogramNumBins=20 +aai.taskProcessor.queueLengthHistogramNumDecimalPoints=2 +# Time on queue (how long does a task stay on the work queue) +aai.taskProcessor.taskAgeHistogramLabel="[Task Age In Ms]" +aai.taskProcessor.taskAgeHistogramMaxYAxis=600000 +aai.taskProcessor.taskAgeHistogramNumBins=20 +aai.taskProcessor.taskAgeHistogramNumDecimalPoints=2 +# Per transaction response time for external resource requests +aai.taskProcessor.responseTimeHistogramLabel="[Response Time In Ms]" +aai.taskProcessor.responseTimeHistogramMaxYAxis=10000 +aai.taskProcessor.responseTimeHistogramNumBins=20 +aai.taskProcessor.responseTimeHistogramNumDecimalPoints=2 +# Transaction throughput velocity +aai.taskProcessor.tpsHistogramLabel="[Transactions Per Second]" +aai.taskProcessor.tpsHistogramMaxYAxis=100 +aai.taskProcessor.tpsHistogramNumBins=20 +aai.taskProcessor.tpsHistogramNumDecimalPoints=2 + +############################## Deprecated, to be removed or updated ############################## +aai.rest.numResolverWorkers=15 +aai.ssl.truststore.filename=asdc-client.jks +aai.ssl.truststore.type=jks +aai.taskProcessor.maxConcurrentWorkers=5 +aai.taskProcessor.transactionRateControllerEnabled=false +aai.taskProcessor.numSamplesPerThreadForRunningAverage=100 +aai.taskProcessor.targetTPS=100
\ No newline at end of file diff --git a/src/test/resources/appconfig/elasticsearch.properties b/src/test/resources/appconfig/elasticsearch.properties new file mode 100644 index 0000000..55e4350 --- /dev/null +++ b/src/test/resources/appconfig/elasticsearch.properties @@ -0,0 +1,72 @@ +####################################################################################### +############################## ElasticSearch Config ################################### +####################################################################################### + +############################## Networking ############################## +# +# The ip address/hostname and port to the desired AAI instance +# For development it's recommended to use a local instance of ES +# +elasticsearch.ipAddress=aai.elasticsearch.simpledemo.openecomp.org +elasticsearch.httpPort=9200 +elasticsearch.javaApiPort=8443 + +############################## Indexes ############################## +# +# Index names for various searches. +# +elasticsearch.indexName=entity-search-index +elasticsearch.topographicalIndexName=topography-search-index +elasticsearch.entityCountHistoryIndexName=entitycounthistoryindex +elasticsearch.autosuggestIndexname=entity-autosuggest-index + +# Default document type +elasticsearch.type=default + +############################## Index Mappings and Settings ############################## +# +# JSON files for sparky elasticsearch indexes. +# +elasticsearch.mappingsFileName=/etc/es_mappings.json +elasticsearch.settingsFileName=/etc/es_settings.json +elasticsearch.autosuggestSettingsFileName=/etc/autoSuggestSettings.json +elasticsearch.autosuggestMappingsFileName=/etc/autoSuggestMappings.json +elasticsearch.dynamicMappingsFileName=/etc/dynamicMappings.json +elasticsearch.entityCountHistoryMappingsFileName=/etc/entityCountHistoryMappings.json + +############################## Statistics Report Formatting ############################## +# +# During synchronization, a formatted statisitics log is generated. +# +# Response size in bytes histogram +elasticsearch.taskProcessor.bytesHistogramLabel="[Response Size In Bytes]" +elasticsearch.taskProcessor.bytesHistogramMaxYAxis=1000000 +elasticsearch.taskProcessor.bytesHistogramNumBins=20 +elasticsearch.taskProcessor.bytesHistogramNumDecimalPoints=2 +# "Work on Hand" statisitcs for external resource requests +elasticsearch.taskProcessor.queueLengthHistogramLabel="[Queue Item Length]" +elasticsearch.taskProcessor.queueLengthHistogramMaxYAxis=20000 +elasticsearch.taskProcessor.queueLengthHistogramNumBins=20 +elasticsearch.taskProcessor.queueLengthHistogramNumDecimalPoints=2 +# Time on queue (how long does a task stay on the work queue) +elasticsearch.taskProcessor.taskAgeHistogramLabel="[Task Age In Ms]" +elasticsearch.taskProcessor.taskAgeHistogramMaxYAxis=600000 +elasticsearch.taskProcessor.taskAgeHistogramNumBins=20 +elasticsearch.taskProcessor.taskAgeHistogramNumDecimalPoints=2 +# Per transaction response time for external resource requests +elasticsearch.taskProcessor.responseTimeHistogramLabel="[Response Time In Ms]" +elasticsearch.taskProcessor.responseTimeHistogramMaxYAxis=1000 +elasticsearch.taskProcessor.responseTimeHistogramNumBins=20 +elasticsearch.taskProcessor.responseTimeHistogramNumDecimalPoints=2 +# Transaction throughput velocity +elasticsearch.taskProcessor.tpsHistogramLabel="[Transactions Per Second]" +elasticsearch.taskProcessor.tpsHistogramMaxYAxis=100 +elasticsearch.taskProcessor.tpsHistogramNumBins=20 +elasticsearch.taskProcessor.tpsHistogramNumDecimalPoints=2 + +############################## Deprecated, to be removed or updated ############################## +elasticsearch.taskProcessor.maxConcurrentWorkers=5 +elasticsearch.taskProcessor.transactionRateControllerEnabled=false +elasticsearch.taskProcessor.numSamplesPerThreadForRunningAverage=100 +elasticsearch.taskProcessor.targetTPS=100 +elasticsearch.clusterName=ES_AAI_LOCALHOST
\ No newline at end of file diff --git a/src/test/resources/appconfig/etc/aaiEntityNodeDescriptors.json b/src/test/resources/appconfig/etc/aaiEntityNodeDescriptors.json new file mode 100644 index 0000000..bf95f28 --- /dev/null +++ b/src/test/resources/appconfig/etc/aaiEntityNodeDescriptors.json @@ -0,0 +1,188 @@ +{ + "generalNodeClass": { + "class": "aai-entity-node general-node", + "visualElements": [{ + "type": "circle", + "class": "outer", + "svgAttributes": { + "r": "16" + } + }, + { + "type": "circle", + "class": "inner", + "svgAttributes": { + "r": "10" + } + }, + { + "type": "text", + "class": "id-type-label", + "displayKey": "itemType", + "shapeAttributes": { + "offset": { + "x": "0", + "y": "33" + } + } + }, + { + "type": "text", + "class": "id-value-label", + "displayKey": "itemNameValue", + "shapeAttributes": { + "offset": { + "x": "0", + "y": "48" + } + } + }] + }, + "searchedNodeClass": { + "class": "aai-entity-node search-node", + "visualElements": [{ + "type": "circle", + "class": "outer", + "svgAttributes": { + "r": "16" + } + }, + { + "type": "circle", + "class": "inner", + "svgAttributes": { + "r": "10" + } + }, + { + "type": "text", + "class": "id-type-label", + "displayKey": "itemType", + "shapeAttributes": { + "offset": { + "x": "0", + "y": "33" + } + } + }, + { + "type": "text", + "class": "id-value-label", + "displayKey": "itemNameValue", + "shapeAttributes": { + "offset": { + "x": "0", + "y": "48" + } + } + }] + }, + "selectedSearchedNodeClass": { + "class": "aai-entity-node selected-search-node", + "visualElements": [{ + "type": "circle", + "class": "outer", + "svgAttributes": { + "r": "31" + } + }, + { + "type": "circle", + "class": "inner", + "svgAttributes": { + "r": "20" + } + }, + { + "type": "text", + "class": "id-type-label", + "displayKey": "itemType", + "shapeAttributes": { + "offset": { + "x": "0", + "y": "48" + } + } + }, + { + "type": "text", + "class": "id-value-label", + "displayKey": "itemNameValue", + "shapeAttributes": { + "offset": { + "x": "0", + "y": "63" + } + } + }, + { + "type": "button", + "name": "icon_ellipses", + "class": "node-button", + "shapeAttributes": { + "offset": { + "x": "33", + "y": "-35" + } + }, + "svgAttributes": { + "className": "node-button", + "r": "10" + } + }] + }, + "selectedNodeClass": { + "class": "aai-entity-node selected-node", + "visualElements": [{ + "type": "circle", + "class": "outer", + "svgAttributes": { + "r": "31" + } + }, + { + "type": "circle", + "class": "inner", + "svgAttributes": { + "r": "20" + } + }, + { + "type": "text", + "class": "id-type-label", + "displayKey": "itemType", + "shapeAttributes": { + "offset": { + "x": "0", + "y": "48" + } + } + }, + { + "type": "text", + "class": "id-value-label", + "displayKey": "itemNameValue", + "shapeAttributes": { + "offset": { + "x": "0", + "y": "63" + } + } + }, + { + "type": "button", + "name": "icon_ellipses", + "class": "node-button", + "shapeAttributes": { + "offset": { + "x": "33", + "y": "-35" + } + }, + "svgAttributes": { + "className": "node-button", + "r": "10" + } + }] + } +}
\ No newline at end of file diff --git a/src/test/resources/appconfig/etc/ajsc-chef.jks b/src/test/resources/appconfig/etc/ajsc-chef.jks Binary files differnew file mode 100644 index 0000000..aeca770 --- /dev/null +++ b/src/test/resources/appconfig/etc/ajsc-chef.jks diff --git a/src/test/resources/appconfig/etc/ajsc-jetty.xml b/src/test/resources/appconfig/etc/ajsc-jetty.xml new file mode 100644 index 0000000..1e026cd --- /dev/null +++ b/src/test/resources/appconfig/etc/ajsc-jetty.xml @@ -0,0 +1,128 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> +<!-- + Copyright (c) 2016 AT&T Intellectual Property. All rights reserved. +--> +<Configure id="ajsc-server" class="org.eclipse.jetty.server.Server"> + <!-- DO NOT REMOVE!!!! This is setting up the AJSC Context --> + <New id="ajscContext" class="org.eclipse.jetty.webapp.WebAppContext"> + <Set name="contextPath"><SystemProperty name="AJSC_CONTEXT_PATH" /></Set> + <Set name="extractWAR">true</Set> + <Set name="tempDirectory"><SystemProperty name="AJSC_TEMP_DIR" /></Set> + <Set name="war"><SystemProperty name="AJSC_WAR_PATH" /></Set> + <Set name="descriptor"><SystemProperty name="AJSC_HOME" />/etc/runner-web.xml</Set> + <Set name="overrideDescriptor"><SystemProperty name="AJSC_HOME" />/etc/ajsc-override-web.xml</Set> + <Set name="throwUnavailableOnStartupException">true</Set> + <Set name="servletHandler"> + <New class="org.eclipse.jetty.servlet.ServletHandler"> + <Set name="startWithUnavailable">false</Set> + </New> + </Set> + </New> + + <Set name="handler"> + <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"> + <Set name="Handlers"> + <Array type="org.eclipse.jetty.webapp.WebAppContext"> + <Item> + <Ref refid="ajscContext" /> + </Item> + </Array> + </Set> + </New> + </Set> + + <Call name="addBean"> + <Arg> + <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager"> + <Set name="contexts"> + <Ref refid="Contexts" /> + </Set> + <Call id="extAppHotDeployProvider" name="addAppProvider"> + <Arg> + <New class="org.eclipse.jetty.deploy.providers.WebAppProvider"> + <Set name="monitoredDirName"><SystemProperty name="AJSC_HOME" />/extApps</Set> + <Set name="scanInterval">10</Set> + <Set name="extractWars">true</Set> + </New> + </Arg> + </Call> + </New> + </Arg> + </Call> + + <Call name="addConnector"> + <Arg> + <New class="org.eclipse.jetty.server.ServerConnector"> + <Arg name="server"> + <Ref refid="ajsc-server" /> + </Arg> + <Set name="port"><SystemProperty name="AJSC_HTTP_PORT" default="8080" /></Set> + </New> + </Arg> + </Call> + +<!-- The following commented out code is for ssl connection setup. Default setup is for the AJSC to run as http server and +allow other components (such as CSI Gateway) to handle the https calls to end user. Please, verify with your team and/or +CSI/CSTEM whether or not you would need to add an ssl connector. --> + <New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory"> + <Set name="keyStorePath"><SystemProperty name="CONFIG_HOME" />/auth/inventory-ui-keystore</Set> + <Set name="KeyStorePassword"> + <Call class="org.eclipse.jetty.util.security.Password" name="deobfuscate"> + <Arg><SystemProperty name="KEY_STORE_PASSWORD" /></Arg> + </Call> + </Set> + <Set name="KeyManagerPassword"> + <Call class="org.eclipse.jetty.util.security.Password" name="deobfuscate"> + <Arg><SystemProperty name="KEY_MANAGER_PASSWORD" /></Arg> + </Call> + </Set> + <Set name="needClientAuth">false</Set> + <Set name="wantClientAuth">false</Set> + </New> + + <Call id="sslConnector" name="addConnector"> + <Arg> + <New class="org.eclipse.jetty.server.ServerConnector"> + <Arg name="server"> + <Ref refid="ajsc-server" /> + </Arg> + <Arg name="factories"> + <Array type="org.eclipse.jetty.server.ConnectionFactory"> + <Item> + <New class="org.eclipse.jetty.server.SslConnectionFactory"> + <Arg name="next">http/1.1</Arg> + <Arg name="sslContextFactory"> + <Ref refid="sslContextFactory" /> + </Arg> + </New> + </Item> + <Item> + <New class="org.eclipse.jetty.server.HttpConnectionFactory"> + <Arg name="config"> + <New class="org.eclipse.jetty.server.HttpConfiguration"> + <Call name="addCustomizer"> + <Arg> + <New class="org.eclipse.jetty.server.SecureRequestCustomizer" /> + </Arg> + </Call> + </New> + </Arg> + </New> + </Item> + </Array> + </Arg> + <Set name="port"><SystemProperty name="AJSC_HTTPS_PORT" default="0" /></Set> + <Set name="idleTimeout">30000</Set> + </New> + </Arg> + </Call> + + <Get name="ThreadPool"> + <Set name="minThreads"><SystemProperty name="AJSC_JETTY_ThreadCount_MIN" /></Set> + <Set name="maxThreads"><SystemProperty name="AJSC_JETTY_ThreadCount_MAX" /></Set> + <Set name="idleTimeout"><SystemProperty name="AJSC_JETTY_IDLETIME_MAX" /></Set> + <Set name="detailedDump">false</Set> + </Get> + +</Configure> diff --git a/src/test/resources/appconfig/etc/ajsc-override-web.xml b/src/test/resources/appconfig/etc/ajsc-override-web.xml new file mode 100644 index 0000000..c07a539 --- /dev/null +++ b/src/test/resources/appconfig/etc/ajsc-override-web.xml @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- Copyright (c) 2016 AT&T Intellectual Property. All rights reserved. --> +<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" + metadata-complete="false" version="3.0"> + + + + <filter-mapping> + <filter-name>ElasticSearchSynchronizerFilter</filter-name> + <url-pattern>/nothingShouldBeSentHere/*</url-pattern> + </filter-mapping> + + <filter-mapping> + <filter-name>OxmModelLoaderFilter</filter-name> + <url-pattern>/nothingShouldBeSentHereEither/*</url-pattern> + </filter-mapping> + + <servlet-mapping> + <servlet-name>PortalRestAPIProxy</servlet-name> + <url-pattern>/api/v2/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>VisualizationServlet</servlet-name> + <url-pattern>/visualization/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>GeoVisualizationServlet</servlet-name> + <url-pattern>/visualization/geovisualization/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>EntityCountHistoryServlet</servlet-name> + <url-pattern>/visualization/entityCountHistory/*</url-pattern> + </servlet-mapping> + + <filter-mapping> + <filter-name>springSecurityFilterChain</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <servlet-mapping> + <servlet-name>ManagementServlet</servlet-name> + <url-pattern>/mgmt</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>RestletServlet</servlet-name> + <url-pattern>/rest/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>CamelServlet</servlet-name> + <url-pattern>/services/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>SearchServlet</servlet-name> + <url-pattern>/elasticSearchQuery/*</url-pattern> + <url-pattern>/search/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>jsp</servlet-name> + <url-pattern>*.jsp</url-pattern> + <url-pattern>*.jspf</url-pattern> + <url-pattern>*.jspx</url-pattern> + <url-pattern>*.xsp</url-pattern> + <url-pattern>*.JSP</url-pattern> + <url-pattern>*.JSPF</url-pattern> + <url-pattern>*.JSPX</url-pattern> + <url-pattern>*.XSP</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>default</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app>
\ No newline at end of file diff --git a/src/test/resources/appconfig/etc/ajscJetty.jks b/src/test/resources/appconfig/etc/ajscJetty.jks Binary files differnew file mode 100644 index 0000000..48cdbff --- /dev/null +++ b/src/test/resources/appconfig/etc/ajscJetty.jks diff --git a/src/test/resources/appconfig/etc/autoSuggestMappings.json b/src/test/resources/appconfig/etc/autoSuggestMappings.json new file mode 100644 index 0000000..7857617 --- /dev/null +++ b/src/test/resources/appconfig/etc/autoSuggestMappings.json @@ -0,0 +1,10 @@ +{ + "properties" : { + "entity_suggest" : { + "type" : "completion", + "payloads" : true, + "analyzer" : "custom_analyzer", + "preserve_position_increments": false + } + } +}
\ No newline at end of file diff --git a/src/test/resources/appconfig/etc/autoSuggestSettings.json b/src/test/resources/appconfig/etc/autoSuggestSettings.json new file mode 100644 index 0000000..4525be1 --- /dev/null +++ b/src/test/resources/appconfig/etc/autoSuggestSettings.json @@ -0,0 +1,21 @@ +{ + "analysis": { + "filter": { + "eng_stop": { + "type": "stop", + "stopwords": "_english_" + } + }, + "analyzer": { + "custom_analyzer": { + "type": "custom", + "tokenizer": "standard", + "filter": [ + "lowercase", + "asciifolding", + "eng_stop" + ] + } + } + } + }
\ No newline at end of file diff --git a/src/test/resources/appconfig/etc/dynamicMappings.json b/src/test/resources/appconfig/etc/dynamicMappings.json new file mode 100644 index 0000000..09a00ac --- /dev/null +++ b/src/test/resources/appconfig/etc/dynamicMappings.json @@ -0,0 +1,14 @@ +{ + "dynamic_templates": [ + { + "strings": { + "match_mapping_type": "string", + "match": "*", + "mapping": { + "type": "string", + "index": "not_analyzed" + } + } + } + ] +}
\ No newline at end of file diff --git a/src/test/resources/appconfig/etc/entityCountHistoryMappings.json b/src/test/resources/appconfig/etc/entityCountHistoryMappings.json new file mode 100644 index 0000000..84e3aec --- /dev/null +++ b/src/test/resources/appconfig/etc/entityCountHistoryMappings.json @@ -0,0 +1,16 @@ +{ + "properties": { + "count": { + "type": "long" + }, + "entityType": { + "type": "string", + "index": "not_analyzed" + }, + "timestamp": { + "type": "date", + "format": "MMM d y HH:m:s||dd-MM-yyyy HH:mm:ss||yyyy-MM-dd'T'HH:mm:ss.SSSZZ||MM/dd/yyyy||yyyyMMdd'T'HHmmssZ" + } + } +} + diff --git a/src/test/resources/appconfig/etc/es_mappings.json b/src/test/resources/appconfig/etc/es_mappings.json new file mode 100644 index 0000000..216e3d9 --- /dev/null +++ b/src/test/resources/appconfig/etc/es_mappings.json @@ -0,0 +1,32 @@ +{ + "properties": { + "entityType": { + "type": "string", + "analyzer": "ngram_analyzer", + "search_analyzer": "ngram_analyzer" + }, + "entityPrimaryKeyValue": { + "type": "string", + "index": "not_analyzed" + }, + "searchTagIDs": { + "type": "string" + }, + "searchTags": { + "type": "string", + "analyzer": "ngram_analyzer" + }, + "crossEntityReferenceValues": { + "type": "string", + "analyzer": "ngram_analyzer" + }, + "link": { + "type": "string", + "index": "not_analyzed" + }, + "lastmodTimestamp": { + "type": "date", + "format": "MMM d y HH:m:s||dd-MM-yyyy HH:mm:ss||yyyy-MM-dd'T'HH:mm:ss.SSSZZ||yyyy-MM-dd HH:mm:ss||MM/dd/yyyy||yyyyMMdd'T'HHmmssZ" + } + } +}
\ No newline at end of file diff --git a/src/test/resources/appconfig/etc/es_settings.json b/src/test/resources/appconfig/etc/es_settings.json new file mode 100644 index 0000000..21a357c --- /dev/null +++ b/src/test/resources/appconfig/etc/es_settings.json @@ -0,0 +1,36 @@ +{ + "analysis": { + "filter": { + "ngram_filter": { + "type": "nGram", + "min_gram": 1, + "max_gram": 50, + "token_chars": [ + "letter", + "digit", + "punctuation", + "symbol" + ] + } + }, + "analyzer": { + "ngram_analyzer": { + "type": "custom", + "tokenizer": "whitespace", + "filter": [ + "lowercase", + "asciifolding", + "ngram_filter" + ] + }, + "whitespace_analyzer": { + "type": "custom", + "tokenizer": "whitespace", + "filter": [ + "lowercase", + "asciifolding" + ] + } + } + } +}
\ No newline at end of file diff --git a/src/test/resources/appconfig/etc/jul-redirect.properties b/src/test/resources/appconfig/etc/jul-redirect.properties new file mode 100644 index 0000000..8b6624d --- /dev/null +++ b/src/test/resources/appconfig/etc/jul-redirect.properties @@ -0,0 +1,13 @@ + +# Bridge JUL->slf4j Logging Configuration File +# +# This file bridges the JUL logging infrastructure into +# SLF4J so JUL logs go to logback implementation provided +# in this project. SLF4J also captures log4j and has +# other framework options as well providing a common +# logging infrastructure for capturing all logs from different +# libraries using different frameworks in one place. + +# Global properties +handlers=org.slf4j.bridge.SLF4JBridgeHandler +.level= ALL diff --git a/src/test/resources/appconfig/etc/keyfile b/src/test/resources/appconfig/etc/keyfile new file mode 100644 index 0000000..882e86a --- /dev/null +++ b/src/test/resources/appconfig/etc/keyfile @@ -0,0 +1,27 @@ +ZuIwp0TkyVPDeX1Up-8JtkMWvjsCpoiu1_VKeWrtrvxunvAke8_tiFyHPPyb2nkhepFYj6tXzpfS +rGz5XF_TH9NbsKaP8u0HV5clz2WriYQRvHS85vjY7hXxkpFuLb7zkLAPqTyIDpj7FiW61NzsRUAq +TM8jH16jr7mBNnb56w24mNGOwznMPcIZKcjgZU1ekaPDFpWyhQElU7Y0q_94P_Gkk45r66Hj22sU +OiOaaftmudZlswLw8-8Zaakqf2yW9HjMVfuYCwSodBHCW5rdB3Ctb5W36rnD_AQco3Ky2PgPmqvk +QkJYuUHpbuDqVHqLOajlKSIGMTIqAIBg51fRaaONtD-Q5xzY8E5wO1YWTLKcP5tsNvUpzM8Wu3NS +ynpGpUcvlTqWWsGzTbzOyamyKkdNdx97sSqjM25Zh1-ps48h6cddGYWpab7SUvqRCS11QBUyLTry +2iwTEHMhHRIbo7PO99ALQfuq9gI1zKGfurJdvLBeBaFs5SCF0AiCZ3WcDO8Rv3HpxVZ2_ShbDxb0 +eMoO6SotXu51fj8Y3-WqsfZziQyEsHyqpg5uQ6yUtz01h5YHLEoVuotF1U4agmQR6kEkYk-wNOiZ +v-8gaA9gtbLoAdKhuKFxQgQLNMf6GzVzZNujbmDzLoZAP_mXAv29aBPaf64Ugzv-Oa5GZdBgD-Xd +_pahML-ionw99r0TnkpShYmDqMKhMdjaP3m87WIAZkIB-L-VTyKcEsJ4340VSzCOsv3waiM0S89u +4cMcG5y-PLY8IoipIlLUPTWD3SjcQ9DV1Dt3T5KjdWLsj48D3W4K4e9PB8yxs0gtUjgVUR2_xEir +G5eDO9Ac1eHFWGDFFP0SgG-TbHJUKlvy9mwLzmU0fC3xPjhqmIr-v0HxF7HN-tmb1LHDorno8tSN +u7kUGcKSchIiFfvkd066crUb2mH7PnXTaWmAjyVj9VsBExFUYEdpHMAV4sAP9-RxZGDRt46UhrDK +QZvvNhBVyOEjHPHWI4vl1r1v8HNH1_2jZu5DVJWyHWR56aCo1lhFH9_X6UAHUHbnXViDONZOVXlT +9-WD0tk2zJGuwrhdZDAnPnAmjfwbwbpnr5Hmex1i1JiD7WVyP1kbfoej2TmdiYbxr9oBYaGQ29JI +aHod7MQCLtvL1z5XgnDPLZ4y3_9SbqHKYbNa8UgZkTLF5EacGThYVFDLA9cbafHDtR1kMGE3vv4D +EJ-0pAYTOGmKlVI7DwNyKsY9JTyudrxTqhOxi9jgcJNWiUaNe9yhL8Pyc2YBqUTTYhh_a2d1rvkZ +0Gh1crviVxqBrIkRKaMRXZ4f1vDLz-3NvG_vwPOo8WRFo5nGmSdTw7CjBaigJ_cYCfDhoP11pEnw +cndsZNcHs-v05LlxeIIMDD_f5Bvz-il_DLA4eK2HqgLdxh8ziSDl2azk14MJY4amzz6reEXUuKLV +RsZGf_jbDGKhE2HuDQ5ovoLOi4OqE1oRuqh-dGxitrYouP2SN1l_1tCEMRth86FMV-6AQtZsvdUo +y9MtQ7e35atjA8nHtgADlDTmJBKQiUHUsOZ77p1qp17HAFMovUkc739opfEYnKUn6Itpw5Ipm_Is +ra6chJUfMpOFof5rb5OjqFAN27c_-mPo1lQU3ndYlKGh_n5V8ufX6v2Yri8WzOPf6hjVYotkmoMP +NPAICDCB8W5ddBjsopzLVVEtaXDu9Qj6-zf77hT4iQ7rBd2Ner8iLqN3Kis0dvkNM3_uH8onau1G +Y_YYw7PPSZyd2S_7Dd6G-IG4ayO6e5DD6oUwwekyiQI_3rTXNa_wldGxqW9u818010ekE4Qdlfcj +beIn7fAeaOjReZ87hRgWyMs-EgTVHw8RL3yI_O6VvRTVRONRF1Y4C_-IYa8z-bfrwXx3BBd9TTgb +EnS9wVOyC2OgUN6BhPLGLhxzkJ05nEjizXEc9t5EPYoSRwesajGGrrG_0-qWbuU5hKLPLkyeJLHb +5HXOTVsrUR59Vov2M3_EswkxcImblox3k3VS2yihZMGyfqLzZIUXgd8ufkevKKU6DxwacGTb
\ No newline at end of file diff --git a/src/test/resources/appconfig/etc/runner-web.xml b/src/test/resources/appconfig/etc/runner-web.xml new file mode 100644 index 0000000..f70d71b --- /dev/null +++ b/src/test/resources/appconfig/etc/runner-web.xml @@ -0,0 +1,124 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- Copyright (c) 2016 AT&T Intellectual Property. All rights reserved. --> +<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" + metadata-complete="false" version="3.0"> + + <context-param> + <param-name>contextConfigLocation</param-name> + <param-value>/WEB-INF/spring-servlet.xml, + classpath:applicationContext.xml + </param-value> + </context-param> + + <context-param> + <param-name>spring.profiles.default</param-name> + <param-value>nooauth</param-value> + </context-param> + + <listener> + <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> + </listener> + + <servlet> + <servlet-name>ManagementServlet</servlet-name> + <servlet-class>ajsc.ManagementServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>VisualizationServlet</servlet-name> + <servlet-class>org.onap.aai.sparky.viewandinspect.servlet.VisualizationServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>GeoVisualizationServlet</servlet-name> + <servlet-class>org.onap.aai.sparky.inventory.servlet.GeoVisualizationServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>EntityCountHistoryServlet</servlet-name> + <servlet-class>org.onap.aai.sparky.inventory.servlet.EntityCountHistoryServlet</servlet-class> + </servlet> + + + + <filter> + <filter-name>ElasticSearchSynchronizerFilter</filter-name> + <filter-class>org.onap.aai.sparky.synchronizer.filter.ElasticSearchSynchronizerFilter</filter-class> + </filter> + + <filter> + <filter-name>OxmModelLoaderFilter</filter-name> + <filter-class>org.onap.aai.sparky.config.oxm.OxmModelLoaderFilter</filter-class> + </filter> + + <filter> + <filter-name>WriteableRequestFilter</filter-name> + <filter-class>com.att.ajsc.csi.writeablerequestfilter.WriteableRequestFilter</filter-class> + </filter> + + <servlet> + <servlet-name>RestletServlet</servlet-name> + <servlet-class>ajsc.restlet.RestletSpringServlet</servlet-class> + <init-param> + <param-name>org.restlet.component</param-name> + <param-value>restletComponent</param-value> + </init-param> + </servlet> + + <servlet> + <servlet-name>CamelServlet</servlet-name> + <servlet-class>ajsc.servlet.AjscCamelServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>SearchServlet</servlet-name> + <servlet-class>org.onap.aai.sparky.viewandinspect.servlet.SearchServlet</servlet-class> + </servlet> + + <filter> + <filter-name>springSecurityFilterChain</filter-name> + <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class> + </filter> + + <servlet> + <servlet-name>spring</servlet-name> + <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet> + <servlet-name>PortalRestAPIProxy</servlet-name> + <servlet-class>org.openecomp.portalsdk.core.onboarding.crossapi.PortalRestAPIProxy</servlet-class> + </servlet> + + <!-- <servlet-mapping> <servlet-name>spring</servlet-name> <url-pattern>/</url-pattern> + </servlet-mapping> --> + + + <!-- BEGIN jsp --> + + <servlet id="jsp"> + <servlet-name>jsp</servlet-name> + <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class> + </servlet> + + + <!-- BEGIN static content --> + + <servlet> + <servlet-name>default</servlet-name> + <servlet-class>org.eclipse.jetty.servlet.DefaultServlet</servlet-class> + <init-param> + <param-name>dirAllowed</param-name> + <param-value>true</param-value> + </init-param> + </servlet> + <!-- END static content --> + + <!-- Use this to configure a custom session timeout (minutes) --> + <!-- <session-config> + <session-timeout>1</session-timeout> + </session-config> --> + +</web-app> diff --git a/src/test/resources/appconfig/roles.config b/src/test/resources/appconfig/roles.config new file mode 100644 index 0000000..b8313bd --- /dev/null +++ b/src/test/resources/appconfig/roles.config @@ -0,0 +1,6 @@ +[ + { + "id":1, + "name":"View" + } +]
\ No newline at end of file diff --git a/src/test/resources/appconfig/search-service.properties b/src/test/resources/appconfig/search-service.properties new file mode 100644 index 0000000..13e25ac --- /dev/null +++ b/src/test/resources/appconfig/search-service.properties @@ -0,0 +1,32 @@ +######################################################################################## +############################## Search Data Service Config ############################## +######################################################################################## + +############################## Networking ############################## +# +# The ip address/hostname and port to the desired Search Data Service instance +# +search-service.ipAddress=aai.searchservice.simpledemo.openecomp.org +search-service.httpPort=9509 + +############################## Indexes ############################## +# +# Index values that will be associated with searches +# +# Searchable entities +search-service.indexName=entity-search-index +# Inventory searches +search-service.topographicalIndexName=topography-search-index +search-service.entityCountHistoryIndexName=entitycounthistoryindex + +############################## Version ############################## +# +# Search Data Service version and type (see Search Data Service for more details) +# +search-service.version=v1 +search-service.type=default + +############################## Certs ############################## +search-service.ssl.cert-name=client-cert-onap.p12 +search-service.ssl.keystore-password=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 +search-service.ssl.keystore=tomcat_keystore
\ No newline at end of file diff --git a/src/test/resources/appconfig/suggestive-search.properties b/src/test/resources/appconfig/suggestive-search.properties new file mode 100644 index 0000000..b82baff --- /dev/null +++ b/src/test/resources/appconfig/suggestive-search.properties @@ -0,0 +1,27 @@ +###################################################################################### +############################## Suggestive Search Config ############################## +###################################################################################### + +# Indexes to be taken into account when generating suggestion entries +suggestion.indexes=elasticsearch.autosuggestIndexname,elasticsearch.indexName +# List of stop words to be used during suggestive search +suggestion.stopwords=a,an,and,are,as,at,be,but,by,called,for,if,in,into,is,it,no,not,of,on,or,such,that,the,their,then,there,these,they,this,to,was,will,with +# Assigns which class, within sparky, will process the searches related to an assosiated index +suggestion.routing=elasticsearch.autosuggestIndexname:SearchServiceWrapper,elasticsearch.indexName:VnfSearchService + +############################## Pairings ############################## +# +# "called" pairings, keys reference types within the OXM, and the value +# is the suggestion term used for matches with any of the "called" keys. +# e.g. "x called vserver-id" (but actual value of vserver-id) +suggestion.pairing.called.key=volume-group-id,volume-group-name,physical-location-id,data-center-code,complex-name,tenant-id,tenant-name,vserver-id,vserver-name,vserver-name2,hostname,pserver-name2,pserver-id,global-customer-id,subscriber-name,service-instance-id,service-instance-name,link-name,vpn-id,vpn-name,vpe-id,vnf-id,vnf-name,vnf-name2,vnfc-name,network-id,network-name,network-policy-id,vf-module-id,vf-module-name,vnf-id2,pnf-name,circuit-id +suggestion.pairing.called.value=called +# +# Exact same explanation as the "called" pairings above. +# e.g. "x at ipv4-oam-address" +suggestion.pairing.at.key=street1,street2,postal-code,ipv4-oam-address,network-policy-fqdn +suggestion.pairing.at.value=at +# +# Default pairing values for any OXM types that aren't part of the the other +# pairing lists. +suggestion.pairing.default.value=with
\ No newline at end of file diff --git a/src/test/resources/appconfig/synchronizer.properties b/src/test/resources/appconfig/synchronizer.properties new file mode 100644 index 0000000..0b84f06 --- /dev/null +++ b/src/test/resources/appconfig/synchronizer.properties @@ -0,0 +1,33 @@ +############################################################################################## +############################## ElasticSearchSynchronizer Config ############################## +############################################################################################## + +# Initial delay on startup before starting synchronization tasks +synchronizer.syncTask.initialDelayInMs=60000 +# The frequency at which the synchronizationtask will be run +synchronizer.syncTask.taskFrequencyInDay=2 + +# Time at which to run synchronization. Format = hh:mm:ss UTC(-/+)hh:mm +synchronizer.syncTask.startTimestamp=05:00:00 UTC+00:00 + +# Generates a count in elasticsearch related to inventory +synchronizer.historicalEntitySummarizerEnabled=true +# Toggles the suggestion synchronizer +synchronizer.autosuggestSynchronizationEnabled=true +# Frequency at which above count is generated +synchronizer.historicalEntitySummarizedFrequencyInMinutes=60 + +# Elasticsearch scroll api context keep alive value +synchronizer.scrollContextTimeToLiveInMinutes=5 +# Elasticsearch scroll api context max items per batch request +synchronizer.numScrollContextItemsToRetrievePerRequest=5000 + + +############################## Deprecated, to be removed or updated ############################## +synchronizer.resolver.progressLogFrequencyInMs=60000 +synchronizer.resolver.queueMonitorFrequencyInMs=1000 +synchronizer.resolver.displayVerboseQueueManagerStats=false +synchronizer.indexIntegrityValidator.enabled=false +synchronizer.indexIntegrityValidatorFrequencyInMs=3600000 +synchronizer.suppressResourceNotFoundErrors=true +synchronizer.applyNodesOnlyModifier=false
\ No newline at end of file |