vfc/nfvo/catalog.git
6 years agoFix Dockerfile of vfc-nfvo-catalog 91/10691/1
fujinhua [Thu, 7 Sep 2017 04:09:00 +0000 (12:09 +0800)]
Fix Dockerfile of vfc-nfvo-catalog

always install the latest nfv-toscaparser lib

Change-Id: Ia49bc79536938c032fb1f9da10075e01e3ca0e4b
Issue-Id: VFC-307
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
6 years agoRename the testcase to solve conflict 75/10675/1
fengyuanxing [Thu, 7 Sep 2017 02:52:07 +0000 (10:52 +0800)]
Rename the testcase to solve conflict

Change-Id: I0f0fda1880e02b93a3f8f1165baabdf4ffb980bf
Issue-Id: VFC-264
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoAdd yaml files to test nfv-toscaparser 23/10523/2
fengyuanxing [Wed, 6 Sep 2017 08:11:22 +0000 (16:11 +0800)]
Add yaml files to test nfv-toscaparser

Change-Id: I80179996bd18176a3e2e4d53a2098d0aed4fb4ae
Issue-Id: VFC-296
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoModify scripts renaming methods 17/10517/2
fengyuanxing [Wed, 6 Sep 2017 08:07:44 +0000 (16:07 +0800)]
Modify scripts renaming methods

Change-Id: I87aa34de1817c5060005dd4af7c1029e10a8fa79
Issu-Id: VFC-264
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoMod code to install requirements inside docker 91/10491/2
fengyuanxing [Wed, 6 Sep 2017 06:20:12 +0000 (14:20 +0800)]
Mod code to install requirements inside docker

Change-Id: I1facdb53e460ca28f904ba949eba77b316c11b7c
Issue-Id: VFC-264
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoFix vfc-catalog microservice port 15/10315/1
ying.yunlong [Tue, 5 Sep 2017 08:30:56 +0000 (16:30 +0800)]
Fix vfc-catalog microservice port

Fix the port of vfc catalog and code indentation is
not canonical.

Change-Id: I88371420d49b1c2427179be854548db654b51d9c
Issue-ID: VFC-279
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
6 years agoDelete unnecessary files 97/10297/3
fengyuanxing [Tue, 5 Sep 2017 06:46:12 +0000 (14:46 +0800)]
Delete unnecessary files

Change-Id: I3224eb7ddbe66ccea30c1b1833111ef9af56f83c
Issue-Id: VFC-276
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoModify code of getting nsd model file path 51/10151/1
fengyuanxing [Mon, 4 Sep 2017 06:45:32 +0000 (14:45 +0800)]
Modify code of getting nsd model file path

Change-Id: I68e820cb6b0d09087bd1d3ebea4d5cd6892983a0
Issue-Id: VFC-254
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoAdd code for parsing nsd model 33/10133/2
fengyuanxing [Mon, 4 Sep 2017 05:36:49 +0000 (13:36 +0800)]
Add code for parsing nsd model

Change-Id: Ie6726686797675a658f72fe8a918bc21a071cdb9
Issue-Id: VFC-254
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoFix bugs of logic in catalog tst cases 13/10113/1
fengyuanxing [Mon, 4 Sep 2017 01:45:41 +0000 (09:45 +0800)]
Fix bugs of logic in catalog tst cases

Change-Id: I041a478176ae04650edbf9bca3564e4c1cf239ff
Issue-Id: VFC-244
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoAdd tosca parser patch1 77/10077/1
maopengzhang [Sat, 2 Sep 2017 08:34:27 +0000 (16:34 +0800)]
Add tosca parser patch1

add tosca parser API patch in catalog

Change-Id: I8fe64afe97c3e6737d1e1ec460fd98f25be32774
Issue-ID: VFC-35
Signed-off-by: maopengzhang <zhang.maopeng1@zte.com.cn>
6 years agoMerge "Add tosca parser"
maopeng zhang [Sat, 2 Sep 2017 07:42:22 +0000 (07:42 +0000)]
Merge "Add tosca parser"

6 years agoAdd tosca parser 73/10073/1
maopengzhang [Sat, 2 Sep 2017 07:35:28 +0000 (15:35 +0800)]
Add tosca parser

