Luji [Wed, 28 Sep 2016 06:15:17 +0000 (06:15 +0000)]
Merge "Fix bug, dialog was not closed after creating service instance."
Luji7 [Wed, 28 Sep 2016 04:12:36 +0000 (12:12 +0800)]
Fix bug, dialog was not closed after creating service instance.
Change-Id: I403bec2fe1d24480518f44b73059d5e986154e46
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
jin xin [Wed, 28 Sep 2016 04:09:07 +0000 (04:09 +0000)]
Merge "Modify the restclient json"
j00302280 [Wed, 28 Sep 2016 04:03:25 +0000 (12:03 +0800)]
Modify the restclient json
Change-Id: I069f282ed9ef3a959a5bc3d1ab395bafd0be5eea
Signed-off-by: j00302280 <j00101220@huawei.com>
Luji [Wed, 28 Sep 2016 04:00:17 +0000 (04:00 +0000)]
Merge "Fix bug, alert serviceInstance is undefined after creating service instance"
Luji7 [Wed, 28 Sep 2016 03:53:03 +0000 (11:53 +0800)]
Fix bug, alert serviceInstance is undefined after creating service instance
Change-Id: I6bb3120e2ef16614e304a6fdab68af691a58c87e
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
Luji [Wed, 28 Sep 2016 03:36:01 +0000 (03:36 +0000)]
Merge "Fix bug, not pass serviceTemplate parameter for create instance"
Luji7 [Wed, 28 Sep 2016 03:27:46 +0000 (11:27 +0800)]
Fix bug, not pass serviceTemplate parameter for create instance
Change-Id: Ic3dd9856bb4e91ae3977e707737edd9ecb9208d2
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
Luji [Wed, 28 Sep 2016 02:32:06 +0000 (02:32 +0000)]
Merge "modify pom.xml files to integrate all modules for deployment"
Luji [Wed, 28 Sep 2016 02:29:31 +0000 (02:29 +0000)]
Merge "OCS-89 Modify license header"
Luji [Wed, 28 Sep 2016 02:29:16 +0000 (02:29 +0000)]
Merge "Fix gatewayUri error"
sunqi310 [Wed, 28 Sep 2016 02:09:29 +0000 (10:09 +0800)]
OCS-89 Modify license header
Change-Id: I7ef21d3f21dbcb71d2e1aa620dd24027272d3b98
Issue-id:OCS-89
Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>
Xiuchao Wu [Tue, 27 Sep 2016 14:42:46 +0000 (15:42 +0100)]
add icons needed by topology rendering, add code for loading data from
overlay micro-services, and show more details when a
node is clicked.
Change-Id: I15335650d77aba6ac7fd1b5ab19c6bef94026d9c
Signed-off-by: Xiuchao Wu <xiuchao.wu@huawei.com>
“shentao” [Tue, 27 Sep 2016 14:01:08 +0000 (22:01 +0800)]
modify pom.xml files to integrate all modules for deployment
Change-Id: I24031f88ccb09225c0b40810432ddaf7bdc996e1
Signed-off-by: “shentao” <shentao@chinamobile.com>
Tao Shen [Tue, 27 Sep 2016 13:33:35 +0000 (13:33 +0000)]
Merge "modify pom.xml files to integrate all modules for deployment"
“shentao” [Tue, 27 Sep 2016 13:26:27 +0000 (21:26 +0800)]
modify pom.xml files to integrate all modules for deployment
Change-Id: If6280da49537495620b0032ca6bd578f66f315a7
Signed-off-by: “shentao” <shentao@chinamobile.com>
j00302280 [Tue, 27 Sep 2016 12:21:03 +0000 (20:21 +0800)]
Modify the visualRange formation
Change-Id: I335151c7fea95524ca815d401053abefb7e11e71
Signed-off-by: j00302280 <j00101220@huawei.com>
Luji7 [Tue, 27 Sep 2016 11:54:35 +0000 (19:54 +0800)]
Fix gatewayUri error
Change-Id: I28f0a2d054dbf4b4eb730c08f99aae0246caf61e
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
Luji7 [Tue, 27 Sep 2016 11:45:47 +0000 (19:45 +0800)]
use jquery promise api instead of synchroize ajax invocation
Change-Id: I776069e9f7b87da6b7840f90507b67152e4c0272
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
Luji7 [Tue, 27 Sep 2016 11:39:49 +0000 (19:39 +0800)]
use jquery promise api instead of synchroize ajax invocation
Change-Id: I1a280ff520307edad2db32876aeb33c9db1629c0
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
sunqi310 [Tue, 27 Sep 2016 06:52:26 +0000 (14:52 +0800)]
TOSCA-85 Resolve the problem that the value of the version attribute can not show when modify vim information
Change-Id: I63182f2cf0475a71d271cc66eb40733fcdb266f6
Issue-id:TOSCA-85
Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>
huangjian [Tue, 27 Sep 2016 02:45:31 +0000 (10:45 +0800)]
Integrate Catalog&ESR
Change-Id: I15eea95225ed4f078999aac7fc3ed8a56b2a6d57
Signed-off-by: huangjian <huang.jian12@zte.com.cn>
Luji [Mon, 26 Sep 2016 14:13:29 +0000 (14:13 +0000)]
Merge "Remove Chinese comment, modify pom. Issue-id:TOSCA-80"
jin xin [Mon, 26 Sep 2016 11:38:17 +0000 (11:38 +0000)]
Merge "Modify start script"
j00302280 [Mon, 26 Sep 2016 11:37:16 +0000 (19:37 +0800)]
Modify start script
Change-Id: Ib1ebbcf8a3e434addf11a39e11339e450181a35c
Signed-off-by: j00302280 <j00101220@huawei.com>
nancylizi [Mon, 26 Sep 2016 11:09:59 +0000 (19:09 +0800)]
Remove Chinese comment, modify pom.
Issue-id:TOSCA-80
Change-Id: I9aae2d4ef98b69b2ff986ef8034fdf604bc3e08d
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
jin xin [Mon, 26 Sep 2016 10:45:54 +0000 (10:45 +0000)]
Merge "Changes for the table header CSS improvement for the res mgr."
Seshu-Kumar-M [Mon, 26 Sep 2016 10:19:59 +0000 (18:19 +0800)]
Changes for the table header CSS improvement for the res mgr.
Change-Id: If9297ea66596b426a918784bde6bb8729b52909b
Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
Luji [Mon, 26 Sep 2016 09:19:25 +0000 (09:19 +0000)]
Merge "Add menus(Catalog/ESR/ModelDesign)"
Luji [Mon, 26 Sep 2016 09:19:05 +0000 (09:19 +0000)]
Merge "Modify the reference issue"
pierfranco ferronato [Mon, 26 Sep 2016 08:56:57 +0000 (08:56 +0000)]
Merge "Delete icons w/o proper license (new icons will be created for Open-O), clean up sigma code (remove unnecessary files and add license header), and make slight changes the layout of overlay vpn topology."
j00302280 [Mon, 26 Sep 2016 08:32:45 +0000 (16:32 +0800)]
Add the log4j configure file
Change-Id: Ic90ac23b4ebc508865eebb2538bd6078df89bf46
Signed-off-by: j00302280 <j00101220@huawei.com>
huangjian [Mon, 26 Sep 2016 07:03:45 +0000 (15:03 +0800)]
Add menus(Catalog/ESR/ModelDesign)
Change-Id: I99fc6c943f8ec2a03dd73bf0fb6209770f0bd058
Signed-off-by: huangjian <huang.jian12@zte.com.cn>
huangjian [Mon, 26 Sep 2016 06:55:19 +0000 (14:55 +0800)]
Modify the reference issue
Change-Id: Ie881b9493d62db909af1d8d0a589f2b86bd97d60
Signed-off-by: huangjian <huang.jian12@zte.com.cn>
j00302280 [Mon, 26 Sep 2016 04:56:23 +0000 (12:56 +0800)]
Solve the install issues
Change-Id: I4402388c3d245a062299fd6d65fa152d63b8f08c
Signed-off-by: j00302280 <j00101220@huawei.com>
Xiuchao Wu [Fri, 23 Sep 2016 15:56:48 +0000 (16:56 +0100)]
Delete icons w/o proper license (new icons will be created for Open-O),
clean up sigma code (remove unnecessary files and add license header), and
make slight changes the layout of overlay vpn topology.
Change-Id: Id6d34ffe9d54bbaf19b0076374aa24b0a07f3e3d
Signed-off-by: Xiuchao Wu <xiuchao.wu@huawei.com>
Seshu-Kumar-M [Fri, 23 Sep 2016 13:53:10 +0000 (21:53 +0800)]
formatting the code, removing unnecessary imports and URL patterns correction
Change-Id: Id160a255d4acb4b901ca33965080b76d38810be1
Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
Seshu-Kumar-M [Fri, 23 Sep 2016 13:52:17 +0000 (21:52 +0800)]
formatting the code, removing unnecessary imports and URL patterns correction
Change-Id: I44ef8d3318e222cf6cdbccfb717f22b05dd6cb01
Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
Seshu-Kumar-M [Fri, 23 Sep 2016 13:50:10 +0000 (21:50 +0800)]
formatting the code, removing unnecessary imports and URL patterns correction
Change-Id: If3e556b40dfd722727156f70975eb93b94d9c088
Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
Luji7 [Fri, 23 Sep 2016 09:20:23 +0000 (17:20 +0800)]
add nodetype in detail page
Change-Id: I3a4294857becd2835fba856c2ec3e03f1c29e0f2
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
Luji7 [Fri, 23 Sep 2016 08:50:03 +0000 (16:50 +0800)]
update license.
Change-Id: I466843001f37d57f64b8ab09453e1e96eaf64cdf
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
“shentao” [Fri, 23 Sep 2016 06:35:10 +0000 (14:35 +0800)]
modify frame html files
Change-Id: I91aa3090449c3b11bca56bdbe773b58760158f9e
Signed-off-by: “shentao” <shentao@chinamobile.com>
“shentao” [Fri, 23 Sep 2016 05:12:04 +0000 (13:12 +0800)]
modify frame pom files
Change-Id: I76438ea4f12c8acd4ccf9ec293e8757e5225bca3
Signed-off-by: “shentao” <shentao@chinamobile.com>
huangjian [Fri, 23 Sep 2016 03:09:09 +0000 (11:09 +0800)]
Modify thirdparty&image reference path
Change-Id: If50fc897be1476836acaaf50ed3732e08700e756
Signed-off-by: huangjian <huang.jian12@zte.com.cn>
nancylizi [Fri, 23 Sep 2016 02:40:54 +0000 (10:40 +0800)]
Modify bug in html files.
Issue-id:TOSCA-76
Change-Id: Ia600ab619500410c6887cdfd32787f7982686679
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
Luji7 [Fri, 23 Sep 2016 02:23:58 +0000 (10:23 +0800)]
Fix link path error
Change-Id: I3ec8b8ae2e7a67c269bece69748485589dc85728
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
Xiuchao Wu [Thu, 22 Sep 2016 15:54:06 +0000 (16:54 +0100)]
add portal-lifecyclemgr into the pom file of openo-portal
Change-Id: Ibd69e55ce654fe1cd94203f2684f04b5157fd85d
Signed-off-by: Xiuchao Wu <xiuchao.wu@huawei.com>
pierfranco ferronato [Thu, 22 Sep 2016 13:23:33 +0000 (13:23 +0000)]
Merge "Complete functions of sdnocontroller."
Luji7 [Thu, 22 Sep 2016 12:26:13 +0000 (20:26 +0800)]
add nvfo nodes info for detail page
Change-Id: Ic4defebc27aee5d5c6ca290a225af484f41522eb
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
Luji [Thu, 22 Sep 2016 11:22:38 +0000 (11:22 +0000)]
Merge "TOSCA-74 Modify the license and the third party component path of external system"
Luji [Thu, 22 Sep 2016 11:16:06 +0000 (11:16 +0000)]
Merge "Modify license. Issue-id:TOSCA-73"
sunqi310 [Thu, 22 Sep 2016 11:15:55 +0000 (19:15 +0800)]
TOSCA-74 Modify the license and the third party component path of external system
Change-Id: Id98de06d6eb30c6b22173ca7943b9379ae6f4819
Issue-id: TOSCA-74
Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>
MR-ZZC [Thu, 22 Sep 2016 11:07:11 +0000 (19:07 +0800)]
Complete functions of sdnocontroller.
Change-Id: I78963ead8487672b459290cb363a767f0e6dca80
Signed-off-by: MR-ZZC <zhaozhongchao@huawei.com>
nancylizi [Thu, 22 Sep 2016 10:07:47 +0000 (18:07 +0800)]
Modify license.
Issue-id:TOSCA-73
Change-Id: I9e5684153ded6299fc9d3b775aad6e955c532e8b
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
pierfranco ferronato [Thu, 22 Sep 2016 09:06:55 +0000 (09:06 +0000)]
Merge "Add controller manager page, only static web pages."
Luji [Thu, 22 Sep 2016 08:21:03 +0000 (08:21 +0000)]
Merge "add resource mgr gui code"
nancylizi [Thu, 22 Sep 2016 07:55:40 +0000 (15:55 +0800)]
Add codes splitting template detail tab page into single pages, and modify import path of common files.
Issue-id:TOSCA-71
Change-Id: I4aad4695debe425ca616c0a737862ddb246f2f12
Signed-off-by: nancylizi <li.zi30@zte.com.cn>
Luji7 [Thu, 22 Sep 2016 04:27:22 +0000 (12:27 +0800)]
add nfvo topo for detail page
Change-Id: I3679ef9a1f89ad01f43d9fa4a0c1bb80dc304e82
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
pierfranco ferronato [Wed, 21 Sep 2016 11:43:23 +0000 (11:43 +0000)]
Merge "Add resmgr and extsys to parent pom"
victor.gao [Wed, 21 Sep 2016 11:04:46 +0000 (19:04 +0800)]
add resource mgr gui code
Change-Id: Iad23ef36df29db34bc61d3f30e7ac77c12971fa6
Signed-off-by: victor.gao <victor.gao@huawei.com>
MR-ZZC [Wed, 21 Sep 2016 09:44:37 +0000 (17:44 +0800)]
Add controller manager page, only static web pages.
Change-Id: Ic87cbf843688243da0f3c905ccaa9ffcf673b61c
Signed-off-by: MR-ZZC <zhaozhongchao@huawei.com>
Seshu-Kumar-M [Wed, 21 Sep 2016 09:43:42 +0000 (17:43 +0800)]
GSO3 added the new folder structure
Change-Id: I69167f2572d2d845909a37e693f7982ea6c07922
Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
MR-ZZC [Wed, 21 Sep 2016 09:37:37 +0000 (17:37 +0800)]
Add resmgr and extsys to parent pom
Change-Id: I90f0866243585a2fd399b76958f65b1ff735f30f
Signed-off-by: MR-ZZC <zhaozhongchao@huawei.com>
Seshu-Kumar-M [Wed, 21 Sep 2016 09:35:24 +0000 (17:35 +0800)]
GSO3 added the new folder structure
Change-Id: Id277f2fc8c21d9cd5027090611e233670e036d46
Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
Seshu-Kumar-M [Wed, 21 Sep 2016 09:14:26 +0000 (17:14 +0800)]
GSO-3: re-structure of the GUI package for the LCM mgr and Res. Mgr packages
Change-Id: I3871814a2ebcb5377f695ada2042acfe4f2adfb9
Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
s71221 [Wed, 21 Sep 2016 07:17:54 +0000 (15:17 +0800)]
auth added in pom
Change-Id: I28237ebba68eb36557e0b25a90e4212e7b819463
Signed-off-by: s71221 <sukeshac@huawei.com>
Luji [Wed, 21 Sep 2016 04:41:06 +0000 (04:41 +0000)]
Merge "Change folder structure of resmagr module."
Tao Shen [Wed, 21 Sep 2016 04:18:13 +0000 (04:18 +0000)]
Merge "modify frame html files"
“shentao” [Wed, 21 Sep 2016 03:26:56 +0000 (11:26 +0800)]
modify frame html files
Change-Id: Ifd558d7e04c656d5173ebb15c03fb9375a5a34a9
Signed-off-by: “shentao” <shentao@chinamobile.com>
MR-ZZC [Wed, 21 Sep 2016 03:23:05 +0000 (11:23 +0800)]
Change folder structure of resmagr module.
Change-Id: I6d19b8d6f5528b7aa1e976fcea61145c088b1b79
Signed-off-by: MR-ZZC <zhaozhongchao@huawei.com>
Tao Shen [Tue, 20 Sep 2016 13:16:21 +0000 (13:16 +0000)]
Merge "add thirdparty bootstrap-table"
“shentao” [Tue, 20 Sep 2016 12:58:16 +0000 (20:58 +0800)]
add thirdparty bootstrap-table
Change-Id: Id2e3781a19724030f9a122a053382e129dd766ad
Signed-off-by: “shentao” <shentao@chinamobile.com>
Tao Shen [Tue, 20 Sep 2016 12:58:14 +0000 (12:58 +0000)]
Merge "add thirdparty bootstrap-table"
“shentao” [Tue, 20 Sep 2016 12:52:11 +0000 (20:52 +0800)]
add thirdparty bootstrap-table
Change-Id: I01457991e824993fba8fcd9c7670497e53a25a4a
Signed-off-by: “shentao” <shentao@chinamobile.com>
Tao Shen [Tue, 20 Sep 2016 12:48:05 +0000 (12:48 +0000)]
Merge "add portal-common files"
“shentao” [Tue, 20 Sep 2016 12:23:38 +0000 (20:23 +0800)]
add portal-common files
Change-Id: Id92745df42a6fde24d3b4709f6d92815cd88bd80
Signed-off-by: “shentao” <shentao@chinamobile.com>
jin xin [Tue, 20 Sep 2016 11:11:44 +0000 (11:11 +0000)]
Merge "add the license text."
zhouruiyu [Tue, 20 Sep 2016 10:55:24 +0000 (18:55 +0800)]
add the license text.
Change-Id: I75b51c8a73775cd30d4d979373007892409c3881
Signed-off-by: zhouruiyu <zhouruiyu@huawei.com>
Tao Shen [Tue, 20 Sep 2016 10:27:10 +0000 (10:27 +0000)]
Merge "update jquery.dataTables.js version to 1.10.11"
“shentao” [Tue, 20 Sep 2016 10:13:00 +0000 (18:13 +0800)]
update jquery.dataTables.js version to 1.10.11
Change-Id: Id4763097245b4a9e1adf0b734b0ff993a2233e73
Signed-off-by: “shentao” <shentao@chinamobile.com>
jin xin [Tue, 20 Sep 2016 10:07:10 +0000 (10:07 +0000)]
Merge "update the json license.txt"
j180240 [Tue, 20 Sep 2016 10:00:43 +0000 (18:00 +0800)]
update the json license.txt
Change-Id: I650173e765607ab64bcb63c4708a78ff6f4c0887
Signed-off-by: jiaxiangli <jiaxiangli@huawei.com>
jin xin [Tue, 20 Sep 2016 09:45:49 +0000 (09:45 +0000)]
Merge "update the license."
Brendan Hassett [Tue, 20 Sep 2016 09:33:47 +0000 (09:33 +0000)]
Merge "1. change the 3rd party path of the user."
j180240 [Tue, 20 Sep 2016 09:32:25 +0000 (17:32 +0800)]
update the license.
Change-Id: I95eb430224302130bd4170e6d6451270fb86bba1
Signed-off-by: jiaxiangli <jiaxiangli@huawei.com>
j180240 [Tue, 20 Sep 2016 08:59:10 +0000 (16:59 +0800)]
update the license.
Change-Id: I5b159c3cc765b8482fe1dd1f864ba7d145455d3c
Signed-off-by: jiaxiangli <jiaxiangli@huawei.com>
j180240 [Tue, 20 Sep 2016 08:36:25 +0000 (16:36 +0800)]
update the license.
Change-Id: Iae9b27b6423129c27dd1debfe20ac42c06129c06
Signed-off-by: jiaxiangli <jiaxiangli@huawei.com>
huangjian [Tue, 20 Sep 2016 04:26:41 +0000 (12:26 +0800)]
Change groupid
Change-Id: I32ecb588623ae84a823282b0e77f764b2c611a81
Signed-off-by: huangjian <huang.jian12@zte.com.cn>
zhouruiyu [Tue, 20 Sep 2016 04:13:23 +0000 (12:13 +0800)]
1. change the 3rd party path of the user.
Change-Id: Iab5cb92678c08de466f90931146da981b79f7429
Signed-off-by: zhouruiyu <zhouruiyu@huawei.com>
huangjian [Tue, 20 Sep 2016 03:24:32 +0000 (11:24 +0800)]
Set java files encoding to UNIX
Change-Id: I4f321a11b56f3b2f2b14e63a814632a7c1c7ba88
Signed-off-by: huangjian <huang.jian12@zte.com.cn>
Luji [Mon, 19 Sep 2016 16:46:29 +0000 (16:46 +0000)]
Merge "add servicegateway implementation for deleteService"
Luji [Mon, 19 Sep 2016 16:38:12 +0000 (16:38 +0000)]
Merge "Reset artifact versions to 1.0.0-SNAPSHOT"
Luji7 [Mon, 19 Sep 2016 16:36:31 +0000 (00:36 +0800)]
add servicegateway implementation for deleteService
Change-Id: I9dd276ccdf1f645c7e62d08eeafc81c751b2f03f
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
Tao Shen [Mon, 19 Sep 2016 13:05:23 +0000 (13:05 +0000)]
Merge "add thirdparty files"
“shentao” [Mon, 19 Sep 2016 12:58:35 +0000 (20:58 +0800)]
add thirdparty files
Change-Id: Ia75c0667f39b6fa14214b4623c5c5832043d2773
Signed-off-by: “shentao” <shentao@chinamobile.com>
Luji7 [Mon, 19 Sep 2016 12:28:28 +0000 (20:28 +0800)]
Fix build error. relativePath use default value
Change-Id: If86ded0095b91fa3776652633c3fc85281f27e94
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
Tao Shen [Mon, 19 Sep 2016 11:01:41 +0000 (11:01 +0000)]
Merge "add thirdparty files"
“shentao” [Mon, 19 Sep 2016 09:32:42 +0000 (17:32 +0800)]
add thirdparty files
Change-Id: Ice7ebee337a78faf506691e80d4a9a83f4eb7f02
Signed-off-by: “shentao” <shentao@chinamobile.com>
jin xin [Mon, 19 Sep 2016 07:44:28 +0000 (07:44 +0000)]
Merge "upload the Swagger.json of servicegateway."
j180240 [Mon, 19 Sep 2016 07:07:19 +0000 (15:07 +0800)]
upload the Swagger.json of servicegateway.
Change-Id: I056f534f166d8cea0411bef7287ebbfa058b2fe9
Signed-off-by: jiaxiangli <jiaxiangli@huawei.com>
Code Review / vnfsdk / refrepo.git / log