2 files changed, 2 insertions, 30 deletions
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaMetadata.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaMetadata.java
index 41c7ca5ba..d42c1f150 100755
--- a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaMetadata.java
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaMetadata.java
@@ -61,9 +61,6 @@ public class ToscaMetadata {
 	/** The resource vendor release. */
 	private String resourceVendorRelease;
 	
-	/** the resourceVendorModelNumber */
-	private String resourceVendorModelNumber;
-
 	/** The service ecomp naming. */
 	private String serviceEcompNaming;
 	
@@ -91,11 +88,6 @@ public class ToscaMetadata {
 	
 	/** The vf module model version. */
 	private String vfModuleModelVersion;
-
-        /** serviceType */
-        private String serviceType;
-        /** serviceRole */
-        private String serviceRole;
 	
 	/**
 	 * Instantiates a new tosca metadata.
@@ -466,26 +458,4 @@ public class ToscaMetadata {
 		
 		return vfModuleModelCustomizationUUID;
 	}
-
-        /** serviceType */
-        public String getServiceType() {
-                return serviceType;
-        }
-        public void setServiceType(String serviceType) {
-                this.serviceType= serviceType;
-        }
-        /** serviceRole */
-        public String getServiceRole() {
-                return serviceRole;
-        }
-        public void setServiceRole(String serviceRole) {
-                this.serviceRole= serviceRole;
-        }
-        /** resourceVendorModelNumber */
-        public String getResourceVendorModelNumber() {
-                return resourceVendorModelNumber;
-        }
-        public void setResourceVendorModelNumber(String resourceVendorModelNumber) {
-                this.resourceVendorModelNumber= resourceVendorModelNumber;
-        }
 }
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/parser/ToscaParserImpl2.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/parser/ToscaParserImpl2.java
index 3f0dd8c31..e2b32fa8c 100644
--- a/vid-app-common/src/main/java/org/openecomp/vid/asdc/parser/ToscaParserImpl2.java
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/parser/ToscaParserImpl2.java
@@ -191,6 +191,8 @@ public class ToscaParserImpl2 {
         volumeGroup.setModelCustomizationName(group.getMetadata().getValue(Constants.vfModuleModelName));
         volumeGroup.setVersion(group.getMetadata().getValue(Constants.vfModuleModelVersion));
         volumeGroup.setUuid(group.getMetadata().getValue(Constants.vfModuleModelUUID));
+        volumeGroup.setCustomizationUuid(group.getMetadata().getValue(Constants.vfModuleModelCustomizationUUID));
+
         return volumeGroup;
     }