add tosca parser API in catalog

Change-Id: Ib255d7d44db5833dd645e7ee81d181dbfcb975d4
Issue-ID: VFC-35
Signed-off-by: maopengzhang <zhang.maopeng1@zte.com.cn>
6 years agoMerge "add the Parser function in the catalog"
maopeng zhang [Fri, 1 Sep 2017 08:21:46 +0000 (08:21 +0000)]
Merge "add the Parser function in the catalog"

6 years agoadd the Parser function in the catalog 99/9899/1
maopengzhang [Fri, 1 Sep 2017 08:15:51 +0000 (16:15 +0800)]
add the Parser function in the catalog

add the Parser function in the catalog

Change-Id: I18465a8153aa5f519d6384c5c3cf40588241ab7e
Issue-ID: VFC-35
Signed-off-by: maopengzhang <zhang.maopeng1@zte.com.cn>
6 years agoFix bug adding code to clean up database teardown 85/9885/1
fengyuanxing [Fri, 1 Sep 2017 07:13:05 +0000 (15:13 +0800)]
Fix bug adding code to clean up database teardown

Change-Id: I3d069a63c2fa756427f34212d9232a1f31e056ca
Issue-Id: VFC-227
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoAdd code of deleting nf ahead of ns 81/9881/1
fengyuanxing [Fri, 1 Sep 2017 06:59:24 +0000 (14:59 +0800)]
Add code of deleting nf ahead of ns

Change-Id: I5360347b7221a3ab7d4c05c409b82f869ccb4569
Issue-Id: VFC-222
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoRename method of delete ns/nf 61/9861/1
fengyuanxing [Fri, 1 Sep 2017 05:27:12 +0000 (13:27 +0800)]
Rename method of delete ns/nf

Change-Id: Id6c4ce377d578094f4550701c214435d9e49cfe6
Issue-Id: VFC-222
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoRefactor vfc catalog parser file 57/9857/1
ying.yunlong [Fri, 1 Sep 2017 05:08:48 +0000 (13:08 +0800)]
Refactor vfc catalog parser file

Change-Id: Ie9d5d3a5357e5845161332f93c300ed131fd6f2e
Issue-ID: VFC-220
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
6 years agoRename method of delete ns/nf 25/9825/1
fengyuanxing [Fri, 1 Sep 2017 03:11:14 +0000 (11:11 +0800)]
Rename method of delete ns/nf

Change-Id: I5eabb08d046a36ffb1537c78a70006b5bbdb50a2
Issue-Id: VFC-214
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoAdd deletion test 17/9817/1
fengyuanxing [Fri, 1 Sep 2017 02:54:54 +0000 (10:54 +0800)]
Add deletion test

Change-Id: I506893c4dfecd270ebf50da67186c8086104bc62
Issue-Id: VFC-213
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoModify test code deleting model objects 47/9647/1
fengyuanxing [Thu, 31 Aug 2017 10:55:01 +0000 (18:55 +0800)]
Modify test code deleting model objects

Change-Id: Idf5d616317e5080b32e44696fce89407c042237d
Issue-Id: VFC-152
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoModify test code of nf distribute 37/9637/1
fengyuanxing [Thu, 31 Aug 2017 09:14:31 +0000 (17:14 +0800)]
Modify test code of nf distribute

Change-Id: I5d1630e1876cfcdb649e2ac362ab2c5361633abb
Issue-Id: VFC-152
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoAdd test code for ns distribute after vnf 29/9629/1
fengyuanxing [Thu, 31 Aug 2017 08:30:55 +0000 (16:30 +0800)]
Add test code for ns distribute after vnf

Change-Id: Ia213cb7dfd912b6911ce8fe67944152416d10db2
Issue-Id: VFC-152
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoModify test by mock job 01/9601/1
fengyuanxing [Thu, 31 Aug 2017 06:14:59 +0000 (14:14 +0800)]
Modify test by mock job

Change-Id: I6facca25657974091ffd61bb9f4d32f6f8b3b8f2
Issue-Id: VFC-152
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoAdd get_nsd mock data 71/9571/1
fengyuanxing [Wed, 30 Aug 2017 09:47:09 +0000 (17:47 +0800)]
Add get_nsd mock data

