[SDC] Full OnBoard health-check and NFoD support

Change-Id: I606f8a52c7e6d2bd5558f824957d890e552c5423
Signed-off-by: Avi Ziv <avi.ziv@amdocs.com>

4 files changed, 53 insertions, 75 deletions

diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/pom.xml.versionsBackup b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/pom.xml.versionsBackup
deleted file mode 100644
index d24c315f39..0000000000
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/pom.xml.versionsBackup
+++ /dev/null
@@ -1,29 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<artifactId>vendor-license-rest-types</artifactId>
-	<name>vendor-license-rest-types</name>
-	<version>1.0-SNAPSHOT</version>
-
-	<parent>
-		<groupId>org.openecomp.sdc.onboarding</groupId>
-		<artifactId>vendor-license-rest</artifactId>
-		<version>1.0-SNAPSHOT</version>
-		<relativePath>../</relativePath>
-	</parent>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.openecomp.sdc</groupId>
-			<artifactId>openecomp-sdc-common-rest</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.openecomp.sdc</groupId>
-			<artifactId>openecomp-sdc-vendor-license-manager</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-
-</project>
\ No newline at end of file
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/EntitlementPoolRequestDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/EntitlementPoolRequestDto.java
index b49a138a09..79cf750f74 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/EntitlementPoolRequestDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/EntitlementPoolRequestDto.java
@@ -33,7 +33,7 @@ import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 @ApiModel(value = "EntitlementPoolRequest")
-//@JsonIgnoreProperties(value = {"manufacturerReferenceNumber"})
+@JsonIgnoreProperties({"manufacturerReferenceNumber", "time", "aggregationFunction", "entitlementMetric"})
 public class EntitlementPoolRequestDto {
 
   @NotNull
@@ -46,23 +46,11 @@ public class EntitlementPoolRequestDto {
   private Integer thresholdValue;
 
   private ThresholdUnit thresholdUnits;
-  @NotNull
-  @Valid
-  private ChoiceOrOtherDto<EntitlementMetric> entitlementMetric;
   @Size(max = 120)
   private String increments;
-  @NotNull
-  @Valid
-  private ChoiceOrOtherDto<AggregationFunction> aggregationFunction;
 
   @Valid
   private MultiChoiceOrOtherDto<OperationalScope> operationalScope;
-  @NotNull
-  @Valid
-  private ChoiceOrOtherDto<EntitlementTime> time;
-  @NotNull
-  @Size(max = 100)
-  private String manufacturerReferenceNumber;
 
   private String startDate;
   private String expiryDate;
@@ -99,14 +87,6 @@ public class EntitlementPoolRequestDto {
     this.thresholdUnits = thresholdUnits;
   }
 
-  public ChoiceOrOtherDto<EntitlementMetric> getEntitlementMetric() {
-    return entitlementMetric;
-  }
-
-  public void setEntitlementMetric(ChoiceOrOtherDto<EntitlementMetric> entitlementMetric) {
-    this.entitlementMetric = entitlementMetric;
-  }
-
   public String getIncrements() {
     return increments;
   }
@@ -115,14 +95,6 @@ public class EntitlementPoolRequestDto {
     this.increments = increments;
   }
 
-  public ChoiceOrOtherDto<AggregationFunction> getAggregationFunction() {
-    return aggregationFunction;
-  }
-
-  public void setAggregationFunction(ChoiceOrOtherDto<AggregationFunction> aggregationFunction) {
-    this.aggregationFunction = aggregationFunction;
-  }
-
   public MultiChoiceOrOtherDto<OperationalScope> getOperationalScope() {
     return operationalScope;
   }
@@ -131,22 +103,6 @@ public class EntitlementPoolRequestDto {
     this.operationalScope = operationalScope;
   }
 
-  public ChoiceOrOtherDto<EntitlementTime> getTime() {
-    return time;
-  }
-
-  public void setTime(ChoiceOrOtherDto<EntitlementTime> time) {
-    this.time = time;
-  }
-
-  public String getManufacturerReferenceNumber() {
-    return manufacturerReferenceNumber;
-  }
-
-  public void setManufacturerReferenceNumber(String manufacturerReferenceNumber) {
-    this.manufacturerReferenceNumber = manufacturerReferenceNumber;
-  }
-
   public String getStartDate() {
     return startDate;
   }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/FeatureGroupDescriptorDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/FeatureGroupDescriptorDto.java
index f2d0d651ef..56b3c25635 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/FeatureGroupDescriptorDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/FeatureGroupDescriptorDto.java
@@ -35,7 +35,7 @@ public class FeatureGroupDescriptorDto {
   @NotNull
   private String partNumber;
 
-  //@NotBlank(message = "is mandatory and should not be empty")
+  @NotBlank(message = "is mandatory and should not be empty")
   @Size(max = 100)
   private String manufacturerReferenceNumber;
 
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseKeyGroupRequestDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseKeyGroupRequestDto.java
index a9072f5e94..fb56f85326 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseKeyGroupRequestDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseKeyGroupRequestDto.java
@@ -22,6 +22,7 @@ package org.openecomp.sdcrests.vendorlicense.types;
 
 import org.openecomp.sdc.vendorlicense.dao.types.LicenseKeyType;
 import org.openecomp.sdc.vendorlicense.dao.types.OperationalScope;
+import org.openecomp.sdc.vendorlicense.dao.types.ThresholdUnit;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
@@ -39,6 +40,16 @@ public class LicenseKeyGroupRequestDto {
   @Valid
   private MultiChoiceOrOtherDto<OperationalScope> operationalScope;
 
+  private String startDate;
+  private String expiryDate;
+
+  private Integer thresholdValue;
+
+  private ThresholdUnit thresholdUnits;
+
+  @Size(max = 120)
+  private String increments;
+
   public String getName() {
     return name;
   }
@@ -70,4 +81,44 @@ public class LicenseKeyGroupRequestDto {
   public void setOperationalScope(MultiChoiceOrOtherDto<OperationalScope> operationalScope) {
     this.operationalScope = operationalScope;
   }
+
+  public String getStartDate() {
+    return startDate;
+  }
+
+  public void setStartDate(String startDate) {
+    this.startDate = startDate;
+  }
+
+  public String getExpiryDate() {
+    return expiryDate;
+  }
+
+  public void setExpiryDate(String expiryDate) {
+    this.expiryDate = expiryDate;
+  }
+
+  public Integer getThresholdValue() {
+    return thresholdValue;
+  }
+
+  public void setThresholdValue(Integer thresholdValue) {
+    this.thresholdValue = thresholdValue;
+  }
+
+  public ThresholdUnit getThresholdUnits() {
+    return thresholdUnits;
+  }
+
+  public void setThresholdUnits(ThresholdUnit thresholdUnits) {
+    this.thresholdUnits = thresholdUnits;
+  }
+
+  public String getIncrements() {
+    return increments;
+  }
+
+  public void setIncrements(String increments) {
+    this.increments = increments;
+  }
 }