From 5ed3340e27b3ab90fb617fac13dbd578285b519d Mon Sep 17 00:00:00 2001
From: ayalaben <ayala.benzvi@amdocs.com>
Date: Wed, 30 May 2018 15:38:09 +0300
Subject: Display UUID and invariant UUID - EP and LKG

Change-Id: Id4b044c76518118ae1538ae72fb26fa848a21669
Issue-ID: SDC-1386
Signed-off-by: ayalaben <ayala.benzvi@amdocs.com>
---
 .../MapEntitlementPoolEntityToEntitlementPoolEntityDto.java      | 1 +
 .../MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto.java      | 1 +
 .../sdcrests/vendorlicense/types/EntitlementPoolEntityDto.java   | 9 +++++++++
 .../sdcrests/vendorlicense/types/LicenseKeyGroupEntityDto.java   | 9 +++++++++
 4 files changed, 20 insertions(+)

diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolEntityToEntitlementPoolEntityDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolEntityToEntitlementPoolEntityDto.java
index 21293ab607..ba23b8cbb0 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolEntityToEntitlementPoolEntityDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolEntityToEntitlementPoolEntityDto.java
@@ -45,5 +45,6 @@ public class MapEntitlementPoolEntityToEntitlementPoolEntityDto
 
     target.setStartDate(source.getStartDate());
     target.setExpiryDate(source.getExpiryDate());
+    target.setVersionUUID(source.getVersionUuId());
   }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto.java
index 66618e8fa7..2b314b7416 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto.java
@@ -41,5 +41,6 @@ public class MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto
     target.setThresholdUnits(source.getThresholdUnits());
     target.setThresholdValue(source.getThresholdValue());
     target.setIncrements(source.getIncrements());
+    target.setVersionUUID(source.getVersionUuId());
   }
 }
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/EntitlementPoolEntityDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/EntitlementPoolEntityDto.java
index 5ed40b00b7..9b0a83901d 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/EntitlementPoolEntityDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/EntitlementPoolEntityDto.java
@@ -29,6 +29,7 @@ import java.util.Set;
 public class EntitlementPoolEntityDto extends EntitlementPoolRequestDto {
   private String id;
   private Set<String> referencingFeatureGroups;
+  private String versionUUID;
 
   public String getId() {
     return id;
@@ -45,4 +46,12 @@ public class EntitlementPoolEntityDto extends EntitlementPoolRequestDto {
   public void setReferencingFeatureGroups(Set<String> referencingFeatureGroups) {
     this.referencingFeatureGroups = referencingFeatureGroups;
   }
+
+  public String getversionUUID() {
+    return versionUUID;
+  }
+
+  public void setVersionUUID(String versionUUID) {
+    this.versionUUID = versionUUID;
+  }
 }
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/LicenseKeyGroupEntityDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseKeyGroupEntityDto.java
index 9fab60fe27..6186398d29 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseKeyGroupEntityDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseKeyGroupEntityDto.java
@@ -26,6 +26,7 @@ import java.util.Set;
 public class LicenseKeyGroupEntityDto extends LicenseKeyGroupRequestDto {
   private String id;
   private Set<String> referencingFeatureGroups;
+  private String versionUUID;
 
   public String getId() {
     return id;
@@ -42,4 +43,12 @@ public class LicenseKeyGroupEntityDto extends LicenseKeyGroupRequestDto {
   public void setReferencingFeatureGroups(Set<String> referencingFeatureGroups) {
     this.referencingFeatureGroups = referencingFeatureGroups;
   }
+
+  public String getVersionUUID() {
+    return versionUUID;
+  }
+
+  public void setVersionUUID(String versionUUID) {
+    this.versionUUID = versionUUID;
+  }
 }
-- 
cgit 1.2.3-korg