Change-Id: Iee6a6abeda37b7e3250f09009dabcb9043ef7761
Issue-Id: VFC-152
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoAdd test code mocking on_distribute data 63/9363/2
fengyuanxing [Wed, 30 Aug 2017 09:32:01 +0000 (17:32 +0800)]
Add test code mocking on_distribute data

Change-Id: If60c8eed9f1d67f0d65dfcafbf43f8e450296805
Issue-Id: VFC-152
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoModify VFC catalog 93/9293/1
maopengzhang [Wed, 30 Aug 2017 04:48:56 +0000 (12:48 +0800)]
Modify VFC catalog

Modify VFC catalog URL and add sql file

Change-Id: Ie49a0c6aefc4d41cd347d0ad4a955f39ef0970c9
Issue-ID: VFC-152
Signed-off-by: maopengzhang <zhang.maopeng1@zte.com.cn>
6 years agoModify models class to remove unused code 85/8885/1
fengyuanxing [Mon, 28 Aug 2017 03:41:46 +0000 (11:41 +0800)]
Modify models class to remove unused code

Change-Id: I491407ae2add826338932042cc702a2f955db2a5
Issue-Id: VFC-152
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoAdd code related to sdc 69/8869/1
fengyuanxing [Sat, 26 Aug 2017 12:11:31 +0000 (20:11 +0800)]
Add code related to sdc

Change-Id: If4ddb9c10e654b04b033b63005f99ddf1adc599b
Issue-Id: VFC-152
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoAdd toscaparser util files 75/8775/1
fengyuanxing [Fri, 25 Aug 2017 09:10:48 +0000 (17:10 +0800)]
Add toscaparser util files

Issue_Id: VFC-152

Change-Id: I3e3b4475a7a1dd89bed2e379e019b7e73e5b3845
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoAdd exception model util files 57/8757/1
fengyuanxing [Fri, 25 Aug 2017 06:39:28 +0000 (14:39 +0800)]
Add exception model util files

Change-Id: Id606258a4bdcb014acae2aabc26fec407e6c7ba0
Issue-Id: VFC-152
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoAdd code accroding to swagger 11/8711/1
fengyuanxing [Fri, 25 Aug 2017 02:23:16 +0000 (10:23 +0800)]
Add code accroding to swagger

Change-Id: Idf5131f4ed5d552fb6b3d4cd59dfb4600e541011
Issue-Id: VFC-148
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoswagger supports for catalog1 17/8617/2
maopengzhang [Thu, 24 Aug 2017 11:46:56 +0000 (19:46 +0800)]
swagger supports for catalog1

Support swagger file in catalog

Change-Id: Ieb2778fd4239cdae66d660f536f930e5d0011db1
Issue-ID: VFC-145
Signed-off-by: maopengzhang <zhang.maopeng1@zte.com.cn>
6 years agoAdd ns package and nf package urls 81/8581/1
fengyuanxing [Thu, 24 Aug 2017 06:30:09 +0000 (14:30 +0800)]
Add ns package and nf package urls

Change-Id: Ia7898fa2742e5a3c1db8af29d749eeb2bc7eda9c
Issue-Id: VFC-152
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoAdd test cases for catalog 35/8535/1
fengyuanxing [Thu, 24 Aug 2017 02:01:09 +0000 (10:01 +0800)]
Add test cases for catalog

Change-Id: I626c0095cd6dda143ad5927cee5bbb0f7c2bcaa4
Issue-Id: VFC-152
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoAdd urls for catalog 95/8395/4
fengyuanxing [Wed, 23 Aug 2017 06:48:33 +0000 (14:48 +0800)]
Add urls for catalog

Change-Id: I87561fb83dde2eef58b6dc61c4c484a074ef3516
Issue-Id: VFC-148
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
6 years agoAdd .gitreview file of vfc-nfvo-catalog 87/8087/1
fujinhua [Sat, 19 Aug 2017 06:34:32 +0000 (14:34 +0800)]
Add .gitreview file of vfc-nfvo-catalog

