Add Category info For Service and Resource

Add Category info For Service and Resource,It is used for generic workflow

Change-Id: I952d39388eac8b379a8ecc365e1292fdc0cf597e
Issue-ID: SO-379
Signed-off-by: c00149107 <chenchuanyu@huawei.com>

7 files changed, 102 insertions, 10 deletions

diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java
index 390bf40e44..b7b35158cd 100644
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java
@@ -787,6 +787,7 @@ public class ToscaResourceInstaller {// implements IVfResourceInstaller {
 			service.setModelUUID(serviceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_UUID));

 			//service.setVersion(serviceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_VERSION));

 			service.setModelInvariantUUID(serviceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID));

+			service.setCategory(serviceMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_CATEGORY));

 			service.setToscaCsarArtifactUUID(toscaResourceStructure.getToscaArtifact().getArtifactUUID());

 			//service.setCreated(getCurrentTimeStamp());

 		}

@@ -835,6 +836,8 @@ public class ToscaResourceInstaller {// implements IVfResourceInstaller {
 		networkResource.setToscaNodeType(networkNodeTemplate.getType());

 		networkResource.setDescription(testNull(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_DESCRIPTION)));

 		networkResource.setOrchestrationMode("HEAT");

+		networkResource.setCategory(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CATEGORY));

+		networkResource.setSubCategory(networkNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_SUBCATEGORY));

 		networkResource.setHeatTemplateArtifactUUID(networkHeatTemplateLookup.getHeatTemplateArtifactUuid());

 			

 		toscaResourceStructure.setCatalogNetworkResource(networkResource); 

@@ -1019,11 +1022,12 @@ public class ToscaResourceInstaller {// implements IVfResourceInstaller {
 		vnfResource.setToscaNodeType(testNull(vfNodeTemplate.getType()));

 		vnfResource.setAicVersionMax(testNull(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_MAXINSTANCES).trim()));

 		vnfResource.setAicVersionMin(testNull(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_MININSTANCES).trim()));

-		//vnfResource.setHeatTemplateArtifactUUId(toscaResourceStructure.getHeatTemplateUUID());

-		

-	//	vfNodeTemplate.getProperties()

-		toscaResourceStructure.setCatalogVnfResource(vnfResource); 

-		

+        // vnfResource.setHeatTemplateArtifactUUId(toscaResourceStructure.getHeatTemplateUUID());

+        vnfResource.setCategory(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CATEGORY));

+        vnfResource.setSubCategory(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_SUBCATEGORY));

+        // vfNodeTemplate.getProperties()

+        toscaResourceStructure.setCatalogVnfResource(vnfResource);

+

 		VnfResourceCustomization vnfResourceCustomization = new VnfResourceCustomization();

 		vnfResourceCustomization.setModelCustomizationUuid(testNull(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID).trim()));

 		vnfResourceCustomization.setModelInstanceName(vfNodeTemplate.getName());

diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkResource.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkResource.java
index b6151f176d..025b13b708 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkResource.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkResource.java
@@ -41,6 +41,8 @@ public class NetworkResource extends MavenLikeVersioning implements Serializable
 	private String toscaNodeType;
 	private Timestamp created;
 	private String modelUUID;
+    private String category;
+    private String subCategory;
 	private String heatTemplateArtifactUUID;
 	
 	public NetworkResource() {}
@@ -123,8 +125,40 @@ public class NetworkResource extends MavenLikeVersioning implements Serializable
 	public void setModelUUID(String modelUUID) {
 		this.modelUUID = modelUUID;
 	}
