Parse service template name from metadata 'name'.

Parse service id name from metadata 'id'.
Add 'SubstitutionMapping' information to service template.

Change-Id: If91af47fedfd822b66869559cde57a3e32d97dec
Issue-id: TOSCA-148
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>

1 files changed, 3 insertions, 1 deletions

diff --git a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/wrapper/ServiceTemplateWrapperTest.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/wrapper/ServiceTemplateWrapperTest.java
index 8a9bf745..76af3744 100644
--- a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/wrapper/ServiceTemplateWrapperTest.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/wrapper/ServiceTemplateWrapperTest.java
@@ -55,6 +55,7 @@ import org.openo.commontosca.catalog.model.entity.RelationShip;
 import org.openo.commontosca.catalog.model.entity.ServiceTemplate;
 import org.openo.commontosca.catalog.model.entity.ServiceTemplateOperation;
 import org.openo.commontosca.catalog.model.entity.ServiceTemplateRawData;
+import org.openo.commontosca.catalog.model.entity.SubstitutionMapping;
 import org.openo.commontosca.catalog.model.wrapper.ServiceTemplateWrapper;
 
 import java.util.ArrayList;
@@ -370,11 +371,12 @@ public class ServiceTemplateWrapperTest {
     OutputParameter[] outputs = getOutputs();
     serviceTemplate.setOutputs(outputs);
     serviceTemplate.setServiceTemplateId("serviceTemplateId");
-    serviceTemplate.setId("templateName");
     serviceTemplate.setTemplateName("templateName");
     serviceTemplate.setType("NS");
     serviceTemplate.setVendor("ZTE");
     serviceTemplate.setVersion("0.0.1");
+    serviceTemplate.setSubstitution(
+        new SubstitutionMapping("serviceTemplateId", "tosca.nodes.nfv.VL"));
     return serviceTemplate;
   }