Change-Id: Ie582ab07f914b2f1406fff1eb45b000efbf9216e
Issue-Id: VFC-116
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
6 years agoAdd seed codes of nfvo catalog 81/7981/1
fujinhua [Fri, 18 Aug 2017 07:03:18 +0000 (15:03 +0800)]
Add seed codes of nfvo catalog

Change-Id: Id0646870cbb297cbeddfe223feb2235f11a4a511
Issue-Id: VFC-108
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
6 years agoRemove abandoned codes of catalog 77/7977/1
fujinhua [Fri, 18 Aug 2017 07:00:17 +0000 (15:00 +0800)]
Remove abandoned codes of catalog

Change-Id: Id258c64b6fbf0e25da8c033991e4a3ba21ad806e
Issue-Id: VFC-107
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
7 years agoModify the uploadPackage. release/mercury v2.0.0
nancylizi [Wed, 1 Mar 2017 09:01:39 +0000 (17:01 +0800)]
Modify the uploadPackage.

Issue-ID:TOSCA-250

Change-Id: I7e1109fb42ec8c15e8f2e095443dda606171f0cc
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
7 years agoModify the api of uploadPackage.
nancylizi [Sat, 4 Feb 2017 07:53:43 +0000 (15:53 +0800)]
Modify the api of uploadPackage.

Fix the logic of "reupload a package which has been onobarded".

Issue-id:TOSCA-238

Change-Id: I3acbf8e3233657a6cc47d3c3999fd619b3248433
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
7 years agoFix the bug "setDeletionPending cannot work"
nancylizi [Sat, 4 Feb 2017 07:43:20 +0000 (15:43 +0800)]
Fix the bug "setDeletionPending cannot work"

Issue-id:TOSCA-201

Change-Id: Idf55da118d4fad3b544fc48f99ad74c563b8d77d
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
7 years agoCo-debug 'SubstitutionMapping' with tosca-yaml-parser.
10090474 [Thu, 15 Dec 2016 11:44:24 +0000 (19:44 +0800)]
Co-debug 'SubstitutionMapping' with tosca-yaml-parser.

Change-Id: Ia7702741acbbdccd193d0f3ac5edde15d3ed9715
Issue-id: TOSCA-191
Signed-off-by: 10090474 <yuan.hu1@zte.com.cn>
7 years agoClose all InputStreams, Readers, ZipFiles while not use.
10090474 [Mon, 12 Dec 2016 11:38:15 +0000 (19:38 +0800)]
Close all InputStreams, Readers, ZipFiles while not use.

Change-Id: I2e94d3fff246e250e3c192966a42ffdeba6f2a36
Issue-id: TOSCA-191
Signed-off-by: 10090474 <yuan.hu1@zte.com.cn>
7 years agoMerge "Standardize POM project naming"
Jian Huang [Wed, 7 Dec 2016 00:41:57 +0000 (00:41 +0000)]
Merge "Standardize POM project naming"

7 years agoModify the api description of 'nodeTypeIds' in the api named 'Query nesting service...
YuanHu [Tue, 6 Dec 2016 10:32:22 +0000 (18:32 +0800)]
Modify the api description of 'nodeTypeIds' in the api named 'Query nesting service template of a node type'.

Change-Id: I4de0b2de25d70488be9c3be7fac8f7540215eab6
Issue-id: TOSCA-191
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
7 years agoAdd response information of wso2 to exception, while deploy/undeploy failed.
YuanHu [Thu, 1 Dec 2016 08:12:46 +0000 (16:12 +0800)]
Add response information of wso2 to exception, while deploy/undeploy failed.

Change-Id: I4e2ca7db63d3df645d629a71583d64ffe96434f0
Issue-id: TOSCA-191
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
7 years agoDeploy/UnDeploy workflow package Code optimization for overwrite upload csar package.
YuanHu [Fri, 25 Nov 2016 02:02:44 +0000 (10:02 +0800)]
Deploy/UnDeploy workflow package Code optimization for overwrite upload csar package.

Change-Id: Ieb8f2e9ce3a3867fa45ef6cbc52d9d40813dfe35
Issue-id: TOSCA-191
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
7 years agoStandardize POM project naming
Gary Wu [Tue, 29 Nov 2016 23:12:23 +0000 (15:12 -0800)]
Standardize POM project naming

