aboutsummaryrefslogtreecommitdiffstats
path: root/catalog-core
AgeCommit message (Collapse)AuthorFilesLines
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> (cherry picked from commit f75bb848b5ad5e15838c3519c1903754fa9e63d7)
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" into sunJian Huang1-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-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-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-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-27Merge "Add 'id' property to service template." into sunJian Huang7-7/+21
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-26Merge "Directly use the response of aria parser as RawData, instead of ↵HuabingZhao7-13/+29
serializing from memory object." into sun
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-26Merge "To delete the SubstitutionMapping Information when delete a csar ↵Jian Huang1-6/+15
package." into sun
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." into sunJian Huang1-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-25Merge "Set property element Type to 'inputs' of 'Plan'." into sunJian Huang1-10/+12
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-25Merge "Parse Service Template name, vendor and version from metadata." into sunJian Huang4-33/+66
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'huangjian5-59/+145
Change-Id: I4bebc635354375d77906b0c5103499aed22cdc3a Issue-id: TOSCA-139 Signed-off-by: huangjian <huang.jian12@zte.com.cn>
2016-10-24Merge "Add log information. Change status of Service template from usage ↵Jian Huang4-30/+33
State to operation status." into sun
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 "Fix the bug "Repeat upload package has logic error"." into sunJian Huang1-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-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-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-17The 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-17Fix 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-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-13Protected 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>
2016-10-13Fix bug "define csar meta in different way may cause upload package failed".nancylizi1-6/+8
Issue-id:TOSCA-106 Change-Id: I5c4c73229787bdd17280c12d1074dffc21a1f327 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-10-10Modify the request parameter from extensionList to extension, while call ↵YuanHu2-16/+15
tosca-yaml-parser. Change-Id: Ie00fbca7ab2d3e71c72ff58715ff09c0df874506 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-10-10Change the default parser type from zte to aria.YuanHu2-3/+2
Change-Id: I5ef4941c63ee34cd35abcdaab1eeac77bdca8384 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-09-30Parse Plan information from our own alone file. Definitions/plans.yamlYuanHu11-75/+410
Change-Id: Ic300ff92bc8063cad33a372f3f31ecc5941c3b1a Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-09-29Clean Code. Extracting common methods.YuanHu6-85/+149
Dynamically Obtain the download-uri of service template. Change-Id: I79e60b6105bdad9cf9682776bc9dda7d2034fc54 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-09-29Modify the bug which "Catalog unit test failure on latest daily build"nancylizi3-1/+6
Issue-id:TOSCA-83 Change-Id: Ife531fe8662cfd7c0735d7e1fd9075238aaa5994 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-09-27Update license headerhuangjian202-10079/+9922
Change-Id: I9254691ebb7c05ebed80d2348e750db773ff0685 Issue-id: TOSCA-84 Signed-off-by: huangjian <huang.jian12@zte.com.cn>
2016-09-27Restore the bug which delete package can not delete templatenancylizi1-32/+6
Issue-id:TOSCA-82 Change-Id: Ib749580b30c5bad4dbaf7607e8a3e6d5f38991aa Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-09-26Change download uri of package, restore the bug in upload package.nancylizi4-15/+24
Issue-id:TOSCA-81 Change-Id: I96964c84ac237f6e07ab4d63b409faec0de58c85 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-09-26Modify the bug about uploadPackage and queryPackageByIdnancylizi3-79/+86
Issue-id:TOSCA-77 Change-Id: I2697f150bca4404bd2c806c9669961c2ddba6de2 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-09-26Add junit about model manager.nancylizi2-0/+518
Issue-id:TOSCA-78 Change-Id: I9871f7c109f0bd60183c893d05c31e7996d3685a Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-09-23Code cleanup. Such as Providing new public method, changing method name.YuanHu5-20/+12
Change-Id: Ida1cd134c94c8c014a4a827acdb06404633d1fc3 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
2016-09-22Modification for co-debug with aria parser.YuanHu7-141/+222
Change-Id: I4839aab6651149d5b167c4cc452d922a5af878c7 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>