aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src
diff options
context:
space:
mode:
authorvasraz <vasyl.razinkov@est.tech>2020-05-01 15:35:01 +0100
committerOfir Sonsino <ofir.sonsino@intl.att.com>2020-05-06 06:47:11 +0000
commit3b343466b5b4c7ca383d0ee281d158639f4eab2f (patch)
tree6e7a27e7a180bbba792eafc870957515050dd604 /openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src
parentcb24c730a254818db9f3a703ef5933e769cefe98 (diff)
Increase test coverage - openecomp-sdc-vendor-software-product-lib
Change-Id: Id51ce6f488efd6db02aad479ff419b58436be27c Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3001
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src')
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/CandidateDataEntityTo.java87
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/AnalyzedZipHeatFiles.java81
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/FilesDataStructure.java48
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/Module.java70
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Component.java49
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ComponentComputeAssociation.java25
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ComponentData.java68
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionData.java28
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionEntityId.java64
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionEntityValidationData.java136
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ComputeData.java61
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/DeploymentFlavor.java43
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ExtractCompositionDataContext.java184
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Image.java75
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ImageData.java41
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Network.java56
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Nic.java110
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/VmSizing.java78
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/ComponentQuestionnaire.java53
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/Compute.java38
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/GuestOS.java38
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/NumOfVMs.java45
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/VmSizing.java59
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/General.java66
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/Hypervisor.java38
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/Image.java46
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/Recovery.java38
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/highAvailability/HighAvailabilityAndLoadBalancing.java79
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/image/ImageDetails.java39
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/network/Network.java22
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/network/NetworkCapacity.java30
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/Backup.java46
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/LogBackup.java46
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/SnapshotBackup.java22
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/Storage.java40
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/AcceptableJitter.java38
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/IpConfiguration.java30
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/Network.java32
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/NicQuestionnaire.java46
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/PacketsAndBytes.java30
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/PeakAndAvg.java30
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/Protocols.java43
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/Sizing.java62
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/VspQuestionnaire.java21
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/Availability.java22
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/General.java45
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/RegionsData.java29
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/StorageDataReplication.java54
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ComponentCompositionSchemaInput.java28
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ComponentQuestionnaireSchemaInput.java39
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ComputeCompositionSchemaInput.java29
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/DeploymentFlavorCompositionSchemaInput.java44
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ImageCompositionSchemaInput.java33
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/NetworkCompositionSchemaInput.java28
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/NicCompositionSchemaInput.java41
55 files changed, 695 insertions, 2078 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/CandidateDataEntityTo.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/CandidateDataEntityTo.java
index cf6e6f7181..3a535e125e 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/CandidateDataEntityTo.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/CandidateDataEntityTo.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,65 +20,42 @@
package org.openecomp.sdc.vendorsoftwareproduct.types;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import lombok.Getter;
+import lombok.Setter;
import org.openecomp.core.utilities.file.FileContentHandler;
import org.openecomp.sdc.datatypes.error.ErrorMessage;
import org.openecomp.sdc.heat.datatypes.structure.HeatStructureTree;
import org.openecomp.sdc.versioning.dao.types.Version;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+@Getter
public class CandidateDataEntityTo {
- private final String vspId;
- private final Version version;
- private final byte[] uploadedFileData;
- private final HeatStructureTree tree;
- private final FileContentHandler contentMap;
- private Map<String, List<ErrorMessage>> errors = new HashMap<>();
-
- /**
- * Instantiates a new Candidate data entity to.
- *
- * @param vspId the vsp id
- * @param uploadedFileData the uploaded file data
- * @param tree the tree
- * @param contentMap the content map
- */
- public CandidateDataEntityTo(String vspId, Version version, byte[] uploadedFileData,
- HeatStructureTree tree, FileContentHandler contentMap) {
- this.vspId = vspId;
- this.version = version;
- this.uploadedFileData = uploadedFileData;
- this.tree = tree;
- this.contentMap = contentMap;
- }
-
- public String getVspId() {
- return vspId;
- }
-
- public byte[] getUploadedFileData() {
- return uploadedFileData;
- }
-
- public HeatStructureTree getTree() {
- return tree;
- }
-
- public Version getVersion() {
- return version;
- }
-
- public FileContentHandler getContentMap() {
- return contentMap;
- }
- public Map<String, List<ErrorMessage>> getErrors() {
- return errors;
- }
+ private final String vspId;
+ private final Version version;
+ private final byte[] uploadedFileData;
+ private final HeatStructureTree tree;
+ private final FileContentHandler contentMap;
+ @Setter
+ private Map<String, List<ErrorMessage>> errors = new HashMap<>();
+
+ /**
+ * Instantiates a new Candidate data entity to.
+ *
+ * @param vspId the vsp id
+ * @param uploadedFileData the uploaded file data
+ * @param tree the tree
+ * @param contentMap the content map
+ */
+ public CandidateDataEntityTo(String vspId, Version version, byte[] uploadedFileData,
+ HeatStructureTree tree, FileContentHandler contentMap) {
+ this.vspId = vspId;
+ this.version = version;
+ this.uploadedFileData = uploadedFileData;
+ this.tree = tree;
+ this.contentMap = contentMap;
+ }
- public void setErrors(Map<String, List<ErrorMessage>> errors) {
- this.errors = errors;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/AnalyzedZipHeatFiles.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/AnalyzedZipHeatFiles.java
index 3d652607ce..63067e3ede 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/AnalyzedZipHeatFiles.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/AnalyzedZipHeatFiles.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,64 +20,47 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.candidateheat;
-import org.apache.commons.collections4.CollectionUtils;
-
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
-/**
- * @author Avrahamg
- * @since December 25, 2016
- */
+@Getter
+@NoArgsConstructor
public class AnalyzedZipHeatFiles {
- private Set<String> nestedFiles = new HashSet<>();
- private Set<String> otherNonModuleFiles = new HashSet<>();
- private Set<String> moduleFiles = new HashSet<>();
-
- public void addNestedFile(String fileName)
- {
- nestedFiles.add(fileName);
- moduleFiles.remove(fileName);
- }
- public void addNestedFiles(Collection<String> fileNames)
- {
- nestedFiles.addAll(fileNames);
- moduleFiles.removeAll(fileNames);
- }
+ private final Set<String> nestedFiles = new HashSet<>();
+ private final Set<String> otherNonModuleFiles = new HashSet<>();
+ private final Set<String> moduleFiles = new HashSet<>();
- public void addOtherNonModuleFile(String fileName)
- {
- otherNonModuleFiles.add(fileName);
- moduleFiles.remove(fileName);
- }
+ public void addNestedFile(String fileName) {
+ nestedFiles.add(fileName);
+ moduleFiles.remove(fileName);
+ }
- public void addOtherNonModuleFiles(Collection<String> fileNames)
- {
- otherNonModuleFiles.addAll(fileNames);
- moduleFiles.removeAll(fileNames);
- }
+ public void addNestedFiles(Collection<String> fileNames) {
+ nestedFiles.addAll(fileNames);
+ moduleFiles.removeAll(fileNames);
+ }
- public void addModuleFile(String fileName)
- {
- moduleFiles.add(fileName);
- }
+ public void addOtherNonModuleFile(String fileName) {
+ otherNonModuleFiles.add(fileName);
+ moduleFiles.remove(fileName);
+ }
- public Collection<String> getFilesNotEligbleForModules()
- {
- return CollectionUtils.union(this.getNestedFiles(), this.getOtherNonModuleFiles());
- }
+ public void addOtherNonModuleFiles(Collection<String> fileNames) {
+ otherNonModuleFiles.addAll(fileNames);
+ moduleFiles.removeAll(fileNames);
+ }
- public Set<String> getNestedFiles() {
- return nestedFiles;
- }
+ public void addModuleFile(String fileName) {
+ moduleFiles.add(fileName);
+ }
- public Set<String> getOtherNonModuleFiles() {
- return otherNonModuleFiles;
- }
+ public Collection<String> getFilesNotEligbleForModules() {
+ return CollectionUtils.union(this.getNestedFiles(), this.getOtherNonModuleFiles());
+ }
- public Set<String> getModuleFiles() {
- return moduleFiles;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/FilesDataStructure.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/FilesDataStructure.java
index f0d5458082..22c4534b6c 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/FilesDataStructure.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/FilesDataStructure.java
@@ -7,9 +7,9 @@
* 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.
@@ -22,42 +22,18 @@ package org.openecomp.sdc.vendorsoftwareproduct.types.candidateheat;
import java.util.ArrayList;
import java.util.List;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+@Getter
+@Setter
+@NoArgsConstructor
public class FilesDataStructure {
- private List<Module> modules = new ArrayList<>();
- private List<String> unassigned = new ArrayList<>();
- private List<String> artifacts = new ArrayList<>();
- private List<String> nested = new ArrayList<>();
- public List<Module> getModules() {
- return modules;
- }
+ private List<Module> modules = new ArrayList<>();
+ private List<String> unassigned = new ArrayList<>();
+ private List<String> artifacts = new ArrayList<>();
+ private List<String> nested = new ArrayList<>();
- public void setModules(List<Module> modules) {
- this.modules = modules;
- }
-
- public List<String> getUnassigned() {
- return unassigned;
- }
-
- public void setUnassigned(List<String> unassigned) {
- this.unassigned = unassigned;
- }
-
- public List<String> getArtifacts() {
- return artifacts;
- }
-
- public void setArtifacts(List<String> artifacts) {
- this.artifacts = artifacts;
- }
-
- public List<String> getNested() {
- return nested;
- }
-
- public void setNested(List<String> nested) {
- this.nested = nested;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/Module.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/Module.java
index 45a29f928f..d25341469f 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/Module.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/Module.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,60 +20,20 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.candidateheat;
-public class Module {
- private String name;
- private Boolean isBase;
- private String yaml;
- private String env;
- private String vol;
- private String volEnv;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Boolean getIsBase() {
- return isBase;
- }
-
- public void setIsBase(Boolean isBase) {
- this.isBase = isBase;
- }
-
- public String getYaml() {
- return yaml;
- }
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
- public void setYaml(String yaml) {
- this.yaml = yaml;
- }
-
- public String getEnv() {
- return env;
- }
-
- public void setEnv(String env) {
- this.env = env;
- }
-
- public String getVol() {
- return vol;
- }
-
- public void setVol(String vol) {
- this.vol = vol;
- }
-
- public String getVolEnv() {
- return volEnv;
- }
+@Getter
+@Setter
+@NoArgsConstructor
+public class Module {
- public void setVolEnv(String volEnv) {
- this.volEnv = volEnv;
- }
+ private String name;
+ private Boolean isBase;
+ private String yaml;
+ private String env;
+ private String vol;
+ private String volEnv;
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Component.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Component.java
index 1e30144be3..de15c64433 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Component.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Component.java
@@ -7,9 +7,9 @@
* 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.
@@ -21,43 +21,18 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
import java.util.List;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+@Getter
+@Setter
+@NoArgsConstructor
public class Component {
- private ComponentData data;
- private List<Nic> nics;
- private List<Image> images;
- private List<ComputeData> compute;
- public ComponentData getData() {
- return data;
- }
+ private ComponentData data;
+ private List<Nic> nics;
+ private List<Image> images;
+ private List<ComputeData> compute;
- public void setData(ComponentData data) {
- this.data = data;
- }
-
- public List<Nic> getNics() {
- return nics;
- }
-
- public void setNics(List<Nic> nics) {
- this.nics = nics;
- }
-
- public List<Image> getImages() {
- return images;
- }
-
- public void setImages(List<Image> images) {
- this.images = images;
- }
-
- public List<ComputeData> getCompute() {
- return compute;
- }
-
- public void setCompute(
- List<ComputeData> compute) {
- this.compute = compute;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ComponentComputeAssociation.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ComponentComputeAssociation.java
index d1193373a6..c58a1df163 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ComponentComputeAssociation.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ComponentComputeAssociation.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,23 +20,16 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+@Getter
+@Setter
+@NoArgsConstructor
public class ComponentComputeAssociation {
+
private String componentId;
private String computeFlavorId;
- public String getComponentId() {
- return componentId;
- }
- public void setComponentId(String componentId) {
- this.componentId = componentId;
- }
- public String getComputeFlavorId() {
- return computeFlavorId;
- }
-
- public void setComputeFlavorId(String computeFlavorId) {
- this.computeFlavorId = computeFlavorId;
- }
-
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ComponentData.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ComponentData.java
index 2a1e833bf6..8e0d1874c2 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ComponentData.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ComponentData.java
@@ -20,63 +20,19 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
-import java.util.Objects;
-
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@EqualsAndHashCode
public class ComponentData implements CompositionDataEntity {
- private String name;
- private String description;
- private String displayName;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getDisplayName() {
- return displayName;
- }
-
- public void setDisplayName(String displayName) {
- this.displayName = displayName;
- }
-
- @Override
- public int hashCode() {
- int result = name != null ? name.hashCode() : 0;
- result = 31 * result + (description != null ? description.hashCode() : 0);
- result = 31 * result + (displayName != null ? displayName.hashCode() : 0);
- return result;
- }
-
- @Override
- public boolean equals(Object object) {
- if (this == object) {
- return true;
- }
- if (!(object instanceof ComponentData)) {
- return false;
- }
-
- ComponentData that = (ComponentData) object;
- if (!Objects.equals(name, that.name)) {
- return false;
- }
- if (description != null ? !description.equals(that.description) : that.description != null) {
- return false;
- }
- return displayName != null ? displayName.equals(that.displayName) : that.displayName == null;
+ private String name;
+ private String description;
+ private String displayName;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionData.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionData.java
index 30e11cde60..7809cf5949 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionData.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionData.java
@@ -7,9 +7,9 @@
* 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.
@@ -21,24 +21,16 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
import java.util.List;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+@Getter
+@Setter
+@NoArgsConstructor
public class CompositionData {
- private List<Network> networks;
- private List<Component> components;
- public List<Network> getNetworks() {
- return networks;
- }
+ private List<Network> networks;
+ private List<Component> components;
- public void setNetworks(List<Network> networks) {
- this.networks = networks;
- }
-
- public List<Component> getComponents() {
- return components;
- }
-
- public void setComponents(List<Component> components) {
- this.components = components;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionEntityId.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionEntityId.java
index 98fde5b64c..c361179a50 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionEntityId.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionEntityId.java
@@ -7,9 +7,9 @@
* 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.
@@ -22,57 +22,23 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
-import com.google.common.annotations.VisibleForTesting;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+@Getter
+@EqualsAndHashCode
+@RequiredArgsConstructor
public class CompositionEntityId {
- private String id;
- private CompositionEntityId parentId;
- @VisibleForTesting
- CompositionEntityId() {}
+ private final String id;
+ private final CompositionEntityId parentId;
- public CompositionEntityId(String id, CompositionEntityId parentId) {
- this.id = id;
- this.parentId = parentId;
- }
-
- public String getId() {
- return id;
- }
-
- public CompositionEntityId getParentId() {
- return parentId;
- }
-
- @Override
- public int hashCode() {
- int result = id != null ? id.hashCode() : 0;
- result = 31 * result + (parentId != null ? parentId.hashCode() : 0);
- return result;
- }
-
- @Override
- public boolean equals(Object object) {
- if (this == object) {
- return true;
- }
- if (object == null || getClass() != object.getClass()) {
- return false;
+ @Override
+ public String toString() {
+ return parentId == null
+ ? id
+ : parentId + "/" + id;
}
- CompositionEntityId that = (CompositionEntityId) object;
-
- if (id != null ? !id.equals(that.id) : that.id != null) {
- return false;
- }
- return parentId != null ? parentId.equals(that.parentId) : that.parentId == null;
-
- }
-
- @Override
- public String toString() {
- return parentId == null
- ? id
- : parentId.toString() + "/" + id;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionEntityValidationData.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionEntityValidationData.java
index 95514d6f08..8bb0881fa7 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionEntityValidationData.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/CompositionEntityValidationData.java
@@ -7,9 +7,9 @@
* 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.
@@ -22,118 +22,40 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
-import com.google.common.annotations.VisibleForTesting;
-
import java.util.ArrayList;
import java.util.Collection;
-
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@EqualsAndHashCode
public class CompositionEntityValidationData {
- private CompositionEntityType entityType;
- private String entityId;
- private String entityName;
- private Collection<String> errors;
- private Collection<CompositionEntityValidationData> subEntitiesValidationData;
-
- @VisibleForTesting
- CompositionEntityValidationData() {}
-
- public CompositionEntityValidationData(CompositionEntityType entityType, String entityId) {
- this.entityType = entityType;
- this.entityId = entityId;
- }
-
- public String getEntityName() {
- return entityName;
- }
-
- public void setEntityName(String entityName) {
- this.entityName = entityName;
- }
-
- public CompositionEntityType getEntityType() {
- return entityType;
- }
-
- public void setEntityType(CompositionEntityType entityType) {
- this.entityType = entityType;
- }
-
- public String getEntityId() {
- return entityId;
- }
-
- public void setEntityId(String entityId) {
- this.entityId = entityId;
- }
-
- public Collection<String> getErrors() {
- return errors;
- }
- public void setErrors(Collection<String> errors) {
- this.errors = errors;
- }
+ private CompositionEntityType entityType;
+ private String entityId;
+ private String entityName;
+ private Collection<String> errors;
+ private Collection<CompositionEntityValidationData> subEntitiesValidationData;
- public Collection<CompositionEntityValidationData> getSubEntitiesValidationData() {
- return subEntitiesValidationData;
- }
-
- public void setSubEntitiesValidationData(Collection<CompositionEntityValidationData> toSet) {
- this.subEntitiesValidationData = toSet;
- }
-
- /**
- * Add sub entity validation data.
- *
- * @param subEntityValidationData the sub entity validation data
- */
- public void addSubEntityValidationData(CompositionEntityValidationData subEntityValidationData) {
- if (subEntitiesValidationData == null) {
- subEntitiesValidationData = new ArrayList<>();
- }
- subEntitiesValidationData.add(subEntityValidationData);
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
+ public CompositionEntityValidationData(CompositionEntityType entityType, String entityId) {
+ this.entityType = entityType;
+ this.entityId = entityId;
}
- CompositionEntityValidationData that = (CompositionEntityValidationData) o;
-
- if (entityType != that.entityType) {
- return false;
+ /**
+ * Add sub entity validation data.
+ *
+ * @param subEntityValidationData the sub entity validation data
+ */
+ public void addSubEntityValidationData(CompositionEntityValidationData subEntityValidationData) {
+ if (subEntitiesValidationData == null) {
+ subEntitiesValidationData = new ArrayList<>();
+ }
+ subEntitiesValidationData.add(subEntityValidationData);
}
- if (entityId != null ? !entityId.equals(that.entityId) : that.entityId != null) {
- return false;
- }
- if (entityName != null ? !entityName.equals(that.entityName) : that.entityName != null) {
- return false;
- }
- if (errors != null ? !errors.equals(that.errors) : that.errors != null) {
- return false;
- }
- if (subEntitiesValidationData != null ? !subEntitiesValidationData
- .equals(that.subEntitiesValidationData) : that.subEntitiesValidationData != null) {
- return false;
- }
-
- return true;
- }
- @Override
- public int hashCode() {
- int result = entityType != null ? entityType.hashCode() : 0;
- result = 31 * result + (entityId != null ? entityId.hashCode() : 0);
- result = 31 * result + (entityName != null ? entityName.hashCode() : 0);
- result = 31 * result + (errors != null ? errors.hashCode() : 0);
- result =
- 31 * result +
- (subEntitiesValidationData != null ? subEntitiesValidationData.hashCode() : 0);
- return result;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ComputeData.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ComputeData.java
index ec66d0e5b2..bff5df6b08 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ComputeData.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ComputeData.java
@@ -7,9 +7,9 @@
* 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.
@@ -22,55 +22,22 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
-import java.util.Objects;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+@Getter
+@Setter
+@NoArgsConstructor
+@EqualsAndHashCode
public class ComputeData implements CompositionDataEntity {
- private String name;
- private String description;
- public ComputeData(){}
+ private String name;
+ private String description;
- public ComputeData(String name) {
- this.name = name;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- @Override
- public int hashCode() {
- int result = name != null ? name.hashCode() : 0;
- result = 31 * result + (description != null ? description.hashCode() : 0);
- return result;
- }
-
- @Override
- public boolean equals(Object object) {
- if (this == object) {
- return true;
- }
- if (!(object instanceof ComputeData)) {
- return false;
+ public ComputeData(String name) {
+ this.name = name;
}
- ComputeData that = (ComputeData) object;
-
- if (!Objects.equals(name, that.name)) {
- return false;
- }
- return description != null ? description.equals(that.description): that.description == null;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/DeploymentFlavor.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/DeploymentFlavor.java
index e5fc6fe9be..6357799e65 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/DeploymentFlavor.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/DeploymentFlavor.java
@@ -7,9 +7,9 @@
* 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.
@@ -22,43 +22,18 @@ package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
import java.util.List;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+@Getter
+@Setter
+@NoArgsConstructor
public class DeploymentFlavor implements CompositionDataEntity {
+
private String model;
private String description;
private String featureGroupId;
private List<ComponentComputeAssociation> componentComputeAssociations;
- public String getModel() {
- return model;
- }
-
- public void setModel(String model) {
- this.model = model;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getFeatureGroupId() {
- return featureGroupId;
- }
-
- public void setFeatureGroupId(String featureGroupId) {
- this.featureGroupId = featureGroupId;
- }
-
- public List<ComponentComputeAssociation> getComponentComputeAssociations() {
- return componentComputeAssociations;
- }
-
- public void setComponentComputeAssociations(List<ComponentComputeAssociation> componentComputeAssociations) {
- this.componentComputeAssociations = componentComputeAssociations;
- }
-
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ExtractCompositionDataContext.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ExtractCompositionDataContext.java
index 46b0c84529..ef202d013d 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ExtractCompositionDataContext.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ExtractCompositionDataContext.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,132 +20,84 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
-import java.util.*;
-
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
public class ExtractCompositionDataContext {
- private List<Network> networks = new ArrayList<>();
- private List<Component> components = new ArrayList<>();
- private Map<String, Nic> nics = new HashMap<>();
- private Map<String, Image> images = new HashMap<>();
- private Map<String, ComputeData> computes = new HashMap<>();
- private Set<String> handledServiceTemplates = new HashSet<>();
- private Set<String> createdComponents = new HashSet<>();
-
- public Set<String> getCreatedComponents() {
- return createdComponents;
- }
-
- public void setCreatedComponents(Set<String> createdComponents) {
- this.createdComponents = createdComponents;
- }
-
- public Set<String> getHandledServiceTemplates() {
- return handledServiceTemplates;
- }
-
- public void setHandledServiceTemplates(Set<String> handledServiceTemplates) {
- this.handledServiceTemplates = handledServiceTemplates;
- }
- public void addHandledServiceTemplates(String handledServiceTemplate) {
- this.handledServiceTemplates.add(handledServiceTemplate);
- }
+ private List<Network> networks = new ArrayList<>();
+ private List<Component> components = new ArrayList<>();
+ private Map<String, Nic> nics = new HashMap<>();
+ private Map<String, Image> images = new HashMap<>();
+ private Map<String, ComputeData> computes = new HashMap<>();
+ private Set<String> handledServiceTemplates = new HashSet<>();
+ private Set<String> createdComponents = new HashSet<>();
- public List<Network> getNetworks() {
- return networks;
- }
-
- public void setNetworks(List<Network> networks) {
- this.networks = networks;
- }
-
- /**
- * Add network.
- *
- * @param network the network
- */
- public void addNetwork(Network network) {
- if (network != null) {
- networks.add(network);
+ public void addHandledServiceTemplates(String handledServiceTemplate) {
+ this.handledServiceTemplates.add(handledServiceTemplate);
}
- }
- /**
- * Add networks.
- *
- * @param network the network
- */
- public void addNetworks(List<Network> network) {
- if (networks != null) {
- networks.addAll(network);
+ /**
+ * Add network.
+ *
+ * @param network the network
+ */
+ public void addNetwork(Network network) {
+ if (network != null) {
+ networks.add(network);
+ }
}
- }
-
- public List<Component> getComponents() {
- return components;
- }
- public void setComponents(List<Component> components) {
- this.components = components;
- }
-
- /**
- * Add component.
- *
- * @param component the component
- */
- public void addComponent(Component component) {
- if (component != null) {
- components.add(component);
+ /**
+ * Add networks.
+ *
+ * @param network the network
+ */
+ public void addNetworks(List<Network> network) {
+ if (networks != null) {
+ networks.addAll(network);
+ }
}
- }
- /**
- * Add components.
- *
- * @param components the components
- */
- public void addComponents(List<Component> components) {
- if (components != null) {
- this.components.addAll(components);
+ /**
+ * Add component.
+ *
+ * @param component the component
+ */
+ public void addComponent(Component component) {
+ if (component != null) {
+ components.add(component);
+ }
}
- }
-
- public Map<String, Nic> getNics() {
- return nics;
- }
-
- public void setNics(Map<String, Nic> nics) {
- this.nics = nics;
- }
-
- public void addNic(String nicId, Nic nic) {
- this.nics.put(nicId, nic);
- }
-
- public Map<String, Image> getImages() {
- return images;
- }
-
- public void setImages(Map<String, Image> images) {
- this.images = images;
- }
-
- public void addImage(String imageId, Image image) {
- this.images.put(imageId, image);
- }
+ /**
+ * Add components.
+ *
+ * @param components the components
+ */
+ public void addComponents(List<Component> components) {
+ if (components != null) {
+ this.components.addAll(components);
+ }
+ }
- public Map<String, ComputeData> getComputes() {
- return computes;
- }
+ public void addNic(String nicId, Nic nic) {
+ this.nics.put(nicId, nic);
+ }
- public void setComputes(
- Map<String, ComputeData> computes) {
- this.computes = computes;
- }
+ public void addImage(String imageId, Image image) {
+ this.images.put(imageId, image);
+ }
- public void addCompute(String computeId, ComputeData computedata ){
- this.computes.put(computeId,computedata);
- }
+ public void addCompute(String computeId, ComputeData computedata) {
+ this.computes.put(computeId, computedata);
+ }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Image.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Image.java
index 942eaa53e6..2c624721cb 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Image.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Image.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,69 +20,20 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+@Getter
+@Setter
+@NoArgsConstructor
public class Image implements CompositionDataEntity {
- private String fileName;
- private String description;
- /*private String version;
- private String format;
- private String md5;
- //private String providedBy;*/
+ private String fileName;
+ private String description;
- public Image(){
- }
-
- public Image(String fileName){
- this.fileName=fileName;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- /*public String getMd5() {
- return md5;
- }
-
- public void setMd5(String md5) {
- this.md5 = md5;
- }
-
- public String getFormat() {
- return format;
- }
-
- public void setFormat(String format) {
- this.format = format;
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }*/
-
- public String getFileName() {
- return fileName;
- }
-
- public void setFileName(String fileName) {
- this.fileName = fileName;
- }
-
- /*public String getProvidedBy() {
- return providedBy;
- }
-
- public void setProvidedBy(String providedBy) {
- this.providedBy = providedBy;
- }*/
+ public Image(String fileName) {
+ this.fileName = fileName;
+ }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ImageData.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ImageData.java
index cef5c4ad83..191a454091 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ImageData.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/ImageData.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,33 +20,18 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
-public class ImageData implements CompositionDataEntity {
-
- private String fileName;
- private String description;
-
- public ImageData(){
-
- }
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
- public ImageData(String fileName, String description) {
- this.fileName = fileName;
- this.description = description;
- }
-
- public String getFileName() {
- return fileName;
- }
-
- public void setFileName(String fileName) {
- this.fileName = fileName;
- }
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class ImageData implements CompositionDataEntity {
- public String getDescription() {
- return description;
- }
+ private String fileName;
+ private String description;
- public void setDescription(String description) {
- this.description = description;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Network.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Network.java
index b0a2e850ed..cc5a5afbae 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Network.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Network.java
@@ -7,9 +7,9 @@
* 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.
@@ -22,50 +22,18 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
-import java.util.Objects;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+@Getter
+@Setter
+@NoArgsConstructor
+@EqualsAndHashCode
public class Network implements CompositionDataEntity {
- private String name;
- private boolean dhcp;
- public String getName() {
- return name;
- }
+ private String name;
+ private boolean dhcp;
- public void setName(String name) {
- this.name = name;
- }
-
- public boolean isDhcp() {
- return dhcp;
- }
-
- public void setDhcp(boolean dhcp) {
- this.dhcp = dhcp;
- }
-
- @Override
- public int hashCode() {
- int result = name != null ? name.hashCode() : 0;
- result = 31 * result + (dhcp ? 1 : 0);
- return result;
- }
-
- @Override
- public boolean equals(Object object) {
- if (this == object) {
- return true;
- }
- if (object == null || getClass() != object.getClass()) {
- return false;
- }
-
- Network network = (Network) object;
-
- if (!Objects.equals(dhcp, network.dhcp)) {
- return false;
- }
- return name != null ? name.equals(network.name) : network.name == null;
-
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Nic.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Nic.java
index f7c3911772..cc23d24407 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Nic.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/Nic.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,100 +20,22 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.composition;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+@Getter
+@Setter
+@NoArgsConstructor
+@EqualsAndHashCode
public class Nic implements CompositionDataEntity {
- private String name;
- private String description;
- private String networkId;
- private String networkName;
- private NetworkType networkType;
- private String networkDescription;
- public String getName() {
- return name;
- }
+ private String name;
+ private String description;
+ private String networkId;
+ private String networkName;
+ private NetworkType networkType;
+ private String networkDescription;
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getNetworkId() {
- return networkId;
- }
-
- public void setNetworkId(String networkId) {
- this.networkId = networkId;
- }
-
- public String getNetworkName() {
- return networkName;
- }
-
- public void setNetworkName(String networkName) {
- this.networkName = networkName;
- }
-
- public NetworkType getNetworkType() {
- return networkType;
- }
-
- public void setNetworkType(NetworkType networkType) {
- this.networkType = networkType;
- }
-
- public String getNetworkDescription(){
- return networkDescription;
- }
-
- public void setNetworkDescription(String networkDescription){
- this.networkDescription=networkDescription;
- }
-
- @Override
- public int hashCode() {
- int result = name != null ? name.hashCode() : 0;
- result = 31 * result + (description != null ? description.hashCode() : 0);
- result = 31 * result + (networkId != null ? networkId.hashCode() : 0);
- result = 31 * result + (networkType != null ? networkType.hashCode() : 0);
- result = 31 * result + (networkDescription != null ? networkDescription.hashCode() : 0);
- return result;
- }
-
- @Override
- public boolean equals(Object object) {
- if (this == object) {
- return true;
- }
- if (object == null || getClass() != object.getClass()) {
- return false;
- }
-
- Nic nic = (Nic) object;
-
- if (name != null ? !name.equals(nic.name) : nic.name != null) {
- return false;
- }
- if (description != null ? !description.equals(nic.description) : nic.description != null) {
- return false;
- }
- if (networkId != null ? !networkId.equals(nic.networkId) : nic.networkId != null) {
- return false;
- }
- if (networkType != null ? !networkType.equals(nic.networkType) : nic.networkType != null) {
- return false;
- }
- if (networkDescription != null ? !networkDescription.equals(nic.networkDescription) : nic.networkDescription != null) {
- return false;
- }
- return networkType == nic.networkType;
-
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/VmSizing.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/VmSizing.java
deleted file mode 100644
index 44bf1fe012..0000000000
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/composition/VmSizing.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 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.vendorsoftwareproduct.types.composition;
-
-public class VmSizing {
- private int numOfCPUs;
- private int fileSystemSizeGB;
- private int persistentStorageVolumeSize;
- private int ioOperationsPerSec;
- private String cpuOverSubscriptionRatio;
- private String memoryRAM;
-
- public int getNumOfCPUs() {
- return numOfCPUs;
- }
-
- public void setNumOfCPUs(int numOfCPUs) {
- this.numOfCPUs = numOfCPUs;
- }
-
- public int getFileSystemSizeGB() {
- return fileSystemSizeGB;
- }
-
- public void setFileSystemSizeGB(int fileSystemSizeGB) {
- this.fileSystemSizeGB = fileSystemSizeGB;
- }
-
- public int getPersistentStorageVolumeSize() {
- return persistentStorageVolumeSize;
- }
-
- public void setPersistentStorageVolumeSize(int persistentStorageVolumeSize) {
- this.persistentStorageVolumeSize = persistentStorageVolumeSize;
- }
-
- public int getIoOperationsPerSec() {
- return ioOperationsPerSec;
- }
-
- public void setIoOperationsPerSec(int ioOperationsPerSec) {
- this.ioOperationsPerSec = ioOperationsPerSec;
- }
-
- public String getCpuOverSubscriptionRatio() {
- return cpuOverSubscriptionRatio;
- }
-
- public void setCpuOverSubscriptionRatio(String cpuOverSubscriptionRatio) {
- this.cpuOverSubscriptionRatio = cpuOverSubscriptionRatio;
- }
-
- public String getMemoryRAM() {
- return memoryRAM;
- }
-
- public void setMemoryRAM(String memoryRAM) {
- this.memoryRAM = memoryRAM;
- }
-}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/ComponentQuestionnaire.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/ComponentQuestionnaire.java
index e451292eaf..6699671d61 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/ComponentQuestionnaire.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/ComponentQuestionnaire.java
@@ -7,9 +7,9 @@
* 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.
@@ -21,59 +21,24 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
import org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.compute.Compute;
import org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.general.General;
import org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.highAvailability.HighAvailabilityAndLoadBalancing;
import org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.network.Network;
import org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.storage.Storage;
-/**
- * Created by TALIO on 11/21/2016
- */
+@Getter
+@Setter
+@NoArgsConstructor
public class ComponentQuestionnaire {
+
private General general;
private Compute compute;
private HighAvailabilityAndLoadBalancing highAvailabilityAndLoadBalancing;
private Network network;
private Storage storage;
- public General getGeneral() {
- return general;
- }
-
- public void setGeneral(General general) {
- this.general = general;
- }
-
- public Compute getCompute() {
- return compute;
- }
-
- public void setCompute(Compute compute) {
- this.compute = compute;
- }
-
- public HighAvailabilityAndLoadBalancing getHighAvailabilityAndLoadBalancing() {
- return highAvailabilityAndLoadBalancing;
- }
-
- public void setHighAvailabilityAndLoadBalancing(HighAvailabilityAndLoadBalancing highAvailabilityAndLoadBalancing) {
- this.highAvailabilityAndLoadBalancing = highAvailabilityAndLoadBalancing;
- }
-
- public Network getNetwork() {
- return network;
- }
-
- public void setNetwork(Network network) {
- this.network = network;
- }
-
- public Storage getStorage() {
- return storage;
- }
-
- public void setStorage(Storage storage) {
- this.storage = storage;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/Compute.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/Compute.java
index 9295288aca..dd5fb9057c 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/Compute.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/Compute.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,35 +20,17 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.compute;
-/**
- * Created by TALIO on 11/22/2016.
- */
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
public class Compute {
+
private GuestOS guestOS;
private NumOfVMs numOfVMs;
private VmSizing vmSizing;
- public GuestOS getGuestOS() {
- return guestOS;
- }
-
- public void setGuestOS(GuestOS guestOS) {
- this.guestOS = guestOS;
- }
-
- public NumOfVMs getNumOfVMs() {
- return numOfVMs;
- }
-
- public void setNumOfVMs(NumOfVMs numOfVMs) {
- this.numOfVMs = numOfVMs;
- }
-
- public VmSizing getVmSizing() {
- return vmSizing;
- }
-
- public void setVmSizing(VmSizing vmSizing) {
- this.vmSizing = vmSizing;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/GuestOS.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/GuestOS.java
index 489557cf08..54de06b1c4 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/GuestOS.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/GuestOS.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,35 +20,17 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.compute;
-/**
- * Created by TALIO on 11/22/2016.
- */
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
public class GuestOS {
+
private String name;
private String tools;
private Number bitSize;
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getTools() {
- return tools;
- }
-
- public void setTools(String tools) {
- this.tools = tools;
- }
-
- public Number getBitSize() {
- return bitSize;
- }
-
- public void setBitSize(Number bitSize) {
- this.bitSize = bitSize;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/NumOfVMs.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/NumOfVMs.java
index 3b0b8dbb0c..f135ba78ff 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/NumOfVMs.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/NumOfVMs.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,44 +20,19 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.compute;
-/**
- * Created by TALIO on 11/22/2016.
- */
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
public class NumOfVMs {
+
private int minimum;
private int maximum;
private String CpuOverSubscriptionRatio;
private String MemoryRAM;
- public int getMinimum() {
- return minimum;
- }
-
- public void setMinimum(int minimum) {
- this.minimum = minimum;
- }
-
- public int getMaximum() {
- return maximum;
- }
-
- public void setMaximum(int maximum) {
- this.maximum = maximum;
- }
-
- public String getCpuOverSubscriptionRatio() {
- return CpuOverSubscriptionRatio;
- }
-
- public void setCpuOverSubscriptionRatio(String cpuOverSubscriptionRatio) {
- CpuOverSubscriptionRatio = cpuOverSubscriptionRatio;
- }
-
- public String getMemoryRAM() {
- return MemoryRAM;
- }
- public void setMemoryRAM(String memoryRAM) {
- MemoryRAM = memoryRAM;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/VmSizing.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/VmSizing.java
index a6a8b406cf..0f72d03d10 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/VmSizing.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/compute/VmSizing.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,7 +20,15 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.compute;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
public class VmSizing {
+
private int numOfCPUs;
private String fileSystemSizeGB;
private Number persistentStorageVolumeSize;
@@ -28,51 +36,4 @@ public class VmSizing {
private String cpuOverSubscriptionRatio;
private String memoryRAM;
- public int getNumOfCPUs() {
- return numOfCPUs;
- }
-
- public void setNumOfCPUs(int numOfCPUs) {
- this.numOfCPUs = numOfCPUs;
- }
-
- public String getFileSystemSizeGB() {
- return fileSystemSizeGB;
- }
-
- public void setFileSystemSizeGB(String fileSystemSizeGB) {
- this.fileSystemSizeGB = fileSystemSizeGB;
- }
-
- public Number getPersistentStorageVolumeSize() {
- return persistentStorageVolumeSize;
- }
-
- public void setPersistentStorageVolumeSize(Number persistentStorageVolumeSize) {
- this.persistentStorageVolumeSize = persistentStorageVolumeSize;
- }
-
- public Number getIOOperationsPerSec() {
- return IOOperationsPerSec;
- }
-
- public void setIOOperationsPerSec(Number IOOperationsPerSec) {
- this.IOOperationsPerSec = IOOperationsPerSec;
- }
-
- public String getCpuOverSubscriptionRatio() {
- return cpuOverSubscriptionRatio;
- }
-
- public void setCpuOverSubscriptionRatio(String cpuOverSubscriptionRatio) {
- this.cpuOverSubscriptionRatio = cpuOverSubscriptionRatio;
- }
-
- public String getMemoryRAM() {
- return memoryRAM;
- }
-
- public void setMemoryRAM(String memoryRAM) {
- this.memoryRAM = memoryRAM;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/General.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/General.java
index 0129fe0981..328715b90e 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/General.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/General.java
@@ -16,10 +16,15 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.general;
-/**
- * Created by TALIO on 11/22/2016.
- */
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
public class General {
+
private Hypervisor hypervisor;
private Image image;
protected Recovery recovery;
@@ -28,59 +33,4 @@ public class General {
private String nfcNamingCode;
private String nfcFunction;
- public Hypervisor getHypervisor() {
- return hypervisor;
- }
-
- public void setHypervisor(Hypervisor hypervisor) {
- this.hypervisor = hypervisor;
- }
-
- public Image getImage() {
- return image;
- }
-
- public void setImage(Image image) {
- this.image = image;
- }
-
- public Recovery getRecovery() {
- return recovery;
- }
-
- public void setRecovery(Recovery recovery) {
- this.recovery = recovery;
- }
-
- public String getDnsConfiguration() {
- return dnsConfiguration;
- }
-
- public void setDnsConfiguration(String dnsConfiguration) {
- this.dnsConfiguration = dnsConfiguration;
- }
-
- public String getVmCloneUsage() {
- return vmCloneUsage;
- }
-
- public void setVmCloneUsage(String vmCloneUsage) {
- this.vmCloneUsage = vmCloneUsage;
- }
-
- public String getNfcNamingCode() {
- return nfcNamingCode;
- }
-
- public void setNfcNamingCode(String nfcNamingCode) {
- this.nfcNamingCode = nfcNamingCode;
- }
-
- public String getNfcFunction() {
- return nfcFunction;
- }
-
- public void setNfcFunction(String nfcFunction) {
- this.nfcFunction = nfcFunction;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/Hypervisor.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/Hypervisor.java
index 930a3ce285..d2ef0456a9 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/Hypervisor.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/Hypervisor.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,35 +20,17 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.general;
-/**
- * Created by TALIO on 11/22/2016.
- */
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
public class Hypervisor {
+
private String hypervisor;
private String drivers;
private String containerFeaturesDescription;
- public String getHypervisor() {
- return hypervisor;
- }
-
- public void setHypervisor(String hypervisor) {
- this.hypervisor = hypervisor;
- }
-
- public String getDrivers() {
- return drivers;
- }
-
- public void setDrivers(String drivers) {
- this.drivers = drivers;
- }
-
- public String getContainerFeaturesDescription() {
- return containerFeaturesDescription;
- }
-
- public void setContainerFeaturesDescription(String containerFeaturesDescription) {
- this.containerFeaturesDescription = containerFeaturesDescription;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/Image.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/Image.java
index e87c0fd2ce..e00d022532 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/Image.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/Image.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,44 +20,18 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.general;
-/**
- * Created by TALIO on 11/22/2016.
- */
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
public class Image {
+
private String format;
private String providedBy;
private Number bootDiskSizePerVM;
private Number ephemeralDiskSizePerVM;
- public String getFormat() {
- return format;
- }
-
- public void setFormat(String format) {
- this.format = format;
- }
-
- public String getProvidedBy() {
- return providedBy;
- }
-
- public void setProvidedBy(String providedBy) {
- this.providedBy = providedBy;
- }
-
- public Number getBootDiskSizePerVM() {
- return bootDiskSizePerVM;
- }
-
- public void setBootDiskSizePerVM(Number bootDiskSizePerVM) {
- this.bootDiskSizePerVM = bootDiskSizePerVM;
- }
-
- public Number getEphemeralDiskSizePerVM() {
- return ephemeralDiskSizePerVM;
- }
-
- public void setEphemeralDiskSizePerVM(Number ephemeralDiskSizePerVM) {
- this.ephemeralDiskSizePerVM = ephemeralDiskSizePerVM;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/Recovery.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/Recovery.java
index f1f8017689..255e9f9235 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/Recovery.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/general/Recovery.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,35 +20,17 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.general;
-/**
- * Created by TALIO on 11/22/2016.
- */
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
public class Recovery {
+
private Number pointObjective;
private Number timeObjective;
private String vmProcessFailuresHandling;
- public Number getPointObjective() {
- return pointObjective;
- }
-
- public void setPointObjective(Number pointObjective) {
- this.pointObjective = pointObjective;
- }
-
- public Number getTimeObjective() {
- return timeObjective;
- }
-
- public void setTimeObjective(Number timeObjective) {
- this.timeObjective = timeObjective;
- }
-
- public String getVmProcessFailuresHandling() {
- return vmProcessFailuresHandling;
- }
-
- public void setVmProcessFailuresHandling(String vmProcessFailuresHandling) {
- this.vmProcessFailuresHandling = vmProcessFailuresHandling;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/highAvailability/HighAvailabilityAndLoadBalancing.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/highAvailability/HighAvailabilityAndLoadBalancing.java
index b5965887ba..75c4e31b15 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/highAvailability/HighAvailabilityAndLoadBalancing.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/highAvailability/HighAvailabilityAndLoadBalancing.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,10 +20,15 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.highAvailability;
-/**
- * Created by TALIO on 11/22/2016.
- */
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
public class HighAvailabilityAndLoadBalancing {
+
private String failureLoadDistribution;
private String nkModelImplementation;
private String architectureChoice;
@@ -33,68 +38,4 @@ public class HighAvailabilityAndLoadBalancing {
private String isComponentMandatory;
private String highAvailabilityMode;
- public String getFailureLoadDistribution() {
- return failureLoadDistribution;
- }
-
- public void setFailureLoadDistribution(String failureLoadDistribution) {
- this.failureLoadDistribution = failureLoadDistribution;
- }
-
- public String getNkModelImplementation() {
- return nkModelImplementation;
- }
-
- public void setNkModelImplementation(String nkModelImplementation) {
- this.nkModelImplementation = nkModelImplementation;
- }
-
- public String getArchitectureChoice() {
- return architectureChoice;
- }
-
- public void setArchitectureChoice(String architectureChoice) {
- this.architectureChoice = architectureChoice;
- }
-
- public String getSlaRequirements() {
- return slaRequirements;
- }
-
- public void setSlaRequirements(String slaRequirements) {
- this.slaRequirements = slaRequirements;
- }
-
- public String getHorizontalScaling() {
- return horizontalScaling;
- }
-
- public void setHorizontalScaling(String horizontalScaling) {
- this.horizontalScaling = horizontalScaling;
- }
-
- public String getLoadDistributionMechanism() {
- return loadDistributionMechanism;
- }
-
- public void setLoadDistributionMechanism(String loadDistributionMechanism) {
- this.loadDistributionMechanism = loadDistributionMechanism;
- }
-
- public String getIsComponentMandatory() {
- return isComponentMandatory;
- }
-
- public void setIsComponentMandatory(String isComponentMandatory) {
- this.isComponentMandatory = isComponentMandatory;
- }
-
- public String getHighAvailabilityMode() {
- return highAvailabilityMode;
- }
-
- public void setHighAvailabilityMode(String highAvailabilityMode) {
- this.highAvailabilityMode = highAvailabilityMode;
- }
-
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/image/ImageDetails.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/image/ImageDetails.java
index af123beba2..9d136a167f 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/image/ImageDetails.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/image/ImageDetails.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,34 +20,17 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.image;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+@Getter
+@Setter
+@NoArgsConstructor
public class ImageDetails {
- private String version;
- private String format;
- private String md5;
+ private String version;
+ private String format;
+ private String md5;
- public String getMd5() {
- return md5;
- }
-
- public void setMd5(String md5) {
- this.md5 = md5;
- }
-
- public String getFormat() {
- return format;
- }
-
- public void setFormat(String format) {
- this.format = format;
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/network/Network.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/network/Network.java
index 3e631c791e..197df1c277 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/network/Network.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/network/Network.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,17 +20,15 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.network;
-/**
- * Created by TALIO on 11/22/2016.
- */
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
public class Network {
- private NetworkCapacity networkCapacity;
- public NetworkCapacity getNetworkCapacity() {
- return networkCapacity;
- }
+ private NetworkCapacity networkCapacity;
- public void setNetworkCapacity(NetworkCapacity networkCapacity) {
- this.networkCapacity = networkCapacity;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/network/NetworkCapacity.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/network/NetworkCapacity.java
index cd1e6e67b5..8976d8298e 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/network/NetworkCapacity.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/network/NetworkCapacity.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,26 +20,16 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.network;
-/**
- * Created by TALIO on 11/22/2016.
- */
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
public class NetworkCapacity {
+
private String protocolWithHighestTrafficProfileAcrossAllNICs;
private int networkTransactionsPerSecond;
- public String getProtocolWithHighestTrafficProfileAcrossAllNICs() {
- return protocolWithHighestTrafficProfileAcrossAllNICs;
- }
-
- public void setProtocolWithHighestTrafficProfileAcrossAllNICs(String protocolWithHighestTrafficProfileAcrossAllNICs) {
- this.protocolWithHighestTrafficProfileAcrossAllNICs = protocolWithHighestTrafficProfileAcrossAllNICs;
- }
-
- public int getNetworkTransactionsPerSecond() {
- return networkTransactionsPerSecond;
- }
-
- public void setNetworkTransactionsPerSecond(int networkTransactionsPerSecond) {
- this.networkTransactionsPerSecond = networkTransactionsPerSecond;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/Backup.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/Backup.java
index 2357ddfaa1..01b6f7fe1f 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/Backup.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/Backup.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,44 +20,18 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.storage;
-/**
- * Created by TALIO on 11/22/2016.
- */
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
public class Backup {
+
private String backupType;
private String backupSolution;
private String backupNIC;
private Number backupStorageSize;
- public String getBackupType() {
- return backupType;
- }
-
- public void setBackupType(String backupType) {
- this.backupType = backupType;
- }
-
- public String getBackupSolution() {
- return backupSolution;
- }
-
- public void setBackupSolution(String backupSolution) {
- this.backupSolution = backupSolution;
- }
-
- public String getBackupNIC() {
- return backupNIC;
- }
-
- public void setBackupNIC(String backupNIC) {
- this.backupNIC = backupNIC;
- }
-
- public Number getBackupStorageSize() {
- return backupStorageSize;
- }
-
- public void setBackupStorageSize(Number backupStorageSize) {
- this.backupStorageSize = backupStorageSize;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/LogBackup.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/LogBackup.java
index 1b6453ac86..ff46e6f095 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/LogBackup.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/LogBackup.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,44 +20,18 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.storage;
-/**
- * Created by TALIO on 11/22/2016.
- */
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
public class LogBackup {
+
private Number sizeOfLogFiles;
private Number logBackupFrequency;
private int logRetentionPeriod;
private String logFileLocation;
- public Number getSizeOfLogFiles() {
- return sizeOfLogFiles;
- }
-
- public void setSizeOfLogFiles(Number sizeOfLogFiles) {
- this.sizeOfLogFiles = sizeOfLogFiles;
- }
-
- public Number getLogBackupFrequency() {
- return logBackupFrequency;
- }
-
- public void setLogBackupFrequency(Number logBackupFrequency) {
- this.logBackupFrequency = logBackupFrequency;
- }
-
- public int getLogRetentionPeriod() {
- return logRetentionPeriod;
- }
-
- public void setLogRetentionPeriod(int logRetentionPeriod) {
- this.logRetentionPeriod = logRetentionPeriod;
- }
-
- public String getLogFileLocation() {
- return logFileLocation;
- }
-
- public void setLogFileLocation(String logFileLocation) {
- this.logFileLocation = logFileLocation;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/SnapshotBackup.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/SnapshotBackup.java
index 6d61c5751a..4266ffbdf8 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/SnapshotBackup.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/SnapshotBackup.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,17 +20,15 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.storage;
-/**
- * Created by TALIO on 11/22/2016.
- */
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
public class SnapshotBackup {
- private int snapshotFrequency;
- public int getSnapshotFrequency() {
- return snapshotFrequency;
- }
+ private int snapshotFrequency;
- public void setSnapshotFrequency(int snapshotFrequency) {
- this.snapshotFrequency = snapshotFrequency;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/Storage.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/Storage.java
index 36d34964ef..b41536b720 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/Storage.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/component/storage/Storage.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,35 +20,17 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.component.storage;
-/**
- * Created by TALIO on 11/22/2016.
- */
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
public class Storage {
+
private Backup backup;
private LogBackup logBackup;
- private SnapshotBackup snapshotBackup;
-
- public Backup getBackup() {
- return backup;
- }
-
- public void setBackup(Backup backup) {
- this.backup = backup;
- }
-
- public LogBackup getLogBackup() {
- return logBackup;
- }
-
- public void setLogBackup(LogBackup logBackup) {
- this.logBackup = logBackup;
- }
-
- public SnapshotBackup getSnapshotBackup() {
- return snapshotBackup;
- }
+ private SnapshotBackup snapshotBackup;
- public void setSnapshotBackup(SnapshotBackup snapshotBackup) {
- this.snapshotBackup = snapshotBackup;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/AcceptableJitter.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/AcceptableJitter.java
index e81822ef5f..0a6b993bde 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/AcceptableJitter.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/AcceptableJitter.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,35 +20,17 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.nic;
-/**
- * Created by TALIO on 11/22/2016.
- */
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
public class AcceptableJitter {
+
private int mean;
private int max;
private int variable;
- public int getMean() {
- return mean;
- }
-
- public void setMean(int mean) {
- this.mean = mean;
- }
-
- public int getMax() {
- return max;
- }
-
- public void setMax(int max) {
- this.max = max;
- }
-
- public int getVariable() {
- return variable;
- }
-
- public void setVariable(int variable) {
- this.variable = variable;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/IpConfiguration.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/IpConfiguration.java
index 06359eb3ef..355fafbc6e 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/IpConfiguration.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/IpConfiguration.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,26 +20,16 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.nic;
-/**
- * Created by TALIO on 11/22/2016.
- */
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
public class IpConfiguration {
+
private boolean ipv4Required;
private boolean ipv6Required;
- public boolean isIpv4Required() {
- return ipv4Required;
- }
-
- public void setIpv4Required(boolean ipv4Required) {
- this.ipv4Required = ipv4Required;
- }
-
- public boolean isIpv6Required() {
- return ipv6Required;
- }
-
- public void setIpv6Required(boolean ipv6Required) {
- this.ipv6Required = ipv6Required;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/Network.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/Network.java
index 882d309b66..af0ad1f7f6 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/Network.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/Network.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,25 +20,17 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.nic;
-/**
- * Created by TALIO on 11/22/2016
- */
-public class Network {
- private String networkDescription;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
- public String getNetworkDescription() {
- return networkDescription;
- }
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class Network {
- public void setNetworkDescription(String networkDescription) {
- this.networkDescription = networkDescription;
- }
+ private String networkDescription;
- @Override
- public String toString() {
- final StringBuilder sb = new StringBuilder("Network{");
- sb.append("networkDescription='").append(networkDescription).append('\'');
- sb.append('}');
- return sb.toString();
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/NicQuestionnaire.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/NicQuestionnaire.java
index 0bc8b5df47..d41c85506e 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/NicQuestionnaire.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/NicQuestionnaire.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,44 +20,18 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.nic;
-/**
- * Created by TALIO on 11/21/2016.
- */
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
public class NicQuestionnaire {
+
private Protocols protocols;
private IpConfiguration ipConfiguration;
private Network network;
private Sizing sizing;
- public Protocols getProtocols() {
- return protocols;
- }
-
- public void setProtocols(Protocols protocols) {
- this.protocols = protocols;
- }
-
- public IpConfiguration getIpConfiguration() {
- return ipConfiguration;
- }
-
- public void setIpConfiguration(IpConfiguration ipConfiguration) {
- this.ipConfiguration = ipConfiguration;
- }
-
- public Network getNetwork() {
- return network;
- }
-
- public void setNetwork(Network network) {
- this.network = network;
- }
-
- public Sizing getSizing() {
- return sizing;
- }
-
- public void setSizing(Sizing sizing) {
- this.sizing = sizing;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/PacketsAndBytes.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/PacketsAndBytes.java
index 358620254c..9eddf3bf6c 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/PacketsAndBytes.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/PacketsAndBytes.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,26 +20,16 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.nic;
-/**
- * Created by TALIO on 11/22/2016.
- */
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
public class PacketsAndBytes {
+
private PeakAndAvg packets;
private PeakAndAvg bytes;
- public PeakAndAvg getPackets() {
- return packets;
- }
-
- public void setPackets(PeakAndAvg packets) {
- this.packets = packets;
- }
-
- public PeakAndAvg getBytes() {
- return bytes;
- }
-
- public void setBytes(PeakAndAvg bytes) {
- this.bytes = bytes;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/PeakAndAvg.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/PeakAndAvg.java
index 1e443277f4..6e50f3b29b 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/PeakAndAvg.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/PeakAndAvg.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,26 +20,16 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.nic;
-/**
- * Created by TALIO on 11/22/2016.
- */
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
public class PeakAndAvg {
+
private int peak;
private Number avg;
- public int getPeak() {
- return peak;
- }
-
- public void setPeak(int peak) {
- this.peak = peak;
- }
-
- public Number getAvg() {
- return avg;
- }
-
- public void setAvg(Number avg) {
- this.avg = avg;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/Protocols.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/Protocols.java
index 37b76bd451..f50d909fbb 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/Protocols.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/Protocols.java
@@ -7,9 +7,9 @@
* 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.
@@ -22,37 +22,18 @@ package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.nic;
import java.util.ArrayList;
import java.util.List;
-
-/**
- * Created by TALIO on 11/22/2016.
- */
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
public class Protocols {
+
private List<String> protocols = new ArrayList<>();
private String protocolWithHighestTrafficProfile;
- public List<String> getProtocols() {
- return protocols;
- }
-
- public void setProtocols(List<String> protocols) {
- this.protocols = protocols;
- }
-
- public String getProtocolWithHighestTrafficProfile() {
- return protocolWithHighestTrafficProfile;
- }
-
- public void setProtocolWithHighestTrafficProfile(String protocolWithHighestTrafficProfile) {
- this.protocolWithHighestTrafficProfile = protocolWithHighestTrafficProfile;
- }
-
- @Override
- public String toString() {
- final StringBuilder sb = new StringBuilder("Protocols{");
- sb.append("protocols=").append(protocols);
- sb.append(", protocolWithHighestTrafficProfile='").append(protocolWithHighestTrafficProfile)
- .append('\'');
- sb.append('}');
- return sb.toString();
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/Sizing.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/Sizing.java
index 4160cba554..c77d25903d 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/Sizing.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/nic/Sizing.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,10 +20,15 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.nic;
-/**
- * Created by TALIO on 11/22/2016
- */
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
public class Sizing {
+
private String describeQualityOfService;
private Number acceptablePacketLoss;
private PacketsAndBytes inflowTrafficPerSecond;
@@ -31,51 +36,4 @@ public class Sizing {
private PacketsAndBytes flowLength;
private AcceptableJitter acceptableJitter;
- public String getDescribeQualityOfService() {
- return describeQualityOfService;
- }
-
- public void setDescribeQualityOfService(String describeQualityOfService) {
- this.describeQualityOfService = describeQualityOfService;
- }
-
- public Number getAcceptablePacketLoss() {
- return acceptablePacketLoss;
- }
-
- public void setAcceptablePacketLoss(Number acceptablePacketLoss) {
- this.acceptablePacketLoss = acceptablePacketLoss;
- }
-
- public PacketsAndBytes getInflowTrafficPerSecond() {
- return inflowTrafficPerSecond;
- }
-
- public void setInflowTrafficPerSecond(PacketsAndBytes inflowTrafficPerSecond) {
- this.inflowTrafficPerSecond = inflowTrafficPerSecond;
- }
-
- public PacketsAndBytes getOutflowTrafficPerSecond() {
- return outflowTrafficPerSecond;
- }
-
- public void setOutflowTrafficPerSecond(PacketsAndBytes outflowTrafficPerSecond) {
- this.outflowTrafficPerSecond = outflowTrafficPerSecond;
- }
-
- public PacketsAndBytes getFlowLength() {
- return flowLength;
- }
-
- public void setFlowLength(PacketsAndBytes flowLength) {
- this.flowLength = flowLength;
- }
-
- public AcceptableJitter getAcceptableJitter() {
- return acceptableJitter;
- }
-
- public void setAcceptableJitter(AcceptableJitter acceptableJitter) {
- this.acceptableJitter = acceptableJitter;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/VspQuestionnaire.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/VspQuestionnaire.java
index 0b53e04f0c..ab416d47d3 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/VspQuestionnaire.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/VspQuestionnaire.java
@@ -7,9 +7,9 @@
* 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.
@@ -21,19 +21,16 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.vsp;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
import org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.vsp.general.General;
-/**
- * Created by TALIO on 11/21/2016.
- */
+@Getter
+@Setter
+@NoArgsConstructor
public class VspQuestionnaire {
- private General general;
- public General getGeneral() {
- return general;
- }
+ private General general;
- public void setGeneral(General general) {
- this.general = general;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/Availability.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/Availability.java
index 4f146466f8..1c457c546c 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/Availability.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/Availability.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,17 +20,15 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.vsp.general;
-/**
- * Created by TALIO on 11/21/2016.
- */
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
public class Availability {
- private boolean useAvailabilityZonesForHighAvailability = false;
- public boolean isUseAvailabilityZonesForHighAvailability() {
- return useAvailabilityZonesForHighAvailability;
- }
+ private boolean useAvailabilityZonesForHighAvailability;
- public void setUseAvailabilityZonesForHighAvailability(boolean useAvailabilityZonesForHighAvailability) {
- this.useAvailabilityZonesForHighAvailability = useAvailabilityZonesForHighAvailability;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/General.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/General.java
index 566374f1f7..1aaba93f8e 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/General.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/General.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,9 +20,13 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.vsp.general;
-/**
- * Created by TALIO on 11/22/2016.
- */
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
public class General {
private String affinityData;
@@ -30,35 +34,4 @@ public class General {
private RegionsData regionsData;
private StorageDataReplication storageDataReplication;
- public StorageDataReplication getStorageDataReplication() {
- return storageDataReplication;
- }
-
- public void setStorageDataReplication(StorageDataReplication storageDataReplication) {
- this.storageDataReplication = storageDataReplication;
- }
-
- public String getAffinityData() {
- return affinityData;
- }
-
- public void setAffinityData(String affinityData) {
- this.affinityData = affinityData;
- }
-
- public Availability getAvailability() {
- return availability;
- }
-
- public void setAvailability(Availability availability) {
- this.availability = availability;
- }
-
- public RegionsData getRegionsData() {
- return regionsData;
- }
-
- public void setRegionsData(RegionsData regionsData) {
- this.regionsData = regionsData;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/RegionsData.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/RegionsData.java
index efdcb46e89..093abcd652 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/RegionsData.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/RegionsData.java
@@ -7,9 +7,9 @@
* 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.
@@ -22,27 +22,16 @@ package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.vsp.general;
import java.util.ArrayList;
import java.util.List;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
-/**
- * Created by TALIO on 11/21/2016.
- */
+@Getter
+@Setter
+@NoArgsConstructor
public class RegionsData {
+
private boolean multiRegion;
private List<String> regions = new ArrayList<>();
- public boolean isMultiRegion() {
- return multiRegion;
- }
-
- public void setMultiRegion(boolean multiRegion) {
- this.multiRegion = multiRegion;
- }
-
- public List<String> getRegions() {
- return regions;
- }
-
- public void setRegions(List<String> regions) {
- this.regions = regions;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/StorageDataReplication.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/StorageDataReplication.java
index cf48703371..766b3bb1f9 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/StorageDataReplication.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/questionnaire/vsp/general/StorageDataReplication.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,53 +20,19 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.questionnaire.vsp.general;
-/**
- * Created by TALIO on 11/21/2016.
- */
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
public class StorageDataReplication {
+
private boolean storageReplicationAcrossRegion;
private Number storageReplicationSize;
private Number storageReplicationFrequency;
private String storageReplicationSource;
private String storageReplicationDestination;
- public String getStorageReplicationDestination() {
- return storageReplicationDestination;
- }
-
- public void setStorageReplicationDestination(String storageReplicationDestination) {
- this.storageReplicationDestination = storageReplicationDestination;
- }
-
- public Number getStorageReplicationSize() {
- return storageReplicationSize;
- }
-
- public void setStorageReplicationSize(Number storageReplicationSize) {
- this.storageReplicationSize = storageReplicationSize;
- }
-
- public Number getStorageReplicationFrequency() {
- return storageReplicationFrequency;
- }
-
- public void setStorageReplicationFrequency(Number storageReplicationFrequency) {
- this.storageReplicationFrequency = storageReplicationFrequency;
- }
-
- public String getStorageReplicationSource() {
- return storageReplicationSource;
- }
-
- public void setStorageReplicationSource(String storageReplicationSource) {
- this.storageReplicationSource = storageReplicationSource;
- }
-
- public boolean isStorageReplicationAcrossRegion() {
- return storageReplicationAcrossRegion;
- }
-
- public void setStorageReplicationAcrossRegion(boolean storageReplicationAcrossRegion) {
- this.storageReplicationAcrossRegion = storageReplicationAcrossRegion;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ComponentCompositionSchemaInput.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ComponentCompositionSchemaInput.java
index 46d0c6c40d..d20d3efb93 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ComponentCompositionSchemaInput.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ComponentCompositionSchemaInput.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,25 +20,17 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.schemagenerator;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
import org.openecomp.sdc.vendorsoftwareproduct.types.composition.ComponentData;
+@Getter
+@Setter
+@NoArgsConstructor
public class ComponentCompositionSchemaInput implements SchemaTemplateInput {
- private boolean manual;
- private ComponentData component;
- public boolean isManual() {
- return manual;
- }
+ private boolean manual;
+ private ComponentData component;
- public void setManual(boolean manual) {
- this.manual = manual;
- }
-
- public ComponentData getComponent() {
- return component;
- }
-
- public void setComponent(ComponentData component) {
- this.component = component;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ComponentQuestionnaireSchemaInput.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ComponentQuestionnaireSchemaInput.java
index 7f038e314d..b0c2b89536 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ComponentQuestionnaireSchemaInput.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ComponentQuestionnaireSchemaInput.java
@@ -17,41 +17,18 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.schemagenerator;
-import com.google.common.annotations.VisibleForTesting;
-
import java.util.List;
import java.util.Map;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+@Getter
+@AllArgsConstructor
public class ComponentQuestionnaireSchemaInput implements SchemaTemplateInput {
- private String componentDisplayName;
- private boolean manual;
- private List<String> nicNames;
- private Map componentQuestionnaireData;
-
- @VisibleForTesting
- ComponentQuestionnaireSchemaInput() {}
-
- public ComponentQuestionnaireSchemaInput(List<String> nicNames, Map componentQuestionnaireData,
- String componentDisplayName, boolean manual) {
- this.nicNames = nicNames;
- this.componentQuestionnaireData = componentQuestionnaireData;
- this.componentDisplayName = componentDisplayName;
- this.manual = manual;
- }
-
- public List<String> getNicNames() {
- return nicNames;
- }
-
- public Map getComponentQuestionnaireData() {
- return componentQuestionnaireData;
- }
- public String getComponentDisplayName() {
- return componentDisplayName;
- }
+ private List<String> nicNames;
+ private Map componentQuestionnaireData;
+ private String componentDisplayName;
+ private boolean manual;
- public boolean isManual() {
- return manual;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ComputeCompositionSchemaInput.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ComputeCompositionSchemaInput.java
index 4e9e08d5d4..5d87dd82c1 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ComputeCompositionSchemaInput.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ComputeCompositionSchemaInput.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,26 +20,17 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.schemagenerator;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
import org.openecomp.sdc.vendorsoftwareproduct.types.composition.ComputeData;
+@Getter
+@Setter
+@NoArgsConstructor
public class ComputeCompositionSchemaInput implements SchemaTemplateInput {
- private boolean manual;
- private ComputeData compute;
+ private boolean manual;
+ private ComputeData compute;
- public boolean isManual() {
- return manual;
- }
-
- public void setManual(boolean manual) {
- this.manual = manual;
- }
-
- public ComputeData getCompute() {
- return compute;
- }
-
- public void setCompute(ComputeData compute) {
- this.compute = compute;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/DeploymentFlavorCompositionSchemaInput.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/DeploymentFlavorCompositionSchemaInput.java
index 9cbb5dd174..ce8d51cac2 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/DeploymentFlavorCompositionSchemaInput.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/DeploymentFlavorCompositionSchemaInput.java
@@ -7,9 +7,9 @@
* 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.
@@ -21,39 +21,19 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.schemagenerator;
-import org.openecomp.sdc.vendorsoftwareproduct.types.composition.DeploymentFlavor;
-
import java.util.Collection;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.openecomp.sdc.vendorsoftwareproduct.types.composition.DeploymentFlavor;
+@Getter
+@Setter
+@NoArgsConstructor
public class DeploymentFlavorCompositionSchemaInput implements SchemaTemplateInput {
- private boolean manual;
- private DeploymentFlavor deploymentFlavor;
- private Collection<String> featureGroupIds;
-
- public boolean isManual() {
- return manual;
- }
-
- public void setManual(boolean manual) {
- this.manual = manual;
- }
-
- public DeploymentFlavor getDeploymentFlavor() {
- return deploymentFlavor;
- }
-
- public void setDeploymentFlavor(
- DeploymentFlavor deploymentFlavor) {
- this.deploymentFlavor = deploymentFlavor;
- }
-
- public Collection<String> getFeatureGroupIds() {
- return featureGroupIds;
- }
-
- public void setFeatureGroupIds(Collection<String> featureGroupIds) {
- this.featureGroupIds = featureGroupIds;
- }
+ private boolean manual;
+ private DeploymentFlavor deploymentFlavor;
+ private Collection<String> featureGroupIds;
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ImageCompositionSchemaInput.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ImageCompositionSchemaInput.java
index c72664d3db..a9ab142cc1 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ImageCompositionSchemaInput.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/ImageCompositionSchemaInput.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,30 +20,17 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.schemagenerator;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
import org.openecomp.sdc.vendorsoftwareproduct.types.composition.Image;
+@Getter
+@Setter
+@NoArgsConstructor
public class ImageCompositionSchemaInput implements SchemaTemplateInput {
- private boolean manual;
- private Image image;
-
- public boolean isManual() {
- return manual;
- }
-
- public void setManual(boolean manual) {
- this.manual = manual;
- }
-
- public Image getImage() {
- return image;
- }
-
- public void setImage(Image image) {
- this.image = image;
- }
-
-
-
+ private boolean manual;
+ private Image image;
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/NetworkCompositionSchemaInput.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/NetworkCompositionSchemaInput.java
index 67a2f3d5a1..d652e0af44 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/NetworkCompositionSchemaInput.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/NetworkCompositionSchemaInput.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,25 +20,17 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.schemagenerator;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
import org.openecomp.sdc.vendorsoftwareproduct.types.composition.Network;
+@Getter
+@Setter
+@NoArgsConstructor
public class NetworkCompositionSchemaInput implements SchemaTemplateInput {
- private boolean manual;
- private Network network;
- public boolean isManual() {
- return manual;
- }
+ private boolean manual;
+ private Network network;
- public void setManual(boolean manual) {
- this.manual = manual;
- }
-
- public Network getNetwork() {
- return network;
- }
-
- public void setNetwork(Network network) {
- this.network = network;
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/NicCompositionSchemaInput.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/NicCompositionSchemaInput.java
index 87693a492c..3cf729bec7 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/NicCompositionSchemaInput.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/schemagenerator/NicCompositionSchemaInput.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,36 +20,19 @@
package org.openecomp.sdc.vendorsoftwareproduct.types.schemagenerator;
-import org.openecomp.sdc.vendorsoftwareproduct.types.composition.Nic;
-
import java.util.Collection;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.openecomp.sdc.vendorsoftwareproduct.types.composition.Nic;
+@Getter
+@Setter
+@NoArgsConstructor
public class NicCompositionSchemaInput implements SchemaTemplateInput {
- private boolean manual;
- private Nic nic;
- private Collection<String> networkIds;
-
- public boolean isManual() {
- return manual;
- }
-
- public void setManual(boolean manual) {
- this.manual = manual;
- }
-
- public Nic getNic() {
- return nic;
- }
-
- public void setNic(Nic nic) {
- this.nic = nic;
- }
- public Collection<String> getNetworkIds() {
- return networkIds;
- }
+ private boolean manual;
+ private Nic nic;
+ private Collection<String> networkIds;
- public void setNetworkIds(Collection<String> networkIds) {
- this.networkIds = networkIds;
- }
}