Change-Id: I5622421adf12fd969de0cc9fd7d02b8a5ded2d9e
Issue-id: INT-67
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
7 years agoModify the error message when basicInfo is null.
nancylizi [Mon, 28 Nov 2016 03:32:10 +0000 (11:32 +0800)]
Modify the error message when basicInfo is null.

Change-Id: Ia40a670e678369a8f920a7d5b1b9298c1c7e7a6f
Issue-id:TOSCA-194
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
7 years agoTOSCA-64 Modify shell scripts directory
sunqi310 [Mon, 21 Nov 2016 07:17:01 +0000 (15:17 +0800)]
TOSCA-64 Modify shell scripts directory

Change-Id: Ia3fe95057455cd8fb3d4def5106ccf5cb2ea83bd
Issue-id: TOSCA-64
Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>
7 years agoFiltered the relationship which target node is same to the source node.
YuanHu [Mon, 21 Nov 2016 01:49:20 +0000 (09:49 +0800)]
Filtered the relationship which target node is same to the source node.

Change-Id: I5e8a8148f7d449be1e7094dea4568d68d7fcff35
Issue-id: TOSCA-183
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
7 years agoTOSCA-182 Catalog service does not relay on other services when it start
sunqi310 [Fri, 18 Nov 2016 07:56:53 +0000 (15:56 +0800)]
TOSCA-182 Catalog service does not relay on other services when it start

Change-Id: I2d37b43f2905c7259196afd7f9b11df32be3ddf3
Issue-id: TOSCA-182
Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>
7 years agoTOSCA-169 Fix issue
sunqi310 [Fri, 4 Nov 2016 02:18:16 +0000 (10:18 +0800)]
TOSCA-169 Fix issue

Change-Id: Idd06e0cbd0b7959356f3eb2d24ebd754ab40786e
Issue-id: TOSCA-169
Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>
7 years agoModify the logical of reupload the same package, Add comet function while delete...
nancylizi [Tue, 1 Nov 2016 06:03:38 +0000 (14:03 +0800)]
Modify the logical of reupload the same package, Add comet function while delete package failed.

Change-Id: I7228f1f5818064a28fc9b815cb7974616f6102ab
Issue-id:TOSCA-164
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
7 years agoIgnore query service template exception when delete its data.
YuanHu [Mon, 31 Oct 2016 07:26:27 +0000 (15:26 +0800)]
Ignore query service template exception when delete its data.

Change-Id: Ie3c3e9459892076e55648fd168ac09897d105599
Issue-id: TOSCA-148
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
7 years agoCatalog's tomcat process launch failed
huangjian [Sat, 29 Oct 2016 03:47:45 +0000 (11:47 +0800)]
Catalog's tomcat process launch failed

Change-Id: I1a76812bea837f5daa97ad08d376a7b5c329fa29
Issue-id: TOSCA-161
Signed-off-by: huangjian <huang.jian12@zte.com.cn>
7 years agoTOSCA-159 Add serviceIp property which is used to config catalog microservice ipaddress
sunqi310 [Fri, 28 Oct 2016 08:46:24 +0000 (16:46 +0800)]
TOSCA-159 Add serviceIp property which is used to config catalog microservice ipaddress

Change-Id: I9faac688747ba9e55cd545716ef927214a24d403
Issue-id: TOSCA-158
Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>
7 years agoMerge "TOSCA-152 Fix issue"
sun qi [Fri, 28 Oct 2016 03:23:54 +0000 (03:23 +0000)]
Merge "TOSCA-152 Fix issue"

7 years agoTOSCA-152 Fix issue
sunqi310 [Fri, 28 Oct 2016 03:20:10 +0000 (11:20 +0800)]
TOSCA-152 Fix issue

Change-Id: Ic3fd3be29e71497d4c63c988e8ea46a1e3e7e3f6
Issue-id: TOSCA-152
Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>
7 years agoParse service template name from metadata 'name'.
YuanHu [Thu, 27 Oct 2016 11:17:45 +0000 (19:17 +0800)]
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>
7 years agoMerge "TOSCA-152 Add metadata and service Template original Id property for service...
sun qi [Thu, 27 Oct 2016 09:28:49 +0000 (09:28 +0000)]
Merge "TOSCA-152 Add metadata and service Template original Id property for service Template table"

