diff options
Diffstat (limited to 'appc-sequence-generator/appc-sequence-generator-bundle/src/main/java')
18 files changed, 103 insertions, 103 deletions
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/sequencegenerator/impl/rev170706/SequenceGeneratorModule.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/sequencegenerator/impl/rev170706/SequenceGeneratorModule.java index 7fa1dcb4e..9de0289ea 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/sequencegenerator/impl/rev170706/SequenceGeneratorModule.java +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/sequencegenerator/impl/rev170706/SequenceGeneratorModule.java @@ -18,16 +18,16 @@ * ============LICENSE_END========================================================= */ -package org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.impl.rev170706; +package org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.impl.rev170706; -import org.openecomp.appc.seqgen.provider.SequenceGeneratorProvider; +import org.onap.appc.seqgen.provider.SequenceGeneratorProvider; -public class SequenceGeneratorModule extends org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.impl.rev170706.AbstractSequenceGeneratorModule { +public class SequenceGeneratorModule extends org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.impl.rev170706.AbstractSequenceGeneratorModule { public SequenceGeneratorModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { super(identifier, dependencyResolver); } - public SequenceGeneratorModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.impl.rev170706.SequenceGeneratorModule oldModule, java.lang.AutoCloseable oldInstance) { + public SequenceGeneratorModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.impl.rev170706.SequenceGeneratorModule oldModule, java.lang.AutoCloseable oldInstance) { super(identifier, dependencyResolver, oldModule, oldInstance); } diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/sequencegenerator/impl/rev170706/SequenceGeneratorModuleFactory.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/sequencegenerator/impl/rev170706/SequenceGeneratorModuleFactory.java index 3ebba2076..3ebd11b05 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/sequencegenerator/impl/rev170706/SequenceGeneratorModuleFactory.java +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/sequencegenerator/impl/rev170706/SequenceGeneratorModuleFactory.java @@ -27,7 +27,7 @@ * * Do not modify this file unless it is present under src/main directory */ -package org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.impl.rev170706; -public class SequenceGeneratorModuleFactory extends org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.impl.rev170706.AbstractSequenceGeneratorModuleFactory { +package org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.impl.rev170706; +public class SequenceGeneratorModuleFactory extends org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.impl.rev170706.AbstractSequenceGeneratorModuleFactory { } diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/SequenceGenerator.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/SequenceGenerator.java index 0eba668ef..709e4e31b 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/SequenceGenerator.java +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/SequenceGenerator.java @@ -18,13 +18,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.seqgen; +package org.onap.appc.seqgen; -import org.openecomp.appc.dg.objects.VnfcFlowModel; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.seqgen.objects.SequenceGeneratorInput; -import org.openecomp.appc.seqgen.objects.Transaction; +import org.onap.appc.dg.objects.VnfcFlowModel; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.seqgen.objects.SequenceGeneratorInput; +import org.onap.appc.seqgen.objects.Transaction; import java.util.List; import java.util.Map; diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/dgplugin/SequenceGeneratorPlugin.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/dgplugin/SequenceGeneratorPlugin.java index afe3810cf..26260d22f 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/dgplugin/SequenceGeneratorPlugin.java +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/dgplugin/SequenceGeneratorPlugin.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.seqgen.dgplugin; +package org.onap.appc.seqgen.dgplugin; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/dgplugin/impl/SequenceGeneratorPluginImpl.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/dgplugin/impl/SequenceGeneratorPluginImpl.java index a89e8b272..c0ea4134c 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/dgplugin/impl/SequenceGeneratorPluginImpl.java +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/dgplugin/impl/SequenceGeneratorPluginImpl.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.seqgen.dgplugin.impl; +package org.onap.appc.seqgen.dgplugin.impl; import com.att.eelf.configuration.EELFLogger; @@ -28,18 +28,18 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.lang3.StringUtils; -import org.openecomp.appc.dg.objects.*; -import org.openecomp.appc.domainmodel.Vnf; -import org.openecomp.appc.domainmodel.Vnfc; -import org.openecomp.appc.domainmodel.Vserver; -import org.openecomp.appc.domainmodel.lcm.VNFOperation; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.seqgen.SequenceGenerator; -import org.openecomp.appc.seqgen.dgplugin.SequenceGeneratorPlugin; -import org.openecomp.appc.seqgen.impl.SequenceGeneratorFactory; -import org.openecomp.appc.seqgen.objects.Constants; -import org.openecomp.appc.seqgen.objects.SequenceGeneratorInput; -import org.openecomp.appc.seqgen.objects.Transaction; +import org.onap.appc.dg.objects.*; +import org.onap.appc.domainmodel.Vnf; +import org.onap.appc.domainmodel.Vnfc; +import org.onap.appc.domainmodel.Vserver; +import org.onap.appc.domainmodel.lcm.VNFOperation; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.seqgen.SequenceGenerator; +import org.onap.appc.seqgen.dgplugin.SequenceGeneratorPlugin; +import org.onap.appc.seqgen.impl.SequenceGeneratorFactory; +import org.onap.appc.seqgen.objects.Constants; +import org.onap.appc.seqgen.objects.SequenceGeneratorInput; +import org.onap.appc.seqgen.objects.Transaction; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import java.io.IOException; diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/impl/SequenceGeneratorFactory.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/impl/SequenceGeneratorFactory.java index 5d41fffe1..3c6a11962 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/impl/SequenceGeneratorFactory.java +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/impl/SequenceGeneratorFactory.java @@ -18,11 +18,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.seqgen.impl; +package org.onap.appc.seqgen.impl; -import org.openecomp.appc.domainmodel.lcm.VNFOperation; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.seqgen.SequenceGenerator; +import org.onap.appc.domainmodel.lcm.VNFOperation; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.seqgen.SequenceGenerator; public class SequenceGeneratorFactory { diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/impl/StartSequenceGenerator.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/impl/StartSequenceGenerator.java index 73e1b843f..dcffaafd8 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/impl/StartSequenceGenerator.java +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/impl/StartSequenceGenerator.java @@ -18,26 +18,26 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.seqgen.impl; +package org.onap.appc.seqgen.impl; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import org.apache.commons.lang3.StringUtils; -import org.openecomp.appc.dg.flowbuilder.FlowBuilder; -import org.openecomp.appc.dg.flowbuilder.impl.FlowBuilderFactory; -import org.openecomp.appc.dg.objects.FlowStrategies; -import org.openecomp.appc.dg.objects.InventoryModel; -import org.openecomp.appc.dg.objects.VnfcDependencyModel; -import org.openecomp.appc.dg.objects.VnfcFlowModel; -import org.openecomp.appc.domainmodel.Vnfc; -import org.openecomp.appc.domainmodel.Vserver; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.seqgen.SequenceGenerator; -import org.openecomp.appc.seqgen.objects.*; +import org.onap.appc.dg.flowbuilder.FlowBuilder; +import org.onap.appc.dg.flowbuilder.impl.FlowBuilderFactory; +import org.onap.appc.dg.objects.FlowStrategies; +import org.onap.appc.dg.objects.InventoryModel; +import org.onap.appc.dg.objects.VnfcDependencyModel; +import org.onap.appc.dg.objects.VnfcFlowModel; +import org.onap.appc.domainmodel.Vnfc; +import org.onap.appc.domainmodel.Vserver; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.seqgen.SequenceGenerator; +import org.onap.appc.seqgen.objects.*; import java.util.*; -import static org.openecomp.appc.seqgen.objects.Constants.*; +import static org.onap.appc.seqgen.objects.Constants.*; public class StartSequenceGenerator implements SequenceGenerator { diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/impl/StopSequenceGenerator.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/impl/StopSequenceGenerator.java index 51edb99bf..77bee6b83 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/impl/StopSequenceGenerator.java +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/impl/StopSequenceGenerator.java @@ -18,26 +18,26 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.seqgen.impl; +package org.onap.appc.seqgen.impl; import org.apache.commons.lang3.StringUtils; -import org.openecomp.appc.dg.flowbuilder.FlowBuilder; -import org.openecomp.appc.dg.flowbuilder.impl.FlowBuilderFactory; -import org.openecomp.appc.dg.objects.FlowStrategies; -import org.openecomp.appc.dg.objects.InventoryModel; -import org.openecomp.appc.dg.objects.VnfcDependencyModel; -import org.openecomp.appc.dg.objects.VnfcFlowModel; -import org.openecomp.appc.domainmodel.Vnfc; -import org.openecomp.appc.domainmodel.Vserver; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.seqgen.SequenceGenerator; -import org.openecomp.appc.seqgen.objects.*; +import org.onap.appc.dg.flowbuilder.FlowBuilder; +import org.onap.appc.dg.flowbuilder.impl.FlowBuilderFactory; +import org.onap.appc.dg.objects.FlowStrategies; +import org.onap.appc.dg.objects.InventoryModel; +import org.onap.appc.dg.objects.VnfcDependencyModel; +import org.onap.appc.dg.objects.VnfcFlowModel; +import org.onap.appc.domainmodel.Vnfc; +import org.onap.appc.domainmodel.Vserver; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.seqgen.SequenceGenerator; +import org.onap.appc.seqgen.objects.*; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import java.util.*; -import static org.openecomp.appc.seqgen.objects.Constants.*; +import static org.onap.appc.seqgen.objects.Constants.*; public class StopSequenceGenerator implements SequenceGenerator { diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/ActionIdentifier.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/ActionIdentifier.java index ae3ed942d..0703edf42 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/ActionIdentifier.java +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/ActionIdentifier.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.seqgen.objects; +package org.onap.appc.seqgen.objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/Constants.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/Constants.java index 354145f02..476c5b718 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/Constants.java +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/Constants.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.seqgen.objects; +package org.onap.appc.seqgen.objects; public class Constants { public static final String RETRY_COUNT = "retry-count"; diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/PreCheckOption.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/PreCheckOption.java index 860fac7e2..00d079b00 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/PreCheckOption.java +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/PreCheckOption.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.seqgen.objects; +package org.onap.appc.seqgen.objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/RequestInfo.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/RequestInfo.java index 697e13e3b..1704d274f 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/RequestInfo.java +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/RequestInfo.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.seqgen.objects; +package org.onap.appc.seqgen.objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/RequestInfoBuilder.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/RequestInfoBuilder.java index 70d4e9a0c..4fad00013 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/RequestInfoBuilder.java +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/RequestInfoBuilder.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.seqgen.objects; +package org.onap.appc.seqgen.objects; public class RequestInfoBuilder { diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/Response.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/Response.java index 9247e6e7f..ba3ccd400 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/Response.java +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/Response.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.seqgen.objects; +package org.onap.appc.seqgen.objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/SequenceGeneratorInput.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/SequenceGeneratorInput.java index 851a07582..d3f6a6d14 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/SequenceGeneratorInput.java +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/SequenceGeneratorInput.java @@ -18,14 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.seqgen.objects; +package org.onap.appc.seqgen.objects; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import org.openecomp.appc.dg.objects.InventoryModel; -import org.openecomp.appc.dg.objects.VnfcDependencyModel; +import org.onap.appc.dg.objects.InventoryModel; +import org.onap.appc.dg.objects.VnfcDependencyModel; import javax.validation.constraints.NotNull; import java.util.List; diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/SequenceGeneratorInputBuilder.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/SequenceGeneratorInputBuilder.java index b72e46e7e..66cb111b5 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/SequenceGeneratorInputBuilder.java +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/SequenceGeneratorInputBuilder.java @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.seqgen.objects; +package org.onap.appc.seqgen.objects; -import org.openecomp.appc.dg.objects.InventoryModel; -import org.openecomp.appc.dg.objects.VnfcDependencyModel; +import org.onap.appc.dg.objects.InventoryModel; +import org.onap.appc.dg.objects.VnfcDependencyModel; import java.util.HashMap; import java.util.List; diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/Transaction.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/Transaction.java index b49d1323a..ce45ec9e5 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/Transaction.java +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/objects/Transaction.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.seqgen.objects; +package org.onap.appc.seqgen.objects; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/provider/SequenceGeneratorProvider.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/provider/SequenceGeneratorProvider.java index b3aab54e1..ad9a68705 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/provider/SequenceGeneratorProvider.java +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/openecomp/appc/seqgen/provider/SequenceGeneratorProvider.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.seqgen.provider; +package org.onap.appc.seqgen.provider; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; @@ -28,30 +28,30 @@ import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.rev170706.GenerateSequenceInput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.rev170706.GenerateSequenceOutput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.rev170706.GenerateSequenceOutputBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.rev170706.SequenceGeneratorService; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.rev170706.dependency.info.dependency.info.Vnfcs; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.rev170706.inventory.info.inventory.info.vnf.info.Vm; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.rev170706.response.StatusBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.rev170706.response.Transactions; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.rev170706.response.TransactionsBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.rev170706.response.transactions.ActionIdentifier; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.rev170706.response.transactions.*; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.sequencegenerator.rev170706.response.transactions.responses.ResponseActionBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.GenerateSequenceInput; +import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.GenerateSequenceOutput; +import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.GenerateSequenceOutputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.SequenceGeneratorService; +import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.dependency.info.dependency.info.Vnfcs; +import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.inventory.info.inventory.info.vnf.info.Vm; +import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.response.StatusBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.response.Transactions; +import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.response.TransactionsBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.response.transactions.ActionIdentifier; +import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.response.transactions.*; +import org.opendaylight.yang.gen.v1.org.onap.appc.sequencegenerator.rev170706.response.transactions.responses.ResponseActionBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; -import org.openecomp.appc.dg.objects.InventoryModel; -import org.openecomp.appc.dg.objects.Node; -import org.openecomp.appc.dg.objects.VnfcDependencyModel; -import org.openecomp.appc.domainmodel.Vnf; -import org.openecomp.appc.domainmodel.Vserver; -import org.openecomp.appc.domainmodel.lcm.VNFOperation; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.seqgen.SequenceGenerator; -import org.openecomp.appc.seqgen.impl.SequenceGeneratorFactory; -import org.openecomp.appc.seqgen.objects.*; +import org.onap.appc.dg.objects.InventoryModel; +import org.onap.appc.dg.objects.Node; +import org.onap.appc.dg.objects.VnfcDependencyModel; +import org.onap.appc.domainmodel.Vnf; +import org.onap.appc.domainmodel.Vserver; +import org.onap.appc.domainmodel.lcm.VNFOperation; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.seqgen.SequenceGenerator; +import org.onap.appc.seqgen.impl.SequenceGeneratorFactory; +import org.onap.appc.seqgen.objects.*; import java.util.*; import java.util.concurrent.ExecutorService; @@ -263,12 +263,12 @@ public class SequenceGeneratorProvider implements AutoCloseable,SequenceGenerato return null; } List<Vnfcs> vnfcs = input.getDependencyInfo().getVnfcs(); - Set<Node<org.openecomp.appc.domainmodel.Vnfc>> dependencies = new HashSet<>(); + Set<Node<org.onap.appc.domainmodel.Vnfc>> dependencies = new HashSet<>(); for(Vnfcs vnfcObj:vnfcs){ - org.openecomp.appc.domainmodel.Vnfc vnfc; - Node<org.openecomp.appc.domainmodel.Vnfc> currentNode = readNode(vnfcObj.getVnfcType(),dependencies); + org.onap.appc.domainmodel.Vnfc vnfc; + Node<org.onap.appc.domainmodel.Vnfc> currentNode = readNode(vnfcObj.getVnfcType(),dependencies); if(currentNode == null){ - vnfc = new org.openecomp.appc.domainmodel.Vnfc(vnfcObj.getVnfcType(),vnfcObj.getResilience()); + vnfc = new org.onap.appc.domainmodel.Vnfc(vnfcObj.getVnfcType(),vnfcObj.getResilience()); currentNode = new Node<>(vnfc); dependencies.add(currentNode); } @@ -277,9 +277,9 @@ public class SequenceGeneratorProvider implements AutoCloseable,SequenceGenerato currentNode.getChild().setMandatory(vnfcObj.isMandatory()); } for(String parentVnfcType:vnfcObj.getParents()){ - Node<org.openecomp.appc.domainmodel.Vnfc> parentNode = readNode(parentVnfcType,dependencies); + Node<org.onap.appc.domainmodel.Vnfc> parentNode = readNode(parentVnfcType,dependencies); if(parentNode == null){ - org.openecomp.appc.domainmodel.Vnfc parentVnfc = new org.openecomp.appc.domainmodel.Vnfc(parentVnfcType,null); + org.onap.appc.domainmodel.Vnfc parentVnfc = new org.onap.appc.domainmodel.Vnfc(parentVnfcType,null); parentNode = new Node<>(parentVnfc); currentNode.addParent(parentVnfc); dependencies.add(parentNode); @@ -292,8 +292,8 @@ public class SequenceGeneratorProvider implements AutoCloseable,SequenceGenerato return new VnfcDependencyModel(dependencies); } - private Node<org.openecomp.appc.domainmodel.Vnfc> readNode(String vnfcType, Set<Node<org.openecomp.appc.domainmodel.Vnfc>> dependencies) { - for(Node<org.openecomp.appc.domainmodel.Vnfc> node : dependencies){ + private Node<org.onap.appc.domainmodel.Vnfc> readNode(String vnfcType, Set<Node<org.onap.appc.domainmodel.Vnfc>> dependencies) { + for(Node<org.onap.appc.domainmodel.Vnfc> node : dependencies){ if(node.getChild().getVnfcType().equalsIgnoreCase(vnfcType)){ return node; } @@ -309,7 +309,7 @@ public class SequenceGeneratorProvider implements AutoCloseable,SequenceGenerato Vnf vnf = new Vnf(input.getInventoryInfo().getVnfInfo().getVnfId(), input.getInventoryInfo().getVnfInfo().getVnfType(),null); - Map<org.openecomp.appc.domainmodel.Vnfc,List<Vserver>> map = new HashMap<>(); + Map<org.onap.appc.domainmodel.Vnfc,List<Vserver>> map = new HashMap<>(); for(Vm vm:input.getInventoryInfo().getVnfInfo().getVm()){ if(StringUtils.isBlank(vm.getVserverId())){ throw new APPCException("vserver-id not found "); @@ -321,7 +321,7 @@ public class SequenceGeneratorProvider implements AutoCloseable,SequenceGenerato throw new APPCException("vnfc-name not found for vserver " + vm.getVserverId()); } - org.openecomp.appc.domainmodel.Vnfc vnfc = new org.openecomp.appc.domainmodel.Vnfc(vm.getVnfc().getVnfcType(),null,vm.getVnfc().getVnfcName()); + org.onap.appc.domainmodel.Vnfc vnfc = new org.onap.appc.domainmodel.Vnfc(vm.getVnfc().getVnfcType(),null,vm.getVnfc().getVnfcName()); List<Vserver> vms = map.get(vnfc); if(vms ==null){ vms = new LinkedList<>(); @@ -329,8 +329,8 @@ public class SequenceGeneratorProvider implements AutoCloseable,SequenceGenerato } vms.add(new Vserver(null,null,vm.getVserverId(),null,null)); } - for(Map.Entry<org.openecomp.appc.domainmodel.Vnfc,List<Vserver>> entry:map.entrySet()){ - org.openecomp.appc.domainmodel.Vnfc vnfc = entry.getKey(); + for(Map.Entry<org.onap.appc.domainmodel.Vnfc,List<Vserver>> entry:map.entrySet()){ + org.onap.appc.domainmodel.Vnfc vnfc = entry.getKey(); List<Vserver> vmList = entry.getValue(); vnfc.addVms(vmList); vnf.addVnfc(vnfc); |