aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-12-15Co-debug 'SubstitutionMapping' with tosca-yaml-parser.100904742-32/+15
Change-Id: Ia7702741acbbdccd193d0f3ac5edde15d3ed9715 Issue-id: TOSCA-191 Signed-off-by: 10090474 <yuan.hu1@zte.com.cn>
2016-12-12Close all InputStreams, Readers, ZipFiles while not use.100904743-83/+99
Change-Id: I2e94d3fff246e250e3c192966a42ffdeba6f2a36 Issue-id: TOSCA-191 Signed-off-by: 10090474 <yuan.hu1@zte.com.cn>
2016-12-07Merge "Standardize POM project naming"Jian Huang10-11/+11
2016-12-06Modify the api description of 'nodeTypeIds' in the api named 'Query nesting ↵YuanHu1-1/+1
service template of a node type'. Change-Id: I4de0b2de25d70488be9c3be7fac8f7540215eab6 Issue-id: TOSCA-191 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-12-01Add response information of wso2 to exception, while deploy/undeploy failed.YuanHu4-6/+25
Change-Id: I4e2ca7db63d3df645d629a71583d64ffe96434f0 Issue-id: TOSCA-191 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-12-01Deploy/UnDeploy workflow package Code optimization for overwrite upload csar ↵YuanHu4-43/+93
package. Change-Id: Ieb8f2e9ce3a3867fa45ef6cbc52d9d40813dfe35 Issue-id: TOSCA-191 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-11-29Standardize POM project namingGary Wu10-11/+11
Change-Id: I5622421adf12fd969de0cc9fd7d02b8a5ded2d9e Issue-id: INT-67 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2016-11-28Modify the error message when basicInfo is null.nancylizi2-1/+7
Change-Id: Ia40a670e678369a8f920a7d5b1b9298c1c7e7a6f Issue-id:TOSCA-194 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-11-21TOSCA-64 Modify shell scripts directorysunqi31011-14/+19
Change-Id: Ia3fe95057455cd8fb3d4def5106ccf5cb2ea83bd Issue-id: TOSCA-64 Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>
2016-11-21Filtered the relationship which target node is same to the source node.YuanHu1-1/+6
Change-Id: I5e8a8148f7d449be1e7094dea4568d68d7fcff35 Issue-id: TOSCA-183 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-11-18TOSCA-182 Catalog service does not relay on other services when it startsunqi3109-24/+388
Change-Id: I2d37b43f2905c7259196afd7f9b11df32be3ddf3 Issue-id: TOSCA-182 Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>
2016-11-04TOSCA-169 Fix issuesunqi3103-5/+12
Change-Id: Idd06e0cbd0b7959356f3eb2d24ebd754ab40786e Issue-id: TOSCA-169 Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>
2016-11-01Modify the logical of reupload the same package, Add comet function while ↵nancylizi1-22/+67
delete package failed. Change-Id: I7228f1f5818064a28fc9b815cb7974616f6102ab Issue-id:TOSCA-164 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-10-31Ignore query service template exception when delete its data.YuanHu1-1/+23
Change-Id: Ie3c3e9459892076e55648fd168ac09897d105599 Issue-id: TOSCA-148 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-10-29Catalog's tomcat process launch failedhuangjian1-0/+0
Change-Id: I1a76812bea837f5daa97ad08d376a7b5c329fa29 Issue-id: TOSCA-161 Signed-off-by: huangjian <huang.jian12@zte.com.cn>
2016-10-28TOSCA-159 Add serviceIp property which is used to config catalog ↵sunqi3105-4/+25
microservice ipaddress Change-Id: I9faac688747ba9e55cd545716ef927214a24d403 Issue-id: TOSCA-158 Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>
2016-10-28Merge "TOSCA-152 Fix issue"sun qi1-1/+3
2016-10-28TOSCA-152 Fix issuesunqi3101-1/+3
Change-Id: Ic3fd3be29e71497d4c63c988e8ea46a1e3e7e3f6 Issue-id: TOSCA-152 Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>
2016-10-27Parse service template name from metadata 'name'.YuanHu8-50/+123
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>
2016-10-27Merge "TOSCA-152 Add metadata and service Template original Id property for ↵sun qi5-3/+40
service Template table"
2016-10-27TOSCA-152 Add metadata and service Template original Id property for service ↵sunqi3105-3/+40
Template table Change-Id: Ie7e443ecdbf8833e60eb87794208e437d63ffdf2 Issue-id: TOSCA-152 Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>
2016-10-27Comet message to WEB after delete package.nancylizi7-43/+354
Change-Id: I03b04aece09b2943c8a80ef56899b688687ab11c Issue-id:TOSCA-153 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-10-27Add 'id' property to service template.YuanHu7-7/+21
Change-Id: I03a861f3b30efec1b79156f271dbadc00a10ffc9 Issue-id: TOSCA-148 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-10-26Directly use the response of aria parser as RawData,YuanHu7-13/+29
instead of serializing from memory object. Change-Id: I9939987715afae95e4fbe1fb37e118f310b652b1 Issue-id: OCS-132 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-10-26To delete the SubstitutionMapping Information when delete a csar package.YuanHu1-6/+15
Change-Id: If8d88acdf9cbdbdfe0a3824c500e5c07fdfd7f7b Issue-id: OCS-132 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-10-26Merge "Fix the bug jUnit caused catalog can not be compiled in Jekins."sun qi1-11/+11
2016-10-26Fix the bug jUnit caused catalog can not be compiled in Jekins.nancylizi1-11/+11
Change-Id: I235a7fe780c711386418c534e884416a7c6157d2 Issue-id:TOSCA-142 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-10-25Set property element Type to 'inputs' of 'Plan'.YuanHu1-10/+12
Change-Id: I61f150f3a9787ee112c355b5e87367e53e6f4b0b Issue-id: TOSCA-141 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-10-25Parse Service Template name, vendor and version from metadata.YuanHu4-33/+66
Change-Id: I40719faec2f8bf41147664394446b33cc2d3b06d Issue-id: TOSCA-141 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-10-25Fix bug TOSCA-142nancylizi1-3/+3
Change-Id: Ib4956617f5a8b647fa91aa9c92681e9767731169 Issue-id:TOSCA-142 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-10-24The response of aria parser changed, need to fix it.YuanHu4-161/+186
Change-Id: I8f7a976517e8d07c6eb20a7ed245478502787b83 Issue-id: TOSCA-141 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-10-24Update tomcat version to '8.5.6'huangjian6-60/+146
Change-Id: I4bebc635354375d77906b0c5103499aed22cdc3a Issue-id: TOSCA-139 Signed-off-by: huangjian <huang.jian12@zte.com.cn>
2016-10-24Add log information.YuanHu4-30/+33
Change status of Service template from usage State to operation status. Change-Id: I6c6df768ecb7b996cbbf484b5afd1a896bc74130 Issue-id: TOSCA-122 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-10-24Fix the bug TOSCA-135nancylizi1-4/+16
Change-Id: Ie5d0038da8dee0c00dd37e6f18921af505a9f213 Issue-id: TOSCA-135 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-10-22Delete package from temp directory and HTTP server while parse package failed.nancylizi1-0/+5
Change-Id: I19fad483b26e36ec8554a5319b1f4b0f616498ea Issue-id:TOSCA-133 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-10-22Fix the bug of upload package in big size failed.nancylizi1-16/+18
Change-Id: Idf9e4aa578bf3e6a60da55777842df0685ae53aa Issue-id:TOSCA-131 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-10-21Fix bugs TOSCA-123 GSO-33nancylizi8-23/+31
Change-Id: Iabd06b1adc2399befd05e1411321c9beb417a94c Issue-id:TOSCA-123 GSO-33 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-10-20Merge "Modify File.separator to '/' for temporary csar uri."sun qi4-3/+18
2016-10-20Modify File.separator to '/' for temporary csar uri.YuanHu4-3/+18
Change-Id: I3c122266f6373f949e6e273ceeefdd6a244baccf Issue-id: TOSCA-122 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-10-20Merge "Fix the bug "Repeat upload package has logic error"."sun qi1-0/+9
2016-10-20Fix the bug "Repeat upload package has logic error".nancylizi1-0/+9
Change-Id: I548de180491738f3e13a119e9d6cc5e03253ca2d Issue-id:TOSCA-124 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-10-19To fix the gaps between catalog model manager and aria parser.YuanHu3-20/+22
Change-Id: I36430decf0092f75cd0f191d841f8f6b48f23b4d Issue-id: TOSCA-122 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-10-18TOSCA-121 Modify the problem of session closed when appincation access the ↵sunqi3101-10/+10
same database table at the same time Change-Id: Ic9f8720339858eed7cf9b71e32255ab334e94a94 Issue-id: TOSCA-121 Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>
2016-10-13The url of http server via msb is started with 'files/catalog-http'.YuanHu1-1/+5
Change-Id: Ifdd6a3283d5ed95a70903703a59eab5036c7fbd9 Issue-id: TOSCA-108 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-10-13Merge "Fix the problem "when upload package throws an exception "String ↵sun qi1-13/+15
index out of range: -1""
2016-10-13Fix the problem "when upload package throws an exception "String index out ↵nancylizi1-13/+15
of range: -1" Change-Id: I594c2e47b104d237390dc9f45d4447e3129f2594 Issue-id:TOSCA-115 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-10-13Merge "bump OPEN-O snapshot versions on master"Jian Huang10-11/+10
2016-10-13bump OPEN-O snapshot versions on masterhuangjian10-11/+10
Change-Id: I23da3f8053950b890647614c79ad800cfc7e06c5 Issue-id: TOSCA-112 Signed-off-by: huangjian <huang.jian12@zte.com.cn>
2016-10-13Parser download csar package from http server via msb.YuanHu1-2/+2
Change-Id: Ibc414e5f01a57065de459d4a95ba27d8e5c2fb77 Issue-id: TOSCA-108 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-10-12Protected of NullPointerException while convert json string to java Object.YuanHu2-13/+29
When call zte parser api. Issue-id: TOSCA-108 Change-Id: I430a018f787b8c413b625dbd4a07b79f87ab0ef7 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>