7 years agoTOSCA-152 Add metadata and service Template original Id property for service Template...
sunqi310 [Thu, 27 Oct 2016 09:17:53 +0000 (17:17 +0800)]
TOSCA-152 Add metadata and service Template original Id property for service Template table

Change-Id: Ie7e443ecdbf8833e60eb87794208e437d63ffdf2
Issue-id: TOSCA-152
Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>
7 years agoComet message to WEB after delete package.
nancylizi [Thu, 27 Oct 2016 08:00:31 +0000 (16:00 +0800)]
Comet message to WEB after delete package.

Change-Id: I03b04aece09b2943c8a80ef56899b688687ab11c
Issue-id:TOSCA-153
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
7 years agoAdd 'id' property to service template.
YuanHu [Thu, 27 Oct 2016 01:55:42 +0000 (09:55 +0800)]
Add 'id' property to service template.

Change-Id: I03a861f3b30efec1b79156f271dbadc00a10ffc9
Issue-id: TOSCA-148
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
7 years agoDirectly use the response of aria parser as RawData,
YuanHu [Wed, 26 Oct 2016 08:23:24 +0000 (16:23 +0800)]
Directly use the response of aria parser as RawData,
instead of serializing from memory object.

Change-Id: I9939987715afae95e4fbe1fb37e118f310b652b1
Issue-id: OCS-132
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
7 years agoTo delete the SubstitutionMapping Information when delete a csar package.
YuanHu [Wed, 26 Oct 2016 07:06:09 +0000 (15:06 +0800)]
To delete the SubstitutionMapping Information when delete a csar package.

Change-Id: If8d88acdf9cbdbdfe0a3824c500e5c07fdfd7f7b
Issue-id: OCS-132
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
7 years agoMerge "Fix the bug jUnit caused catalog can not be compiled in Jekins."
sun qi [Wed, 26 Oct 2016 01:21:25 +0000 (01:21 +0000)]
Merge "Fix the bug jUnit caused catalog can not be compiled in Jekins."

7 years agoFix the bug jUnit caused catalog can not be compiled in Jekins.
nancylizi [Wed, 26 Oct 2016 01:15:20 +0000 (09:15 +0800)]
Fix the bug jUnit caused catalog can not be compiled in Jekins.

Change-Id: I235a7fe780c711386418c534e884416a7c6157d2
Issue-id:TOSCA-142
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
7 years agoSet property element Type to 'inputs' of 'Plan'.
YuanHu [Tue, 25 Oct 2016 06:29:07 +0000 (14:29 +0800)]
Set property element Type to 'inputs' of 'Plan'.

Change-Id: I61f150f3a9787ee112c355b5e87367e53e6f4b0b
Issue-id: TOSCA-141
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
7 years agoParse Service Template name, vendor and version from metadata.
YuanHu [Tue, 25 Oct 2016 03:47:51 +0000 (11:47 +0800)]
Parse Service Template name, vendor and version from metadata.

Change-Id: I40719faec2f8bf41147664394446b33cc2d3b06d
Issue-id: TOSCA-141
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
7 years agoFix bug TOSCA-142
nancylizi [Tue, 25 Oct 2016 02:00:05 +0000 (10:00 +0800)]
Fix bug TOSCA-142

Change-Id: Ib4956617f5a8b647fa91aa9c92681e9767731169
Issue-id:TOSCA-142
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
7 years agoThe response of aria parser changed, need to fix it.
YuanHu [Mon, 24 Oct 2016 08:52:54 +0000 (16:52 +0800)]
The response of aria parser changed, need to fix it.

Change-Id: I8f7a976517e8d07c6eb20a7ed245478502787b83
Issue-id: TOSCA-141
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
7 years agoUpdate tomcat version to '8.5.6'
huangjian [Mon, 24 Oct 2016 06:44:17 +0000 (14:44 +0800)]
Update tomcat version to '8.5.6'