-
-	public String getHeatTemplateArtifactUUID() {
+	
+	
+    /**
+     * @return Returns the category.
+     */
+    public String getCategory() {
+        return category;
+    }
+
+    
+    /**
+     * @param category The category to set.
+     */
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    
+    /**
+     * @return Returns the subCategory.
+     */
+    public String getSubCategory() {
+        return subCategory;
+    }
+
+    
+    /**
+     * @param subCategory The subCategory to set.
+     */
+    public void setSubCategory(String subCategory) {
+        this.subCategory = subCategory;
+    }
+
+    public String getHeatTemplateArtifactUUID() {
 		return heatTemplateArtifactUUID;
 	}
 
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Service.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Service.java
index fe7b7a3b8c..beb021ac11 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Service.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Service.java
@@ -39,6 +39,7 @@ public class Service extends MavenLikeVersioning implements Serializable {
 	private Timestamp created;
 	private String toscaCsarArtifactUUID;
 	private String modelVersion;
+	private String category;
 	private String serviceType;
 	private String serviceRole;
 	private Map<String,ServiceRecipe> recipes;
@@ -115,8 +116,22 @@ public class Service extends MavenLikeVersioning implements Serializable {
 		this.modelVersion = modelVersion;
 	}
 
-	
-	public String getServiceType() {
+    /**
+     * @return Returns the category.
+     */
+    public String getCategory() {
+        return category;
+    }
+
+    
+    /**
+     * @param category The category to set.
+     */
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public String getServiceType() {
 		return serviceType;
 	}
 
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResource.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResource.java
index 8fe8127383..0872f146ad 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResource.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResource.java
@@ -43,6 +43,8 @@ public class VnfResource extends MavenLikeVersioning implements Serializable {
     private String orchestrationMode;
     private String aicVersionMin;
     private String aicVersionMax;
+    private String category;
+    private String subCategory;
     private String heatTemplateArtifactUUId;
     private Timestamp created;
     private String modelVersion;
@@ -108,7 +110,39 @@ public class VnfResource extends MavenLikeVersioning implements Serializable {
 		this.aicVersionMax = aicVersionMax;
 	}
 
-	public String getModelInvariantUuid() {
+	
+    /**
+     * @return Returns the category.
+     */
+    public String getCategory() {
+        return category;
+    }
+
+    
+    /**
+     * @param category The category to set.
+     */
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    
+    /**
+     * @return Returns the subCategory.
+     */
+    public String getSubCategory() {
+        return subCategory;
+    }
+
+    
+    /**
+     * @param subCategory The subCategory to set.
+     */
+    public void setSubCategory(String subCategory) {
+        this.subCategory = subCategory;
+    }
+
+    public String getModelInvariantUuid() {
 		return this.modelInvariantUuid;
 	}
 
diff --git a/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml b/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml
index 1599cf5c66..41e049ad8d 100644
--- a/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml
+++ b/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml
@@ -35,6 +35,8 @@
 		<property name="neutronNetworkType" 		column="NEUTRON_NETWORK_TYPE" 			type="string" 	length="20"/>
 		<property name="description" 				column="DESCRIPTION" 					type="string" 	length="1200"/>
 		<property name="orchestrationMode" 			column="ORCHESTRATION_MODE" 			type="string" 	length="20"/>
+		<property name="category" 				    column="RESOURCE_CATEGORY"              type="string" 	length="20"/>
+		<property name="subCategory" 				column="RESOURCE_SUB_CATEGORY" 	        type="string" 	length="20"/>
 		<property name="heatTemplateArtifactUUID"	column="HEAT_TEMPLATE_ARTIFACT_UUID" 	type="string"	length="200"	not-null="true" />
 
 		<property name="aicVersionMin" type="string" >
diff --git a/mso-catalog-db/src/main/resources/Service.hbm.xml b/mso-catalog-db/src/main/resources/Service.hbm.xml
index 5bdb0f62bd..70f5731b7d 100644
--- a/mso-catalog-db/src/main/resources/Service.hbm.xml
+++ b/mso-catalog-db/src/main/resources/Service.hbm.xml
@@ -39,6 +39,7 @@
 		<property name="modelInvariantUUID" type="string">
            <column name="MODEL_INVARIANT_UUID" default="'MANUAL_RECORD'" not-null="true" length="200"/>
         </property>
+        <property name="category" 				column="SERVICE_CATEGORY" 				type="string" 		length="20"/>
         <property name="serviceType" 				column="SERVICE_TYPE" 				type="string" 		length="20"/>
         <property name="serviceRole" 				column="SERVICE_ROLE" 				type="string" 		length="20"/>
         
diff --git a/mso-catalog-db/src/main/resources/VnfResource.hbm.xml b/mso-catalog-db/src/main/resources/VnfResource.hbm.xml
index 2647a0fcc2..03d1de544c 100644
--- a/mso-catalog-db/src/main/resources/VnfResource.hbm.xml
+++ b/mso-catalog-db/src/main/resources/VnfResource.hbm.xml
@@ -36,6 +36,8 @@
 		<property name="orchestrationMode" 			type="string" 		column="ORCHESTRATION_MODE" 			length="20"		not-null="true"/>
 		<property name="aicVersionMin" 				type="string" 		column="AIC_VERSION_MIN" 				length="20"/>
 		<property name="aicVersionMax" 				type="string" 		column="AIC_VERSION_MAX" 				length="20"/>
+		<property name="category" 				    type="string" 		column="RESOURCE_CATEGORY" 				length="20"/>
+		<property name="subCategory" 				type="string" 		column="RESOURCE_SUB_CATEGORY" 			length="20"/>
 		<property name="heatTemplateArtifactUUId" 	type="string" 		column="HEAT_TEMPLATE_ARTIFACT_UUID" 	length="200" />
 		<property name="created" 					type="timestamp" generated="insert" update="false" insert="false" not-null="true">
           <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>