1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/org/onap/aai/graphgraph/velocity/VelocityEntityProperty.java b/src/main/java/org/onap/aai/graphgraph/velocity/VelocityEntityProperty.java
index 9ee2fbb..fcd2106 100644
--- a/src/main/java/org/onap/aai/graphgraph/velocity/VelocityEntityProperty.java
+++ b/src/main/java/org/onap/aai/graphgraph/velocity/VelocityEntityProperty.java
@@ -1,14 +1,16 @@
 package org.onap.aai.graphgraph.velocity;
 
+import java.util.UUID;
 import org.onap.aai.graphgraph.dto.Property;
 
 public class VelocityEntityProperty extends Property {
 
   private final VelocityEntity entity;
-
+  private final String propertyId;
   public VelocityEntityProperty(String propertyName, String propertyValue, VelocityEntity entity) {
     super(propertyName, propertyValue);
     this.entity = entity;
+    propertyId = entity != null ? entity.getRandomId() : UUID.randomUUID().toString();
   }
 
   public String getEntityId() {
@@ -23,6 +25,10 @@ public class VelocityEntityProperty extends Property {
     return entity != null;
   }
 
+  public String getPropertyId() {
+    return propertyId;
+  }
+
   @Override
   public String toString() {
     return "VelocityEntityProperty{" +