Change-Id: I4bebc635354375d77906b0c5103499aed22cdc3a
Issue-id: TOSCA-139
Signed-off-by: huangjian <huang.jian12@zte.com.cn>
7 years agoAdd log information.
YuanHu [Mon, 24 Oct 2016 03:13:00 +0000 (11:13 +0800)]
Add log information.
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>
7 years agoFix the bug TOSCA-135
nancylizi [Mon, 24 Oct 2016 01:48:17 +0000 (09:48 +0800)]
Fix the bug TOSCA-135

Change-Id: Ie5d0038da8dee0c00dd37e6f18921af505a9f213
Issue-id: TOSCA-135
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
7 years agoDelete package from temp directory and HTTP server while parse package failed.
nancylizi [Sat, 22 Oct 2016 08:38:24 +0000 (16:38 +0800)]
Delete package from temp directory and HTTP server while parse package failed.

Change-Id: I19fad483b26e36ec8554a5319b1f4b0f616498ea
Issue-id:TOSCA-133
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
7 years agoFix the bug of upload package in big size failed.
nancylizi [Sat, 22 Oct 2016 03:24:11 +0000 (11:24 +0800)]
Fix the bug of upload package in big size failed.

Change-Id: Idf9e4aa578bf3e6a60da55777842df0685ae53aa
Issue-id:TOSCA-131
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
7 years agoFix bugs TOSCA-123 GSO-33
nancylizi [Fri, 21 Oct 2016 07:57:05 +0000 (15:57 +0800)]
Fix bugs TOSCA-123 GSO-33

Change-Id: Iabd06b1adc2399befd05e1411321c9beb417a94c
Issue-id:TOSCA-123 GSO-33
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
7 years agoMerge "Modify File.separator to '/' for temporary csar uri."
sun qi [Thu, 20 Oct 2016 06:10:49 +0000 (06:10 +0000)]
Merge "Modify File.separator to '/' for temporary csar uri."

7 years agoModify File.separator to '/' for temporary csar uri.
YuanHu [Thu, 20 Oct 2016 06:03:45 +0000 (14:03 +0800)]
Modify File.separator to '/' for temporary csar uri.

Change-Id: I3c122266f6373f949e6e273ceeefdd6a244baccf
Issue-id: TOSCA-122
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
7 years agoMerge "Fix the bug "Repeat upload package has logic error"."
sun qi [Thu, 20 Oct 2016 06:01:46 +0000 (06:01 +0000)]
Merge "Fix the bug "Repeat upload package has logic error"."

7 years agoFix the bug "Repeat upload package has logic error".
nancylizi [Thu, 20 Oct 2016 05:01:41 +0000 (13:01 +0800)]
Fix the bug "Repeat upload package has logic error".

Change-Id: I548de180491738f3e13a119e9d6cc5e03253ca2d
Issue-id:TOSCA-124
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
7 years agoTo fix the gaps between catalog model manager and aria parser.
YuanHu [Wed, 19 Oct 2016 03:47:17 +0000 (11:47 +0800)]
To fix the gaps between catalog model manager and aria parser.

Change-Id: I36430decf0092f75cd0f191d841f8f6b48f23b4d
Issue-id: TOSCA-122
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
7 years agoTOSCA-121 Modify the problem of session closed when appincation access the same datab...
sunqi310 [Tue, 18 Oct 2016 01:30:07 +0000 (09:30 +0800)]
TOSCA-121 Modify the problem of session closed when appincation access the same database table at the same time

Change-Id: Ic9f8720339858eed7cf9b71e32255ab334e94a94
Issue-id: TOSCA-121
Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>
7 years agoThe url of http server via msb is started with 'files/catalog-http'.
YuanHu [Thu, 13 Oct 2016 07:16:05 +0000 (15:16 +0800)]
The url of http server via msb is started with 'files/catalog-http'.

Change-Id: Ifdd6a3283d5ed95a70903703a59eab5036c7fbd9
Issue-id: TOSCA-108
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
7 years agoMerge "Fix the problem "when upload package throws an exception "String index out...
sun qi [Thu, 13 Oct 2016 06:43:34 +0000 (06:43 +0000)]
Merge "Fix the problem "when upload package throws an exception "String index out of range: -1""

