diff options
38 files changed, 773 insertions, 166 deletions
diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/DataMigration.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/DataMigration.java index eafec8bf60..9b1e3dc227 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/DataMigration.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/DataMigration.java @@ -20,11 +20,26 @@ package org.openecomp.sdc.asdctool.impl; -import com.carrotsearch.hppc.cursors.ObjectCursor; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; -import fj.data.Either; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.lang.reflect.Type; +import java.net.MalformedURLException; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.EnumMap; +import java.util.Map; +import java.util.TimeZone; + import org.apache.commons.lang.SystemUtils; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.cluster.metadata.IndexMetaData; @@ -40,25 +55,34 @@ import org.openecomp.sdc.be.dao.cassandra.CassandraOperationStatus; import org.openecomp.sdc.be.dao.cassandra.schema.Table; import org.openecomp.sdc.be.dao.es.ElasticSearchClient; import org.openecomp.sdc.be.resources.data.ESArtifactData; -import org.openecomp.sdc.be.resources.data.auditing.*; +import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum; +import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent; +import org.openecomp.sdc.be.resources.data.auditing.AuditingGetUebClusterEvent; +import org.openecomp.sdc.be.resources.data.auditing.AuditingTypesConstants; +import org.openecomp.sdc.be.resources.data.auditing.AuthEvent; +import org.openecomp.sdc.be.resources.data.auditing.CategoryEvent; +import org.openecomp.sdc.be.resources.data.auditing.ConsumerEvent; +import org.openecomp.sdc.be.resources.data.auditing.DistributionDeployEvent; +import org.openecomp.sdc.be.resources.data.auditing.DistributionDownloadEvent; +import org.openecomp.sdc.be.resources.data.auditing.DistributionEngineEvent; +import org.openecomp.sdc.be.resources.data.auditing.DistributionNotificationEvent; +import org.openecomp.sdc.be.resources.data.auditing.DistributionStatusEvent; +import org.openecomp.sdc.be.resources.data.auditing.GetCategoryHierarchyEvent; +import org.openecomp.sdc.be.resources.data.auditing.GetUsersListEvent; +import org.openecomp.sdc.be.resources.data.auditing.ResourceAdminEvent; +import org.openecomp.sdc.be.resources.data.auditing.UserAccessEvent; +import org.openecomp.sdc.be.resources.data.auditing.UserAdminEvent; import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import java.io.*; -import java.lang.reflect.Type; -import java.net.MalformedURLException; -import java.net.URISyntaxException; -import java.net.URL; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.EnumMap; -import java.util.Map; -import java.util.TimeZone; +import com.carrotsearch.hppc.cursors.ObjectCursor; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; + +import fj.data.Either; /** * Created by mlando on 5/16/2016. diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/GraphJsonValidator.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/GraphJsonValidator.java index 1ce976dbe5..23019b9b15 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/GraphJsonValidator.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/GraphJsonValidator.java @@ -21,10 +21,6 @@ package org.openecomp.sdc.asdctool.impl; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; @@ -32,6 +28,11 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.fasterxml.jackson.databind.ObjectMapper; + /** * simple util class to verify that the titan export json graph is not corrupted */ diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/PopulateComponentCache.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/PopulateComponentCache.java index eac972660f..b67bfc8097 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/PopulateComponentCache.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/PopulateComponentCache.java @@ -20,9 +20,7 @@ package org.openecomp.sdc.asdctool.impl; -import java.io.IOException; import java.util.ArrayList; -import java.util.Date; import java.util.Iterator; import java.util.List; import java.util.concurrent.Callable; @@ -36,9 +34,7 @@ import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.dao.titan.TitanOperationStatus; import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; import org.openecomp.sdc.be.model.Component; -import org.openecomp.sdc.be.model.Product; import org.openecomp.sdc.be.model.Resource; -import org.openecomp.sdc.be.model.Service; import org.openecomp.sdc.be.model.cache.ComponentCache; import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade; import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ProductLogic.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ProductLogic.java index 9f15c83dd8..7ed8b17907 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ProductLogic.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ProductLogic.java @@ -20,18 +20,19 @@ package org.openecomp.sdc.asdctool.impl; -import com.thinkaurelius.titan.core.TitanFactory; -import com.thinkaurelius.titan.core.TitanGraph; -import com.thinkaurelius.titan.core.TitanVertex; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + import org.apache.tinkerpop.gremlin.structure.Vertex; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; +import com.thinkaurelius.titan.core.TitanFactory; +import com.thinkaurelius.titan.core.TitanGraph; +import com.thinkaurelius.titan.core.TitanVertex; /** * Created by mlando on 2/23/2016. diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/RestUtils.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/RestUtils.java index c2ebc24d49..355780cfc6 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/RestUtils.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/RestUtils.java @@ -20,17 +20,16 @@ package org.openecomp.sdc.asdctool.impl; +import java.io.IOException; + import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpDelete; import org.apache.http.client.methods.HttpUriRequest; - import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; - /** * Created by mlando on 2/23/2016. */ diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/ValidationToolBL.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/ValidationToolBL.java index a57a237e76..e373107081 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/ValidationToolBL.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/ValidationToolBL.java @@ -1,5 +1,7 @@ package org.openecomp.sdc.asdctool.impl.validator; +import java.util.List; + import org.openecomp.sdc.asdctool.impl.validator.executers.ValidatorExecuter; import org.openecomp.sdc.asdctool.impl.validator.utils.ReportManager; import org.slf4j.Logger; @@ -7,8 +9,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.*; - /** * Created by chaya on 7/3/2017. */ diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfiguration.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfiguration.java index 0e6b2c7d16..3b81ba81e4 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfiguration.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/config/ValidationToolConfiguration.java @@ -1,11 +1,11 @@ package org.openecomp.sdc.asdctool.impl.validator.config; +import org.openecomp.sdc.asdctool.impl.validator.ValidationToolBL; +import org.openecomp.sdc.asdctool.impl.validator.executers.ServiceValidatorExecuter; +import org.openecomp.sdc.asdctool.impl.validator.executers.VfValidatorExecuter; import org.openecomp.sdc.asdctool.impl.validator.tasks.artifacts.ArtifactValidationUtils; import org.openecomp.sdc.asdctool.impl.validator.tasks.artifacts.ServiceArtifactValidationTask; import org.openecomp.sdc.asdctool.impl.validator.tasks.artifacts.VfArtifactValidationTask; -import org.openecomp.sdc.asdctool.impl.validator.executers.ServiceValidatorExecuter; -import org.openecomp.sdc.asdctool.impl.validator.executers.VfValidatorExecuter; -import org.openecomp.sdc.asdctool.impl.validator.ValidationToolBL; import org.openecomp.sdc.asdctool.impl.validator.tasks.moduleJson.ModuleJsonTask; import org.openecomp.sdc.asdctool.impl.validator.utils.ReportManager; import org.openecomp.sdc.be.dao.DAOTitanStrategy; @@ -15,7 +15,16 @@ import org.openecomp.sdc.be.dao.cassandra.CassandraClient; import org.openecomp.sdc.be.dao.jsongraph.TitanDao; import org.openecomp.sdc.be.dao.titan.TitanGraphClient; import org.openecomp.sdc.be.model.DerivedNodeTypeResolver; -import org.openecomp.sdc.be.model.jsontitan.operations.*; +import org.openecomp.sdc.be.model.jsontitan.operations.ArtifactsOperations; +import org.openecomp.sdc.be.model.jsontitan.operations.ByToscaNameDerivedNodeTypeResolver; +import org.openecomp.sdc.be.model.jsontitan.operations.CategoryOperation; +import org.openecomp.sdc.be.model.jsontitan.operations.GroupsOperation; +import org.openecomp.sdc.be.model.jsontitan.operations.NodeTemplateOperation; +import org.openecomp.sdc.be.model.jsontitan.operations.NodeTypeOperation; +import org.openecomp.sdc.be.model.jsontitan.operations.TopologyTemplateOperation; +import org.openecomp.sdc.be.model.jsontitan.operations.ToscaDataOperation; +import org.openecomp.sdc.be.model.jsontitan.operations.ToscaElementLifecycleOperation; +import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/ServiceValidatorExecuter.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/ServiceValidatorExecuter.java index 817ab15418..b64fdde8d7 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/ServiceValidatorExecuter.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/ServiceValidatorExecuter.java @@ -1,5 +1,8 @@ package org.openecomp.sdc.asdctool.impl.validator.executers; +import java.util.ArrayList; +import java.util.List; + import org.openecomp.sdc.asdctool.impl.validator.tasks.ServiceValidationTask; import org.openecomp.sdc.be.dao.jsongraph.GraphVertex; import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; @@ -7,8 +10,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import java.util.*; - /** * Created by chaya on 7/4/2017. */ diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuter.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuter.java index 15f25738c0..04f014fbc9 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuter.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuter.java @@ -1,6 +1,12 @@ package org.openecomp.sdc.asdctool.impl.validator.executers; -import fj.data.Either; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.openecomp.sdc.asdctool.impl.validator.tasks.TopologyTemplateValidationTask; import org.openecomp.sdc.asdctool.impl.validator.utils.ReportManager; import org.openecomp.sdc.asdctool.impl.validator.utils.VertexResult; @@ -12,12 +18,11 @@ import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum; import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum; import org.openecomp.sdc.be.model.jsontitan.operations.TopologyTemplateOperation; -import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import java.util.*; +import fj.data.Either; /** * Created by chaya on 7/3/2017. diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/ValidatorExecuter.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/ValidatorExecuter.java index 8281d1f353..519a900ec9 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/ValidatorExecuter.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/ValidatorExecuter.java @@ -1,10 +1,5 @@ package org.openecomp.sdc.asdctool.impl.validator.executers; -import org.openecomp.sdc.asdctool.impl.validator.utils.ElementTypeEnum; -import org.openecomp.sdc.be.model.Component; - -import java.util.List; - /** * Created by chaya on 7/3/2017. */ diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/VfValidatorExecuter.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/VfValidatorExecuter.java index 913a36fbd4..b4f333dab3 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/VfValidatorExecuter.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/VfValidatorExecuter.java @@ -1,12 +1,13 @@ package org.openecomp.sdc.asdctool.impl.validator.executers; +import java.util.ArrayList; +import java.util.List; + import org.openecomp.sdc.asdctool.impl.validator.tasks.VfValidationTask; import org.openecomp.sdc.be.dao.jsongraph.GraphVertex; import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; import org.springframework.beans.factory.annotation.Autowired; -import java.util.*; - /** * Created by chaya on 7/3/2017. */ diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/tasks/artifacts/ArtifactValidationUtils.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/tasks/artifacts/ArtifactValidationUtils.java index faccd647c2..90d8f8639c 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/tasks/artifacts/ArtifactValidationUtils.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/tasks/artifacts/ArtifactValidationUtils.java @@ -1,6 +1,11 @@ package org.openecomp.sdc.asdctool.impl.validator.tasks.artifacts; -import fj.data.Either; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Optional; + import org.openecomp.sdc.asdctool.impl.validator.utils.ReportManager; import org.openecomp.sdc.be.dao.cassandra.ArtifactCassandraDao; import org.openecomp.sdc.be.dao.cassandra.CassandraOperationStatus; @@ -14,7 +19,7 @@ import org.openecomp.sdc.be.model.jsontitan.operations.TopologyTemplateOperation import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus; import org.springframework.beans.factory.annotation.Autowired; -import java.util.*; +import fj.data.Either; /** * Created by chaya on 7/6/2017. diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/tasks/artifacts/ArtifactsVertexResult.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/tasks/artifacts/ArtifactsVertexResult.java index c010148644..c82a7b9d4f 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/tasks/artifacts/ArtifactsVertexResult.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/tasks/artifacts/ArtifactsVertexResult.java @@ -1,10 +1,10 @@ package org.openecomp.sdc.asdctool.impl.validator.tasks.artifacts; -import org.openecomp.sdc.asdctool.impl.validator.utils.VertexResult; - import java.util.HashSet; import java.util.Set; +import org.openecomp.sdc.asdctool.impl.validator.utils.VertexResult; + /** * Created by chaya on 7/25/2017. */ diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/tasks/moduleJson/ModuleJsonTask.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/tasks/moduleJson/ModuleJsonTask.java index 187359f127..78045a56a6 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/tasks/moduleJson/ModuleJsonTask.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/tasks/moduleJson/ModuleJsonTask.java @@ -1,7 +1,13 @@ package org.openecomp.sdc.asdctool.impl.validator.tasks.moduleJson; -import fj.data.Either; -import org.apache.cassandra.cql3.CQL3Type; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.stream.Collectors; + import org.openecomp.sdc.asdctool.impl.validator.tasks.ServiceValidationTask; import org.openecomp.sdc.asdctool.impl.validator.utils.ReportManager; import org.openecomp.sdc.asdctool.impl.validator.utils.VertexResult; @@ -18,8 +24,7 @@ import org.openecomp.sdc.be.model.jsontitan.operations.TopologyTemplateOperation import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus; import org.springframework.beans.factory.annotation.Autowired; -import java.util.*; -import java.util.stream.Collectors; +import fj.data.Either; /** * Created by chaya on 7/18/2017. diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ElementTypeEnum.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ElementTypeEnum.java index 245d38c853..e6a09ee875 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ElementTypeEnum.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ElementTypeEnum.java @@ -1,10 +1,10 @@ package org.openecomp.sdc.asdctool.impl.validator.utils; -import org.openecomp.sdc.asdctool.impl.validator.executers.VfValidatorExecuter; - import java.util.ArrayList; import java.util.List; +import org.openecomp.sdc.asdctool.impl.validator.executers.VfValidatorExecuter; + /** * Created by chaya on 7/4/2017. */ diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ReportManager.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ReportManager.java index 64bea12957..4a4af15fdf 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ReportManager.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ReportManager.java @@ -1,14 +1,18 @@ package org.openecomp.sdc.asdctool.impl.validator.utils; -import org.apache.commons.lang.text.StrBuilder; -import org.openecomp.sdc.asdctool.impl.validator.config.ValidationConfigManager; -import org.openecomp.sdc.be.dao.jsongraph.GraphVertex; - import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; import java.nio.file.StandardOpenOption; -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Optional; +import java.util.Set; + +import org.apache.commons.lang.text.StrBuilder; +import org.openecomp.sdc.asdctool.impl.validator.config.ValidationConfigManager; +import org.openecomp.sdc.be.dao.jsongraph.GraphVertex; /** * Created by chaya on 7/5/2017. diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ValidationTaskResult.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ValidationTaskResult.java index 8fad932941..d1d1c261f7 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ValidationTaskResult.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ValidationTaskResult.java @@ -1,7 +1,6 @@ package org.openecomp.sdc.asdctool.impl.validator.utils; import org.openecomp.sdc.be.dao.jsongraph.GraphVertex; -import org.openecomp.sdc.be.model.Component; /** * Created by chaya on 7/5/2017. diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/core/SdcMigrationTool.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/core/SdcMigrationTool.java index e2691dc7f8..21671a67a9 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/core/SdcMigrationTool.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/migration/core/SdcMigrationTool.java @@ -1,5 +1,7 @@ package org.openecomp.sdc.asdctool.migration.core; +import java.util.List; + import org.openecomp.sdc.asdctool.migration.core.execution.MigrationExecutionResult; import org.openecomp.sdc.asdctool.migration.core.execution.MigrationExecutorImpl; import org.openecomp.sdc.asdctool.migration.core.task.Migration; @@ -9,8 +11,6 @@ import org.openecomp.sdc.asdctool.migration.service.SdcRepoService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.List; - public class SdcMigrationTool { private static final Logger LOGGER = LoggerFactory.getLogger(SdcMigrationTool.class); diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/AppTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/AppTest.java deleted file mode 100644 index ae23b73d7d..0000000000 --- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/AppTest.java +++ /dev/null @@ -1,54 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * 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========================================================= - */ - -package org.openecomp.sdc.asdctool; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Unit test for simple App. - */ -public class AppTest extends TestCase { - /** - * Create the test case - * - * @param testName - * name of the test case - */ - public AppTest(String testName) { - super(testName); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() { - return new TestSuite(AppTest.class); - } - - /** - * Rigourous Test :-) - */ - public void testApp() { - assertTrue(true); - } -} diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/servlets/EntryPointTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/servlets/EntryPointTest.java new file mode 100644 index 0000000000..c3f7874c12 --- /dev/null +++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/servlets/EntryPointTest.java @@ -0,0 +1,24 @@ +package org.openecomp.sdc.asdctool.servlets; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class EntryPointTest { + + private EntryPoint createTestSubject() { + return new EntryPoint(); + } + + + @Test + public void testTest() throws Exception { + EntryPoint testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.test(); + } +}
\ No newline at end of file diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/clean/AsdcComponentsCleanerTaskTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/clean/AsdcComponentsCleanerTaskTest.java new file mode 100644 index 0000000000..be55cbd12a --- /dev/null +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/clean/AsdcComponentsCleanerTaskTest.java @@ -0,0 +1,66 @@ +package org.openecomp.sdc.be.components.clean; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class AsdcComponentsCleanerTaskTest { + + private AsdcComponentsCleanerTask createTestSubject() { + return new AsdcComponentsCleanerTask(); + } + + + @Test + public void testInit() throws Exception { + AsdcComponentsCleanerTask testSubject; + + // default test + testSubject = createTestSubject(); + testSubject.init(); + } + + + @Test + public void testDestroy() throws Exception { + AsdcComponentsCleanerTask testSubject; + + // default test + testSubject = createTestSubject(); + testSubject.destroy(); + } + + + @Test + public void testStartTask() throws Exception { + AsdcComponentsCleanerTask testSubject; + + // default test + testSubject = createTestSubject(); + testSubject.startTask(); + } + + + @Test + public void testStopTask() throws Exception { + AsdcComponentsCleanerTask testSubject; + + // default test + testSubject = createTestSubject(); + testSubject.stopTask(); + } + + + + + + @Test + public void testRun() throws Exception { + AsdcComponentsCleanerTask testSubject; + + // default test + testSubject = createTestSubject(); + testSubject.run(); + } +}
\ No newline at end of file diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactTypesInfoTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactTypesInfoTest.java new file mode 100644 index 0000000000..4010d9bf86 --- /dev/null +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ArtifactTypesInfoTest.java @@ -0,0 +1,60 @@ +package org.openecomp.sdc.be.info; + +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Test; +import org.openecomp.sdc.be.model.ArtifactType; + + +public class ArtifactTypesInfoTest { + + private ArtifactTypesInfo createTestSubject() { + return new ArtifactTypesInfo(); + } + + + @Test + public void testGetArtifactTypes() throws Exception { + ArtifactTypesInfo testSubject; + List<ArtifactType> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getArtifactTypes(); + } + + + @Test + public void testSetArtifactTypes() throws Exception { + ArtifactTypesInfo testSubject; + List<ArtifactType> artifactTypes = null; + + // default test + testSubject = createTestSubject(); + testSubject.setArtifactTypes(artifactTypes); + } + + + @Test + public void testGetHeatDefaultTimeout() throws Exception { + ArtifactTypesInfo testSubject; + Integer result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getHeatDefaultTimeout(); + } + + + @Test + public void testSetHeatDefaultTimeout() throws Exception { + ArtifactTypesInfo testSubject; + Integer heatDefaultTimeout = 0; + + // default test + testSubject = createTestSubject(); + testSubject.setHeatDefaultTimeout(heatDefaultTimeout); + } +}
\ No newline at end of file diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusListResponseTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusListResponseTest.java new file mode 100644 index 0000000000..db4d735a7e --- /dev/null +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusListResponseTest.java @@ -0,0 +1,36 @@ +package org.openecomp.sdc.be.info; + +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Test; + +public class DistributionStatusListResponseTest { + + private DistributionStatusListResponse createTestSubject() { + return new DistributionStatusListResponse(); + } + + + @Test + public void testGetDistributionStatusList() throws Exception { + DistributionStatusListResponse testSubject; + List<DistributionStatusInfo> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getDistributionStatusList(); + } + + + @Test + public void testSetDistributionStatusList() throws Exception { + DistributionStatusListResponse testSubject; + List<DistributionStatusInfo> distribStatusInfoList = null; + + // default test + testSubject = createTestSubject(); + testSubject.setDistributionStatusList(distribStatusInfoList); + } +}
\ No newline at end of file diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusOfServiceListResponceTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusOfServiceListResponceTest.java new file mode 100644 index 0000000000..830292a66f --- /dev/null +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/DistributionStatusOfServiceListResponceTest.java @@ -0,0 +1,37 @@ +package org.openecomp.sdc.be.info; + +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class DistributionStatusOfServiceListResponceTest { + + private DistributionStatusOfServiceListResponce createTestSubject() { + return new DistributionStatusOfServiceListResponce(); + } + + + @Test + public void testGetDistributionStatusOfServiceList() throws Exception { + DistributionStatusOfServiceListResponce testSubject; + List<DistributionStatusOfServiceInfo> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getDistributionStatusOfServiceList(); + } + + + @Test + public void testSetDistributionStatusOfServiceList() throws Exception { + DistributionStatusOfServiceListResponce testSubject; + List<DistributionStatusOfServiceInfo> distribStatusOfServiceInfoList = null; + + // default test + testSubject = createTestSubject(); + testSubject.setDistributionStatusOfServiceList(distribStatusOfServiceInfoList); + } +}
\ No newline at end of file diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServicesWrapperTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServicesWrapperTest.java new file mode 100644 index 0000000000..085583aa2d --- /dev/null +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ServicesWrapperTest.java @@ -0,0 +1,37 @@ +package org.openecomp.sdc.be.info; + +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class ServicesWrapperTest { + + private ServicesWrapper createTestSubject() { + return new ServicesWrapper(); + } + + + @Test + public void testGetServices() throws Exception { + ServicesWrapper testSubject; + List<ServiceInfo> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getServices(); + } + + + @Test + public void testSetServices() throws Exception { + ServicesWrapper testSubject; + List<ServiceInfo> services = null; + + // default test + testSubject = createTestSubject(); + testSubject.setServices(services); + } +}
\ No newline at end of file diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/info/ToscaNodeTypeInterfaceTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ToscaNodeTypeInterfaceTest.java new file mode 100644 index 0000000000..80ae443afe --- /dev/null +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/info/ToscaNodeTypeInterfaceTest.java @@ -0,0 +1,37 @@ +package org.openecomp.sdc.be.info; + +import java.util.List; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class ToscaNodeTypeInterfaceTest { + + private ToscaNodeTypeInterface createTestSubject() { + return new ToscaNodeTypeInterface(); + } + + + @Test + public void testGetScripts() throws Exception { + ToscaNodeTypeInterface testSubject; + List<String> result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getScripts(); + } + + + @Test + public void testSetScripts() throws Exception { + ToscaNodeTypeInterface testSubject; + List<String> scripts = null; + + // default test + testSubject = createTestSubject(); + testSubject.setScripts(scripts); + } +}
\ No newline at end of file diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/switchover/detector/SwitchoverDetectorTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/switchover/detector/SwitchoverDetectorTest.java new file mode 100644 index 0000000000..f93819c0a1 --- /dev/null +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/switchover/detector/SwitchoverDetectorTest.java @@ -0,0 +1,38 @@ +package org.openecomp.sdc.be.switchover.detector; + +import javax.annotation.Generated; + +import org.junit.Test; + + +public class SwitchoverDetectorTest { + + private SwitchoverDetector createTestSubject() { + return new SwitchoverDetector(); + } + + + @Test + public void testGetSiteMode() throws Exception { + SwitchoverDetector testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getSiteMode(); + } + + + @Test + public void testSetSiteMode() throws Exception { + SwitchoverDetector testSubject; + String mode = ""; + + // default test + testSubject = createTestSubject(); + testSubject.setSiteMode(mode); + } + + + +}
\ No newline at end of file diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/AccountTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/AccountTest.java index 81a2b41946..414748a416 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/AccountTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/AccountTest.java @@ -1,17 +1,13 @@ package org.openecomp.sdc.be.dao; -import javax.annotation.Generated; - import org.junit.Test; - public class AccountTest { private Account createTestSubject() { return new Account(); } - @Test public void testGetName() throws Exception { Account testSubject; @@ -22,7 +18,6 @@ public class AccountTest { result = testSubject.getName(); } - @Test public void testSetName() throws Exception { Account testSubject; @@ -33,7 +28,6 @@ public class AccountTest { testSubject.setName(name); } - @Test public void testGetEmail() throws Exception { Account testSubject; @@ -44,7 +38,6 @@ public class AccountTest { result = testSubject.getEmail(); } - @Test public void testSetEmail() throws Exception { Account testSubject; @@ -55,7 +48,6 @@ public class AccountTest { testSubject.setEmail(email); } - @Test public void testEquals() throws Exception { Account testSubject; @@ -67,7 +59,6 @@ public class AccountTest { result = testSubject.equals(other); } - @Test public void testHashCode() throws Exception { Account testSubject; diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/exception/ResourceDAOExceptionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/exception/ResourceDAOExceptionTest.java new file mode 100644 index 0000000000..5424e712fc --- /dev/null +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/resources/exception/ResourceDAOExceptionTest.java @@ -0,0 +1,36 @@ +package org.openecomp.sdc.be.resources.exception; + +import javax.annotation.Generated; + +import org.junit.Test; +import org.openecomp.sdc.be.dao.api.ResourceUploadStatus; + + +public class ResourceDAOExceptionTest { + + private ResourceDAOException createTestSubject() { + return new ResourceDAOException("", null); + } + + + @Test + public void testGetStatus() throws Exception { + ResourceDAOException testSubject; + ResourceUploadStatus result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getStatus(); + } + + + @Test + public void testSetStatus() throws Exception { + ResourceDAOException testSubject; + ResourceUploadStatus status = null; + + // default test + testSubject = createTestSubject(); + testSubject.setStatus(status); + } +}
\ No newline at end of file diff --git a/catalog-fe/src/test/java/org/openecomp/sdc/fe/GzipFilterTest.java b/catalog-fe/src/test/java/org/openecomp/sdc/fe/GzipFilterTest.java new file mode 100644 index 0000000000..b91048dfa1 --- /dev/null +++ b/catalog-fe/src/test/java/org/openecomp/sdc/fe/GzipFilterTest.java @@ -0,0 +1,40 @@ +package org.openecomp.sdc.fe; + +import javax.annotation.Generated; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; + +import org.junit.Test; + + +public class GzipFilterTest { + + private GzipFilter createTestSubject() { + return new GzipFilter(); + } + + + + + @Test + public void testInit() throws Exception { + GzipFilter testSubject; + FilterConfig filterConfig = null; + + // default test + testSubject = createTestSubject(); + testSubject.init(filterConfig); + } + + + @Test + public void testDestroy() throws Exception { + GzipFilter testSubject; + + // default test + testSubject = createTestSubject(); + testSubject.destroy(); + } +}
\ No newline at end of file diff --git a/catalog-fe/src/test/java/org/openecomp/sdc/fe/client/BackendClientTest.java b/catalog-fe/src/test/java/org/openecomp/sdc/fe/client/BackendClientTest.java new file mode 100644 index 0000000000..d851899f59 --- /dev/null +++ b/catalog-fe/src/test/java/org/openecomp/sdc/fe/client/BackendClientTest.java @@ -0,0 +1,34 @@ +package org.openecomp.sdc.fe.client; + +import java.util.List; + +import javax.annotation.Generated; +import javax.net.ssl.HostnameVerifier; +import javax.ws.rs.container.AsyncResponse; + +import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.CloseableHttpClient; +import org.eclipse.jetty.http.HttpGenerator.ResponseInfo; +import org.junit.Test; +import org.openecomp.sdc.fe.impl.HttpRequestInfo; + + +public class BackendClientTest { + + private BackendClient createTestSubject() { + return new BackendClient("", "", ""); + } + + + @Test + public void testGetHostnameVerifier() throws Exception { + BackendClient testSubject; + HostnameVerifier result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getHostnameVerifier(); + } + + +}
\ No newline at end of file diff --git a/catalog-fe/src/test/java/org/openecomp/sdc/fe/listen/MyObjectMapperProviderTest.java b/catalog-fe/src/test/java/org/openecomp/sdc/fe/listen/MyObjectMapperProviderTest.java new file mode 100644 index 0000000000..a6885bfe1b --- /dev/null +++ b/catalog-fe/src/test/java/org/openecomp/sdc/fe/listen/MyObjectMapperProviderTest.java @@ -0,0 +1,30 @@ +package org.openecomp.sdc.fe.listen; + +import javax.annotation.Generated; + +import org.junit.Test; + +import com.fasterxml.jackson.databind.ObjectMapper; + + +public class MyObjectMapperProviderTest { + + private MyObjectMapperProvider createTestSubject() { + return new MyObjectMapperProvider(); + } + + + @Test + public void testGetContext() throws Exception { + MyObjectMapperProvider testSubject; + Class<?> type = null; + ObjectMapper result; + + // default test + testSubject = createTestSubject(); + result = testSubject.getContext(type); + } + + + +}
\ No newline at end of file diff --git a/catalog-fe/src/test/java/org/openecomp/sdc/fe/servlets/PortalServletTest.java b/catalog-fe/src/test/java/org/openecomp/sdc/fe/servlets/PortalServletTest.java new file mode 100644 index 0000000000..25a7c6962d --- /dev/null +++ b/catalog-fe/src/test/java/org/openecomp/sdc/fe/servlets/PortalServletTest.java @@ -0,0 +1,35 @@ +package org.openecomp.sdc.fe.servlets; + +import java.util.List; + +import javax.annotation.Generated; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.junit.Test; +import org.openecomp.sdc.common.impl.MutableHttpServletRequest; + +import io.netty.handler.codec.http2.Http2FrameReader.Configuration; + + +public class PortalServletTest { + + private PortalServlet createTestSubject() { + return new PortalServlet(); + } + + + @Test + public void testDoGet() throws Exception { + PortalServlet testSubject; + HttpServletRequest request = null; + HttpServletResponse response = null; + + // default test + testSubject = createTestSubject(); + testSubject.doGet(request, response); + } + + + +}
\ No newline at end of file diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaElementOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaElementOperationTest.java index 339023f9a4..806c22a8fb 100644 --- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaElementOperationTest.java +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/ToscaElementOperationTest.java @@ -1,7 +1,14 @@ package org.openecomp.sdc.be.model.jsontitan.operations; -import fj.data.Either; -import org.apache.cassandra.cql3.CQL3Type; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Rule; @@ -21,10 +28,7 @@ import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import java.util.*; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import fj.data.Either; /** * Created by chaya on 6/12/2017. diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/ToscaTypeTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/ToscaTypeTest.java new file mode 100644 index 0000000000..0cea40fcec --- /dev/null +++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/tosca/ToscaTypeTest.java @@ -0,0 +1,67 @@ +package org.openecomp.sdc.be.model.tosca; + +import javax.annotation.Generated; + +import org.junit.Assert; +import org.junit.Test; + + +public class ToscaTypeTest { + + private ToscaType createTestSubject() { + return ToscaType.BOOLEAN; + } + + + @Test + public void testFromYamlTypeName() throws Exception { + String typeName = ""; + ToscaType result; + + // test 1 + typeName = null; + result = ToscaType.fromYamlTypeName(typeName); + Assert.assertEquals(null, result); + + // test 2 + typeName = ""; + result = ToscaType.fromYamlTypeName(typeName); + Assert.assertEquals(null, result); + } + + + @Test + public void testIsValidValue() throws Exception { + ToscaType testSubject; + String value = ""; + boolean result; + + // default test + testSubject = createTestSubject(); + result = testSubject.isValidValue(value); + } + + + + @Test + public void testConvert() throws Exception { + ToscaType testSubject; + String value = ""; + Object result; + + // default test + testSubject = createTestSubject(); + result = testSubject.convert(value); + } + + + @Test + public void testToString() throws Exception { + ToscaType testSubject; + String result; + + // default test + testSubject = createTestSubject(); + result = testSubject.toString(); + } +}
\ No newline at end of file diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VendorSoftwareProductsImpl.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VendorSoftwareProductsImpl.java index 4167785c02..9e4d3bf51b 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VendorSoftwareProductsImpl.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VendorSoftwareProductsImpl.java @@ -405,58 +405,101 @@ public class VendorSoftwareProductsImpl implements VendorSoftwareProducts { List<VersionedVendorSoftwareProductInfo> vspList = Objects.requireNonNull( vendorSoftwareProductManager.listVsps(VersionStatus.Final.name(), user)); + int skippedCounter = 0; + final int vspListSizeBefore = vspList.size(); + + for (VersionedVendorSoftwareProductInfo versionVspInfo : vspList) { + final VspDetails vspDetails = versionVspInfo.getVspDetails(); + final String vspId = vspDetails.getId(); + final Version latestFinalVersion = + getVersionInfo(vspId, VersionableEntityAction.Read, user).getLatestFinalVersion(); + + if (latestFinalVersion.getStatus().equals(VersionStatus.Locked)) { + logger.info("Skipping processing VSP name [{}]/id [{}] due to status LOCKED", vspDetails + .getName(), + vspId); + skippedCounter++; + vspList.remove(versionVspInfo); + } + } + + logger.info("Removed {} VSPs out of {} from processing due to status LOCKED", skippedCounter, + vspListSizeBefore); int healingCounter = 0; int failedCounter = 0; + int totalCounter = 0; - try { - logger.info("Total number of VSPs: {}. Performing healing and " + - "resubmit for all non-Manual VSPs in submitted status.\n No need to pre-set oldVersion " + - "field", vspList.size()); - - for (VersionedVendorSoftwareProductInfo versionVspInfo : vspList) { + final int vspListSize = vspList.size(); + logger.info("Total number of VSPs: {}. Performing healing and " + + "resubmit for all non-Manual VSPs in submitted status.\n No need to pre-set oldVersion " + + "field", vspListSize); + for (VersionedVendorSoftwareProductInfo versionVspInfo : vspList) { + try { + totalCounter++; + final Version activeVersion = versionVspInfo.getVersionInfo().getActiveVersion(); final VspDetails vspDetails = versionVspInfo.getVspDetails(); final String vspId = vspDetails.getId(); final Version latestFinalVersion = getVersionInfo(vspId, VersionableEntityAction.Read, user).getLatestFinalVersion(); + final String vspName = vspDetails.getName(); + logger.info("VSP Name {}, VSP id [{}], Active Version {} , Active Version Status {}," + + "Latest Final Version {} , " + + "Latest Final Version Status {}", vspName, vspId, activeVersion + .toString(), + activeVersion.getStatus(), latestFinalVersion.toString(), + latestFinalVersion.getStatus()); + if (Objects.nonNull(latestFinalVersion) && (!OnboardingMethod.Manual.name().equals(vspDetails.getOnboardingMethod()))) { - reSubmit(vspDetails, user); + reSubmit(vspDetails, user, totalCounter, vspListSize); healingCounter++; } + } catch (Exception e) { + failedCounter++; } - - } catch (Exception e) { - logger.error("Failed during resubmitAll", e); - failedCounter++; - } finally { - logger.info("Finished attempted healing and resubmit for {} VSPs out " + - "of total # of {} submitted VSPs. Failure count during resubmitAll: {}", - healingCounter, vspList.size(), failedCounter); } + logger.info("Total VSPs processed {}. Completed running healing and resubmit for {} VSPs out" + + " " + + "of total # of {} submitted VSPs. Failures count during resubmitAll: {}", + totalCounter, healingCounter, vspListSize, failedCounter); + return Response.ok().build(); } - private void reSubmit(VspDetails vspDetails, String user) throws IOException { + private void reSubmit(VspDetails vspDetails, String user, int currentCount, int total) throws + Exception { final String vspId = vspDetails.getId(); - long startTime = System.currentTimeMillis(); - logger.info("Starting on healing and resubmit for VSP id[{}]", vspId); + final String vspName = vspDetails.getName(); + final Version versionBefore = vspDetails.getVersion(); + Version finalVersion; + + logger.info("Starting on healing and resubmit for VSP [{}], #{} out of total {}", vspName, + currentCount, total); vspDetails.setOldVersion("true"); - vendorSoftwareProductManager.healAndAdvanceFinalVersion(vspId, vspDetails, user); + try { + finalVersion = + vendorSoftwareProductManager.healAndAdvanceFinalVersion(vspId, vspDetails, user); - long endTime = System.currentTimeMillis(); - long seconds = (endTime - startTime) / 1000; + } catch (Exception e) { + + logger.error("Failed during resubmit, VSP [{}] , version before:{}, version after:{}, " + + "status after:{}, with exception:{}", + vspName, versionBefore.toString(), vspDetails.getVersion().toString(), vspDetails + .getVersion().getStatus().name(), e.getMessage()); + throw e; + } - logger.info("Completed healing and resubmit for VSP id [{}], duration: {} seconds", - vspId, seconds); + logger.info("Completed healing and resubmit for VSP [{}], version before:{}, version after:" + + " {}", vspName, versionBefore.toString(), finalVersion); } private static void printAuditForErrors(List<ErrorMessage> errorList, String vspId, diff --git a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-core/src/main/java/org/openecomp/sdc/healing/impl/HealingManagerImpl.java b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-core/src/main/java/org/openecomp/sdc/healing/impl/HealingManagerImpl.java index 16f9c60d7f..1c895ffc6f 100644 --- a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-core/src/main/java/org/openecomp/sdc/healing/impl/HealingManagerImpl.java +++ b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-core/src/main/java/org/openecomp/sdc/healing/impl/HealingManagerImpl.java @@ -92,7 +92,7 @@ public class HealingManagerImpl implements HealingManager { MdcDataErrorMessage.createErrorMessageAndUpdateMdc(LoggerConstants.TARGET_ENTITY_DB, LoggerTragetServiceName.SELF_HEALING, ErrorLevel.ERROR.name(), LoggerErrorCode .DATA_ERROR.getErrorCode(), LoggerErrorDescription.CANT_HEAL); - healingFailureMessages.add(e.getMessage()); + healingFailureMessages.add(e.getMessage() + " ,healer name :" + healerImplClassName); } return null; } diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProduct.js b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProduct.js index 6426847cfc..ae3d3932ed 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProduct.js +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProduct.js @@ -274,8 +274,9 @@ const mapActionsToProps = (dispatch, {currentScreen: {screen, props: {softwarePr const props = { onVersionSwitching: (version, meta) => { + const screenToLoad = !currentComponentId ? screen : enums.SCREEN.SOFTWARE_PRODUCT_COMPONENTS; SoftwareProductActionHelper.fetchSoftwareProduct(dispatch, {softwareProductId, version}); - props.onNavigate({id: getActiveNavigationId(screen, currentComponentId), meta, version}); + props.onNavigate({id: getActiveNavigationId(screenToLoad), meta, version}); }, onToggle: (groups, itemIdToExpand) => groups.map(({items}) => SoftwareProductActionHelper.toggleNavigationItems(dispatch, {items, itemIdToExpand})), onNavigate: ({id, meta, version}) => { |