[SDC] rebase 1710 code

Change-Id: I532ed68979fee7840ea8a5395e7e965b155fb9f9
Signed-off-by: Michael Lando <ml636r@att.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
index d6f87967ca..9fdd2d3b0f 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
@@ -333,10 +333,13 @@ public class ToscaExportHandler {
 			toscaMetadata.setSubcategory(categoryDefinition.getSubcategories().get(0).getName());
 			toscaMetadata.setResourceVendor(resource.getVendorName());
 			toscaMetadata.setResourceVendorRelease(resource.getVendorRelease());
-			
+			toscaMetadata.setResourceVendorModelNumber(resource.getResourceVendorModelNumber());
 			break;
 		case SERVICE:
+			Service service = (Service) component;
 			toscaMetadata.setType(component.getComponentType().getValue());
+			toscaMetadata.setServiceType(service.getServiceType());
+			toscaMetadata.setServiceRole(service.getServiceRole());
 			if (!isInstance) {
 				// DE268546
 				toscaMetadata.setServiceEcompNaming(((Service)component).isEcompGeneratedNaming());
@@ -747,8 +750,9 @@ public class ToscaExportHandler {
 			toscaMetadata = new VfModuleToscaMetadata();
 
 			Map<String, Object> properties = fillGroupProperties(props.get());
-
-			properties.put(VF_MODULE_DESC_KEY, description.get());
+			if(!properties.containsKey(VF_MODULE_DESC_KEY) || StringUtils.isEmpty((String) properties.get(VF_MODULE_DESC_KEY))){
+				properties.put(VF_MODULE_DESC_KEY, description.get());
+			}
 			toscaGroup.setProperties(properties);
 		}
 		toscaMetadata.setName(groupName.get());