7 years agoFix the problem "when upload package throws an exception "String index out of range...
nancylizi [Thu, 13 Oct 2016 04:39:32 +0000 (12:39 +0800)]
Fix the problem "when upload package throws an exception "String index out of range: -1"

Change-Id: I594c2e47b104d237390dc9f45d4447e3129f2594
Issue-id:TOSCA-115
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
7 years agoMerge "bump OPEN-O snapshot versions on master"
Jian Huang [Thu, 13 Oct 2016 03:16:35 +0000 (03:16 +0000)]
Merge "bump OPEN-O snapshot versions on master"

7 years agobump OPEN-O snapshot versions on master
huangjian [Thu, 13 Oct 2016 02:11:00 +0000 (10:11 +0800)]
bump OPEN-O snapshot versions on master

Change-Id: I23da3f8053950b890647614c79ad800cfc7e06c5
Issue-id: TOSCA-112
Signed-off-by: huangjian <huang.jian12@zte.com.cn>
7 years agoParser download csar package from http server via msb.
YuanHu [Thu, 13 Oct 2016 01:43:47 +0000 (09:43 +0800)]
Parser download csar package from http server via msb.

Change-Id: Ibc414e5f01a57065de459d4a95ba27d8e5c2fb77
Issue-id: TOSCA-108
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
7 years agoProtected of NullPointerException while convert json string to java Object.
YuanHu [Wed, 12 Oct 2016 06:57:20 +0000 (14:57 +0800)]
Protected of NullPointerException while convert json string to java Object.
When call zte parser api.

Issue-id: TOSCA-108
Change-Id: I430a018f787b8c413b625dbd4a07b79f87ab0ef7
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
7 years agoFix bug "define csar meta in different way may cause upload package failed".
nancylizi [Wed, 12 Oct 2016 03:35:52 +0000 (11:35 +0800)]
Fix bug "define csar meta in different way may cause upload package failed".
Issue-id:TOSCA-106

Change-Id: I5c4c73229787bdd17280c12d1074dffc21a1f327
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
7 years agoModify the request parameter from extensionList to extension, while call tosca-yaml...
YuanHu [Mon, 10 Oct 2016 03:54:30 +0000 (11:54 +0800)]
Modify the request parameter from extensionList to extension, while call tosca-yaml-parser.

Change-Id: Ie00fbca7ab2d3e71c72ff58715ff09c0df874506
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
7 years agoChange the default parser type from zte to aria.
YuanHu [Mon, 10 Oct 2016 01:35:02 +0000 (09:35 +0800)]
Change the default parser type from zte to aria.

Change-Id: I5ef4941c63ee34cd35abcdaab1eeac77bdca8384
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
7 years agoParse Plan information from our own alone file. Definitions/plans.yaml
YuanHu [Fri, 30 Sep 2016 03:46:32 +0000 (11:46 +0800)]
Parse Plan information from our own alone file. Definitions/plans.yaml

Change-Id: Ic300ff92bc8063cad33a372f3f31ecc5941c3b1a
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
7 years agoClean Code. Extracting common methods.
YuanHu [Thu, 29 Sep 2016 08:26:15 +0000 (16:26 +0800)]
Clean Code. Extracting common methods.
Dynamically Obtain the download-uri of service template.

Change-Id: I79e60b6105bdad9cf9682776bc9dda7d2034fc54
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
7 years agoModify the bug which "Catalog unit test failure on latest daily build"
nancylizi [Thu, 29 Sep 2016 07:16:23 +0000 (15:16 +0800)]
Modify the bug which "Catalog unit test failure on latest daily build"
Issue-id:TOSCA-83

Change-Id: Ife531fe8662cfd7c0735d7e1fd9075238aaa5994
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
7 years agoUpdate license header
huangjian [Tue, 27 Sep 2016 02:08:44 +0000 (10:08 +0800)]
Update license header

Change-Id: I9254691ebb7c05ebed80d2348e750db773ff0685
Issue-id: TOSCA-84
Signed-off-by: huangjian <huang.jian12@zte.com.cn>